gentoo auto-resync : 22:02:2023 - 20:29:22

6 files changed, 27 insertions, 100 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 99ea6e7adfa4..1314c1fecbf5 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 3cc9ac159bca..d00a32552499 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -3,15 +3,11 @@ AUX fortune-mod-1.99.1-gentoo.patch 2495 BLAKE2B 755d525da36c6d5b00ac3635082d788
 AUX fortune-mod-3.14.0-valgrind-tests.patch 684 BLAKE2B eef576d1e7aba921050fe06202c9b817962f41b014047381d2f63b4d1fae79aeeb596fc45b7c37203e6cd1449bed668d74c157e9bba60d3353757f2cf94e424b SHA512 fe322153ef38718c8dc87a87547bfaf05eed488724d816c570bdb3c30233525740eec7ae8f51c44dd40accb4f14e44aa482d98145d45415d5bdc67999b2bdddb
 AUX fortune-mod-3.14.1-fix-localdir-mixup.patch 941 BLAKE2B 6ea20d1582a66c83d838ca564d382cd752028d9265a64835997f2054b44803f96ecf3dbdccf7313e0f1176dcffa8a73acb416d44edbb927d064d316ed75d1fdc SHA512 dc90a70f5d0d8ab60fb8ab2f6689abd785d3e671c1ff21580f22b88afde1ba8041499b3db4eadc30dfea1d0680a034dd0652295e2590ce1251d28abe71243e1e
 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.14.0.tar.xz 1428984 BLAKE2B 9b7df93cd7ced677a391ed30a84503cbd36689de406bbeb346bc9e465420908c9115b0d58e8e0b245f554557f032a014cc52418da4a69281e3844412c8e9641d SHA512 289f11923bd91ac0c46d8879c57c1f4da20ef2ef165be2eea9635b3aca5fc18bfc2438e85bfbc2a872671f41658b68bb3f7dd74bef7e4268889371ff702d7cae
 DIST fortune-mod-3.14.1.tar.xz 1428956 BLAKE2B a62d4056cdceef14f1d63dbc8b98bbd88098c64d0020b949ecc8e6006f1a4b1369211ac8b87a33db60b238cd7e6d3d6f3c4d2e59933a6cf0bd3fa54c439c4330 SHA512 0de0ec033ffc35a7a9ec1a549e6dac425757ec5fcc718c772f0a4e548d23c46451af4a90b0ac548f2ab60d68856ca0fa5e8f10930efe6b199e96b2cc1c568810
-DIST fortune-mod-3.6.1.tar.xz 1419132 BLAKE2B 0ff684ee8aaf5eaabd75f187a3bff533ab4ee6e66c47c57fc700d2671006c8dff42f732fde78b40516f8ee907a52fc1965fb0ff257b12563d645f97c5ebc0031 SHA512 3f35bf35d62c46dfeaca450a127a7444bb870f6345c92afe626f81548ac375d21306c00a56d31982b8e25129acd6f829402d5afaec676e1200ad5bf586f7a8f1
+DIST fortune-mod-3.16.0.tar.xz 1460580 BLAKE2B f9618d8669442f76843955fa446f565945467cc6a69e7b70131df21ca622e18c0f1c1ab83c32d5e478fd5c5abdb59ed5e009449fcdbc1fd1a2ede6c3d1ecef18 SHA512 ccd81f2c804f785f29e03680c7fb4f3cad7919aa1e265984fc2d6e7316d73d354e3cce285c28ea28662d99ef09aaf6baa5c64cadd0610f8d6a364ccfb9323848
 EBUILD fortune-mod-1.99.1-r3.ebuild 1647 BLAKE2B 47842da549c84f1b5231b10875fa64fd1334b276e8840cf6823cfdc9b0d5f27f488f61da8d38d885036c457be43b91ee5d7976978afeafb7cda40323e8b6ec41 SHA512 34d5ae85bdf682b945184531d20da7b10526a74c38c12f856afc161c9d3fc1677fc3ce91b06e6bb93b7916520abb98406c21aac7ec5f4a64a530ac91398dc955
-EBUILD fortune-mod-3.10.0.ebuild 1026 BLAKE2B a13b18432e2098f7e88413ca5ca57ee8d72ee2e28cca576edf98e413b2c15c5314e5febe5fe96fcf2611628af1e1a2a149db336581dc2d1eae3eeec3994abddf SHA512 a1ad35f0a72f3671032773c45de0a56a4e92facd36e67df1c67e42ef24cce60142dc1796e0f5d75d0a37c737036ba9f095f27a550084d00ee2f437ac8c5cf116
 EBUILD fortune-mod-3.12.0.ebuild 1034 BLAKE2B d88c039bb1357906893dc989fc6c36579e540eb91ec4c53c53edf5bb408ead722c178e8bf9b39a45c2f92defe585672a363c386bc5d5f476aeb62e5d4c252a91 SHA512 cf20c11d1822df4acd81345f2c518f4ba6cd769752181c06ccbeeeeb6f3657abeeadacb51fd2a975d2623550c02a2b89229274cd170234aa2d0b70edaeba47f7
-EBUILD fortune-mod-3.14.0.ebuild 1320 BLAKE2B e267790a608757b1f4a45612703e4f9f17ade519216c8815af6da1306d08a0d800f3f06f2f8cb8fbae4b3abd8c6f4ae0885c7fe5a671e18c9e8220a89f948e2f SHA512 dee3ab980c9ba8b5e7d17033d3de7a472c7c7dd7fb6bd17bb5f423e1402ff7a932613f51ac26cbd6ea973c1bc9a3510f0d7dc7bf00d082897181815edf86a859
 EBUILD fortune-mod-3.14.1-r1.ebuild 1513 BLAKE2B e19e72f9e0bb2647126a6cb4eebf6b4b190aa5ca058ff285ec1037467a0fbb113ade52835d3c2cf08f618a74f06483d8d7ee18f6e209358c40073e92da99c94f SHA512 902dd1a5b7cbeb9dadfcff72a54a58355f6a132c2e786453d906454102deea4e7fa81eb8f6ad30cb7d30ea268c52a1ebc32e9d27621b195ad21922bfbd664d29
-EBUILD fortune-mod-3.6.1-r1.ebuild 998 BLAKE2B dc9625552ed2492fdd3f9c7cb07bf79c87d1795cd5c530745055ecf76633d41ade32adf47830dcfb2178759a49891c72f2c5f9765ebb98474a20dcd4c7be8c3f SHA512 f542bdac95508c993d9008075ae86409289455896f843ebb3e2e2a820258c3940cfb9540f4b3426d4f7fad98d7691a93756fbfe895f26215f73ca748d1cd920a
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+EBUILD fortune-mod-3.16.0-r1.ebuild 1467 BLAKE2B a8f4accd305646c04f134a6b657a45cf4415ca4733e80647f72855aba39b8e2b5800122999d8a9d5cd52860fd25422240bf0a65a8ef1b1f234c63ee1b10491a4 SHA512 61311ef50e495fc0996a6167c8c54595b1c47afe6f4539ff5759d36c0d202fa6940e47c88e5915226af07b8e9beb9f66a1fc8eafe696f3ff6bf142415a2e2dc5
+MISC metadata.xml 338 BLAKE2B 876b9917bb33c6fb56cb0d2f995262e4cbecba868783c03443b2fb213a6d515d9966bea4fa92c03a8bd69ee9a8611ca762bd683112d897e3692912ae47071010 SHA512 e9496f6bb7097e389ac2c34b6f8aa888a8697162f00b09956bc4168d3a7bba982dd3a686d9603fecea6528c31ff5ae2f4955d50e6ea3fae5706b5aab92d861f7
diff --git a/games-misc/fortune-mod/fortune-mod-3.10.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.10.0.ebuild
deleted file mode 100644
index fd1f66e99c54..000000000000
--- a/games-misc/fortune-mod/fortune-mod-3.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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/fortune-mod/fortune-mod-3.14.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.16.0-r1.ebuild
index 4e3371a8aa6f..5ec04e9ca029 100644
--- a/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-3.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,20 +12,26 @@ SRC_URI="https://www.shlomifish.org/open-source/projects/${PN}/arcs/${P}.tar.xz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 IUSE="offensive test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="app-text/recode:=
-	!games-misc/fortune-mod-tao"
+RDEPEND="
+	app-text/recode:=
+	dev-libs/rinutils
+	!games-misc/fortune-mod-tao
+"
 DEPEND="${RDEPEND}"
-BDEPEND="app-text/App-XML-DocBook-Builder
+BDEPEND="
+	app-text/App-XML-DocBook-Builder
+	dev-lang/perl
 	test? (
 		dev-perl/File-Find-Object
 		dev-perl/IO-All
 		dev-perl/Test-Differences
 		dev-perl/Test-Trap
-	)"
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.14.0-valgrind-tests.patch
@@ -34,7 +40,8 @@ PATCHES=(
 src_configure() {
 	local mycmakeargs=(
 		-DNO_OFFENSIVE=$(usex !offensive)
-		-DLOCALDIR="/usr/share/fortune"
+		# bug #857246
+		-DLOCALDIR="/usr/local/share/fortune"
 		-DCOOKIEDIR="/usr/share/fortune"
 	)
 
@@ -48,6 +55,9 @@ src_test() {
 src_install() {
 	cmake_src_install
 
+	# We don't want to create the dir if it doesn't exist
+	rm -rf "${ED}"//usr/local || die
+
 	mkdir -p "${ED}"/usr/bin || die
 	mv "${ED}"/usr/games/fortune "${ED}"/usr/bin/fortune || die
 	rm -rf "${ED}"/usr/games || die
diff --git a/games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild b/games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild
deleted file mode 100644
index 070bc906922b..000000000000
--- a/games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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"
-
-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/fortune-mod/metadata.xml b/games-misc/fortune-mod/metadata.xml
index 1c3ba213c494..7038c9527ac8 100644
--- a/games-misc/fortune-mod/metadata.xml
+++ b/games-misc/fortune-mod/metadata.xml
@@ -1,8 +1,11 @@
 <?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>
+	<upstream>
+		<remote-id type="github">shlomif/fortune-mod</remote-id>
+	</upstream>
 </pkgmetadata>