| 1 |
commit: 6a024f59ae4a7c51817f6034d37f2fc02c561816 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 20 01:48:58 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 20 01:49:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a024f59 |
| 7 |
|
| 8 |
games-misc/fortune-mod: fix fortune paths |
| 9 |
|
| 10 |
The intention of LOCALDIR seems to be to allow local cookies to be |
| 11 |
provided by the sysadmin in e.g. /usr/local/share/fortune, |
| 12 |
but if set, before this patch, even cookies distributed |
| 13 |
by upstream were stored there (and nothing in COOKIEDIR, e.g. |
| 14 |
/usr/share/fortune - https://bugs.gentoo.org/865809). |
| 15 |
|
| 16 |
Originally, we were setting LOCALDIR=COOKIEDIR=/usr/share/fortune to |
| 17 |
workaround the issue, but see https://bugs.gentoo.org/857246. |
| 18 |
|
| 19 |
Closes: https://bugs.gentoo.org/865809 |
| 20 |
Closes: https://bugs.gentoo.org/857246 |
| 21 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 22 |
|
| 23 |
.../fortune-mod-3.14.1-fix-localdir-mixup.patch | 28 ++++++++++++++++++++++ |
| 24 |
...-3.14.1.ebuild => fortune-mod-3.14.1-r1.ebuild} | 14 +++++++---- |
| 25 |
2 files changed, 38 insertions(+), 4 deletions(-) |
| 26 |
|
| 27 |
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 |
| 28 |
new file mode 100644 |
| 29 |
index 000000000000..d8d267ee1440 |
| 30 |
--- /dev/null |
| 31 |
+++ b/games-misc/fortune-mod/files/fortune-mod-3.14.1-fix-localdir-mixup.patch |
| 32 |
@@ -0,0 +1,28 @@ |
| 33 |
+The intention of LOCALDIR seems to be to allow local cookies to be |
| 34 |
+provided by the sysadmin in e.g. /usr/local/share/fortune, |
| 35 |
+but if set, before this patch, even cookies distributed |
| 36 |
+by upstream were stored there (and nothing in COOKIEDIR, e.g. |
| 37 |
+/usr/share/fortune - https://bugs.gentoo.org/865809). |
| 38 |
+ |
| 39 |
+Originally, we were setting LOCALDIR=COOKIEDIR=/usr/share/fortune to |
| 40 |
+workaround the issue, but see https://bugs.gentoo.org/857246. |
| 41 |
+--- a/datfiles/CMakeLists.txt |
| 42 |
++++ b/datfiles/CMakeLists.txt |
| 43 |
+@@ -68,7 +68,7 @@ ADD_CUSTOM_TARGET( |
| 44 |
+ ) |
| 45 |
+ INSTALL( |
| 46 |
+ FILES ${_install_unrot_cookies} |
| 47 |
+- DESTINATION "${LOCALDIR}" |
| 48 |
++ DESTINATION "${COOKIEDIR}" |
| 49 |
+ ) |
| 50 |
+ |
| 51 |
+ IF (NOT NO_OFFENSIVE) |
| 52 |
+--- a/datfiles/off/CMakeLists.txt |
| 53 |
++++ b/datfiles/off/CMakeLists.txt |
| 54 |
+@@ -54,5 +54,5 @@ ADD_CUSTOM_TARGET( |
| 55 |
+ ) |
| 56 |
+ INSTALL( |
| 57 |
+ FILES ${_install_rotated_cookies} |
| 58 |
+- DESTINATION "${LOCALODIR}" |
| 59 |
++ DESTINATION "${OCOOKIEDIR}" |
| 60 |
+ ) |
| 61 |
|
| 62 |
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 |
| 63 |
similarity index 88% |
| 64 |
rename from games-misc/fortune-mod/fortune-mod-3.14.1.ebuild |
| 65 |
rename to games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild |
| 66 |
index 71c733aee02a..d7c5bdcc3b1d 100644 |
| 67 |
--- a/games-misc/fortune-mod/fortune-mod-3.14.1.ebuild |
| 68 |
+++ b/games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild |
| 69 |
@@ -16,19 +16,25 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86" |
| 70 |
IUSE="offensive test" |
| 71 |
RESTRICT="!test? ( test )" |
| 72 |
|
| 73 |
-RDEPEND="app-text/recode:= |
| 74 |
- !games-misc/fortune-mod-tao" |
| 75 |
+RDEPEND=" |
| 76 |
+ app-text/recode:= |
| 77 |
+ !games-misc/fortune-mod-tao |
| 78 |
+" |
| 79 |
DEPEND="${DEPEND}" |
| 80 |
-BDEPEND="app-text/App-XML-DocBook-Builder |
| 81 |
+BDEPEND=" |
| 82 |
+ app-text/App-XML-DocBook-Builder |
| 83 |
+ dev-lang/perl |
| 84 |
test? ( |
| 85 |
dev-perl/File-Find-Object |
| 86 |
dev-perl/IO-All |
| 87 |
dev-perl/Test-Differences |
| 88 |
dev-perl/Test-Trap |
| 89 |
- )" |
| 90 |
+ ) |
| 91 |
+" |
| 92 |
|
| 93 |
PATCHES=( |
| 94 |
"${FILESDIR}"/${PN}-3.14.0-valgrind-tests.patch |
| 95 |
+ "${FILESDIR}"/${PN}-3.14.1-fix-localdir-mixup.patch |
| 96 |
) |
| 97 |
|
| 98 |
src_configure() { |
Archives