gentoo auto-resync : 20:08:2022 - 08:38:17

4 files changed, 42 insertions, 5 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 2f166780cfab..d4a4eddca8b0 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 e25a4986849a..157b88059964 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,6 +1,7 @@
 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
+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
@@ -11,6 +12,6 @@ EBUILD fortune-mod-1.99.1-r3.ebuild 1647 BLAKE2B 47842da549c84f1b5231b10875fa64f
 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 1319 BLAKE2B 5a650f161f3287811135047ec6bbcba0d61e72cc0938a1fed9f241fb457ea0472ce8778cef42e2e056e96be0e259d3d98feb52368eeb321cc4a11b82eea4381d SHA512 b16b321b2d5f63e9d28a684d5e058e8bf50a08d0c06d83dd70f998d31de4c43a9aac6a9d89a9bb5a18fb07dbcc539a7afbc4328395ff3385989064ab045b9724
-EBUILD fortune-mod-3.14.1.ebuild 1431 BLAKE2B efee01b6e101acaedbfc9c613dbe70368fd58341fcc97454ca54eee9567b23be32266e0456ed78d364b0b8fc41da226946380d0a4ade5e45b192cbe6d7f781a9 SHA512 e0188ff5a9b5545297a8d04b472c2ae1992cb8f23fbe1a3e8421412941a263b71adb342e3e98debbc0cf0d5fcbd13d5799d14b4412636b92e3ac32ff0e14b0d3
+EBUILD fortune-mod-3.14.1-r1.ebuild 1505 BLAKE2B c77512991ab396e4986ff1c280742f795083e681c3bc10c8d1a6c8f2794409eaed2c37e1ce21ff6208fca69036b3572ab69ac17d851a72923c94c8fd68425e18 SHA512 6782ba61c6f8e9c869207bddce2aed66bb407c31511f97e382257ed7049bab9027dd6d021f66ebd6bfdcda175c63176ad4652358c643761c3d56c14dae4259f1
 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.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-3.14.1.ebuild b/games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild
index 71c733aee02a..d7c5bdcc3b1d 100644
--- a/games-misc/fortune-mod/fortune-mod-3.14.1.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild
@@ -16,19 +16,25 @@ 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"
+RDEPEND="
+	app-text/recode:=
+	!games-misc/fortune-mod-tao
+"
 DEPEND="${DEPEND}"
-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
+	"${FILESDIR}"/${PN}-3.14.1-fix-localdir-mixup.patch
 )
 
 src_configure() {