commit: 6a024f59ae4a7c51817f6034d37f2fc02c561816 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Aug 20 01:48:58 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 20 01:49:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a024f59
games-misc/fortune-mod: fix fortune paths 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. Closes: https://bugs.gentoo.org/865809 Closes: https://bugs.gentoo.org/857246 Signed-off-by: Sam James <sam <AT> gentoo.org> .../fortune-mod-3.14.1-fix-localdir-mixup.patch | 28 ++++++++++++++++++++++ ...-3.14.1.ebuild => fortune-mod-3.14.1-r1.ebuild} | 14 +++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) 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..d8d267ee1440 --- /dev/null +++ b/games-misc/fortune-mod/files/fortune-mod-3.14.1-fix-localdir-mixup.patch @@ -0,0 +1,28 @@ +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 similarity index 88% rename from games-misc/fortune-mod/fortune-mod-3.14.1.ebuild rename to 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() {
