gentoo resync : 04.01.2022

9 files changed, 53 insertions, 112 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 7973a8fcd110..08be69099ce1 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index 4c1ade5d9dc9..d0f0a839ae23 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -2,8 +2,10 @@ AUX 01_all_fortune_all-fix.patch 711 BLAKE2B a4c6802863fe2d19bdb3080e7f8a039ae0c
 AUX fortune-mod-1.99.1-gentoo.patch 2495 BLAKE2B 755d525da36c6d5b00ac3635082d788a5bd70e3712b23e6227328c726740b5adbf6ce1d254706901ff183bfbe40c04da73a26edf181fe4a9727bb7623dbf5bea SHA512 338861e27cc82baf4a062fe17029a7f2d05ea19d009be8627c04f66bebd74e8801272c1fc3cdeab2f29da797ad6373f38dd0ded011a7176ee93774b396e45cd9
 DIST fortune-mod-1.99.1.tar.gz 1812089 BLAKE2B a5df4a5a518021073ee95ac7e110ac75b961feb1b4dfcc3a40165ea98859f93e6d002ee4906d3f03a40762503ae475b61399a2bd4144609fa4d9815a1a85fa84 SHA512 4c06ea37532dd59f0251d7c49538bee703852c60a3247aba7c516f4f0d4b8ab15b9d7495d004a6423acd74c4dd7532e3dbe1679d6904ab373b617a3386205cde
 DIST fortune-mod-3.10.0.tar.xz 1429132 BLAKE2B e2dcfccee0c8d897971e742e4a5e345f9e825ba73479e2dc056891e16f005dc1d1f843573565741d1b35e4e1d1020cd382db9706f34b0caa4000d265a2c4dd30 SHA512 cb4d171405324a8ebac55ca5c7c8d8f5c06b594c2ded1b1c97fb599a4eaf638317f613fbeee4b3ca9ba7060ba4eeff7e678acddac12d49555a33d33017a90f4d
+DIST fortune-mod-3.12.0.tar.xz 1427848 BLAKE2B 3a3b0c28a0f7c297294b1788c57e01eb78d5083578aba877b896f41b854d2c34f65c9b46a1efe8bfef669f7ced6bb5e8ba667e3df1391a3cd3e5fed22e9058b6 SHA512 3a25d276219bb4f8a3015cd24b43462844d3be481815b587a365acd31dde31afee110dc5a658dd4df43bc6ba7d19e85afeffb215bd8c8f34640d658edb335089
 DIST fortune-mod-3.6.1.tar.xz 1419132 BLAKE2B 0ff684ee8aaf5eaabd75f187a3bff533ab4ee6e66c47c57fc700d2671006c8dff42f732fde78b40516f8ee907a52fc1965fb0ff257b12563d645f97c5ebc0031 SHA512 3f35bf35d62c46dfeaca450a127a7444bb870f6345c92afe626f81548ac375d21306c00a56d31982b8e25129acd6f829402d5afaec676e1200ad5bf586f7a8f1
-EBUILD fortune-mod-1.99.1-r3.ebuild 1717 BLAKE2B 7ec337d3a55e882d24c485e0461d8c757e34f894a65283d36e2af906dc1015cf13b27dc3aa487478a776510f984baae73852dbc2870c5e4a557d228f2b552e8b SHA512 35d6fd99e402cb26466860bc3754d6123d3e63d533afaa27f119f6d048b05c253ea5e32d160ba3172f024151762c9d281aab5b7825ae8be115fdfd54da8b1910
+EBUILD fortune-mod-1.99.1-r3.ebuild 1649 BLAKE2B 0936afbf139b0cff55fe57fb231d1a6305f58961274d3ae30b580c6b0aeff2850700e20f8ef5368d6d1d8f2118fc5941fbf42e6119f4a9a1ad88cc36e67d606b SHA512 b7324150eb46db55ab8a30a861605f1b364a544c971e56c175d72e2536199902e87ac27f890b9d643fc4128b68004fb87c0ce3eae96228a7526f5037b4b0efa5
 EBUILD fortune-mod-3.10.0.ebuild 1026 BLAKE2B a13b18432e2098f7e88413ca5ca57ee8d72ee2e28cca576edf98e413b2c15c5314e5febe5fe96fcf2611628af1e1a2a149db336581dc2d1eae3eeec3994abddf SHA512 a1ad35f0a72f3671032773c45de0a56a4e92facd36e67df1c67e42ef24cce60142dc1796e0f5d75d0a37c737036ba9f095f27a550084d00ee2f437ac8c5cf116
+EBUILD fortune-mod-3.12.0.ebuild 1026 BLAKE2B a13b18432e2098f7e88413ca5ca57ee8d72ee2e28cca576edf98e413b2c15c5314e5febe5fe96fcf2611628af1e1a2a149db336581dc2d1eae3eeec3994abddf SHA512 a1ad35f0a72f3671032773c45de0a56a4e92facd36e67df1c67e42ef24cce60142dc1796e0f5d75d0a37c737036ba9f095f27a550084d00ee2f437ac8c5cf116
 EBUILD fortune-mod-3.6.1-r1.ebuild 998 BLAKE2B dc9625552ed2492fdd3f9c7cb07bf79c87d1795cd5c530745055ecf76633d41ade32adf47830dcfb2178759a49891c72f2c5f9765ebb98474a20dcd4c7be8c3f SHA512 f542bdac95508c993d9008075ae86409289455896f843ebb3e2e2a820258c3940cfb9540f4b3426d4f7fad98d7691a93756fbfe895f26215f73ca748d1cd920a
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
index 2c5dd2971c79..b8fb4741d33d 100644
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.redellipse.net/code/downloads/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="offensive elibc_glibc"
+IUSE="offensive"
 
 DEPEND="app-text/recode:0="
 RDEPEND="${DEPEND}"
@@ -34,7 +34,6 @@ src_prepare() {
 		Makefile || die "sed Makefile failed"
 
 	if ! use elibc_glibc ; then
-		[[ ${CHOST} == *-*bsd* ]] && local reglibs="-lcompat"
 		[[ ${CHOST} == *-darwin* ]] && local reglibs="-lc"
 		has_version "app-text/recode[nls]" && reglibs="${reglibs} -lintl"
 		sed -i \
diff --git a/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
new file mode 100644
index 000000000000..fd1f66e99c54
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The notorious fortune program"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/fortune-mod/ http://www.redellipse.net/code/fortune"
+SRC_URI="https://github.com/shlomif/fortune-mod/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
+IUSE="offensive"
+
+DEPEND="app-text/recode:=
+	!games-misc/fortune-mod-tao"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/App-XML-DocBook-Builder"
+
+# TODO: Get tests running?
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_OFFENSIVE=$(usex !offensive)
+		-DLOCALDIR="/usr/share/fortune"
+		-DCOOKIEDIR="/usr/share/fortune"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	mkdir -p "${ED}"/usr/bin || die
+	mv "${ED}"/usr/games/fortune "${ED}"/usr/bin/fortune || die
+	rm -rf "${ED}"/usr/games || die
+
+	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
+}
diff --git a/games-misc/funny-manpages/Manifest b/games-misc/funny-manpages/Manifest
index 49b1cf3d9fc8..1468b8b2d97b 100644
--- a/games-misc/funny-manpages/Manifest
+++ b/games-misc/funny-manpages/Manifest
@@ -1,6 +1,3 @@
-DIST funny-manpages_1.3-5.diff.gz 2639 BLAKE2B 2234a963be3292e33fadeb12213b11a6a9b81157f60c505df3e9d097cc99cb90a5b180bc1b64636d423a04d44a67fdd2ea8478ac83ce984f6a799896e2251036 SHA512 69110989da9071321a8d8e9ea4f09bd7635704caeaccbdbf7fb2fb1abd540632f19d63d15de3232fabbc35e76dfe2eefb64ce84b6f4606d8dbe581e15f83d24c
-DIST funny-manpages_1.3.orig.tar.gz 22691 BLAKE2B 2b54879992a3c9254e39b175adb060cbcf0ad65597454659fe66bb694ba5be70e97a3e7356ec79d6cd42cfc64f1b5adffd8328edc200a79987687a1227328bc8 SHA512 83c753540d9a9829017246f4a9de22ba09965fa5b8af8276f55ef141129876ca3e641b367ebc31ca99301f37a56132c07eee1ebc9616c954a2e84387fe62383d
 DIST funny-manpages_2.3.orig.tar.gz 23949 BLAKE2B 27f3dc4f548b6012c6830d303980c6871c0079cd123b706bdda75cdc49c90e66171a096b24ef3ba448f3d8e0c6a48f316b8c2783cfa6cc0087ef755311bb5ac3 SHA512 7920e9a62972f8ea0649b50d0b108936a6e0a5d5b68baccadded4999d0219af3f4685349dd881aded9e762e0d1f00575f382d155db0969f7e51a4a1963f0519e
-EBUILD funny-manpages-1.3_rc5-r1.ebuild 747 BLAKE2B a6b6891d4f2255beedef0533efc48e165435717ac748785e783016e01eb0d1c710646c7e1cce5ff124c422d65b63832960b6ab7e4f92d76115625477101d2610 SHA512 9720282788c93b6efe6637128a738c213e9d352bc57ba92d60ef3c844c1113ccb84dd44ddf4a771390d52dfc970b7808404bec0458862b16efbabcc847fcd588
 EBUILD funny-manpages-2.3.ebuild 829 BLAKE2B 60f63ded7563f279ea7964051e43a1405e7f8de548dc7d466c82c9d5a8d119f0580bf94a5a5a91a1bf9668bb269ec2feaf9774188502b75f2db782fff87d5bc1 SHA512 bdd8f529f6a7b258dd4c11b6d87983be6de355344ddfab3e8af514afdaf8c1ea5c8ab697111c2ae9210705a6d707fe7a9a5326489ef8280ccfd930cc4654f709
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+MISC metadata.xml 278 BLAKE2B 7127b54a88150ba5e77706c5286930700682acfd8031806561e32fcafb54fe6c21257eb5199a9e4c7efd7bd2e84e7b8f6a5a5e222bf323e89143ff6995117352 SHA512 a81e14af9aa98d16f1d2b000e3f43425e931b9b69c8e2a7de5ed529ca2bdef203ab19937ed52439b38ac1caa9d6bf29fcffced225553a1c20131b9afecddf616
diff --git a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild b/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
deleted file mode 100644
index b215501cbb20..000000000000
--- a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_R=${PV:0-1}
-MY_P=${PN}_${PV/_rc?/}
-DESCRIPTION="Funny manpages collected from various sources"
-HOMEPAGE="https://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/f/funny-manpages/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/f/funny-manpages/${MY_P}-${MY_R}.diff.gz"
-S="${WORKDIR}"/${MY_P/_/-}.orig
-
-LICENSE="freedist" #465704
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86"
-
-RDEPEND="virtual/man"
-
-PATCHES=(
-	"${WORKDIR}"/${MY_P}-${MY_R}.diff
-)
-
-src_prepare() {
-	default
-
-	for f in *.[0-57-9]fun ; do
-		mv ${f} ${f/.?fun/.6fun} || die "renaming ${f} failed"
-	done
-}
-
-src_install() {
-	doman *.6fun
-}
diff --git a/games-misc/funny-manpages/metadata.xml b/games-misc/funny-manpages/metadata.xml
index 1c3ba213c494..5539242c2fbc 100644
--- a/games-misc/funny-manpages/metadata.xml
+++ b/games-misc/funny-manpages/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest
index 45386650a95d..6821819cae08 100644
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@@ -1,5 +1,3 @@
-DIST opengfx-0.6.1-source.tar.xz 9690748 BLAKE2B faa3ca805166a1716f8a235048506620bbb98a4265c72571b3a33e88f3375caff75b5576b64ef451e99dea734145f3be748a9109c7003d1ad9043a90cdd34dad SHA512 4ba3528dbdddea1baa2875f917f959034659c8205fbda2b2a67c5fe80161235d15c25dab323e6da8cba2711b7b4f0c9a96d4187fd2de61ae9a2ff9fd077b063b
 DIST opengfx-7.1-source.tar.xz 9828168 BLAKE2B a1d8305744b76924400cad8503af1a20991551323adea6d0d60d9f6d5ac6311e52cb8f028eb614bbda41106823ab9b912f1fb8af02953758a2eb2912066a38e9 SHA512 55079babcd78d4a36279cb7610b6800308aca8409ed3b9fa33cd4993b0c1f988d7afe270b17930b97609c4fdf8cf4e362e17c11bd85d2ef136d042256c98483f
-EBUILD opengfx-0.6.1.ebuild 1110 BLAKE2B bc015c7e976e7cc8fe92edd19d21a875972582353d205797d2dc05b865e56c0b97c18ce040e2698c6e3ea397a86fb04b9b84f15d840fe0ad362a0d7c735149db SHA512 e1f79bc2741790dfab53e0c88a8e1412374d329aa8c1bdb517fb588f4322887b1b58c7190098754e7bd88bd55dad72cc04679a1a2e69ffc47062e643631c094c
 EBUILD opengfx-7.1.ebuild 1111 BLAKE2B 16059ae53cd6c764f035bead7a11c98b888140a7bdd83aed9c2ee97b14f355055396fe8d69475eebce2f289fb8b1e87a1a060e3120ba784ce212c9b4f063928d SHA512 897d7586e9024322e29ea183d3f1ec299063dfd656588332284879e2b6299bb929aa26d6cb5f0af9d148c5e6adc50e8e191576fa434a446ce43b07a001516e3d
 MISC metadata.xml 327 BLAKE2B c715ce68b2db10d38dd11434102f5345515dba779726012906aabc6169681605c615866328bf8d213ff80f77a7c7a4a7bbe7c3145c18b33abd8de553059e7e75 SHA512 c5f22f130e0506a7714b27dd2858f69d52a6f11854ebd82b4116d7045a57ef74b435dfe920bbb18c99eca7b139c276a56aef4b5e28396b376dad5ceba6686127
diff --git a/games-misc/opengfx/opengfx-0.6.1.ebuild b/games-misc/opengfx/opengfx-0.6.1.ebuild
deleted file mode 100644
index 95f257d71459..000000000000
--- a/games-misc/opengfx/opengfx-0.6.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-any-r1
-
-DESCRIPTION="OpenGFX data files for OpenTTD"
-HOMEPAGE="https://wiki.openttd.org/en/Basesets/OpenGFX https://github.com/OpenTTD/OpenGFX"
-SRC_URI="https://cdn.openttd.org/${PN}-releases/${PV}/${P}-source.tar.xz"
-S="${WORKDIR}/${P}-source"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DEPEND="
-	games-util/grfcodec
-	games-util/nml
-	${PYTHON_DEPS}
-"
-
-DOCS=( "README.md" "changelog.txt" )
-
-src_prepare() {
-	default
-
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	local myemakeargs=(
-		GIMP=""
-		PYTHON="${EPYTHON}"
-	)
-
-	emake "${myemakeargs[@]}" all
-}
-
-src_test() {
-	local myemakeargs=(
-		GIMP=""
-		PYTHON="${EPYTHON}"
-	)
-
-	emake "${myemakeargs[@]}" check
-}
-
-src_install() {
-	local myemakeargs=(
-		DO_NOT_INSTALL_README="true"
-		DO_NOT_INSTALL_LICENSE="true"
-		DO_NOT_INSTALL_CHANGELOG="true"
-		GIMP=""
-		INSTALL_DIR="${ED}/usr/share/openttd/baseset/"
-		PYTHON="${EPYTHON}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}