gentoo resync : 12.05.2022

4 files changed, 85 insertions, 2 deletions

diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index 273e0e1eddf8..30126c5938c8 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,11 +1,14 @@
 AUX 01_all_fortune_all-fix.patch 711 BLAKE2B a4c6802863fe2d19bdb3080e7f8a039ae0c39235b33d6c6a1d0bad6d2d19607a7ae8e72f292ffa1d755985e24cdd92bb31b54ef0013365ce81c0216c69ed45fd SHA512 ebc0bffa0f7d89eb1b88631984742c109b8703e8116e30b6b0b11c28f12bab5aa929a0567f1bc3a603f01f6618d613a881b046646e20fd685133bbb6daa39aa9
 AUX fortune-mod-1.99.1-gentoo.patch 2495 BLAKE2B 755d525da36c6d5b00ac3635082d788a5bd70e3712b23e6227328c726740b5adbf6ce1d254706901ff183bfbe40c04da73a26edf181fe4a9727bb7623dbf5bea SHA512 338861e27cc82baf4a062fe17029a7f2d05ea19d009be8627c04f66bebd74e8801272c1fc3cdeab2f29da797ad6373f38dd0ded011a7176ee93774b396e45cd9
+AUX fortune-mod-3.14.0-valgrind-tests.patch 684 BLAKE2B eef576d1e7aba921050fe06202c9b817962f41b014047381d2f63b4d1fae79aeeb596fc45b7c37203e6cd1449bed668d74c157e9bba60d3353757f2cf94e424b SHA512 fe322153ef38718c8dc87a87547bfaf05eed488724d816c570bdb3c30233525740eec7ae8f51c44dd40accb4f14e44aa482d98145d45415d5bdc67999b2bdddb
 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.6.1.tar.xz 1419132 BLAKE2B 0ff684ee8aaf5eaabd75f187a3bff533ab4ee6e66c47c57fc700d2671006c8dff42f732fde78b40516f8ee907a52fc1965fb0ff257b12563d645f97c5ebc0031 SHA512 3f35bf35d62c46dfeaca450a127a7444bb870f6345c92afe626f81548ac375d21306c00a56d31982b8e25129acd6f829402d5afaec676e1200ad5bf586f7a8f1
 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 1040 BLAKE2B a52e628c0f40e7f4dd460b620f0ad99cbd530df5af452324c7850a94b463d81e8fef9a8258c12e9b4ab8bcae2e3349f7fe5f6414bc97972ab4e85802eeb9303e SHA512 b0710353e9c1b3fc339681d59a6c4ff6e816e6c2cb1dbd6e6662c98bd86e6045725a0fe397d395798c42c4c235ac31846626790d431b99e57c04fd92b0ef4aa3
+EBUILD fortune-mod-3.12.0.ebuild 1034 BLAKE2B d88c039bb1357906893dc989fc6c36579e540eb91ec4c53c53edf5bb408ead722c178e8bf9b39a45c2f92defe585672a363c386bc5d5f476aeb62e5d4c252a91 SHA512 cf20c11d1822df4acd81345f2c518f4ba6cd769752181c06ccbeeeeb6f3657abeeadacb51fd2a975d2623550c02a2b89229274cd170234aa2d0b70edaeba47f7
+EBUILD fortune-mod-3.14.0.ebuild 1319 BLAKE2B 5a650f161f3287811135047ec6bbcba0d61e72cc0938a1fed9f241fb457ea0472ce8778cef42e2e056e96be0e259d3d98feb52368eeb321cc4a11b82eea4381d SHA512 b16b321b2d5f63e9d28a684d5e058e8bf50a08d0c06d83dd70f998d31de4c43a9aac6a9d89a9bb5a18fb07dbcc539a7afbc4328395ff3385989064ab045b9724
 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/files/fortune-mod-3.14.0-valgrind-tests.patch b/games-misc/fortune-mod/files/fortune-mod-3.14.0-valgrind-tests.patch
new file mode 100644
index 000000000000..166f8dfcd5b6
--- /dev/null
+++ b/games-misc/fortune-mod/files/fortune-mod-3.14.0-valgrind-tests.patch
@@ -0,0 +1,24 @@
+https://git.exherbo.org/arbor.git/plain/packages/games-misc/fortune-mod/files/fortune-mod-Don-t-run-tests-involving-valgrind.patch?id=4c04c9e10bfee01e4c7cc3278c452efb6863d549
+
+Upstream: no
+Reason: Test wants to install stuff, doesn't work and saves us the dep
+
+From eabc85921ccb8ffda14d34d26f6486700bf63b8f Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 15 Dec 2021 17:11:31 +0100
+Subject: [PATCH] Don't run tests involving valgrind
+
+--- a/run-tests.pl
++++ b/run-tests.pl
+@@ -35,11 +35,6 @@ sub do_system
+     }
+ }
+ 
+-do_system(
+-    {
+-        cmd => [ $^X, "$src_dir/tests/scripts/split-valgrind.pl", ]
+-    }
+-);
+ do_system(
+     {
+         cmd => [
diff --git a/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
index f70c23cdda42..203ee916b253 100644
--- a/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shlomif/fortune-mod/releases/download/${P}/${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv ~sparc x86"
 IUSE="offensive"
 
 DEPEND="app-text/recode:=
diff --git a/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
new file mode 100644
index 000000000000..121927e8d619
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 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://www.shlomifish.org/open-source/projects/${PN}/arcs/${P}.tar.xz
+	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 ~sparc ~x86"
+IUSE="offensive test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/recode:=
+	!games-misc/fortune-mod-tao"
+DEPEND="${DEPEND}"
+BDEPEND="app-text/App-XML-DocBook-Builder
+	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
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_OFFENSIVE=$(usex !offensive)
+		-DLOCALDIR="/usr/share/fortune"
+		-DCOOKIEDIR="/usr/share/fortune"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_compile check
+}
+
+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
+}