From bc00b0a0a7f8581cd20bf61d95522078ca3fe332 Mon Sep 17 00:00:00 2001
From: grepwood <grepwood>
Date: Tue, 21 Apr 2020 04:46:29 +0200
Subject: [PATCH] Paid dues for Fallout 1

---
 eclass/gog.eclass                             | 11 +++++-----
 games-rpg/fallout1/fallout1-1.1.ebuild        | 20 +++++++++----------
 .../lgogdownloader-3.7-r1.ebuild              |  4 ++--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/eclass/gog.eclass b/eclass/gog.eclass
index 5eb466a..e4af077 100644
--- a/eclass/gog.eclass
+++ b/eclass/gog.eclass
@@ -16,6 +16,9 @@
 # It is up to the ebuild to enable and offer other alternate avenues to support
 # a particular game.
 
+# In order to disable network-sandbox:
+PROPERTIES+="live"
+
 # @ECLASS-VARIABLE: GOG_GAME_NAME
 # @DESCRIPTION:
 # Name of the game as it appears in lgogdownloader list.
@@ -39,15 +42,13 @@
 # through separate installers.
 : ${GOG_GAME_INSTALLER:=()}
 
-LICENSE="GOG_EULA"
+LICENSE+="GOG_EULA"
 BDEPEND+="
 	games-util/lgogdownloader[portage]
-	app-arch/innoextract"
+	app-arch/innoextract
+"
 
 gog_sanity_check() {
-	if [ $(echo ${FEATURES} | tr ' ' '\n' | grep -c network\-sandbox) -ne 0 ]; then
-		die "This ebuild requires network-sandbox to be removed from FEATURES."
-	fi
 	portageq envvar GOG_CONFIG >/dev/null 2>/dev/null
 	if [ $? -ne 0 ]; then
 		die "Please define GOG_CONFIG in /etc/portage/make.conf as the output of export_gog_to_portage."
diff --git a/games-rpg/fallout1/fallout1-1.1.ebuild b/games-rpg/fallout1/fallout1-1.1.ebuild
index 8c52bd5..43d1e65 100644
--- a/games-rpg/fallout1/fallout1-1.1.ebuild
+++ b/games-rpg/fallout1/fallout1-1.1.ebuild
@@ -25,16 +25,16 @@ GOG_GAME_L10N="en"
 GOG_GAME_PLATFORM="w"
 GOG_GAME_INSTALLER="setup_fallout_2.1.0.18.exe"
 
-BDEPEND="${BDEPEND}
+BDEPEND+="
 	media-gfx/icoutils
 	media-gfx/imagemagick
 	dos? ( app-arch/unzip )
 "
 
-RDEPEND="
-	dos?	( games-emulation/dosbox
-		  app-emulation/dos32a )
-	wine?	( app-emulation/wine-vanilla[abi_x86_32] )
+RDEPEND+="
+	dos?  (	games-emulation/dosbox
+			app-emulation/dos32a )
+	wine? (	app-emulation/wine-vanilla[abi_x86_32] )
 "
 
 DEPEND="${RDEPEND}"
@@ -45,21 +45,21 @@ src_unpack() {
 	gog_initialize
 	FALLOUT_EXE="fallout1_wine"
 	gog_download_installer
-	innoextract -I app -e ${GOG_GAME_NAME}/${GOG_GAME_INSTALLER}
+	innoextract -I app -e "${GOG_GAME_NAME}/${GOG_GAME_INSTALLER}"
 	wrestool -x -t14 -o . app/falloutw.exe
 	convert falloutw.exe_14_99_0.ico fallout1.png
 	mv fallout1-4.png fallout1.png
 	if use dos; then
-		cp ${DISTDIR}/HMID*.386 app
-		unzip ${DISTDIR}/fallup1d.zip FALL11.ZIP
+		cp "${DISTDIR}"/HMID*.386 app
+		unzip "${DISTDIR}/fallup1d.zip" FALL11.ZIP
 		unzip FALL11.ZIP FALLOUT.EXE
 		mv FALLOUT.EXE app
 		ln -s /usr/share/dos32a/dos32a.exe app/dos4gw.exe
-		cp ${FILESDIR}/dosbox.conf app
+		cp "${FILESDIR}/dosbox.conf" app
 		FALLOUT_EXE="fallout1_dos"
 	fi
 	mv app fallout1
-	cp ${FILESDIR}/${FALLOUT_EXE} fallout1_exe
+	cp "${FILESDIR}/${FALLOUT_EXE}" fallout1_exe
 }
 
 src_install() {
diff --git a/games-util/lgogdownloader/lgogdownloader-3.7-r1.ebuild b/games-util/lgogdownloader/lgogdownloader-3.7-r1.ebuild
index 8f078fc..cfa1648 100644
--- a/games-util/lgogdownloader/lgogdownloader-3.7-r1.ebuild
+++ b/games-util/lgogdownloader/lgogdownloader-3.7-r1.ebuild
@@ -37,7 +37,7 @@ src_configure() {
 		-DUSE_QT_GUI=$(usex gui)
 	)
 	if use portage; then
-		patch -p1 < ${FILESDIR}/0001-recycle-cookies-and-tokens.patch
+		patch -p1 < "${FILESDIR}/0001-recycle-cookies-and-tokens.patch"
 	fi
 	cmake_src_configure
 }
@@ -46,6 +46,6 @@ src_install() {
 	cmake_src_install
 	gunzip "${ED}"/usr/share/man/man1/${PN}.1.gz || die
 	if use portage; then
-		dobin ${FILESDIR}/export_gog_to_portage
+		dobin "${FILESDIR}/export_gog_to_portage"
 	fi
 }