gentoo resync : 17.06.2021

16 files changed, 189 insertions, 288 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index df04490461e3..5fec19c8e144 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/atakks/Manifest b/games-board/atakks/Manifest
index 1a11868cc1cc..d28f6eea6c6d 100644
--- a/games-board/atakks/Manifest
+++ b/games-board/atakks/Manifest
@@ -1,5 +1,5 @@
 AUX 1.0-warnings.patch 974 BLAKE2B 54ead5cdd8b43c812f11685f053b9a8fa8eaa5aa8da2d4a585bf4b8c90180a7d53036ec6ec230f47ea2beeb0361579d6dc732c435fd1763a8f83af466d9ab3dc SHA512 36911a16c5a9ea3db5a13fb9cb38e6481465016d1d58d1d255730ee35aad44e9356a1493ce93a010d5544b28d8e3ea35d40087e95dc86e577904eb033025b411
 AUX atakks-1.0-as-needed.patch 443 BLAKE2B 8d9ea8a04f2ca9cfc592427bd22223ba77c25796c2c3b6d4a5cf4ffd129e279da4b50d5c2377e0313acda12807ced7b30557fc705d4c272ccdf219338a8ef281 SHA512 6280db8cd198caf320daa85773358f92b0bcf71c243b5ab36ccc989fb7c88fdeab2de8a1dc4ce45c97977b2f5ac026e811db1e1e6b3683759d2e5f639fa2155d
 DIST atakks-1.0.tar.gz 62464 BLAKE2B 1419e4fff60121e0bd793322cd20515335ad82d9b1341ab9ae658aa5e2882af3457440485318b1d872f9f8f483c22b21d8dc55f5d4862694427d08fb52e93e85 SHA512 a4b31635ef74198c86002fc930922266f462926bffa5b1fd7fb8ba1186dbc1efd8ae8c84ac0a429737916d1350b5432967221a67505bfe73d47a6dadd7600e39
-EBUILD atakks-1.0-r1.ebuild 894 BLAKE2B 680740590cd12d1df67781ba1a043539cc345774076c90bf8ea2c6db1ce8b83269447b5ac7cb9ecc71c524edf7a39616d9801ee267c235604b1e7771b2450045 SHA512 6c564d8d03622a883c8e99a86d3753b73be46f8baa360d596245b2c44a6188f39be76a150a8bb1c0ce461a47c81ec77a9a8b4eb2bd92d1f8b4cbdc1595b09359
+EBUILD atakks-1.0-r2.ebuild 783 BLAKE2B 992781404d810b6b5e7b53d1fbebe9fee7137c084ee9d56a20eb66b18b9908baaa34e048464f8be72b202d91e6e36f74ca9277c52b1d54095e56811ae6c375e0 SHA512 20335f452f77916b0796e7389044e9e1de3fb17ec8d23dca29082f4847d4d7510329a3068c43bbd4ccd7b8f83b3e17a9a0ddee01a40f728ee0e117c9703a88c3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/atakks/atakks-1.0-r1.ebuild b/games-board/atakks/atakks-1.0-r1.ebuild
deleted file mode 100644
index 052924ba8c88..000000000000
--- a/games-board/atakks/atakks-1.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_P=${P/-/_}
-DESCRIPTION="A clone of Ataxx"
-HOMEPAGE="http://team.gcu-squad.org/~fab"
-# no version upstream
-#SRC_URI="http://team.gcu-squad.org/~fab/down/${PN}.tgz"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl:0"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-warnings.patch
-	"${FILESDIR}"/${P}-as-needed.patch
-)
-
-src_prepare() {
-	default
-
-	# Modify game data paths
-	sed -i \
-		-e "s:SDL_LoadBMP(\":SDL_LoadBMP(\"/usr/share/${PN}/:" \
-		main.c || die
-}
-
-src_compile() {
-	emake E_CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins *bmp
-	newicon icon.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Atakks /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-board/atakks/atakks-1.0-r2.ebuild b/games-board/atakks/atakks-1.0-r2.ebuild
new file mode 100644
index 000000000000..8da2077bfe0e
--- /dev/null
+++ b/games-board/atakks/atakks-1.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Clone of Ataxx"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+S="${WORKDIR}/${PN}_${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/libsdl[video]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-warnings.patch
+	"${FILESDIR}"/${P}-as-needed.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "/LoadBMP/s|\"|\"${EPREFIX}/usr/share/${PN}/|" main.c || die
+}
+
+src_compile() {
+	tc-export CC
+
+	emake E_CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins *.bmp
+
+	make_desktop_entry ${PN} Atakks applications-games
+
+	einstalldocs
+}
diff --git a/games-board/ccgo/Manifest b/games-board/ccgo/Manifest
index da0a78bb7d27..fb961f1fe364 100644
--- a/games-board/ccgo/Manifest
+++ b/games-board/ccgo/Manifest
@@ -1,5 +1,5 @@
 AUX ccgo-0.3.6.5-gcc4.patch 204 BLAKE2B 7cf7b69699dacb14b03308d5959016eda17ed92cf4da86239e3e37a680c5f2efc3f0417ecc01743c53ec229ca2c808eb7aa417718d60f1961c8ff99667c0d4d8 SHA512 86d8f663e3058076f63526217a15f4c8bdc70dc178d48b26a032c38b1bfe02cad4ce28de08889312cd769e39d927e427b14bbbf2631e3455a7e219fbf49ed95d
 AUX ccgo-0.3.6.5-tinfo.patch 979 BLAKE2B 2cada9ee44d475fd13f4627b51f72757297b59dd8289aca476a632f61e06712b7f705c83712f4bb1762452cf49a4f193af5cc21a6251c4632a6a2b672e4d8410 SHA512 fb5082e9543cabbcaad2856e3f15a1c39bc88bfb51ddc3c32a77409e1a1f32494327a8ab35c705aff304147c1ce5360750d41fade8ac4fd2e739b5d7a61d29b7
 DIST ccgo-0.3.6.5.tar.gz 639238 BLAKE2B a0e67cbfe270c7dd4906e01545310e3a93fcf5ff843c987917df36209846fbae4297e3a6f61b5c321a12ce157bcfb516da0ca28a700ca869944127ac05b1eb68 SHA512 268c228eee9c42e49df333bfa0707e7b72c39731ccd64239e3c426958f6c17b65658db91bc7ab89548c4cc647ade791a7c67c30c410a5b3935c8fd3f326bf36b
-EBUILD ccgo-0.3.6.5-r1.ebuild 1280 BLAKE2B 4321c7637ec2d8bfcf0525988fd32081736ff81e90449ad87fe743f98ee6282e769b39382f5a584448e64a26083f40f0d038cee9b7f2ac99b9311afb2910a687 SHA512 f5b6952ce2a03af72baa58a8920149622ed6a6826e8d5ced6151ca4230c06a26419c48f07c5e440e2272d3debd3ff2fe8e25f740a0a100e4edc7207afbdea189
+EBUILD ccgo-0.3.6.5-r1.ebuild 1311 BLAKE2B d3e3da26ab67da9d38fcd90592ac03ae85f5a1df4a17fd9f8570031573244e19461c3b98a0166bf1cb2742a6fd80fbd55d5647d2d56c7df7a3db670a2649abc6 SHA512 022a1a85d81600019895aea2a29f352d13332e1df59e8310a528db849495bcba4d1869ae43fae7a72f2b583ed4ecc6a0a096c34678d216a0b49914e7c1dc92a4
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild b/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild
index fd69f9b4f475..9530e3f901cd 100644
--- a/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild
+++ b/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils toolchain-funcs flag-o-matic
+inherit autotools flag-o-matic toolchain-funcs
 
-DESCRIPTION="An IGS client written in C++"
+DESCRIPTION="IGS client written in C++"
 HOMEPAGE="https://ccdw.org/~cjj/prog/ccgo/"
 SRC_URI="https://ccdw.org/~cjj/prog/ccgo/src/${P}.tar.gz"
 
@@ -18,8 +18,8 @@ RDEPEND="
 	>=dev-cpp/gconfmm-2.6
 	>=dev-cpp/gtkmm-2.4:2.4
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
 PATCHES=(
@@ -37,8 +37,8 @@ src_prepare() {
 
 	sed -i \
 		-e '/^localedir/s/=.*/=@localedir@/' \
-		-e '/^appicondir/s:=.*:=/usr/share/pixmaps:' \
-		-e '/^desktopdir/s:=.*:=/usr/share/applications:' \
+		-e "/^appicondir/s|=.*|=${EPREFIX}/usr/share/pixmaps|" \
+		-e "/^desktopdir/s|=.*|=${EPREFIX}/usr/share/applications|" \
 		Makefile.am || die
 
 	# cargo cult from bug #569528
@@ -52,7 +52,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--localedir=/usr/share/locale \
+		--localedir="${EPREFIX}"/usr/share/locale \
 		$(use_enable nls)
 }
 
diff --git a/games-board/freedoko/Manifest b/games-board/freedoko/Manifest
index bb1e39210658..c1f888b2c0ee 100644
--- a/games-board/freedoko/Manifest
+++ b/games-board/freedoko/Manifest
@@ -6,6 +6,5 @@ DIST kdecarddecks.zip 3370611 BLAKE2B d097bd95545e57250ea7dc034d40577253cf8e78e5
 DIST openclipart.zip 1251509 BLAKE2B 66ac2ada7d96726d4f4f9d016feb088814ff95def9950082c04b0a440d86e80701fcb06ee6e04afc431daf759198957281a971124f591346b66d70be916b50db SHA512 8c5e84d8f8f011cfc84f7d012c97e606f80c2254336518c9b9563315bd63971e7211b762effbb841e74603e0f02bb12ae9e91d1be6a4e23c243691b025874ec2
 DIST pysol.zip 26314316 BLAKE2B f8df3be0b4a2f9343af40dd3311f4d58ca33a1392474f837afc2a0e56bcf21e1bd39b3b2914e06f6e226e5e832b2c6cba9f090639e27f38d554da81dbc3e1d58 SHA512 951891631c6890144361d779bc52aed2b94a87e810de65f7ef240193c49a243e2f1a93f3e170eacb19080dd28beb99b279d7e0bc16d7cb54553e27d29e65b1f7
 DIST xskat.zip 666085 BLAKE2B 2141ffec9b76142ab96bc0bd66784578711a44163788b868b9b02cfa9514f123e02a75d6d3c979ba86283b5fdda1604167eff9181c9ce2ee8b324db0b02bb0e1 SHA512 725bb12e983e8c1494748faf78b2e1c76c424806eeb7a88aafecf580aa63703c166907aea2bbd7890d2f972ffacc5dde78d01a82b72ab87cccf1a8e50d1034f9
-EBUILD freedoko-0.7.16-r1.ebuild 2618 BLAKE2B 10013cc1d84d7a99d97168ba757acbba960ebefc40d6d6d3a4a1ff7caeaef6f7ea20b8f3b9941ef6011a6620ba166157a06f93578d63cff221ef7f0fc4f70566 SHA512 310c381b1e145ef43e55fb343c134319848f199258b7912f7d344726e528638f69e0fcd5e2842ca6b306c4d433ba9d6ce9bb7fb0360e768f9b4f194d8b2fbb15
-EBUILD freedoko-0.7.16.ebuild 2697 BLAKE2B 19cdf1d26ced16f9f79c7b537868e07b859ae1d146a6eef90ded70ee6f2033cff98ecb0674773737c761d4ed89113abb51396959eb6cf7284238300d625a9baa SHA512 5eacdc90fa6fa0473e5fdb808ff3fdc1cf9f82439f8429469aaa79d5d58558805928a6957e12596f499c285b02fef1cee66b95a0d8e9797879f61d8c3ffacd05
-MISC metadata.xml 817 BLAKE2B 0b98264bb5e7f8db35d1db092a0b31779747c47c50463c489f2aa05abf8d465ec1ee9c8380d728ad9dc36b26c305d4c41921391ba4acdb5fa9b26613a32597e7 SHA512 36779c23b160e2fedaedc705cf19a4f70170d735cbda5d72e577f0e3c7f9937e30552804389023ced71f4428a6b6e90c640dc39bfce764eb93fb7b0744196d33
+EBUILD freedoko-0.7.16-r1.ebuild 2537 BLAKE2B 35541f76a4dd3fcd43c184b870eefa47cf1740be9f7cdfe876bcd5a17998d8327e973324f472a81c320222d1eb6104c4ef9c0fa97973c3cf34a25292f58574f2 SHA512 27f88a8ffd2f750af7e78143ae919bbbd256325f0f714f430fa7a7f5c47ead057f269b955b3405c29e5ded2f221fcc6b39a60aebb96014a94b5cc4e650c2eab4
+MISC metadata.xml 761 BLAKE2B d7ed9777e441df02f9d84948a5dda5aaf678482d84a0789999d2595e266e78d43bcdff72a336b19850318d157d63eb198dd15155dd08f1d689a2e754fdde0638 SHA512 e249da1eb0b49d59217376092672f3a8cde45e592d984569bfeb622abbde2242d37293e456a8ca73125040fdba1803062e459732a62af76b7283826ddb26223b
diff --git a/games-board/freedoko/freedoko-0.7.16-r1.ebuild b/games-board/freedoko/freedoko-0.7.16-r1.ebuild
index 2776366c552c..0a9f423066ad 100644
--- a/games-board/freedoko/freedoko-0.7.16-r1.ebuild
+++ b/games-board/freedoko/freedoko-0.7.16-r1.ebuild
@@ -1,54 +1,64 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="FreeDoko is a Doppelkopf-game"
 HOMEPAGE="http://free-doko.sourceforge.net"
-SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
+SRC_URI="
+	mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
 	backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> ${PN}-backgrounds.zip )
-	kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip )
-	xskatcards? ( mirror://sourceforge/free-doko/xskat.zip )
-	pysolcards? ( mirror://sourceforge/free-doko/pysol.zip )
 	gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip )
+	kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip )
 	openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip )
+	pysolcards? ( mirror://sourceforge/free-doko/pysol.zip )
+	xskatcards? ( mirror://sourceforge/free-doko/xskat.zip )
 	!xskatcards? (
 		!kdecards? (
 			!gnomecards? (
 				!openclipartcards? (
 					!pysolcards? (
 						mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )"
+S="${WORKDIR}/FreeDoko_${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds"
+IUSE="+backgrounds +gnomecards +kdecards +openclipartcards +pysolcards +xskatcards"
 
-RDEPEND=">=dev-cpp/gtkmm-2.4:2.4"
-DEPEND="${RDEPEND}
+RDEPEND="
+	dev-cpp/gtkmm:3.0
+	media-libs/openal"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/unzip
 	virtual/pkgconfig"
 
-S=${WORKDIR}/FreeDoko_${PV}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.16-gentoo.patch
+)
 
 src_unpack() {
-	local cards=0
+	unpack FreeDoko_${PV}.src.zip
 
+	local cards=
 	unpack_cards() {
-		use $1 && { unpack $2 ; cards=$(( $cards + 1 )); };
+		if use $1; then
+			cards=y
+			unpack $2
+		fi
 	}
-	unpack FreeDoko_${PV}.src.zip
-	cp /dev/null "${S}"/src/Makefile.local || die
 
 	cd "${S}"/data/cardsets || die
 
-	unpack_cards xskatcards       xskat.zip
-	unpack_cards kdecards         kdecarddecks.zip
-	unpack_cards pysolcards       pysol.zip
 	unpack_cards gnomecards       gnome-games.zip
+	unpack_cards kdecards         kdecarddecks.zip
 	unpack_cards openclipartcards openclipart.zip
-	[ $cards ] || unpack xskat.zip # fall back to xskat
+	unpack_cards pysolcards       pysol.zip
+	unpack_cards xskatcards       xskat.zip
+	[[ $cards ]] || unpack xskat.zip # fall back to xskat
 
 	if use backgrounds ; then
 		cd "${S}"/data/backgrounds || die
@@ -56,44 +66,33 @@ src_unpack() {
 	fi
 }
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.16-gentoo.patch
-)
-
-src_prepare() {
-	default
-	export VARTEXFONTS="${T}/fonts" #652028
+src_compile() {
+	tc-export CXX
 	append-cxxflags -std=c++14
-}
+	append-cppflags \
+		-DPUBLIC_DATA_DIRECTORY_VALUE="'\"${EPREFIX}/usr/share/${PN}\"'" \
+		-DMANUAL_DIRECTORY_VALUE="'\"${EPREFIX}/usr/share/doc/${PF}/html\"'"
+	touch src/Makefile.local || die # needed for above paths to be used
 
-src_compile() {
-	export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"/usr/share/${PN}\"'"
-	export CPPFLAGS+=" -DMANUAL_DIRECTORY_VALUE='\"/usr/share/doc/${PF}/html\"'"
 	export OSTYPE=Linux
 	export USE_NETWORK=false
 	export USE_SOUND_ALUT=false # still marked experimental
+	export VARTEXFONTS="${T}/fonts" #652028
+
 	emake Version
-	emake -C src FreeDoko
+	emake -C src FreeDoko LIBS="${LDFLAGS}"
 }
 
 src_install() {
 	newbin src/FreeDoko freedoko
-	insinto /usr/share/${PN}/
-	doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*png}
-	find "${D}/usr/share/${PN}" -name Makefile -delete
-	dodoc AUTHORS README ChangeLog
-	newicon -s 32 src/FreeDoko.png ${PN}.png
-	make_desktop_entry ${PN} FreeDoko
-}
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
+	insinto /usr/share/${PN}
+	doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*.png}
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
+	newicon src/icon.png ${PN}.png
+	make_desktop_entry ${PN} FreeDoko
+
+	einstalldocs
 
-pkg_postrm() {
-	gnome2_icon_cache_update
+	find "${ED}"/usr/share/${PN} -name Makefile -delete || die
 }
diff --git a/games-board/freedoko/freedoko-0.7.16.ebuild b/games-board/freedoko/freedoko-0.7.16.ebuild
deleted file mode 100644
index 279bdf73da22..000000000000
--- a/games-board/freedoko/freedoko-0.7.16.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="FreeDoko is a Doppelkopf-game"
-HOMEPAGE="http://free-doko.sourceforge.net"
-SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
-	backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> ${PN}-backgrounds.zip )
-	kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip )
-	xskatcards? ( mirror://sourceforge/free-doko/xskat.zip )
-	pysolcards? ( mirror://sourceforge/free-doko/pysol.zip )
-	gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip )
-	openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip )
-	!xskatcards? (
-		!kdecards? (
-			!gnomecards? (
-				!openclipartcards? (
-					!pysolcards? (
-						mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net"
-
-RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 )
-	>=dev-cpp/gtkmm-2.4:2.4"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/FreeDoko_${PV}
-
-src_unpack() {
-	local cards=0
-
-	unpack_cards() {
-		use $1 && { unpack $2 ; cards=$(( $cards + 1 )); };
-	}
-	unpack FreeDoko_${PV}.src.zip
-	cp /dev/null "${S}"/src/Makefile.local || die
-
-	cd "${S}"/data/cardsets || die
-
-	unpack_cards xskatcards       xskat.zip
-	unpack_cards kdecards         kdecarddecks.zip
-	unpack_cards pysolcards       pysol.zip
-	unpack_cards gnomecards       gnome-games.zip
-	unpack_cards openclipartcards openclipart.zip
-	[ $cards ] || unpack xskat.zip # fall back to xskat
-
-	if use backgrounds ; then
-		cd "${S}"/data/backgrounds || die
-		unpack ${PN}-backgrounds.zip
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.16-gentoo.patch
-)
-
-src_prepare() {
-	default
-	export VARTEXFONTS="${T}/fonts" #652028
-	append-cxxflags -std=c++14
-}
-
-src_compile() {
-	export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"/usr/share/${PN}\"'"
-	export CPPFLAGS+=" -DMANUAL_DIRECTORY_VALUE='\"/usr/share/doc/${PF}/html\"'"
-	export OSTYPE=Linux
-	export USE_NETWORK=$(use net && echo true || echo false)
-	export USE_SOUND_ALUT=false # still marked experimental
-	emake Version
-	emake -C src FreeDoko
-}
-
-src_install() {
-	newbin src/FreeDoko freedoko
-	insinto /usr/share/${PN}/
-	doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*png}
-	find "${D}/usr/share/${PN}" -name Makefile -delete
-	dodoc AUTHORS README ChangeLog
-	newicon -s 32 src/FreeDoko.png ${PN}.png
-	make_desktop_entry ${PN} FreeDoko
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/freedoko/metadata.xml b/games-board/freedoko/metadata.xml
index a5dbad4c24dd..2e46e5ae6b65 100644
--- a/games-board/freedoko/metadata.xml
+++ b/games-board/freedoko/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="kdecards">Install the KDE card set</flag>
-    <flag name="net">Enable network game support</flag>
     <flag name="pysolcards">Install the PySol card set</flag>
     <flag name="xskatcards">Install the XSkat card set</flag>
     <flag name="gnomecards">Install the gnome-games card set</flag>
diff --git a/games-board/megamek/Manifest b/games-board/megamek/Manifest
index 5a1d2508bf3c..6b3b85b62bdf 100644
--- a/games-board/megamek/Manifest
+++ b/games-board/megamek/Manifest
@@ -1,3 +1,3 @@
 DIST MegaMek-v0.34.10.zip 16677286 BLAKE2B 73c4ee9e38b4c50221c40c5d0cba1c13de00e586bf2cb9432c356f5c21045c26cfa64705b303c7213f29deda369a97ea5fba397c995c138731a66152c062c5b5 SHA512 943f6ed4f4d57197092a7aa09637f60827f23181a7b8b0991907fcc62109b471ea2ce53816a79dfcad9d8da65c9514be3190e924d9bf2b17aacf84fc1fa6e037
-EBUILD megamek-0.34.10-r1.ebuild 1053 BLAKE2B e9dae9a8ff3f3ee050166d1db15dfb752254ab2c19e4f96fe949c66430de78188b3b8bc442c9c7b1ae8d3c23719707a13a9c534a2750a35438d7221ec82de1d6 SHA512 126ee03e5a9dd995101da2e6c1d63de25d238a6838e595638aac3793ce76270016d1e94bb7a7a417cb7535cbf0e59acd7c03276ad2b973f35703f032486c19ed
-MISC metadata.xml 330 BLAKE2B 08bb146ebca0d9f6e0006d1d6d615a93434dc4a98f363da9da16eba5649678fc36325cdd84253a9f8d3ad72cc165d783228db019026380e447a5242365b29e06 SHA512 e2b391074805c40a32f3a2d74db870e75c5a9cb0413b15b41b43cf7bf16a6bf90363c3d1eb1b6c1fccbc4f44defcadbf44bea218b1a5f3d4fb66a4428e5b5cde
+EBUILD megamek-0.34.10-r2.ebuild 1086 BLAKE2B 7b11b5e08496c09ecc28174aac1cebf86b787d32627fdc0bc3837aaad2fe7ac27aaec3b5ca813a7c30000652e9e3e93f8a10843b15fd3e41c098590cf5d85054 SHA512 2c84b18b4d58cdd39bf9bfff67156f7eb1678bff93c9216fb97293bf3c334faf1cca0d84487217c0866d85c3165f7999e026c3acc7021c052c3f6bf70c89b740
+MISC metadata.xml 385 BLAKE2B 97f3040dbc9c0db34e70a0da22608bfdbeb3a4ea160e642524a08332f799a5f190a3a9f3b661066ef70fae07bbe9c9755d16631a87dcdc79493d186d4e55d243 SHA512 4aa15a91f2d1c31724a23204a09f91f3fd4bde2fa69fc890f002d894830fd5837c617517fad8abc84ed9a45be85a841582395df530a121216e5d7b95664bccca
diff --git a/games-board/megamek/megamek-0.34.10-r1.ebuild b/games-board/megamek/megamek-0.34.10-r1.ebuild
deleted file mode 100644
index 6b3fe5a0bb91..000000000000
--- a/games-board/megamek/megamek-0.34.10-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="an unofficial, online version of the Classic BattleTech board game"
-HOMEPAGE="http://megamek.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/MegaMek-v${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	rm -v *.jar || die
-	edos2unix startup.sh
-	sed -i \
-		-e "s:XmX:Xmx:" \
-		-e "s:/usr/share/java:/usr/share/${PN}:" \
-		-e "s:/usr/share/MegaMek:/usr/share/${PN}:" \
-		startup.sh || die "sed failed"
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	eant
-}
-
-src_install() {
-	newbin startup.sh ${PN}
-	insinto /usr/share/${PN}
-	doins -r data docs l10n lib mmconf *.jar readme*
-	dodoc HACKING readme.txt
-	make_desktop_entry ${PN} MegaMek /usr/share/pixmaps/${PN}.gif
-	newicon data/images/misc/megamek-icon.gif ${PN}.gif
-}
diff --git a/games-board/megamek/megamek-0.34.10-r2.ebuild b/games-board/megamek/megamek-0.34.10-r2.ebuild
new file mode 100644
index 000000000000..a1e76585011b
--- /dev/null
+++ b/games-board/megamek/megamek-0.34.10-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop edos2unix java-pkg-2 java-ant-2
+
+DESCRIPTION="Unofficial online version of the Classic BattleTech board game"
+HOMEPAGE="https://megamek.org/"
+SRC_URI="mirror://sourceforge/${PN}/MegaMek-v${PV}.zip"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+
+	rm MegaMek.jar || die
+
+	sed -e "s|XmX|Xmx|" \
+		-e "s|/usr/share/java|${EPREFIX}/usr/share/${PN}|" \
+		-e "s|/usr/share/MegaMek|${EPREFIX}/usr/share/${PN}|" \
+		startup.sh > ${PN} || die
+	edos2unix ${PN}
+
+	# workaround encoding issues posing problems with >=jdk-1.8
+	find . -name '*.java' -exec sed -i 's/\xf6/\xc3\xb6/' {} + || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r MegaMek.jar data docs l10n lib mmconf readme* # readme used at runtime
+
+	dodoc HACKING readme.txt
+
+	make_desktop_entry ${PN} MegaMek applications-games
+}
diff --git a/games-board/megamek/metadata.xml b/games-board/megamek/metadata.xml
index 1c5cb53716e8..290f45425af2 100644
--- a/games-board/megamek/metadata.xml
+++ b/games-board/megamek/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">MegaMek/megamek</remote-id>
 		<remote-id type="sourceforge">megamek</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-board/pasang-emas/Manifest b/games-board/pasang-emas/Manifest
index 4fea99f2c7d7..4819c3fa8e1d 100644
--- a/games-board/pasang-emas/Manifest
+++ b/games-board/pasang-emas/Manifest
@@ -3,5 +3,5 @@ DIST pasang-emas-3.1.0.tar.bz2 3030528 BLAKE2B c61caf905f17fb51fd58609c8f0ec9fc6
 DIST pasang-emas-themes-1.0.tar.bz2 1190560 BLAKE2B a2218920dc601a12c86da15600f8cd09ae434265695d872d706086ab02b9b02e557e8c786789b8089d142b86114adbabfe392f1af290138a95a1d805845582a9 SHA512 8b82ce6ba588b83ed4a0d70d8aab256e2dae16143e64ca8a1fc25ffe61f001cdbc71d62d8eb42d9af4aeb63d6584f47b513b0ce1840d9b9f49d9b1b635eb4043
 DIST pet-fragrance.tar.bz2 1019437 BLAKE2B a4408d60c4ea14efab84f10bbce4da0382253f19cd60a82b278ac55c6b9f897a0e2eeef924930b7c8159a02460e3a269dea4254126e2389c84fe0f02cf61c62e SHA512 2af8908848cc20962c70ef573156b208dbc33032529035ae6f0b5760f5eb1b718582dc823340587e29b7e66a2d3c89ba113dedbf299c0bef639f28329ff278f2
 DIST pet-marble.tar.bz2 631999 BLAKE2B aee419bfe7355f6c90822deed14d44174d5862f08a6bcb81cabd3c2b05f7ee99ae836574af21e3a2a9c9bf203c1c39d8c4f435466cbbf274cdd162e2c6cc3805 SHA512 3ecaeaddb12e23fbd90e4d158a47dffb73b756bf9f5263d93c5f6aa21d290be3d91885de7200cdd3a45718b49ac19cd7073ed8bf83697af6bff64759f810122e
-EBUILD pasang-emas-3.1.0-r1.ebuild 1417 BLAKE2B 4aaf2fa8344a0f7d8807002c6eaecdfbf82acc0a92362766dccfca9bf2b018a0f0ae199015ef17cb495f4e31df00e73d950a20f62646c20a1a112da9aac8bd6c SHA512 dd36d7d6a5867b4eb1c73ade3d4651d60cce6ce5a169bd617a8355aad9c6bd284d806b2c6908a23aab4f98833cfc9000bc2225bf3884bf59820206c38fbba619
+EBUILD pasang-emas-3.1.0-r1.ebuild 1471 BLAKE2B 60d07e08e15aff2a3afc21beff4110a980bdee1d7a608b83a9a8773c299e026bbf5949b6e3815fe4cd3b6db957e7c2d5754f46893276b61bda95c823ed4ac6ca SHA512 aafd0dc5d8e3b8f279368ca6124c22e08a72600249341b2cbe670760c066f30bad08b2e3a6696e00ac2a2ae497cb11b6bc10511f84fcdca86252af85809292df
 MISC metadata.xml 418 BLAKE2B 6b928c147371451147002cd57f68630e399e64539f8de21411c9d3d0aa79313f306b1f273c24f980b6240f102c828c86c6246f23bcd2898466f0d9538682b09b SHA512 32f5fe7a93d534ffe61023137d21e0d5cfe9328ecbf16c3b0e117a3d131319fa3e284b23c244669cde0c1c0cf45ceffb291dd53198bd4961536ff223e71a3465
diff --git a/games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild b/games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild
index b028b2871b2d..5bf6199b8d6d 100644
--- a/games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild
+++ b/games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild
@@ -1,25 +1,32 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils gnome2-utils
+EAPI=7
 
-DESCRIPTION="A traditional game of Brunei"
+inherit gnome2-utils toolchain-funcs
+
+DESCRIPTION="Traditional game of Brunei"
 HOMEPAGE="http://pasang-emas.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	extras? ( mirror://sourceforge/${PN}/pasang-emas-themes-1.0.tar.bz2
-	          mirror://sourceforge/${PN}/pet-marble.tar.bz2
-	          mirror://sourceforge/${PN}/pet-fragrance.tar.bz2 )"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	extras? (
+		mirror://sourceforge/${PN}/pasang-emas-themes-1.0.tar.bz2
+		mirror://sourceforge/${PN}/pet-marble.tar.bz2
+		mirror://sourceforge/${PN}/pet-fragrance.tar.bz2
+	)"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="extras nls"
+RESTRICT="test" # only used to validate .xml help files and fetches .dtd for it
 
-RDEPEND="app-text/gnome-doc-utils
-	>=x11-libs/gtk+-2.18.2:2
-	virtual/libintl"
-DEPEND="${RDEPEND}
+RDEPEND="
+	app-text/gnome-doc-utils
+	x11-libs/gtk+:2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rarian
 	nls? ( sys-devel/gettext )"
 
@@ -29,31 +36,32 @@ PATCHES=(
 
 src_prepare() {
 	default
-	sed -i \
-		-e '/Encoding/d' \
-		-e '/Icon/s:\.png::' \
-		data/pasang-emas.desktop.in || die
+
+	sed -i '/Encoding/d;/Icon/s:\.png::' data/pasang-emas.desktop.in || die
+
 	gnome2_omf_fix
 }
 
 src_configure() {
-	econf \
-		--localedir=/usr/share/locale \
-		--with-omf-dir=/usr/share/omf \
-		--with-help-dir=/usr/share/gnome/help \
+	local econfargs=(
 		$(use_enable nls)
+		--with-help-dir="${EPREFIX}"/usr/share/gnome/help
+		--with-omf-dir="${EPREFIX}"/usr/share/omf
+	)
+	econf "${econfargs[@]}"
+}
+
+src_compile(){
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
 	default
+
 	if use extras; then
 		insinto /usr/share/${PN}/themes
-		doins -r \
-			"${WORKDIR}"/marble \
-			"${WORKDIR}"/pasang-emas-themes-1.0/{conteng,kaca} \
-			"${WORKDIR}"/fragrance
+		doins -r "${WORKDIR}"/{fragrance,marble,pasang-emas-themes-1.0/{conteng,kaca}}
 	fi
-	use nls || rm -rf "${D}"usr/share/locale
 }
 
 pkg_preinst() {