public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-misc/fortune-mod/, games-misc/fortune-mod/files/
@ 2022-05-03 23:24 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-05-03 23:24 UTC (permalink / raw
  To: gentoo-commits

commit:     6008ec0b6d66004e4c55e7486b037ea1bb0e28ca
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 23:24:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  3 23:24:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6008ec0b

games-misc/fortune-mod: add 3.14.0

Lost keywords due to enabling tests w/ new deps.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-misc/fortune-mod/Manifest                    |  1 +
 .../files/fortune-mod-3.14.0-valgrind-tests.patch  | 24 ++++++++++
 games-misc/fortune-mod/fortune-mod-3.14.0.ebuild   | 56 ++++++++++++++++++++++
 3 files changed, 81 insertions(+)

diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index 32eb08c49bc1..45fff48026fa 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.14.0.tar.xz 1428984 BLAKE2B 9b7df93cd7ced677a391ed30a84503cbd36689de406bbeb346bc9e465420908c9115b0d58e8e0b245f554557f032a014cc52418da4a69281e3844412c8e9641d SHA512 289f11923bd91ac0c46d8879c57c1f4da20ef2ef165be2eea9635b3aca5fc18bfc2438e85bfbc2a872671f41658b68bb3f7dd74bef7e4268889371ff702d7cae
 DIST fortune-mod-3.6.1.tar.xz 1419132 BLAKE2B 0ff684ee8aaf5eaabd75f187a3bff533ab4ee6e66c47c57fc700d2671006c8dff42f732fde78b40516f8ee907a52fc1965fb0ff257b12563d645f97c5ebc0031 SHA512 3f35bf35d62c46dfeaca450a127a7444bb870f6345c92afe626f81548ac375d21306c00a56d31982b8e25129acd6f829402d5afaec676e1200ad5bf586f7a8f1

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..166f8dfcd5b6
--- /dev/null
+++ b/games-misc/fortune-mod/files/fortune-mod-3.14.0-valgrind-tests.patch
@@ -0,0 +1,24 @@
+https://git.exherbo.org/arbor.git/plain/packages/games-misc/fortune-mod/files/fortune-mod-Don-t-run-tests-involving-valgrind.patch?id=4c04c9e10bfee01e4c7cc3278c452efb6863d549
+
+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/fortune-mod-3.14.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
new file mode 100644
index 000000000000..cd454e20e253
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 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://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 ~m68k ~mips"
+IUSE="offensive test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/recode:=
+	!games-misc/fortune-mod-tao"
+DEPEND="${DEPEND}"
+BDEPEND="app-text/App-XML-DocBook-Builder
+	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)
+		-DLOCALDIR="/usr/share/fortune"
+		-DCOOKIEDIR="/usr/share/fortune"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_compile check
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-misc/fortune-mod/, games-misc/fortune-mod/files/
@ 2022-08-20  1:49 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-08-20  1:49 UTC (permalink / raw
  To: gentoo-commits

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() {


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-misc/fortune-mod/, games-misc/fortune-mod/files/
@ 2024-07-07  5:15 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-07-07  5:15 UTC (permalink / raw
  To: gentoo-commits

commit:     1d9be0848908a9831cc1b86505554d8922544926
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  7 05:07:35 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul  7 05:07:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d9be084

games-misc/fortune-mod: drop 1.99.1-r3, 3.12.0, 3.14.1-r1, 3.16.0-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-misc/fortune-mod/Manifest                    |  4 -
 .../fortune-mod/files/01_all_fortune_all-fix.patch | 21 -----
 .../files/fortune-mod-1.99.1-gentoo.patch          | 99 ----------------------
 .../fortune-mod-3.14.1-fix-localdir-mixup.patch    | 30 -------
 .../fortune-mod/fortune-mod-1.99.1-r3.ebuild       | 62 --------------
 games-misc/fortune-mod/fortune-mod-3.12.0.ebuild   | 42 ---------
 .../fortune-mod/fortune-mod-3.14.1-r1.ebuild       | 66 ---------------
 .../fortune-mod/fortune-mod-3.16.0-r1.ebuild       | 66 ---------------
 8 files changed, 390 deletions(-)

diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index 26426f3ffff0..836f4da4b62c 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,5 +1 @@
-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

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.14.1-r1.ebuild b/games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild
deleted file mode 100644
index 3f2a4dd29cac..000000000000
--- a/games-misc/fortune-mod/fortune-mod-3.14.1-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 ~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
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
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-07  5:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-20  1:49 [gentoo-commits] repo/gentoo:master commit in: games-misc/fortune-mod/, games-misc/fortune-mod/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-07-07  5:15 Sam James
2022-05-03 23:24 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox