11 files changed, 268 insertions, 95 deletions
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index 32eb08c49bc1..26426f3ffff0 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,4 +1,5 @@
 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
+DIST fortune-mod-3.14.1.tar.xz 1428956 BLAKE2B a62d4056cdceef14f1d63dbc8b98bbd88098c64d0020b949ecc8e6006f1a4b1369211ac8b87a33db60b238cd7e6d3d6f3c4d2e59933a6cf0bd3fa54c439c4330 SHA512 0de0ec033ffc35a7a9ec1a549e6dac425757ec5fcc718c772f0a4e548d23c46451af4a90b0ac548f2ab60d68856ca0fa5e8f10930efe6b199e96b2cc1c568810
+DIST fortune-mod-3.16.0.tar.xz 1460580 BLAKE2B f9618d8669442f76843955fa446f565945467cc6a69e7b70131df21ca622e18c0f1c1ab83c32d5e478fd5c5abdb59ed5e009449fcdbc1fd1a2ede6c3d1ecef18 SHA512 ccd81f2c804f785f29e03680c7fb4f3cad7919aa1e265984fc2d6e7316d73d354e3cce285c28ea28662d99ef09aaf6baa5c64cadd0610f8d6a364ccfb9323848
+DIST fortune-mod-3.18.0.tar.xz 1470208 BLAKE2B b975d75aea745f06f26753038416b1cc50b462a11a5cbe71a9aadc44b31f9120ac3e37ed160c9d7f90e379e5ea4c51dc39921362d24811547364e37d64c3faf9 SHA512 b8d16bf5032c1a0fcb161c912109abd24f3b762f3455eaf86d41ed3f16a33db4913d9a21bb6a42f974a3b11cfaedac57cabc4456d178a3d631d8d4a723789798
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..763c708600e6
--- /dev/null
+++ b/games-misc/fortune-mod/files/fortune-mod-3.14.0-valgrind-tests.patch
@@ -0,0 +1,24 @@
+https://gitlab.exherbo.org/exherbo/arbor/-/blob/e1ff3d8f49ee349f289d248747f8139fc42857db/packages/games-misc/fortune-mod/files/fortune-mod-Don-t-run-tests-involving-valgrind.patch
+
+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/files/fortune-mod-3.14.1-fix-localdir-mixup.patch b/games-misc/fortune-mod/files/fortune-mod-3.14.1-fix-localdir-mixup.patch
new file mode 100644
index 000000000000..a28c8081392c
--- /dev/null
+++ b/games-misc/fortune-mod/files/fortune-mod-3.14.1-fix-localdir-mixup.patch
@@ -0,0 +1,30 @@
+https://github.com/shlomif/fortune-mod/pull/69
+
+The intention of LOCALDIR seems to be to allow local cookies to be
+provided by the sysadmin in e.g. /usr/local/share/fortune,
+but if set, before this patch, even cookies distributed
+by upstream were stored there (and nothing in COOKIEDIR, e.g.
+/usr/share/fortune - https://bugs.gentoo.org/865809).
+
+Originally, we were setting LOCALDIR=COOKIEDIR=/usr/share/fortune to
+workaround the issue, but see https://bugs.gentoo.org/857246.
+--- a/datfiles/CMakeLists.txt
++++ b/datfiles/CMakeLists.txt
+@@ -68,7 +68,7 @@ ADD_CUSTOM_TARGET(
+ )
+ INSTALL(
+     FILES ${_install_unrot_cookies}
+-    DESTINATION "${LOCALDIR}"
++    DESTINATION "${COOKIEDIR}"
+ )
+ 
+ IF (NOT NO_OFFENSIVE)
+--- a/datfiles/off/CMakeLists.txt
++++ b/datfiles/off/CMakeLists.txt
+@@ -54,5 +54,5 @@ ADD_CUSTOM_TARGET(
+ )
+ INSTALL(
+     FILES ${_install_rotated_cookies}
+-    DESTINATION "${LOCALODIR}"
++    DESTINATION "${OCOOKIEDIR}"
+ )
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 25e1f06b1ab7..52c430fbdeae 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-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,12 +6,12 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="The notorious fortune program"
-HOMEPAGE="http://www.redellipse.net/code/fortune"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/fortune-mod/"
 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"
+KEYWORDS="amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="offensive"
 
 DEPEND="app-text/recode:0="
@@ -53,7 +53,6 @@ src_prepare() {
 
 src_compile() {
 	local myrex=
-	[[ ${CHOST} == *-interix* ]] && myrex="REGEXDEFS=-DNO_REGEX"
 	emake prefix="${EPREFIX}" CC="$(tc-getCC)" ${myrex}
 }
 
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.12.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
index 7c59e9787dda..18fb1fad3268 100644
--- a/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-3.12.0.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
@@ -6,12 +6,12 @@ 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"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/fortune-mod/"
 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 ~sparc ~x86"
+KEYWORDS="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.1-r1.ebuild b/games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild
new file mode 100644
index 000000000000..3f2a4dd29cac
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 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/"
+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="${RDEPEND}"
+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
+	"${FILESDIR}"/${PN}-3.14.1-fix-localdir-mixup.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_OFFENSIVE=$(usex !offensive)
+		# bug #857246
+		-DLOCALDIR="/usr/local/share/fortune"
+		-DCOOKIEDIR="/usr/share/fortune"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_compile check
+}
+
+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
+
+	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
+}
diff --git a/games-misc/fortune-mod/fortune-mod-3.16.0-r1.ebuild b/games-misc/fortune-mod/fortune-mod-3.16.0-r1.ebuild
new file mode 100644
index 000000000000..be3cb6a7cc57
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-3.16.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 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/"
+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 ~x86"
+IUSE="offensive test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-text/recode:=
+	dev-libs/rinutils
+	!games-misc/fortune-mod-tao
+"
+DEPEND="${RDEPEND}"
+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
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_OFFENSIVE=$(usex !offensive)
+		# bug #857246
+		-DLOCALDIR="/usr/local/share/fortune"
+		-DCOOKIEDIR="/usr/share/fortune"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_compile check
+}
+
+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
+
+	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
+}
diff --git a/games-misc/fortune-mod/fortune-mod-3.18.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.18.0.ebuild
new file mode 100644
index 000000000000..18b328886254
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-3.18.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 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/"
+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:=
+	dev-libs/rinutils
+	!games-misc/fortune-mod-tao
+"
+DEPEND="${RDEPEND}"
+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
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_OFFENSIVE=$(usex !offensive)
+		# bug #857246
+		-DLOCALDIR="/usr/local/share/fortune"
+		-DCOOKIEDIR="/usr/share/fortune"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_compile check
+}
+
+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
+
+	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
+}
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>