gentoo auto-resync : 07:07:2024 - 12:24:46

9 files changed, 12 insertions, 337 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index d2ade356de8c..6adaeda32e57 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 2abaee847ed7..1298ce3e3306 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,15 +1,6 @@
-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 689 BLAKE2B f56e33bfe3702745ce1ed3d1d7352c9ac78c2cf430e0db761be917fbbf3b5a297f318b2c5f582b60dcfdebb621409d48535cacc46d729757cfa8a6d0aba2e94c SHA512 808e53b4baa1465bded2baef6aae888f49f50ad5b5d4129b6db9d1d24c7e982a3593ad6f0f786c97d56051aeed71d82631278069e269a2b22d16234bcb26bc45
-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.12.0.tar.xz 1427848 BLAKE2B 3a3b0c28a0f7c297294b1788c57e01eb78d5083578aba877b896f41b854d2c34f65c9b46a1efe8bfef669f7ced6bb5e8ba667e3df1391a3cd3e5fed22e9058b6 SHA512 3a25d276219bb4f8a3015cd24b43462844d3be481815b587a365acd31dde31afee110dc5a658dd4df43bc6ba7d19e85afeffb215bd8c8f34640d658edb335089
-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
-EBUILD fortune-mod-1.99.1-r3.ebuild 1587 BLAKE2B 6f5e6d99b19d722bc8cd6706a08a76964a2dfaa2720e806bcff2c6a8032c0cd0a2469dcd417e45a0f0e35a3b845211ba7ceef208aad3bd5a9afca77b2f1221fd SHA512 f9aa7ec60a833bb81134bde4639ffbd25dfab1e396408374a536b4f33ccbaed20ef476ae9f572abb1047d175c44f28822e6cfb9a6615a81551ce872e9a9b6b01
-EBUILD fortune-mod-3.12.0.ebuild 988 BLAKE2B e5ac028715a049eb6cde8c162dfa04d3dfdde76806a9d42aedd160ac88759bfc51b1b770e8d0b514f022fd30d067d97ea9ad7800e6baaa299a8a6828184ce561 SHA512 abd0fd49d6fcffb0e30b5e5ccfef4a59163c4a730c35866b6c122eed6d7f0eea32b438dd5284a872f1375761a7ea9cc4f21ae5d332e9018c4f4c229733e78246
-EBUILD fortune-mod-3.14.1-r1.ebuild 1467 BLAKE2B 260be7a4b72d5286ba6be6abc16f7ca1b4d4b93a7036f49ea34f152ab7360f40f3136ede28863b12bc4fb6f643811af00a84fe5e6641b1ba5153adc4ebe8128d SHA512 d5d574dd9a2a3c0618a8134c345275abfa2b55c6ced25de637c65316674d14a2e080966df9a18578947d5ea243c4682c9582e9ebd1b2e352d02625a4524ce51e
-EBUILD fortune-mod-3.16.0-r1.ebuild 1426 BLAKE2B 44807405ababc6835d5009da80489f28f5e932230599288b6e16e1a709101e84e298cee2ddef073c2d99c65db969d027bbd3d76cc324ab035199e042e496e2b9 SHA512 e4bc65b8b3f5d68d5ad0b94b8e0f90625a114d4cf5c31200e8ecd2dee8f2ff3336772b132556d114d22c574efcc1c31b489ad619ef2e5c375bdfbae03f856bce
+DIST fortune-mod-3.22.0.tar.xz 1473952 BLAKE2B 9edddea4c059314a22351bf088035284cf74983c714165bf52e50f1de00a300f3d04dc4e510ca8b4f3d78c89a4523e7b413a40ca4d6924c0fe94d3f11319c1d4 SHA512 54726bad10a986b71a98de6eaed2ec56bbd28aeb245eea04254f2aa84fa4658d3bac148a0d1f3b8f44ed539b3a4d40379fc9d6438a1dba419a5c05a3180e3537
 EBUILD fortune-mod-3.18.0.ebuild 1427 BLAKE2B 58ffd739617b44a8c82ce777ada9debf435a94ad657aeab5355dbee020cf4f59eb174b1c08f25022d384237ebed64f53da0693802b9c8ef6384647a10a83cf8e SHA512 e30a5bbfbaf53de6e2be25e6326560b16a5f00b0811a6fa2b4e0d5cc3068473497c7c664ef681c4ccdd4d08f947223e20a44b156d95b23a2853e283a11539cc7
+EBUILD fortune-mod-3.22.0.ebuild 1505 BLAKE2B d2ffb324adf4b2304e1a26a3390638b407c5f424cddd84a67e46b5e046c0080f78c2ca9fee56b89dadf35d0c29a21b8b0f2facf69ad35cfc0165e748e2ef7cfb SHA512 c07048b6f96e2be2c265dac3a9f40b7d3e30a519b6004cd53a0db8476b4cd87a2d28ccdec878fa63aeb8d80a3e2a7ec6bbf0a12d0a0eaeb8941194408c24e77a
 MISC metadata.xml 338 BLAKE2B 876b9917bb33c6fb56cb0d2f995262e4cbecba868783c03443b2fb213a6d515d9966bea4fa92c03a8bd69ee9a8611ca762bd683112d897e3692912ae47071010 SHA512 e9496f6bb7097e389ac2c34b6f8aa888a8697162f00b09956bc4168d3a7bba982dd3a686d9603fecea6528c31ff5ae2f4955d50e6ea3fae5706b5aab92d861f7
diff --git a/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch b/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch
deleted file mode 100644
index 48807293bf1a..000000000000
--- a/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/fortune/fortune.c
-+++ b/fortune/fortune.c
-@@ -974,7 +974,7 @@
- 	  if (!ret)
- 	    ret=add_file(percent, fullpathname, NULL, &File_list,
- 			 &File_tail, NULL);
--	  if ( (!ret && fullpathname != locpathname) || strcmp(sp, "all") == 0 )
-+	  if (!ret && strncmp(fullpathname, locpathname, sizeof(fullpathname)))
- 	    ret=add_file(percent, locpathname, NULL, &File_list,
- 		         &File_tail, NULL);
- 	  
-@@ -985,7 +985,8 @@
- 	  }
- 	  if (!ret)
- 	    return FALSE;
--	  
-+	  if (strncmp(fullpathname, locpathname, sizeof(fullpathname)) && strcmp(sp, "all") == 0)
-+	    add_file(percent, locpathname, NULL, &File_list, &File_tail, NULL);
- 	}
- 	else
- 	  if (!add_file(percent, fullpathname, NULL, &File_list,
diff --git a/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch b/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch
deleted file mode 100644
index 97f04259ba92..000000000000
--- a/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/datfiles/Makefile
-+++ b/datfiles/Makefile
-@@ -58,7 +58,7 @@
- 	if [ $(WEB) = 1 ] ; then cd html && $(MAKE) install ; fi
- 	for i in $(COOKIES) ; do \
- 		install -m 0644 $$i $$i.dat $(COOKIEDIR) || exit $? ; \
--		cp -d $$i.u8 $(COOKIEDIR) ; \
-+		cp -P $$i.u8 $(COOKIEDIR) ; \
- 		done
- 
- clean:
---- a/datfiles/off/Makefile
-+++ b/datfiles/off/Makefile
-@@ -38,7 +38,7 @@
- 	install -m 0755 -d $(OCOOKIEDIR)
- 	for i in $(OCOOKIES) ; \
- 	    do install -m 0644 $$i $$i.dat $(OCOOKIEDIR) || exit $$? ; \
--	    cp -d $$i.u8 $(OCOOKIEDIR) ; \
-+	    cp -P $$i.u8 $(OCOOKIEDIR) ; \
- 	done
- 
- clean:
---- a/Makefile
-+++ b/Makefile
-@@ -65,8 +65,7 @@
- RECODELIBS=-lrecode
- 
- DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\"" -DLOCFORTDIR="\"$(LOCALDIR)\"" -DLOCOFFDIR="\"$(LOCALODIR)\""
--CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe -fsigned-char
--LDFLAGS=-s
-+CFLAGS += $(DEFINES) -fsigned-char
- 
- # The above flags are used by default; the debug flags are used when make
- # is called with a debug target, such as 'make debug'
---- a/fortune/fortune.c
-+++ b/fortune/fortune.c
-@@ -97,7 +97,7 @@
- #endif /* killing warnings */
- 
- #define		PROGRAM_NAME		"fortune-mod"
--#define		PROGRAM_VERSION		"9708"
-+#define		PROGRAM_VERSION		"1.99.1"
- 
- #ifdef HAVE_STDBOOL_H
- #include <stdbool.h>
-@@ -256,6 +256,7 @@
- 
- int add_dir(register FILEDESC *);
- 
-+const char *program_name;
- char *program_version(void)
- {
-     static char buf[BUFSIZ];
-@@ -1675,14 +1675,17 @@
-     char *ctype, *crequest;
-     getargs(ac, av);
- 
-+    program_name = (char *const) av[0];
-     outer = recode_new_outer(true);
-     request = recode_new_request (outer);
- 
-     setlocale(LC_ALL,"");
-     ctype = nl_langinfo(CODESET);
--    if(strcmp(ctype,"ANSI_X3.4-1968") == 0)
--        ctype="ISO-8859-1";
--	
-+    if (!ctype || !*ctype)
-+    	ctype="C"; /* revert to C if no valid envvars! */
-+    else
-+    	if(strcmp(ctype,"ANSI_X3.4-1968") == 0)
-+    		ctype="ISO-8859-1";
-     crequest = malloc(strlen(ctype) + 7 + 1);
-     sprintf(crequest, "UTF-8..%s", ctype);
-     recode_scan_request (request, crequest);
---- a/util/rot.c
-+++ b/util/rot.c
-@@ -5,10 +5,11 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <stdlib.h>
- 
- int main(void)
- {
--    char a, b;
-+    short int a, b;
- 
-     while ((a = getchar()) != EOF)
-     {
---- a/util/unstr.c
-+++ b/util/unstr.c
-@@ -96,6 +96,7 @@
- #include	<string.h>
- #include	<unistd.h>
- 
-+#include	<stdlib.h>
- #ifndef MAXPATHLEN
- #define	MAXPATHLEN	1024
- #endif /* MAXPATHLEN */
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
deleted file mode 100644
index a28c8081392c..000000000000
--- a/games-misc/fortune-mod/files/fortune-mod-3.14.1-fix-localdir-mixup.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 52c430fbdeae..000000000000
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="The notorious fortune program"
-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="amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="offensive"
-
-DEPEND="app-text/recode:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/01_all_fortune_all-fix.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:/games::' \
-		-e 's:/fortunes:/fortune:' \
-		-e '/^FORTDIR=/s:=.*:=$(prefix)/usr/bin:' \
-		-e '/^all:/s:$: fortune/fortune.man:' \
-		-e "/^OFFENSIVE=/s:=.*:=`use offensive && echo 1 || echo 0`:" \
-		Makefile || die "sed Makefile failed"
-
-	if ! use elibc_glibc ; then
-		[[ ${CHOST} == *-darwin* ]] && local reglibs="-lc"
-		has_version "app-text/recode[nls]" && reglibs="${reglibs} -lintl"
-		sed -i \
-			-e "/^REGEXLIBS=/s:=.*:= ${reglibs}:" \
-			Makefile \
-			|| die "sed REGEXLIBS failed"
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's:u_int:uint:g' util/strfile.h || die "sed strfile.h failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/-DBSD_REGEX/-DPOSIX_REGEX/' Makefile || die "sed Makefile failed"
-	fi
-}
-
-src_compile() {
-	local myrex=
-	emake prefix="${EPREFIX}" CC="$(tc-getCC)" ${myrex}
-}
-
-src_install() {
-	emake prefix="${ED}" install
-	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
deleted file mode 100644
index 18fb1fad3268..000000000000
--- a/games-misc/fortune-mod/fortune-mod-3.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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://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"
-
-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.16.0-r1.ebuild b/games-misc/fortune-mod/fortune-mod-3.16.0-r1.ebuild
deleted file mode 100644
index be3cb6a7cc57..000000000000
--- a/games-misc/fortune-mod/fortune-mod-3.16.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.14.1-r1.ebuild b/games-misc/fortune-mod/fortune-mod-3.22.0.ebuild
index 3f2a4dd29cac..3d029dc31bf1 100644
--- a/games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-3.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,18 +7,22 @@ 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"
+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"
+IUSE="offensive pcre test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-text/recode:=
 	!games-misc/fortune-mod-tao
+	app-text/recode:=
+	>=dev-libs/rinutils-0.10.2
+	pcre? ( dev-libs/libpcre2 )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -34,11 +38,11 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.14.0-valgrind-tests.patch
-	"${FILESDIR}"/${PN}-3.14.1-fix-localdir-mixup.patch
 )
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_PCRE=$(usex pcre)
 		-DNO_OFFENSIVE=$(usex !offensive)
 		# bug #857246
 		-DLOCALDIR="/usr/local/share/fortune"