gentoo resync : 12.07.2021

4 files changed, 32 insertions, 55 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 4d2ee5ab0655..1ac77199ed6f 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/little-inferno/Manifest b/games-misc/little-inferno/Manifest
index c7d1b0ea76fe..fa4d22f1eca6 100644
--- a/games-misc/little-inferno/Manifest
+++ b/games-misc/little-inferno/Manifest
@@ -1,3 +1,3 @@
 DIST LittleInferno-20130509.sh 194304242 BLAKE2B 993d387c31cca0a92b7c1cf06581f60dfc31ba001250cfac00036204143350764d5ab023d6cc432e477219ac9cb24223fae21a422ecb501e58f499ae38469aac SHA512 19e2e616b1b1a6e7f8974ba12756c4b54c1daa99c99056891c56f7ed578f20a15143d683960efbb69f3d680243dd219051fc0bdac60ab74dcddc1c69df7d00dd
-EBUILD little-inferno-20130509-r1.ebuild 1539 BLAKE2B e9f58944632983a8079db78482fdcf46691f6d07973f82bc688fcdea2dfbadc996c177f62105a654e769d6748774ec17aacee16d86721f94ec939e2187761a42 SHA512 ab22e841639e964fa36bbf4955bea3439d58ce9b1db8d8eef3d863b232c5da09ccff17dea756aafc688c9a1b5793d909a294d8c641e4f98086adcc1d79a84abd
-MISC metadata.xml 326 BLAKE2B 20c0a3a6cbb19e457c09b386a837b4202cf279231a681f3da7d604f3bffcfe6761f849ce82bc0169cc498d9bab565ff75216f4b749068e6663f5acbace935f7b SHA512 87eee3f514c290aba519dad7fdb335424ebd7ed7bb1cfa8650d293136ad2a6efdb44eff2c1c48973e9a587f282a2114866d9e4d66adb857b61a085d5635ecfd2
+EBUILD little-inferno-20130509-r1.ebuild 1358 BLAKE2B a944bf88adb02c35300e9bbe1c30e7906a8df5667c75e8f5295f413e387175fa33bec62269d0775d1a1ca84e85ad9fbe49d205aff4dac13361382cbcd11f640d SHA512 7937f1019ba7c46e92cd549dd462c4934ec17e2d1387c8221774edaa726fa964193d49382d9b71a7d0e81afc60b2597c04f9d715906e2d3b3aeb261adaab0ffd
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-misc/little-inferno/little-inferno-20130509-r1.ebuild b/games-misc/little-inferno/little-inferno-20130509-r1.ebuild
index 91d4eb7d18eb..cac9b4d67135 100644
--- a/games-misc/little-inferno/little-inferno-20130509-r1.ebuild
+++ b/games-misc/little-inferno/little-inferno-20130509-r1.ebuild
@@ -3,75 +3,55 @@
 
 EAPI=7
 
-inherit desktop gnome2-utils unpacker wrapper
+inherit desktop unpacker wrapper
 
 DESCRIPTION="Throw your toys into your fire, and play with them as they burn"
-HOMEPAGE="http://tomorrowcorporation.com/"
+HOMEPAGE="https://tomorrowcorporation.com/littleinferno"
 SRC_URI="LittleInferno-${PV}.sh"
+S="${WORKDIR}"
 
 LICENSE="Gameplay-Group-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
+RESTRICT="bindist fetch"
 
-RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
-
-MYGAMEDIR=opt/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/LittleInferno.bin.x86
-	${MYGAMEDIR#/}/lib/*"
+QA_PREBUILT="
+	opt/${PN}/LittleInferno.bin.x86
+	opt/${PN}/lib/libogg.so.0
+	opt/${PN}/lib/libvorbis.so.0"
 
 RDEPEND="
-	>=net-misc/curl-7.37.0-r1[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
+	media-libs/openal[abi_x86_32(-)]
+	net-misc/curl[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
-	!bundled-libs? (
-		>=media-libs/libogg-1.3.1[abi_x86_32(-)]
-		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-		>=media-libs/openal-1.15.1-r1[abi_x86_32(-)]
-	)
-"
-BDEPEND="app-arch/xz-utils"
-
-src_unpack() {
-	unpack_makeself ${A}
-
-	mkdir ${P} || die
-	cd ${P} || die
+	x11-libs/libX11[abi_x86_32(-)]"
 
-	local i
-	for i in instarchive_{,linux_}all ; do
-		mv ../"${i}" ../"${i}".tar.xz || die
-		unpack ./../"${i}".tar.xz
-	done
+pkg_nofetch() {
+	einfo "Please buy and download '${A}' from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and place it in your distfiles directory."
 }
 
-src_prepare() {
-	default
-
-	if ! use bundled-libs ; then
-		rm -rv lib || die
-	fi
+src_unpack() {
+	unpack_makeself ${A}
+	mv instarchive_all{,.tar.xz} || die
+	mv instarchive_linux_all{,.tar.xz} || die
+	unpack ./instarchive_{,linux_}all.tar.xz
 }
 
 src_install() {
-	insinto ${MYGAMEDIR}
-	doins -r *
-
-	doicon -s 128 LittleInferno.png
-	make_desktop_entry ${PN} "Little Inferno" LittleInferno
-	make_wrapper ${PN} "./LittleInferno.bin.x86" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
+	exeinto /opt/${PN}
+	doexe LittleInferno.bin.x86
 
-	fperms +x ${MYGAMEDIR}/LittleInferno.bin.x86
-}
+	insinto /opt/${PN}
+	doins -r {debug,embed,frontend,resource}.pak shaders
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
+	# game currently segfaults without bundled libvorbis
+	exeinto /opt/${PN}/lib
+	doexe lib/lib{ogg,vorbis}.so.0
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
+	make_wrapper ${PN} ./LittleInferno.bin.x86 /opt/${PN}
 
-pkg_postrm() {
-	gnome2_icon_cache_update
+	newicon LittleInferno.png ${PN}.png
+	make_desktop_entry ${PN} "Little Inferno"
 }
diff --git a/games-misc/little-inferno/metadata.xml b/games-misc/little-inferno/metadata.xml
index befc8c80e0b1..26079e608bed 100644
--- a/games-misc/little-inferno/metadata.xml
+++ b/games-misc/little-inferno/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="bundled-libs">Use bundled libraries.</flag>
-	</use>
 </pkgmetadata>