gentoo resync : 20.06.2021

3 files changed, 33 insertions, 83 deletions

diff --git a/games-action/solar2/Manifest b/games-action/solar2/Manifest
index 3d753a0d196b..47f1667bf5d7 100644
--- a/games-action/solar2/Manifest
+++ b/games-action/solar2/Manifest
@@ -1,4 +1,4 @@
 DIST solar2-linux-1.10.tar.gz 106202569 BLAKE2B 4dc1f0c273aa8363178c581a516969a22707a5345eb11a373f96dd8136af3b390451cd72e7b06bc661ef3e8926f0339d3dad70e9b950210e7820efe9913fe9af SHA512 68475cfe9220a1f19608cd2dfb575979e231dcf1bc61e12230db5a39856a03afceeb8c3f2b0ea6d958b36a53945bdb2768261f2b0bcc50a88f2b3eeddc48df9d
 DIST solar2.png 8260 BLAKE2B cf154377ee73b6d0f3c86e0377b29ca7208ef030183db7bae88b352d5684f3c513d0ad57119121a79906287e72d0a863891285224b631fa44d2ccee12a1eacef SHA512 a85e875e3a159670ea2a3f32687e7e52cf369f29add86f19e6431f05e7835c1a30303ddd4ff406a525c1086298807c2f94773dd987d4d99b89bc7c63150c9c85
-EBUILD solar2-1.10-r1.ebuild 2499 BLAKE2B bbe1195d0f7a651f15d086392a33999fa3dd947f2ea988fbd845b13bababa98ddaff37302732c1e8f7c5a150a218cc6e89519f5f818aade98e737e46776eccbd SHA512 ea04f3ae67e3a4b3c867ccd803351c4fe641dd084503c32bdfbaa7e4fe1be657c394866daf7c7cc47d745e03416673839286bb8fd031aadba326daa7805242fb
-MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
+EBUILD solar2-1.10-r1.ebuild 1571 BLAKE2B d499b593d8e922224ea7eb12129753abe3592f8489bb30bd51d876d613e27d22fad679e7d94dfba017c4c30f6788138be447e4bf0d588f24cf3cbed8b88ea654 SHA512 ffe56346055a311e88e7c0fe2ff7d5cb84ff71d78c824c4d8870075604a842cf0dc5a3de8b91685afa34bbaef9a606139189622c142e2ec6f0f6e3d25246a01a
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/solar2/metadata.xml b/games-action/solar2/metadata.xml
index b878aaa1812d..26079e608bed 100644
--- a/games-action/solar2/metadata.xml
+++ b/games-action/solar2/metadata.xml
@@ -5,9 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="bundled-libs">
-			Use the upstream provided bundled libraries.
-		</flag>
-	</use>
 </pkgmetadata>
diff --git a/games-action/solar2/solar2-1.10-r1.ebuild b/games-action/solar2/solar2-1.10-r1.ebuild
index 1d32c61c8bba..a201117007e2 100644
--- a/games-action/solar2/solar2-1.10-r1.ebuild
+++ b/games-action/solar2/solar2-1.10-r1.ebuild
@@ -1,105 +1,60 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop gnome2-utils wrapper
+inherit desktop wrapper
 
-GAMEBALL="${PN}-linux-${PV}.tar.gz"
-ICONFILE="https://dev.gentoo.org/~chewi/distfiles/${PN}.png"
-DESCRIPTION="An open-world, sandbox game set in an infinite abstract universe"
+DESCRIPTION="Open-world sandbox game set in an infinite abstract universe"
 HOMEPAGE="http://murudai.com/solar/"
-SRC_URI="${GAMEBALL} ${ICONFILE}"
-S="${WORKDIR}"/Solar2
+SRC_URI="
+	${PN}-linux-${PV}.tar.gz
+	fetch+https://dev.gentoo.org/~chewi/distfiles/${PN}.png"
+S="${WORKDIR}/Solar2"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
+RESTRICT="bindist fetch"
 
-RESTRICT="bindist fetch splitdebug"
+# game outputs audio using openal and libsdl backends simultaneously
+RDEPEND="
+	media-libs/libsdl[X,joystick,opengl,sound,video,abi_x86_32(-)]
+	media-libs/openal[abi_x86_32(-)]
+	media-libs/sdl-mixer[mad,mp3,abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]"
 
-MYGAMEDIR=opt/${PN}
 QA_PREBUILT="
-	${MYGAMEDIR#/}/lib/*
-	${MYGAMEDIR#/}/Solar2.bin.x86
-"
-
-# TODO: - unbundle libmono for 64bit
-#       - unbundling libSDL_mixer breaks the game
-#       - provide icon
-#       - test useflags for libsdl on x86
-RDEPEND="
-	virtual/opengl
-	amd64? (
-		>=media-libs/flac-1.2.1-r5[abi_x86_32(-)]
-		>=media-libs/libsdl-1.2.15-r4[X,sound,video,joystick,abi_x86_32(-)]
-		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-		!bundled-libs? (
-			>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)]
-			>=media-libs/openal-1.15.1[abi_x86_32(-)]
-			>=media-libs/sdl-mixer-1.2.12-r4[flac,mikmod,mad,mp3,vorbis,abi_x86_32(-)]
-			>=media-libs/libmikmod-3.2.0[abi_x86_32(-)]
-		)
-	)
-	x86? (
-		media-libs/flac
-		media-libs/libsdl[X,sound,video,joystick]
-		media-libs/libvorbis
-		!bundled-libs? (
-			dev-lang/mono
-			media-libs/libmad
-			media-libs/libmikmod
-			media-libs/openal
-			media-libs/sdl-mixer[flac,mikmod,mad,mp3,vorbis]
-		)
-	)"
+	opt/${PN}/Solar2.bin.x86
+	opt/${PN}/lib/libmono-2.0.so.1"
 
 pkg_nofetch() {
-	einfo "Please buy and download ${GAMEBALL} from:"
+	einfo "Please buy and download '${A%% *}' from:"
 	einfo "  ${HOMEPAGE}"
-	einfo "Also download ${ICONFILE}"
-	einfo "and move both to your distfiles directory. The Humble Bundle download"
-	einfo "may have a timestamp appended to the filename."
+	einfo "and place it in your distfiles directory. The Humble Bundle"
+	einfo "download may have a timestamp appended to the filename."
 }
 
 src_prepare() {
 	default
 
-	# remove unused files
-	rm solar2.sh || die
+	# remove duplicate libmono and unused wrapper
+	rm lib/libmono-2.0.so solar2.sh || die
 
-	if ! use bundled-libs ; then
-		einfo "Removing bundled libs..."
-		if use amd64 ; then
-			# no mono 32bit libs on amd64 yet
-			rm -v lib/libmad.so* lib/libmikmod.so* lib/libopenal.so* || die
-		else
-			rm -v lib/libmad.so* lib/libmikmod.so* lib/libopenal.so* lib/libmono-2.0.so* || die
-		fi
-	fi
+	# remove bundled libs except mono (had no success using system's)
+	rm lib/lib{SDL_mixer-1.2,mad,mikmod,openal}.so* || die
 }
 
 src_install() {
-	insinto ${MYGAMEDIR}
-	doins -r *
-
-	make_wrapper ${PN} "./Solar2.bin.x86" "${MYGAMEDIR}"
-	make_desktop_entry ${PN}
-	doicon -s 64 "${DISTDIR}"/${PN}.png
+	insinto /opt/${PN}
+	doins -r .
 
-	fperms +x ${MYGAMEDIR}/Solar2.bin.x86
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
+	fperms +x /opt/${PN}/Solar2.bin.x86
+	make_wrapper ${PN} ./Solar2.bin.x86 /opt/${PN}
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} "Solar 2"
 
-pkg_postrm() {
-	gnome2_icon_cache_update
+	# game insists on loading sdl-mixer from its own directory
+	dosym -r /{usr,opt/${PN}}/lib/libSDL_mixer-1.2.so.0
 }