gentoo resync : 20.06.2021

23 files changed, 252 insertions, 212 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 8c703f481f92..964ffd500348 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/atanks/Manifest b/games-action/atanks/Manifest
index 61bb8a82102a..b044e9d8066b 100644
--- a/games-action/atanks/Manifest
+++ b/games-action/atanks/Manifest
@@ -1,4 +1,4 @@
 AUX atanks-6.4-fix-build-system.patch 579 BLAKE2B 002bbbbba9981e010669f5b85cccb48816d35f1dfde0a35ef9c6cb1634cc75686b531572fa0c2163f78d49e56f15375b4cc0810798adb56b91e51e877ca3b279 SHA512 86b046c37de4ff24f30dce799f32674d33930605c9da32a1c95e8438f6573e66f46455cbf371f66a1b4d8240c608dd338376be150bab59d4048bb46326f82daa
 DIST atanks-6.5.tar.gz 6059648 BLAKE2B 8a5c3e77391d0e7b3dc8170f49e2cd24fb31eda6f29362851d29eba5dc10748d2b95bfb688771fbbdaac4aada253f06c5ce4064e293335ef59cc8accc43a64a0 SHA512 cb1456e06132da754ae5d9926e118ecb8ac7789747f0a3273bcb49311d79824610bb9cfc74fbba8c75bbefe905d63ae2e01d193ccb37a64759f5490328c8cc89
-EBUILD atanks-6.5.ebuild 829 BLAKE2B 5d0d93be59c19384f2d6481f3567a6f28410ae5d856de96016636bf8426fc8891d5b031e96c58b545b6b4004bd0d273356779f0281fb359646a5c8cac5478ab6 SHA512 3e19aac15f24ce61b6eb615c5fd429a619e34e93411516d04cfc2e549e972e41e7ded1824d9193e42cb4919eb2402c69e80e02443d7b0f9dd28c80f45696c8b3
+EBUILD atanks-6.5.ebuild 769 BLAKE2B ae05f7af473380ea3fce2cdde1b0723bd7381843499951137168a795a92a801d0b19853e9eb56b7eef5e1610849ac75423d26aac0f890092c1fa6eef5ec5d25a SHA512 d0c9536e99e970be9f0bd99cac1f3fa3f620d6c06e823765b49f9f4567a670ca29cedbb6f0a91f827aa567fbb63b726ba7ae59000325097b57c73af2fe1b8a31
 MISC metadata.xml 329 BLAKE2B 7a85aeb104fe2068285701ff8f771f7337a7b5f884b33e683206be3d66aca6e1fbfc611b312e71288ec842c28790bf025b979235677387d72070aa85f0bf0adc SHA512 1dc2914fc7dfe5c7f87ac565b6183b50d281fdf768e05cf211309699a264fde8a3e434ed07049b984e6f116256fec2124ed458ccfc70374ff35ff3189ec57917
diff --git a/games-action/atanks/atanks-6.5.ebuild b/games-action/atanks/atanks-6.5.ebuild
index 1efffe797e76..0c043402a9a0 100644
--- a/games-action/atanks/atanks-6.5.ebuild
+++ b/games-action/atanks/atanks-6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop gnome2-utils toolchain-funcs
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Worms and Scorched Earth-like game"
 HOMEPAGE="https://atanks.sourceforge.io/"
@@ -13,28 +13,27 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="media-libs/allegro:0[X]"
-RDEPEND="${DEPEND}"
+RDEPEND="media-libs/allegro:0[X]"
+DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-6.4-fix-build-system.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.4-fix-build-system.patch
+)
 
-src_configure() {
+src_compile() {
 	tc-export CXX
-}
 
-src_compile() {
 	emake INSTALLDIR="${EPREFIX}/usr/share/${PN}"
 }
 
 src_install() {
 	dobin ${PN}
 
-	local DOCS=( Changelog README TODO )
-	einstalldocs
+	dodoc Changelog README TODO
 
 	insinto /usr/share/${PN}
 	doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt
 
-	doicon -s 48 ${PN}.png
+	doicon ${PN}.png
 	make_desktop_entry atanks "Atomic Tanks"
 }
diff --git a/games-action/barrage/Manifest b/games-action/barrage/Manifest
index 0f7579e49226..499a4a90b542 100644
--- a/games-action/barrage/Manifest
+++ b/games-action/barrage/Manifest
@@ -1,3 +1,5 @@
 DIST barrage-1.0.4.tar.gz 484641 BLAKE2B 84a3747245c2e475c7685cc49259eb8e345fe639e9b345a9b8cb59f36ec04a31f639169a4498a50369e86a3355414e84c7326addcdc519e8bf869734ffd2ae30 SHA512 c866c0b98541c0c878ff015d99a2ae62e123c8095e94f64ef5aed26d68b734432110181c11a5b429d4feb808b2b276ac94295ff2b23ddfc64a8790d04a89a966
+DIST barrage-1.0.5.tar.gz 510221 BLAKE2B 31d0cc322bcd3d896fc11bc0df5246948493e0e3c9c47ddfea598d1f1e3751e1c3bf06123535f88812e6c5e5a2da92c6c7a1c39deedeb6b93938c615de143629 SHA512 a57a46ba1fa8719c6e115522c940edc58027baf8ea11858ca6ac45603f59e373a9ef4ce825a49d6bb05f8935bfbd81e5587c69ce153e64494f7dc1bb9e35f13d
 EBUILD barrage-1.0.4-r1.ebuild 700 BLAKE2B 430b2c2e72decd84e7295ebed62659b76fe768a83ce64ce2c1a38c105f8099f6f2f96af957fbde9d45fe6b74dd46965b351a517d8ec52dd108ef6879be75a470 SHA512 a7028c769eab64bede1bf6ae28fc13656a2d53eab00933468dbd2edc28c5807d4f7aa2fbf3d2a64c11b262215e4bcb94cbd22e697cf8908114f5add2d6b9b21a
+EBUILD barrage-1.0.5.ebuild 880 BLAKE2B b0c35808f8c690faada7cc8dc24b03f4f9f812803b1cbb9248a48c8155a6f1c003c9aed111ec33b5294a2896b4b205309697c4ef59df8cf458f00417de8d01db SHA512 a5089957ce14cfde3279b67cd1374adab2b6c71fa97c9ae525f59e68224131128565d2aa56d2a141d33d0c450020fc952b7054cfc95f6f52b2767f10d8d83a97
 MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-action/barrage/barrage-1.0.5.ebuild b/games-action/barrage/barrage-1.0.5.ebuild
new file mode 100644
index 000000000000..62254d9f380d
--- /dev/null
+++ b/games-action/barrage/barrage-1.0.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+DESCRIPTION="Violent point-and-click shooting game"
+HOMEPAGE="http://lgames.sourceforge.net/Barrage/"
+SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf --localstatedir="${EPREFIX}"/var/games
+}
+
+src_compile() {
+	default
+
+	# generated .desktop hardcodes icon path (and in wrong location)
+	sed -i "/^Icon=/s|=.*|=${PN}|" ${PN}.desktop || die
+}
+
+src_install() {
+	default
+
+	fowners :gamestat /{usr/bin/${PN},var/games/${PN}.hscr}
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/${PN}.hscr
+
+	rm "${ED}"/usr/share/icons/${PN}48.png || die
+	newicon ${PN}48.png ${PN}.png
+}
diff --git a/games-action/chromium-bsu/Manifest b/games-action/chromium-bsu/Manifest
index a1f147faeade..dc6e1d92912d 100644
--- a/games-action/chromium-bsu/Manifest
+++ b/games-action/chromium-bsu/Manifest
@@ -1,4 +1,6 @@
 AUX chromium-bsu-0.9.15.1-gcc6.patch 4183 BLAKE2B 33c6bbb1f3a21c62b6f693714ad215c7561637bbb9bc45172a89e8254a04b3346452ac2b7fa4e0b6c2460a05ad68d78c5011910f71bdf28ba4483d66465780c1 SHA512 dd6c35feba99ae8654840cbe433961f054412bc40b0221aa0bc0709723dd4f0ed91b35f82ed74f652ce2f9848093c861f79cefecae147a84be1705a16e1cdc2e
 DIST chromium-bsu-0.9.15.1.tar.gz 1689634 BLAKE2B c834cb5b962031a1b8d187df9a58104896a53188907e5c3e7776aa129be3ff9287c6750af3f3df2a447b86f9f67f7dc5db21dca7d6f6cdaf2a8faad619723c75 SHA512 1e62161a10a5eb4246c0e04a13e7d8b521218aa709cced5bed1440055bb91bbcff45a85e544bdc6854f1ed727ea15257d34a3c988c65818bfbfe8004ac76c104
+DIST chromium-bsu-0.9.16.1.tar.gz 1709898 BLAKE2B b89ba20756fcb5903ed45c5174a0353618fb1bb1577ddb3f525d3f2a4242744e76297ca35fe186d36687d4d7f6bbe8de2a5dca8049697d5b82059e056fd16995 SHA512 1d202c0704e16b31d93c552ae6cfc17caf1182a9ec80730a981cd99c8ca8cb64d4e6e838691aa86e17ea23b7c2c0b1e7b1f4dab91bbc6129f9bf86801f2b27c8
 EBUILD chromium-bsu-0.9.15.1-r1.ebuild 1285 BLAKE2B 16aa18c5d90449a56aecc394edb6d3acce50a9124b7613070d5b2a0dcea247ad303e1bd6e819d8ba1deb9e6b8a6416c1008a1f3cb74bce560305172b47422898 SHA512 2965e817946b29b76a4c60d177717e920ae855e6dc66b032e1930fb32769480573fee03002271b2aede02092bee30c638a95febc20ee6799a114ce4e68f64ed9
+EBUILD chromium-bsu-0.9.16.1.ebuild 1119 BLAKE2B 17992d61e4077c226a3ccaf359745b3e5171378c489051496e80f7e6dab45543b3fe8e8528c1e7288388b096dbcc29a5fff3061d3263e404878f76ec6f421a13 SHA512 9a1b94594156adbb9f6d6dc51512a41f9a820aba4a854d05b1e834101e990afac7152a9d660a043682f358510c96569a0de1d3219b10df4311733510c5bc7890
 MISC metadata.xml 484 BLAKE2B ad101206b1434b2030e28ad1c2c756c81b37613b9231f1354bb9ab329d7ecde001db56042963280333df042b8ef8c19e433737269169fe27a337cdcfc59d218c SHA512 7695d9d521352e0147da5357117ddf30ca854c2bd78948f79a6dbf5151ca482302f56a9ecc7e0384ca11d54b95623309011392bfa61753f0a17966f7bedda86f
diff --git a/games-action/chromium-bsu/chromium-bsu-0.9.16.1.ebuild b/games-action/chromium-bsu/chromium-bsu-0.9.16.1.ebuild
new file mode 100644
index 000000000000..2868bdfc3dd5
--- /dev/null
+++ b/games-action/chromium-bsu/chromium-bsu-0.9.16.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic xdg
+
+DESCRIPTION="Fast paced, arcade-style, top-scrolling space shooter"
+HOMEPAGE="http://chromium-bsu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/chromium-bsu/${P}.tar.gz"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openal"
+
+RDEPEND="
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/quesoglc
+	media-libs/sdl2-image[png]
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	openal? (
+		media-libs/freealut
+		media-libs/openal
+	)
+	!openal? (
+		media-libs/libsdl2[sound]
+		media-libs/sdl2-mixer
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	append-cppflags -DWITH_JOYSTICK
+
+	local econfargs=(
+		$(use_enable openal)
+		--docdir="${EPREFIX}"/usr/share/${PF}/html
+
+		# there's other build-time alternatives but most are deprecated/dead
+		# or with some issues, simply stick to the newly added SDL2 support
+		--disable-{ftgl,glpng,glut,sdl,sdlimage,sdlmixer}
+	)
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+}
diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index 0d66cd3d1855..426fc0795284 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,4 +1,4 @@
 DIST dxx-rebirth-0.61.0_pre20200615.tar.gz 1959226 BLAKE2B 08d66eb1599100172e2bd8dcb8e13ca11314f3b06658c36851ddc7d91897a8376899b7c33b6e7a2d7b72e93cf7f20f157994d06f880e138dc807350e4c64c517 SHA512 3470e2b9cf20268f1af5e8084f0b361d1dd5d797bee9a1d97ce5509046f79750ac214d0f34e7eef1acc4ee4ae868ad3f34d33b45ff163863333e9d8a7d758db2
-EBUILD dxx-rebirth-0.61.0_pre20200615.ebuild 8845 BLAKE2B b08a16ab08f97c81ed2b152641beb63838e7c3d5191da513978cda584878525d01273babea1213f5bc503dff5bf6c352ed8e0394347c99da38805c31572360ba SHA512 f68759d96627ed2cc1d074985631651e97ba9d70294c6b192416ce22f7b7fb893eb91a03fdb2480d10c8bdf027ee480753542f8bb7f2690ca3406b8b49c355fb
-EBUILD dxx-rebirth-9999.ebuild 8403 BLAKE2B 01a97a53447e4d1546348e239289204f0897b9158b27de27ff48531b556bbc6df4cf9bedc7602bcdc9b406398a9ceacc0c334083f6faa4890f2f27392c7fc165 SHA512 e18d4c2b33cc8cee139f3d643df55f2a51b598c68b3dfb1eef0c7089a4252bce276b1bb66f4e80c2d9ab4d6bc4f12eac0a14dce4752effd5d4d79881f139ac3c
+EBUILD dxx-rebirth-0.61.0_pre20200615.ebuild 8874 BLAKE2B 8f4b020a8280fc197e45eb07f6fd24f57fc279301e0e9c4f643d0121c4dc5310a71af0fc8759daf6efdce4929db1e0438679d8970438b63b903c4c40bdb2d8e2 SHA512 935210d506c489f56332bbd75c429bc1eef2d98db4cd324e45547fdb4b55143324921b836f4a2213c9f39cb6658517e55a44b7817d2cb3b6ae147236aaddb1e2
+EBUILD dxx-rebirth-9999.ebuild 8432 BLAKE2B 1ca0fcc3547e62cb2e3aaa0f950227b99de114d5ee4be525c33579e7b5b2b0b96e42e2e6b50ac2ed67f18ea8da52df92f16e1293b0979c401c4689178f1cbfce SHA512 608cf593b9fa0d404b47c07dc9d7a93325f63cb3e9c4fc6a4a40d551140611897ee3641e86835b357a3db7cc27e69f9f8df3433d6231b01d7287f99ce2dcc7a2
 MISC metadata.xml 2537 BLAKE2B 709f8b7ed142ab72535062bda6d890dd4e17a4c37a68689544858d71b932740080444c400a0d86c0365954650e0638162185b4c1447b96a1b5fd4d656ed9857c SHA512 2f326d7d55af3a5d1ac3e35df2e46deb0c8dd1057b6eb2be301b80f7518a138c7518c6794d15ef0d0d60356ac8711d0f2b718f1b033f8d69ae296ee242dfb634
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
index 86ced2d16b5b..2f380b10341f 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
@@ -168,6 +168,8 @@ REQUIRED_USE='
 # and therefore requires a rebuild when changed.
 #IUSE_RUNTIME="flac l10n_de midi mp3 opl3-musicpack sc55-musicpack vorbis"
 
+BDEPEND="virtual/pkgconfig"
+
 dxx_scons() {
 	# Always build profile `m`.  If use editor, also build profile `e`.
 	# Set most variables in the default anonymous profile.  Only
diff --git a/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild b/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
index 5a01f9daaefc..b29054e2a7bc 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
@@ -151,6 +151,8 @@ REQUIRED_USE='
 	sdl2? ( opengl )
 '
 
+BDEPEND="virtual/pkgconfig"
+
 # As of this writing, IUSE_RUNTIME is a GLEP, but not an implemented
 # feature.  This variable is stored here to be ready to activate when
 # Portage implements this feature.
diff --git a/games-action/heroes/Manifest b/games-action/heroes/Manifest
index 241b69557ecc..c085bc5e5042 100644
--- a/games-action/heroes/Manifest
+++ b/games-action/heroes/Manifest
@@ -7,5 +7,5 @@ DIST heroes-0.21.tar.bz2 709079 BLAKE2B 356c7c97504c5abe6c9e94a9ba190613d199000c
 DIST heroes-data-1.5.tar.bz2 391970 BLAKE2B b4325e978955ad6cfe522055755ebcc0ff487a9fdc136dbeaea30073f450d50946859d61cf44f75ab89be556e0886f8cb6ff3623c84c3275194ac81e60b1d0f9 SHA512 a4cb1508c2010b2157dc0e1d0a7973131fa167cb1f3c93649c3bc9b2c37419e4429e33cde14f3b67c7a4670f751ff4c28d88604102780bdb1fe5c77a93e1a213
 DIST heroes-sound-effects-1.0.tar.bz2 389883 BLAKE2B cd4e889bf7e0b33eda33806040d3141576d60b93332d6c4bf7d41fd587bb9d661ded4f619e313e17d8508500e138f7f3ce08b9336818f85d9e240d2fdebaf4e2 SHA512 51da63373f1bdb2314a8c3164028ee9cbb95958bfe8f13b1119236f035282a711efcc6ef5a84fd647c1e8451b4da788a74e4b8506e1476a437299dfc7b2046d1
 DIST heroes-sound-tracks-1.0.tar.bz2 1245613 BLAKE2B b390a96065c6b127addc0bc25326c8d0055b13f896d33e765ab9a5b3c45d831c0f91e1cff361f43a2b4956e87a6a980ce2cd07d6e6588357038f92805c64dbd1 SHA512 3e7ee2890c47366a39cfc7d7b9a1e5fdf3c3379013ca96072586ba909e2a602b114c728ffbe9dfe8eb6b62232cb6c25b13475f2a33da0243ea1ffb3f040842f0
-EBUILD heroes-0.21-r2.ebuild 1542 BLAKE2B d3e59ea72325b58f00aef689c05c4c57ecf767f28908b650494a72bdd26b0f44ee2de912bbf59e825acc18121d3ce6bcdae09bd0ae68a5c53c7388d5c17e13b4 SHA512 7e7c01995b2325f4c05b45c12060aaa9806e1046921462badb01afff8dddb2de34d5e85e8d750417ec00fd0de842c8bc3fbcdf84571b6827ce734f515a1fa182
+EBUILD heroes-0.21-r3.ebuild 1584 BLAKE2B cfdee2930a0856bb3460971d3b8d267c089641fa0c5912268ff4f2e883eb7590cf56c450acee0735ab6c17a14fb467a76026ab840060d21653a83279559bc498 SHA512 b996f5228d8385725b1e24fe510fde56c9eb2dd54cf62d5ff262e13d8ee3faaff6550a18150b46fc5dd704717a1bbce87d78c875d51356f4fa791a23934abfea
 MISC metadata.xml 329 BLAKE2B 3d95771553c911350c23023422240c0a791ede2044a55bf40a25ac4c5ac84114ddb2942b370b9605a966d4dac960b1498f278394925d065bee642164f4893187 SHA512 f33d2b7d06f5e772abf4acb8b3dc8ba78b52ab8220a350ddc64d8bde67e850062830b4251f13021b8472b110602c937cfdc3fd34c97c37ba455542b771ecb872
diff --git a/games-action/heroes/heroes-0.21-r2.ebuild b/games-action/heroes/heroes-0.21-r3.ebuild
index a576ebf8f758..502043e2eb33 100644
--- a/games-action/heroes/heroes-0.21-r2.ebuild
+++ b/games-action/heroes/heroes-0.21-r3.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
-
-data_ver=1.5
-snd_trk_ver=1.0
-snd_eff_ver=1.0
+inherit autotools desktop
 
 DESCRIPTION="Heroes Enjoy Riding Over Empty Slabs: similar to Tron and Nibbles"
 HOMEPAGE="http://heroes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${PN}-data-${data_ver}.tar.bz2
-	mirror://sourceforge/${PN}/${PN}-sound-tracks-${snd_trk_ver}.tar.bz2
-	mirror://sourceforge/${PN}/${PN}-sound-effects-${snd_eff_ver}.tar.bz2"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://sourceforge/${PN}/${PN}-data-1.5.tar.bz2
+	mirror://sourceforge/${PN}/${PN}-sound-tracks-1.0.tar.bz2
+	mirror://sourceforge/${PN}/${PN}-sound-effects-1.0.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ggi nls sdl"
+IUSE="ggi nls +sdl"
 REQUIRED_USE="^^ ( ggi sdl )"
 RESTRICT="test"
 
@@ -31,8 +28,8 @@ RDEPEND="
 	)
 	nls? ( virtual/libintl )
 	sdl? (
-		media-libs/libsdl
-		media-libs/sdl-mixer
+		media-libs/libsdl[joystick,sound,video]
+		media-libs/sdl-mixer[mod]
 	)"
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
@@ -47,28 +44,35 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
 src_configure() {
+	local econfargs=(
+		$(use_enable nls)
+		$(use_with ggi mikmod)
+		$(use_with ggi)
+		$(use_with sdl sdl-mixer)
+		$(use_with sdl)
+		--disable-heroes-debug
+		--disable-optimizations
+	)
+
 	local pkg
 	for pkg in ${A//.tar.bz2}; do
 		cd "${WORKDIR}"/${pkg} || die
-		econf \
-			--disable-heroes-debug \
-			--disable-optimizations \
-			$(use_with sdl) \
-			$(use_with sdl sdl-mixer) \
-			$(use_with ggi) \
-			$(use_with ggi mikmod) \
-			$(use_enable nls)
+		econf "${econfargs[@]}"
 	done
 }
 
 src_install() {
 	local pkg
 	for pkg in ${A//.tar.bz2} ; do
-		cd "${WORKDIR}"/${pkg} || die
-		emake DESTDIR="${D}" install
+		emake -C "${WORKDIR}"/${pkg} DESTDIR="${D}" install
 	done
+
+	einstalldocs
+
+	make_desktop_entry ${PN} Heroes applications-games
 }
diff --git a/games-action/moon-buggy/Manifest b/games-action/moon-buggy/Manifest
index d2bdf0da0097..c6fca8a428f0 100644
--- a/games-action/moon-buggy/Manifest
+++ b/games-action/moon-buggy/Manifest
@@ -1,3 +1,3 @@
 DIST moon-buggy-1.0.51.tar.gz 263572 BLAKE2B d298b04116a5bc7735f672c067efa688dbea153dbc309a6e371b970b7a31648a337af872513bd94b5d01981fdf5595ca326cca11503d138cfcbe126f18ef55e9 SHA512 34da2ca8b79d4f95a762cb7142586d176fd1b58ea6f4375de424d73d6046c2dc3dbae30dddb3a78c8c2563fbfec01d9eaafe27b79cc78ffa22121ad5a2e9dc77
-EBUILD moon-buggy-1.0.51-r1.ebuild 946 BLAKE2B 1e092ff5d29976b6703bcb9eb042138799210beb13fc55c95e9e771a5d5c04309b494e018098d07e7b442c4bc37b6ea07fc610f234c77f25d9cf0ef592c1ad21 SHA512 f9d113b3bcd7489bacff2fe2f79bffd4c65ec28b9e252353d4951a9b7cc5989ea15b237599e1ae24dd458046adff331814e65ba816812af5baea365e2661b87c
+EBUILD moon-buggy-1.0.51-r2.ebuild 947 BLAKE2B c64741a22ddc07e99085f4529aee67ca43a97ded964d8888b505331db807e81ec752114995c5b7e68b203d5a3ce8b57abad6a1dd31052432c00083a1809d068f SHA512 122d156b2095bc249ef4484957836768757b3b98967743ce0e183575b1f732a45c007f05687c3c700d6763f099ca44f3add86fdc6e58a74cd772c98395da1af6
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/moon-buggy/moon-buggy-1.0.51-r1.ebuild b/games-action/moon-buggy/moon-buggy-1.0.51-r2.ebuild
index 77d531ffe023..0347e5bfa292 100644
--- a/games-action/moon-buggy/moon-buggy-1.0.51-r1.ebuild
+++ b/games-action/moon-buggy/moon-buggy-1.0.51-r2.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="acct-group/gamestat
-	sys-libs/ncurses:0"
+	sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/games-action/shootingstar/Manifest b/games-action/shootingstar/Manifest
index 40f1c12747f6..a09ccfb52b74 100644
--- a/games-action/shootingstar/Manifest
+++ b/games-action/shootingstar/Manifest
@@ -1,5 +1,4 @@
-AUX 1.2.0-gcc34.patch 1053 BLAKE2B 7e10e3fa04dcc4431c7991755ede638a59906c2c545d72bff6156825662fc9246e00a4f5dd84e36a6eb8b88c10685ea59938b2aff91bcc20e4f2c341efe46260 SHA512 0941733f645f1fa97dfc860d2f9d33bf6e96a75ada97fd477d60d9aa21a693a067731834df3c31fd2abfde3e7d2a4fe429b8aeeb154100cd730c0713a70cd247
-AUX shootingstar-1.2.0-gcc44.patch 324 BLAKE2B 392579c1792b3863134047f64b0df1d2dfe44ee11eeb640d6b738565ad349cf1df211679121f8e0b0c1ea559fcf0e25a843d4d3dbb675bc5849d2396ea94d893 SHA512 3bda8a966ed6d6536390b228606bc65b4789d8c2adde8e993089b8e63a62bbdceae4d0ec97c3c7f5d87b5b9c3149eb85d4eee64db295b5aa8c67f2f5349b21f1
+AUX shootingstar-1.2.0-basic-fixes.patch 776 BLAKE2B 95f78181ba4955f4db4900697cad12c964d76655568c33cc17dac7836f9a0b57f3fde1730f5af57ce46c5d361c3ffef5a724e3341817eb1bf83a68578cc1b0d2 SHA512 eed32a44ecc3dd0b9f7427452f49d8e8b8760738789694d4b44fe077088bdb5ac1781f889e9fb52b28a4a99dc62520a95e23c1497d28aae3a5b42e679ed8d17c
 DIST shootingstar-1.2.0.tar.gz 7755911 BLAKE2B 22e48044a4a17d7282abd408a6ccc727d60c56da16d170230b287927adb95729a0c6da0b0a9f70ad7d39e647be16dff96cf55aef9e3efbf3396402b4a684527a SHA512 5bc13a444c925ab834482fad7f055ea02eac471f454a3f0ed80e50c3b0956586b7bfa68db82e3034696fa2e8ce5beaf10fc8b8583508e1c29c276469ef7b2b74
-EBUILD shootingstar-1.2.0-r1.ebuild 989 BLAKE2B ffbb85e11d57299e17f7cb5db48838a5bcc3e689e61408c6c293b9954b82ee82612403fac3f7cadf9a55b845cd0b74efb9aca10a48c5d54f8eac28d18d0edbb1 SHA512 304ca6d9ae169c12bd6a7cc2a406f7bf9ad80fed48904dd494ad512bdeab43c2e26966d06034c4613707d8c191948dc8f8506c3a3911ed272a142b01e57001da
+EBUILD shootingstar-1.2.0-r2.ebuild 763 BLAKE2B 47c46d43987dd391baf7d4a18b634356f7be95628e5a89bc7d1b26710cb9c2948a32e626abd6fec2ceb049a78e17f58e14ce1e0f288e962b0d93569b691f4d3d SHA512 47ad99c3e520c0a54eb7a98d8d733a765ab7f6a62df025f51d9d314361d457b89104aa359736b984362fcb94637d97a88dc562669edae5801561718557424b09
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/shootingstar/files/1.2.0-gcc34.patch b/games-action/shootingstar/files/1.2.0-gcc34.patch
deleted file mode 100644
index b55997552fc8..000000000000
--- a/games-action/shootingstar/files/1.2.0-gcc34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur shootingstar-1.2.0/src/engine/cTextureFont.cpp shootingstar-1.2.0.loz/src/engine/cTextureFont.cpp
---- shootingstar-1.2.0/src/engine/cTextureFont.cpp	2003-07-06 19:31:10.000000000 +0100
-+++ shootingstar-1.2.0.loz/src/engine/cTextureFont.cpp	2004-07-26 20:51:16.992768063 +0100
-@@ -31,6 +31,7 @@
- #include <stdio.h>
- #include <GL/gl.h>
- #include <GL/glu.h>
-+#include <math.h>
- #include "cTextureManager.hpp"
- #include "Debug.hpp"
- //------------------------------------------------------------------------------
-diff -ur shootingstar-1.2.0/src/game/cOptions.cpp shootingstar-1.2.0.loz/src/game/cOptions.cpp
---- shootingstar-1.2.0/src/game/cOptions.cpp	2003-12-22 05:09:06.000000000 +0000
-+++ shootingstar-1.2.0.loz/src/game/cOptions.cpp	2004-07-26 21:00:25.265284270 +0100
-@@ -201,7 +201,7 @@
- 			dbgError () << "Unable to read from options file\n";
- 			throw runtime_error ("Unable to load options");
- 		}
--		int (keys.keys[i]) = key;	// IS THIS SAFE?
-+		keys.keys[i] = (SDLKey)key;	// IS THIS SAFE?
- 		
- 		fin >> key;
- 		keys.buttons[i] = key;
diff --git a/games-action/shootingstar/files/shootingstar-1.2.0-basic-fixes.patch b/games-action/shootingstar/files/shootingstar-1.2.0-basic-fixes.patch
new file mode 100644
index 000000000000..48304070d5c8
--- /dev/null
+++ b/games-action/shootingstar/files/shootingstar-1.2.0-basic-fixes.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/58287 (math.h/SDLKey for gcc 3.4)
+https://bugs.gentoo.org/272374 (cstdio for gcc 4.4)
+https://bugs.gentoo.org/607428 (signed int for segfault)
+--- a/src/engine/cTextureFont.cpp
++++ b/src/engine/cTextureFont.cpp
+@@ -33,2 +33,3 @@
+ #include <GL/glu.h>
++#include <math.h>
+ #include "cTextureManager.hpp"
+--- a/src/engine/dbg.cpp
++++ b/src/engine/dbg.cpp
+@@ -26,2 +26,3 @@
+ #include <cstdlib>
++#include <cstdio>
+ #include <string>
+--- a/src/game/cMainMenu.cpp
++++ b/src/game/cMainMenu.cpp
+@@ -401,3 +401,3 @@
+ 	
+-	static unsigned int i = 0;
++	static int i = 0;
+ 	if ( mLastLetter + 100 < now )
+--- a/src/game/cOptions.cpp
++++ b/src/game/cOptions.cpp
+@@ -203,3 +203,3 @@
+ 		}
+-		int (keys.keys[i]) = key;	// IS THIS SAFE?
++		keys.keys[i] = (SDLKey)key;
+ 		
diff --git a/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch b/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch
deleted file mode 100644
index dfc1a8d8e77e..000000000000
--- a/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/engine/dbg.cpp	2009-06-03 15:15:46.000000000 +0200
-+++ b/src/engine/dbg.cpp	2009-06-03 16:09:19.000000000 +0200
-@@ -28,6 +28,7 @@
- #include <vector>
- #include <map>
- #include <algorithm>
-+#include <cstdio>
- 
-     /**********************************************************************
-      * Implementation notes
diff --git a/games-action/shootingstar/shootingstar-1.2.0-r1.ebuild b/games-action/shootingstar/shootingstar-1.2.0-r1.ebuild
deleted file mode 100644
index 014fc4fb2580..000000000000
--- a/games-action/shootingstar/shootingstar-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop gnome2-utils
-
-# Note: currently segfaults on startup, but that's also in the previous ebuild
-# See https://bugs.gentoo.org/607428
-
-DESCRIPTION="A topdown shooter"
-HOMEPAGE="http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/Arcade/Shooting-Star-19754.shtml"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/libsdl[video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	virtual/glu
-	virtual/opengl"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gcc34.patch
-	"${FILESDIR}"/${P}-gcc44.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon -s 128 data/textures/body1.png ${PN}.png
-	make_desktop_entry ${PN} "Shooting Star"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/shootingstar/shootingstar-1.2.0-r2.ebuild b/games-action/shootingstar/shootingstar-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..7885724a6b03
--- /dev/null
+++ b/games-action/shootingstar/shootingstar-1.2.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop toolchain-funcs
+
+DESCRIPTION="A topdown shooter"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[opengl,sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-basic-fixes.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	newicon data/textures/body1.png ${PN}.png
+	make_desktop_entry ${PN} "Shooting Star"
+}
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
 }