gentoo resync : 24.07.2021

17 files changed, 214 insertions, 154 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index d6a83bfa3b96..6ba91ef6d665 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/avadon/Manifest b/games-rpg/avadon/Manifest
index 439eefa10167..44e96db3b710 100644
--- a/games-rpg/avadon/Manifest
+++ b/games-rpg/avadon/Manifest
@@ -1,3 +1,3 @@
 DIST avadon-linux-1331768904-bin.txt 109767395 BLAKE2B ba89e4cc9d7374b4c140f36860bb3e2682bc8639503500d0371a7783c0ce7fc1b40ac2c552285f03d564ecae21d5f887f822e6785a30034fdeaba9d0837ee6eb SHA512 7c1acbb1ce3bbfb33052454c9b93060fa97b13fbf4202ee2bb0d70fb59423efc05dfe0bca07cce1e711af9f2757b79c590f237dea5f92aa11aa5979c35d018a7
-EBUILD avadon-1.0.4_p1331768904.ebuild 1237 BLAKE2B 9b10a153d3e102359b91971cfbb4696ca89f10d867c746154c92ca02e28afb4e550fb3c66cc714e0423cf9ab67fa9e301043408dee520e2e337327221bdaa216 SHA512 a43fd6f3b37e3decf7c510e160b2a6fbe43f9a74bc0abe3bc04f808530a7f962d890ae64263e6196c528f3c99875a53e9168c555ab3b6c2aaa37531ea54ff2c7
+EBUILD avadon-1.0.4_p1331768904.ebuild 1081 BLAKE2B eb75eee4ec365a8965913b5b1ba01f07b2c72c61d07d7a56b899a80394f27aac2866d1fe79e348a41132e73787877bb5d8016e88b66792cdca94441827777a43 SHA512 59f01b184165c4340aed7eb71284a217323ff3e4620dc668b9a7a5a27fe29f5bf28ace8a8f1de1d2f148563987ec7ccc790828035f179207e8e2c394a45ff7f0
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild b/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
index 4a9ff4f3cecd..794827ce5ff1 100644
--- a/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
+++ b/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils unpacker
+inherit desktop unpacker
 
 DESCRIPTION="Epic fantasy role-playing adventure in an enormous and unique world"
 HOMEPAGE="https://www.spiderwebsoftware.com/avadon"
 SRC_URI="avadon-linux-${PV#*_p}-bin.txt" # .txt is odd but that's what Humble Bundle sends.
+S="${WORKDIR}/data"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch bindist"
+RESTRICT="bindist fetch"
 
 QA_PREBUILT="opt/${PN}/Avadon"
 
-RDEPEND="media-libs/libsdl[opengl,video]
+RDEPEND="
+	media-libs/libsdl[opengl,video]
 	media-libs/openal"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/data"
+BDEPEND="app-arch/unzip"
 
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
@@ -35,19 +35,15 @@ src_unpack() {
 src_install() {
 	local dir=/opt/${PN}
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins -r "avadon files" icon.bmp
 
-	exeinto "${dir}"
+	exeinto ${dir}
 	newexe Avadon-$(usex amd64 amd64 x86) Avadon
-	dosym "../..${dir}"/Avadon /usr/bin/${PN}
+	dosym ../..${dir}/Avadon /usr/bin/${PN}
 
-	newicon -s 512 Avadon.png ${PN}.png
+	newicon Avadon.png ${PN}.png
 	make_desktop_entry ${PN} "Avadon: The Black Fortress"
 
 	dodoc README-linux.txt
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-rpg/dear-esther/Manifest b/games-rpg/dear-esther/Manifest
index 5aa0f14a475c..928fbe422486 100644
--- a/games-rpg/dear-esther/Manifest
+++ b/games-rpg/dear-esther/Manifest
@@ -1,3 +1,3 @@
 DIST dearesther-linux-06082013-bin 1007461686 BLAKE2B 0ffb2387490beef790ad00f110a8393bb69f0fe762799795a655eab748aed08eb8665c199ea0f588c764bafaa68eae3ba6884296614abbd66ecd1b72810b2c88 SHA512 c66a2b068b4caaebfb63e4617102af4a5df153dfe76854d1fa94305fb95b15e4362c9ca5e715ea4b29966916a9a585fa71bfc2b2b33b878f26e3785b7d93722e
-EBUILD dear-esther-20130608-r1.ebuild 1476 BLAKE2B 41902cb17858901ae611cc83d0762cb04fbd5a245eaf9cafdba644cc99528e2fafa4849c84077602104f9f6fdf846be41a13be995e2bc65c8ebb3590340677e4 SHA512 d5a5520fb54bce5a1525d7e95a4f2db47aeaa87eeffe444491bc3005b52e9a003ec44b1ff8c128e67f2e80408995ce96c00feb1534caf761255e917ce02c13f1
+EBUILD dear-esther-20130608-r1.ebuild 1232 BLAKE2B 1cc35b890ec1e3869f5f6ef8fbc8b1511f33a57bdf326e7e2df85dd636fa01e7bb497929dcadd9621e4eaba3b4de92b333d7e19c1efd4ca994ca1914a7348436 SHA512 d256edb9c4f3b922bf36ee937dd388caeea6447946b712744a640525b7057e96c4267e45e99a08852679d02818c5c9db7951a86eff98ff3ba9543ca2756ae80c
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild b/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild
index b2a07780a454..34dd1adabcdb 100644
--- a/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild
+++ b/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild
@@ -3,41 +3,37 @@
 
 EAPI=7
 
-inherit desktop gnome2-utils unpacker wrapper
+inherit desktop unpacker wrapper xdg
+
+MY_TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
 
-TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
 DESCRIPTION="Ghost story, told using first-person gaming technologies"
 HOMEPAGE="http://dear-esther.com/"
-SRC_URI="dearesther-linux-${TIMESTAMP}-bin"
-S="${WORKDIR}"/data
+SRC_URI="dearesther-linux-${MY_TIMESTAMP}-bin"
+S="${WORKDIR}/data"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch"
 
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=opt/${PN}
 QA_PREBUILT="
-	${MYGAMEDIR#/}/dearesther_linux
-	${MYGAMEDIR#/}/bin/*.so*
-"
+	opt/${PN}/dearesther_linux
+	opt/${PN}/bin/*.so*"
 
 # TODO: unbundle libSDL2
 RDEPEND="
-	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
+	media-libs/freetype[abi_x86_32(-)]
+	media-libs/libsdl[abi_x86_32(-)]
+	media-libs/openal[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
-"
+	x11-libs/libX11[abi_x86_32(-)]"
 BDEPEND="app-arch/unzip"
 
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
 	einfo "and move it to your DISTDIR directory."
-	einfo
 }
 
 src_unpack() {
@@ -45,26 +41,14 @@ src_unpack() {
 }
 
 src_install() {
-	insinto ${MYGAMEDIR}
+	insinto /opt/${PN}
 	doins -r bin dearesther platform dearesther_linux
 
-	doicon -s 256 dearesther.png
-	make_desktop_entry "${PN}" "Dear Esther" dearesther
-	make_wrapper ${PN} "./dearesther_linux -game dearesther" "${MYGAMEDIR}" "${MYGAMEDIR}/bin"
-
-	dodoc README-linux.txt
-
-	fperms +x ${MYGAMEDIR}/dearesther_linux
-}
+	fperms +x /opt/${PN}/dearesther_linux
+	make_wrapper ${PN} "./dearesther_linux -game dearesther" /opt/${PN}{,/bin}
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
+	newicon dearesther.png ${PN}.png
+	make_desktop_entry ${PN} "Dear Esther"
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	dodoc README-linux.txt
 }
diff --git a/games-rpg/grimrock/Manifest b/games-rpg/grimrock/Manifest
index f98afb3eae90..95d67585f760 100644
--- a/games-rpg/grimrock/Manifest
+++ b/games-rpg/grimrock/Manifest
@@ -1,3 +1,3 @@
 DIST Grimrock-Linux-2015-07-07.sh 316846242 BLAKE2B 5d8123b3e2dedf4d6b2ae6f43c9ebe5427e63205b7ff53dc0fba26b0b3a8a1f164b79a3a10776c751aa0fbe29c7ef715412bff826476894eec6aa545da4adec3 SHA512 c90203a747564223281fb61ffcc7ac90f772990f33bb8345aff68c65fbc371f0f1a611645e952a75bd9dbca9e760398c0411eb9adade9c58e525a5b1c4e186db
-EBUILD grimrock-20150707.ebuild 1555 BLAKE2B 11b0bc03dd1b01614dd3899b1d6b615fc34d32b02162b7e750a37da21b12e3b49cd9fce9a155f2c85e9edaba9d19841755bd4afa2acdf29118a69d5837b83a2f SHA512 d46f2401d3daac6767a535175fde51167c8bbf946c4e8ba4608cbad2b6d4da0b3f076c3ff1e9594cb1b802bcd30ea18072ddf252f29f36b35e9946ca2d5992e4
+EBUILD grimrock-20150707.ebuild 1374 BLAKE2B 3ef091ddd158ec02a9555ec0ec6d32f37c8c60e3a2a7538d5de599eb3d62482e93132cd117cb5879c38330a818ead9060fe28a4e78f906929f2c3fe1b1d0655a SHA512 ddada99446e943c33c29eaf06c0950d0c720e3518cf277ccb4739a61e93d37ea07e330aeb5d725c4217d85c03189d995cae27338bef853a8e252b9c0eb59468a
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/grimrock/grimrock-20150707.ebuild b/games-rpg/grimrock/grimrock-20150707.ebuild
index 03275c50c9a5..e0950dd5bc09 100644
--- a/games-rpg/grimrock/grimrock-20150707.ebuild
+++ b/games-rpg/grimrock/grimrock-20150707.ebuild
@@ -1,36 +1,35 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils unpacker
+inherit desktop unpacker xdg
 
-TIMESTAMP="${PV:0:4}-${PV:4:2}-${PV:6:2}"
 MY_PN="Grimrock"
+MY_TIMESTAMP="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
 DESCRIPTION="Legend of Grimrock: The ultimate dungeon crawling RPG + modding engine"
 HOMEPAGE="http://www.grimrock.net/"
-SRC_URI="Grimrock-Linux-${TIMESTAMP}.sh"
+SRC_URI="Grimrock-Linux-${MY_TIMESTAMP}.sh"
+S="${WORKDIR}"
 
-SLOT="0"
 LICENSE="all-rights-reserved"
+SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch bindist splitdebug"
+RESTRICT="bindist fetch"
 
-QA_PREBUILT="/opt/${PN}/${MY_PN}.bin"
+QA_PREBUILT="opt/${PN}/${MY_PN}.bin"
 
-RDEPEND="media-libs/freeimage
+RDEPEND="
+	media-libs/freeimage
 	media-libs/freetype:2
-	media-libs/openal
 	media-libs/libsdl2[opengl,sound,video]
 	media-libs/libvorbis
+	media-libs/openal
 	sys-libs/zlib[minizip]
 	virtual/opengl
 	x11-libs/libX11"
 
-DEPEND="app-arch/xz-utils"
-
-S="${WORKDIR}"
-
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
@@ -38,25 +37,26 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	myarch=$(usex amd64 x86_64 x86)
+	MY_ARCH=$(usex amd64 x86_64 x86)
+
 	unpack_makeself
 
 	local i
-	for i in subarch instarchive_all instarchive_linux_${myarch}; do
-		ln -snf "${i}" "${i}.tar.xz" || die
-		unpack ./"${i}.tar.xz"
+	for i in subarch instarchive_all instarchive_linux_${MY_ARCH}; do
+		ln -snf ${i} ${i}.tar.xz || die
+		unpack ./${i}.tar.xz
 	done
 }
 
 src_install() {
 	local dir=/opt/${PN}
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins ${PN}.{dat,png}
 
-	exeinto "${dir}"
-	newexe ${MY_PN}.bin{.${myarch},}
-	dosym "../..${dir}"/${MY_PN}.bin /usr/bin/${PN}
+	exeinto ${dir}
+	newexe ${MY_PN}.bin{.${MY_ARCH},}
+	dosym ../..${dir}/${MY_PN}.bin /usr/bin/${PN}
 
 	doicon -s 256 ${PN}.png
 	newicon -s 64 ${MY_PN}.png ${PN}.png
@@ -64,7 +64,3 @@ src_install() {
 
 	dodoc README.linux
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-rpg/openglad/Manifest b/games-rpg/openglad/Manifest
index 920a954af436..60573f340107 100644
--- a/games-rpg/openglad/Manifest
+++ b/games-rpg/openglad/Manifest
@@ -2,6 +2,8 @@ AUX 0.98-gladpack.c.patch 511 BLAKE2B 57434e5edd25f0757e18f2c2c73198236fa069eb09
 AUX openglad-0.98-gcc43.patch 205 BLAKE2B 05dac9336eac12434d51ebe1322387ec1c32d77bda52f654312075260f1add0a24d4d5834e2d72d6c8208851f583b245147595a8df2e9a9b6e72bf72dcc1421c SHA512 c7f6b4602234f7119dea119a6fd7c2edd07af856dd711195a942d291063912c46a202f446db8183eb62cc0a2aea3586bb3a2b8e1140d4d915be1fd6e166eb4d1
 AUX openglad-0.98-ovfl.patch 381 BLAKE2B 28a7d1dabbacaf665f01f1b238c904855706921b9ae33e09802104734c3456889aa409cdc38bc12e076d609df0909f6ecab7a02be15933d90c4ec8fba11abb00 SHA512 00ac89d9cf223ac8db111b30ce7838b892f318ac8c8a93522afa719a98887c386eb95c788a912c4bfce99ef804a8395b3c2260b9ec22454651e6f2539d1833e8
 DIST openglad-0.98.tar.gz 724106 BLAKE2B 6cd9df5fd260af9902997bc0708c8285e48081e52fff7af05f432ae94f2f6fdbfba162c664ac4f531796a0372f1be3be064843dad75163e68b7e324b9b6d506d SHA512 3f9165fbf8fff081a862bfe81401a3b2ac227da58b84409beee8b0441f88b1a6deb3d24a1af6e71bd3a3484fc90de5574950fd54be82d837021a07f06302f0e1
+DIST openglad-0.98_p20200907.tar.gz 2060013 BLAKE2B 5ea16c0ab13e45f1723ceb0b4167fcbf5863d040e1fc54cd27fa59df14200f84e0e22c0cba87f9ad3294a90850d5b36199cba8e78804d1994fb2dea6ea493fff SHA512 b3bf582a780d90408fc585b28418f462602ec35434c018d6315fb8b119b34cb0dceabcd6b5a6450ba6beb2ab5dc931d6e21ecf46e76853c7f5051c9b3be9014c
 DIST openglad.png 5593 BLAKE2B 1fbc5a32861dc4cc5bb4aae4b1b42e92411756618ccfa4172e1494c4f98eb527f6bd36273a250cd7ce721baa76ba80548d75ec1e89b3da134c78d0a7b415b6bd SHA512 27419fcbbbf8640718968304a4824101860736c2091f494defcd111b5cc252856b5373c0e7a2bca1c79f9c7551012b0ba04577f9ed97769e436637ee25f5caeb
 EBUILD openglad-0.98-r1.ebuild 868 BLAKE2B 70f20201f2cbf7f82701e2d4d6058213121bd8d2c05fcfe3c1f0230410901feea5c82954933c3dfc30c5d852d574facccada3157571a4b07f36151f1ad052f4a SHA512 20fc6585c53de645d5a0b12858819cd28a2174a4f67518f245d33a8c6a8647ef69ccee4954df15365966ffa613a7c3bc3fe92b1e16b7cd5789c9af0e9bb7555e
-MISC metadata.xml 332 BLAKE2B 29e8535bbe3b4ccd5225fdee9e19b41afba42751a9926226375f47e320cb743944b4fb81eb1b665ea9782df581eba22db602e4515b2cd723ca319ef90bfa86ff SHA512 b751058cb6393309c0635329d5fd5236b013d2e07d5e2e2a7fdffcb50ee8dd60e8b0157d161ba498e01140106f91f3b2052a43737be12214f7f065ebd9f6d07d
+EBUILD openglad-0.98_p20200907.ebuild 1880 BLAKE2B 7cf82e365fa92ca87848cac9e312907af5594041c3637ce2078f1d32edcd1a657606a143d6b8bc340c4b7bc03019ff7e26f563fede65a229c93431f194a80fb9 SHA512 05c385eac139939a8229b1ebbcaa82d1bb7b337b0094c73161d2bf4a75e904811277eaa2d55aa29349fbec5f0f6cde54666bc4694a61f9ad0ff919ded19e00a0
+MISC metadata.xml 389 BLAKE2B 114b39daa76f110c2769567433582e1dfb984f3040ec53c0ce184ec621b6676c0697912b2e46f7cba0ebac1335caeb78312f23b16ad3892b3dec577c3ef54cbc SHA512 ccf5c251e70ae23dff515ae55b21e6f5ea03339e1477ae46e6da81b50666bcb0a201b0046c0d43e4fcb8f460ca0f2aea607f7b73e47cc3cd7c9d2dd83a329730
diff --git a/games-rpg/openglad/metadata.xml b/games-rpg/openglad/metadata.xml
index b093b0fee1ec..7be52b700c61 100644
--- a/games-rpg/openglad/metadata.xml
+++ b/games-rpg/openglad/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">openglad/openglad</remote-id>
 		<remote-id type="sourceforge">snowstorm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-rpg/openglad/openglad-0.98_p20200907.ebuild b/games-rpg/openglad/openglad-0.98_p20200907.ebuild
new file mode 100644
index 000000000000..132a5ea39795
--- /dev/null
+++ b/games-rpg/openglad/openglad-0.98_p20200907.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+MY_COMMIT="80e33b15cfa6d7d288b4b3db4dcca0349f13691f"
+
+DESCRIPTION="SDL clone of Gladiator, a classic RPG game"
+HOMEPAGE="http://snowstorm.sourceforge.net/"
+SRC_URI="
+	https://github.com/openglad/openglad/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/${PN}.png"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="Boost-1.0 GPL-2+ ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libyaml
+	dev-libs/libzip:=
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,opengl,sound,video]
+	media-libs/sdl2-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/premake:4
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# game uses the binary's location for assets even with a wrapper
+	sed -e '/^std::string get_asset_path/!b;n' \
+		-e "a\\return \"${EPREFIX}/usr/share/${PN}/\";" \
+		-i src/io.cpp || die
+
+	# unbundle (delete + add to pkg-config below is enough)
+	# physfs: need missing physfsrwops.h matching system's to unbundle
+	rm -r src/external/{libyaml,libzip} || die
+
+	# cleanup not to install
+	rm sound/Makefile.am || die
+}
+
+src_configure() {
+	# premake4.lua assumes a lot (e.g. no SDL2 include path), check ourselves
+	local pkgs=( SDL2_mixer libpng libzip sdl2 yaml-0.1 )
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags "${pkgs[@]}" || die)
+	append-libs $($(tc-getPKG_CONFIG) --libs "${pkgs[@]}" || die)
+
+	premake4 gmake || die
+}
+
+src_compile() {
+	emake verbose=y ARCH= CC="$(tc-getCC)" CXX="$(tc-getCXX)" LIBS="${LIBS}"
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r builtin cfg extra_campaigns pix sound
+	# note: extra_campaigns not directly used, but users may want them
+
+	dodoc {cheats,classes,scen}.txt
+	einstalldocs
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry openglad Openglad
+}
diff --git a/games-rpg/pcgen/Manifest b/games-rpg/pcgen/Manifest
index 43f0a9c26a3e..2ab58b69d727 100644
--- a/games-rpg/pcgen/Manifest
+++ b/games-rpg/pcgen/Manifest
@@ -1,3 +1,5 @@
 DIST pcgen-6.04.01-full.zip 68679438 BLAKE2B e9afa6b9937804988425d8d18cfed7728197ecc303f586ed899491e4d500eb0e6ddc0ae92aef1d4bfef7ff3fb987cca34af95246c83ebe71e089e3e5e91aa9dd SHA512 37e76e9bca3defe803459f898d3c51015cb4c4f69905c4179b78b1b26977b7d720ef413b3f5b2ef4252aa98f732075b9567c4f4822c61d169a5a0a6e2c78c0d4
+DIST pcgen-6.06.01-full.zip 73423642 BLAKE2B 54dbebb3e73188435ce6ed6d38387e194fff156f39d9238b55f0e7d990f785eb79f562a41c60a4861f637514615802ef5103f886e0f96624f7f53b197adcd5a3 SHA512 9af94aa434229ce00f08385759b4efc22f16ad32be81be4177c44eec94f1bedcec0742b494bbed3c95c1bcf9b2c51e2649330ee0a54f7ca4b0042966099851eb
 EBUILD pcgen-6.04.01-r1.ebuild 847 BLAKE2B 9baec67066489b94514db1ebdf575c4d05285d776ae8e48abf9d11271ec64bd3d6855ba8fa1984f6113110f934bc65505948d43a2ec65f233a50a0051d30ba4b SHA512 23bd92b3f73583776594e150906d499c077ffaa8d13d41923fa971755bb5acd7ef9c7a6c0da0a3aa67805bd2fa5304bc1c51d586ccf7fb5f3d443811904c9f70
-MISC metadata.xml 328 BLAKE2B 45ace1f30157cc4450f9dc90a24a7a6112a09fe61c1a17dca06b87d32fdbce9c7f704b36bb217da0371f71a8ff9b2ecdccbb63ad7b981587f61c33a3c4ef6adb SHA512 cd3e9ca2c51782031b89444cc5c3eda37537c04467753e9a6bd5c2e5357d5ba3077ed6aee0adeac6dd91c829c7fded3077fb8d39ab8e80d87e3dc62af5605cb7
+EBUILD pcgen-6.06.01.ebuild 795 BLAKE2B 627fa16921af9aee9395609eda4f99dbe72427f9a3cd6a593d4d4014b0cccc12a4a9a7695b513c580e2ad757b57c60e2389a6472a190858dbdbeb35d2ccd8d43 SHA512 69aa805a6caf28a7b2cccdc44b2799087ac21fb05fe3703c05189cdf84730571cc8de9491bfa088a669b11b075a7e4aa935047a948cb01d435858d4b6046baf1
+MISC metadata.xml 379 BLAKE2B 8915ccbc5046286453c4e21b9d60dfcaa6d3f83e5d4c8351f0ba126ca4ecbf5f47f22f5c3cb12f938204b9f4c2155f3c9c3d84e508f29a335be646fbe14d915e SHA512 67cf9fe30f4628f8126f1fe5dc90d697f7aa62e4ca2bb5d7514e3d45163db37d6a2929414ee3643f58ef1f67fedfe2f387a5d3642530add4979a7d99b64786c3
diff --git a/games-rpg/pcgen/metadata.xml b/games-rpg/pcgen/metadata.xml
index e2b2929d7fb9..2602eda62716 100644
--- a/games-rpg/pcgen/metadata.xml
+++ b/games-rpg/pcgen/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">PCGen/pcgen</remote-id>
 		<remote-id type="sourceforge">pcgen</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-rpg/pcgen/pcgen-6.06.01.ebuild b/games-rpg/pcgen/pcgen-6.06.01.ebuild
new file mode 100644
index 000000000000..6bf03db1d130
--- /dev/null
+++ b/games-rpg/pcgen/pcgen-6.06.01.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop edos2unix
+
+DESCRIPTION="D&D character generator"
+HOMEPAGE="http://pcgen.org/"
+SRC_URI="https://github.com/PCGen/pcgen/releases/download/${PV}/${P}-full.zip"
+S="${WORKDIR}/${PN}"
+
+LICENSE="LGPL-2.1 OGL-1.0a"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+
+	edos2unix ${PN}.sh
+	sed "/^cd /c\\cd \"${EPREFIX}/opt/${PN}\" || exit 1" ${PN}.sh > "${T}"/${PN} || die
+
+	rm -r LICENSE docs/{doc_tools,pngcrush_logs.txt} ${PN}.{exe,sh} || die
+}
+
+src_install() {
+	dobin "${T}"/${PN}
+
+	insinto /opt/${PN}
+	doins -r .
+
+	newicon system/sponsors/pcgen/pcgen_128x128.png ${PN}.png
+	make_desktop_entry ${PN} PCGen
+}
diff --git a/games-rpg/to-the-moon/Manifest b/games-rpg/to-the-moon/Manifest
index c15d236e7cf1..39e8975f694d 100644
--- a/games-rpg/to-the-moon/Manifest
+++ b/games-rpg/to-the-moon/Manifest
@@ -1,3 +1,3 @@
 DIST ToTheMoon_linux_1389114090.sh 75823678 BLAKE2B de63a8c5eff7d99f5af4fbc85c8e416c7bd7a07fad03dfb0424bf43f410bdbc9a0d064c8892dbb6c9fdc637391f2b2ef6ef40c72c501790ffec0aac8448add21 SHA512 bed844f143ef9c3ff8fe93da186422e84d259229874c331315d8f1c7538fd6c417d6ca1aeecbe6c2a664fad98aff51f4723227d0ef07612acf29f86313f9aa1a
-EBUILD to-the-moon-0-r1.ebuild 2423 BLAKE2B d9f921cfa744e4ad10134811a20b134aaead701367ba3747cdf2b50fe4010634ddef498271b1ef13343a4711080d34c668ba7e0f1393b382700d5b2245946e50 SHA512 5e5446a9abbbb7d2ee04f44f731bf4442e6d3d28d0ba6e6e126178e1ceb2fae36eb25362d1a4c0e313337676596a852ecd9eb892fcb6e6369f0439802c5b4849
+EBUILD to-the-moon-0-r1.ebuild 2084 BLAKE2B 3f054999698d3b4cbeb53bae17aeef92824bb90ece8085c3f8235602ca0a6d0729437284d78957f9834160ebac0827ea08ce3f144fbbbecf583695f5442c2dff SHA512 986e1b2b4c57fd65a7d71d3264f5c1a0e6346776fc48960c12a5fea3ce1eee8adf50ce66e8df460b72f6bf373676bbbd7ef981b5fe26570c6a09af0e5d4269ee
 MISC metadata.xml 325 BLAKE2B 27d3f66c92edf0dda747247d5a31972620750facfbad0d6f82c51c5ca5a99327a0b3918264ab590da1e7250ee8aebb85393981049a33843883238734df348d31 SHA512 a8068b353b7597ae988ad3fd9855339beb981eb11a392483129346d2ee51d658934fb772e8b3f3062e1d14d553e73de9f6bc2f456b4bf5de15902257c22e69ce
diff --git a/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild b/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild
index 619cdd026667..a5cc9e2b6f8b 100644
--- a/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild
+++ b/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild
@@ -3,27 +3,25 @@
 
 EAPI=7
 
-inherit desktop gnome2-utils unpacker wrapper
+inherit desktop unpacker wrapper
+
+MY_PN="ToTheMoon"
 
-MY_PN=ToTheMoon
 DESCRIPTION="Two doctors traversing the memories of a dying man to fulfill his last wish"
 HOMEPAGE="http://freebirdgames.com/games/to-the-moon"
 SRC_URI="${MY_PN}_linux_1389114090.sh"
-S="${WORKDIR}"/data
+S="${WORKDIR}/data"
 
 LICENSE="all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bundled-libs"
+RESTRICT="bindist fetch"
 
-RESTRICT="fetch bindist splitdebug"
-
-QA_PREBUILT="opt/${PN}/${MY_PN}.bin*"
-if [[ ${ARCH} == "amd64" ]] ; then
-	QA_PREBUILT="${QA_PREBUILT} opt/${PN}/lib64/*"
-else
-	QA_PREBUILT="${QA_PREBUILT} opt/${PN}/lib/*"
-fi
+QA_PREBUILT="
+	opt/${PN}/${MY_PN}.bin*
+	opt/${PN}/lib/*
+	opt/${PN}/lib64/*"
 
 # TODO: unbundling sdl-sound breaks the game
 RDEPEND="
@@ -37,17 +35,11 @@ RDEPEND="
 		media-libs/sdl2-ttf
 	)
 "
-DEPEND="
-	sys-apps/coreutils
-	sys-apps/grep
-"
 
 pkg_nofetch() {
-	einfo
 	einfo "Please buy & download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
 	einfo "and move/link it to your DISTDIR directory."
-	einfo
 }
 
 src_unpack() {
@@ -64,35 +56,24 @@ src_unpack() {
 
 src_install() {
 	local dir=/opt/${PN}
-	local libsuffix=$(usex amd64 "64" "")
-	local arch=$(usex amd64 "x86_64" "x86")
+	local libsuffix=$(usex amd64 64 '')
+	local arch=$(usex amd64 x86_64 x86)
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins -r noarch/{Audio,Data,Fonts,Graphics,Game.ini,mkxp.conf,ToTheMoon.png}
 
-	exeinto "${dir}"
+	exeinto ${dir}
 	doexe ${arch}/${MY_PN}.bin.${arch}
 
-	exeinto "${dir}/lib${libsuffix}"
+	exeinto ${dir}/lib${libsuffix}
 	if use bundled-libs ; then
 		doexe ${arch}/lib${libsuffix}/*
 	else
 		doexe ${arch}/lib${libsuffix}/libSDL_sound-1.0.so.1
 	fi
 
-	make_wrapper ${PN} "./${MY_PN}.bin.${arch}" "${dir}" "${dir}/lib${libsuffix}"
-	make_desktop_entry ${PN} "To the Moon"
-	newicon -s 32 noarch/${MY_PN}.png ${PN}.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
+	make_wrapper ${PN} ./${MY_PN}.bin.${arch} ${dir}{,/lib${libsuffix}}
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	newicon noarch/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} "To the Moon"
 }
diff --git a/games-rpg/wasteland2/Manifest b/games-rpg/wasteland2/Manifest
index 40a6e2e1bfce..aecc042af6c4 100644
--- a/games-rpg/wasteland2/Manifest
+++ b/games-rpg/wasteland2/Manifest
@@ -1,3 +1,3 @@
 DIST gog_wasteland_2_1.9.0.13.tar.gz 10959158010 BLAKE2B 8a82a608b3530fd2000ebe689b337529630da3c81ac4fc9369d9dd210b48b842658770b16ea451f3eedd63fcc682ad0c898fcff895d119ab4395fad32c04e9c4 SHA512 8b5ed19ffee9505efaf03f7ef3ba55dbdbbeda68b7961e92c22776bbb7e842df8c5e5ee727967e79dec753fd03d39f0a1c98e380e540971834b56066b6a79929
-EBUILD wasteland2-1.9.0.13-r1.ebuild 1945 BLAKE2B 19714595fe7c1280a3bada785989138e50b6eb45a389b3078688730c2460dba1892a1fbcc384a08e56e747781ed87d5c8b6faf4718ad9bcc60c04b2b63d59fd8 SHA512 f0fca084083d7d1d43ce4611f5216ec1128093b7f226fdf63a700fad169d0014817130f237fa92f4c1848e65835f681c67c460a791ec82285f3be953ec417e3f
+EBUILD wasteland2-1.9.0.13-r2.ebuild 1657 BLAKE2B 26fdcab72a0a33fb4f4ecd2f51ef5fe8b810e007b4458f929fd392975f35dfef584e9a9780af1386139cd404d76a15504f3c457eba1a5408c01acb5d7756ce78 SHA512 670d9aa0aaf7a8ed816488c5946ceacad64d51c1bc646411191fb78394da5349ebd9c0943b6e94c017b33b69d70175fd2b4ec27324b3849be47e28707e9bc3d8
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-rpg/wasteland2/wasteland2-1.9.0.13-r1.ebuild b/games-rpg/wasteland2/wasteland2-1.9.0.13-r2.ebuild
index 2dffd54fb060..42082b1444ca 100644
--- a/games-rpg/wasteland2/wasteland2-1.9.0.13-r1.ebuild
+++ b/games-rpg/wasteland2/wasteland2-1.9.0.13-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CHECKREQS_DISK_BUILD="22000M"
 CHECKREQS_DISK_USR="21600M"
-inherit check-reqs desktop gnome2-utils wrapper
+inherit check-reqs desktop wrapper
 
 DESCRIPTION="Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout"
 HOMEPAGE="https://wasteland.inxile-entertainment.com/"
@@ -15,29 +15,27 @@ S="${WORKDIR}/Wasteland 2"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist fetch mirror"
+RESTRICT="bindist fetch"
 
 QA_PREBUILT="opt/${PN}/*"
 
 RDEPEND="
-	>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)]
-	>=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)]
-	>=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)]
-	>=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)]
-	>=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)]
-	>=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)]
-	>=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)]
-	>=x11-libs/pango-1.36.5[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-	>=virtual/glu-9.0-r1[abi_x86_32(-)]
-	virtual/opengl
-"
+	dev-libs/atk[abi_x86_32(-)]
+	dev-libs/glib:2[abi_x86_32(-)]
+	media-libs/fontconfig:1.0[abi_x86_32(-)]
+	media-libs/freetype:2[abi_x86_32(-)]
+	virtual/glu[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/cairo[abi_x86_32(-)]
+	x11-libs/gdk-pixbuf[abi_x86_32(-)]
+	x11-libs/gtk+:2[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXcursor[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/pango[abi_x86_32(-)]"
 
 pkg_nofetch() {
-	einfo
 	einfo "Please buy Wasteland 2"
 	einfo "from https://www.gog.com/ and"
 	einfo "download ${SRC_URI}"
@@ -46,7 +44,6 @@ pkg_nofetch() {
 	einfo "This ebuild was tested with the CLASSICAL edition."
 	einfo "If it works with the deluxe edition too, please"
 	einfo "open a bug report. If not, open a bug report too."
-	einfo
 }
 
 src_install() {
@@ -54,25 +51,15 @@ src_install() {
 
 	# over 20GB of data
 	dodir ${dir}
-	mv game/WL2_Data "${ED}/${dir}"/ || die
+	mv game/WL2_Data "${ED}"/${dir}/ || die
+
 	exeinto ${dir}
 	doexe game/WL2
 
-	make_wrapper ${PN} ./WL2 "${dir}"
-	newicon -s 256 support/gog-wasteland-2.png ${PN}.png
+	make_wrapper ${PN} ./WL2 ${dir}
+
+	newicon support/gog-wasteland-2.png ${PN}.png
 	make_desktop_entry ${PN} "Wasteland 2"
 
 	dodoc docs/*.pdf
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}