app-emulation/windows95: update for new bintron eclass

Signed-off-by: Maciej Barć <xgqt@riseup.net>

app-editors/atom/atom-1.58.0.ebuild

@@ -15,7 +15,6 @@ SLOT="0"
 KEYWORDS="-* ~amd64"
 
 src_install() {
-	dosym ${BINTRON_HOME}/atom /usr/bin/atom
 	doicon "${S}"/atom.png
 	make_desktop_entry atom Atom atom "TextEditor;Development;IDE;"
 

app-emulation/windows95/windows95-2.3.0.ebuild

@@ -18,8 +18,5 @@ src_install() {
 	domenu ../../share/applications/${PN}.desktop
 	doicon ../../share/pixmaps/${PN}.png
 
-	mkdir ./bin || die
-	ln -s ../${PN} ./bin/${PN} || die
-
 	bintron_src_install
 }

dev-util/beekeeper-studio/beekeeper-studio-2.1.4.ebuild

@@ -22,7 +22,5 @@ src_install() {
 	done
 	make_desktop_entry ${PN} "Beekeeper Studio" ${PN} "Development;"
 
-	mkdir ./bin || die
-	ln -s ../${PN} ./bin/${PN} || die
 	bintron_src_install
 }

dev-util/github-desktop/github-desktop-2.9.3.ebuild

@@ -23,8 +23,5 @@ src_install() {
 			../../share/icons/hicolor/${size}x${size}/apps/github-desktop.png
 	done
 
-	mkdir ./bin || die
-	ln -s ../github-desktop ./bin/github-desktop || die
-
 	bintron_src_install
 }

eclass/bintron.eclass

@@ -177,6 +177,7 @@ function bintron_remove_language_paks() {
 function bintron_system_replace() {
 	if use system-ffmpeg; then
 		echo "Replacing bundled libffmpeg"
+
 		rm ./libffmpeg.so ||
 			die "Failed: remove bundled libffmpeg"
 		ln -s "${EROOT}"/usr/lib64/chromium/libffmpeg.so . ||
@@ -184,10 +185,18 @@ function bintron_system_replace() {
 	fi
 	if use system-vulkan; then
 		echo "Replacing bundled libvulkan"
-		rm ./libvulkan.so.1 ||
+
-			die "Failed: remove bundled libvulkan"
+		if [[ -f ./libvulkan.so ]]; then
-		ln -s "${EROOT}"/usr/lib64/libvulkan.so.1 . ||
+			rm ./libvulkan.so ||
-			die "Failed: link libvulkan"
+				die "Failed: remove bundled libvulkan"
+			ln -s "${EROOT}"/usr/lib64/libvulkan.so . ||
+				die "Failed: link libvulkan"
+		elif [[ -f ./libvulkan.so.1 ]]; then
+			rm ./libvulkan.so.1 ||
+				die "Failed: remove bundled libvulkan"
+			ln -s "${EROOT}"/usr/lib64/libvulkan.so.1 . ||
+				die "Failed: link libvulkan"
+		fi
 	fi
 }
 
@@ -214,8 +223,23 @@ function bintron_src_compile() {
 # @DESCRIPTION:
 # Install all the files in a given directory, or current directory.
 function bintron_install_copy() {
+	local dir="${1:=.}"
+
 	mkdir -p "${ED}/${BINTRON_HOME}" || die "Failed: mkdir"
-	cp -r ./"${1}"/* "${ED}/${BINTRON_HOME}" || die "Failed: copy $(pwd)"
+	cp -r "${dir}"/* "${ED}/${BINTRON_HOME}" || die "Failed: copy $(pwd)"
+}
+
+
+# @FUNCTION: bintron_prepare_bin
+# @DESCRIPTION:
+# Preparation for bintron_link_bin.
+# If there is no "bin" directory and a file named "${PN}" exists,
+# then create a link from from "bin/${PN}" to "${PN}".
+function bintron_prepare_bin() {
+	local dir="${1:=.}"
+
+	mkdir -p "${dir}"/bin || die
+	ln -s "${dir}"/../${PN} "${dir}"/bin/${PN} || die
 }
 
 
@@ -223,9 +247,11 @@ function bintron_install_copy() {
 # @DESCRIPTION:
 # Link launchers in "bin" directory.
 function bintron_link_bin() {
-	if [[ -d "${ED}/${BINTRON_HOME}"/bin ]]; then
+	local dir="${1:=.}"
+
+	if [[ -d "${dir}"/bin ]]; then
 		local bin
-		for bin in "${ED}/${BINTRON_HOME}"/bin/*; do
+		for bin in "${dir}"/bin/*; do
 			mkdir -p "${ED}/usr/bin/" || die "Failed: mkdir"
 			chmod +x "${bin}" || die "Failed: make ${bin} executable"
 
@@ -242,8 +268,12 @@ function bintron_link_bin() {
 # @DESCRIPTION:
 # Default src_install.
 function bintron_src_install() {
+	if [[ ! -d ./bin ]] && [[ -f ./${PN} ]]; then
+		bintron_prepare_bin .
+	fi
+	bintron_link_bin .
+
 	bintron_install_copy .
-	bintron_link_bin
 }