gentoo resync : 28.04.2021

4 files changed, 29 insertions, 22 deletions

diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index be4e2bef910c..b3e1c2c09b43 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,5 +1,5 @@
-AUX 01_all_fortune_all-fix.patch 783 BLAKE2B 6624a194f63177a3dd414f7c0612d14343f1663867eee04456d8c7fa6b374c7bd1da48495c5c4e8820aedc93c247357574c7a73b71249970f5bea9feac18ff07 SHA512 52211ad8a5f29bc65314fff58e151a7890f0f5d1d6e613b67e693f0bf4ece09219febdb9291ff006901d48b6c50dab0f5507201d412760ddc5d7857c74e11e86
-AUX fortune-mod-1.99.1-gentoo.patch 2699 BLAKE2B aea72dffd92071d416d8bb239f26f26a59aa2920d5bb25cae36267cd8a12362f6463bf43592c9b5065d218d413bc0d5c5d1ad361f52fd6f8260eef4f447b5204 SHA512 83ad811f73216db89eaea52a1a55b63e6f12f8580fd3e360b7adc6e80066c0d6d79191e6c2fbe3e2b78cf446bdb0500562cd9fe8cf00375af76034861b2ab54c
+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
 DIST fortune-mod-1.99.1.tar.gz 1812089 BLAKE2B a5df4a5a518021073ee95ac7e110ac75b961feb1b4dfcc3a40165ea98859f93e6d002ee4906d3f03a40762503ae475b61399a2bd4144609fa4d9815a1a85fa84 SHA512 4c06ea37532dd59f0251d7c49538bee703852c60a3247aba7c516f4f0d4b8ab15b9d7495d004a6423acd74c4dd7532e3dbe1679d6904ab373b617a3386205cde
-EBUILD fortune-mod-1.99.1-r3.ebuild 1700 BLAKE2B 9f9c7f261c359c46f6d5d7f0387537c6b3b93f735e25901979a0c926a2c222531e2314d018a3b7183680712613b9a4dc1d33763906d6c007ebf536198a0d9f9a SHA512 38b28d9145dc5311d7996d578d90d9dd5e36d80262b24c61f41da0ab8c930c33df6709af89d67edbd0f53305a3a78bd8a951a97a329d349a8b46a1c0bbe6230f
+EBUILD fortune-mod-1.99.1-r3.ebuild 1710 BLAKE2B b9af07978e8f4bf7ad975d24c51820b583f5f09f5079f3f1ea20f1013abd553ab4e9e1e928ee36725c3071122c434574b97b25c4ffad2d7504a1d93736777fff SHA512 d13f50c481cbcace84eb958c533f1c1464a6247d5251ef0f900c6e3dd99a720b483fdba0c0e8e4ac8e05e68993fb210ac6a052de4d2211a77e79c11c4229c6b2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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
index b4175ac81bfc..48807293bf1a 100644
--- a/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch
+++ b/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch
@@ -1,5 +1,5 @@
---- fortune/fortune.c.old	2006-03-11 15:33:14.000000000 +0100
-+++ fortune/fortune.c	2006-03-11 15:43:16.000000000 +0100
+--- a/fortune/fortune.c
++++ b/fortune/fortune.c
 @@ -974,7 +974,7 @@
  	  if (!ret)
  	    ret=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
index d9b27fb350e5..97f04259ba92 100644
--- 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
@@ -1,5 +1,5 @@
---- fortune-mod-1.99.1/datfiles/Makefile
-+++ fortune-mod-1.99.1/datfiles/Makefile
+--- a/datfiles/Makefile
++++ b/datfiles/Makefile
 @@ -58,7 +58,7 @@
  	if [ $(WEB) = 1 ] ; then cd html && $(MAKE) install ; fi
  	for i in $(COOKIES) ; do \
@@ -9,8 +9,8 @@
  		done
  
  clean:
---- fortune-mod-1.99.1/datfiles/off/Makefile
-+++ fortune-mod-1.99.1/datfiles/off/Makefile
+--- a/datfiles/off/Makefile
++++ b/datfiles/off/Makefile
 @@ -38,7 +38,7 @@
  	install -m 0755 -d $(OCOOKIEDIR)
  	for i in $(OCOOKIES) ; \
@@ -20,8 +20,8 @@
  	done
  
  clean:
---- fortune-mod-1.99.1/Makefile
-+++ fortune-mod-1.99.1/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -65,8 +65,7 @@
  RECODELIBS=-lrecode
  
@@ -32,8 +32,8 @@
  
  # The above flags are used by default; the debug flags are used when make
  # is called with a debug target, such as 'make debug'
---- fortune-mod-1.99.1/fortune/fortune.c
-+++ fortune-mod-1.99.1/fortune/fortune.c
+--- a/fortune/fortune.c
++++ b/fortune/fortune.c
 @@ -97,7 +97,7 @@
  #endif /* killing warnings */
  
@@ -72,8 +72,8 @@
      crequest = malloc(strlen(ctype) + 7 + 1);
      sprintf(crequest, "UTF-8..%s", ctype);
      recode_scan_request (request, crequest);
---- fortune-mod-1.99.1/util/rot.c
-+++ fortune-mod-1.99.1/util/rot.c
+--- a/util/rot.c
++++ b/util/rot.c
 @@ -5,10 +5,11 @@
  
  #include <stdio.h>
@@ -87,8 +87,8 @@
  
      while ((a = getchar()) != EOF)
      {
---- fortune-mod-1.99.1/util/unstr.c
-+++ fortune-mod-1.99.1/util/unstr.c
+--- a/util/unstr.c
++++ b/util/unstr.c
 @@ -96,6 +96,7 @@
  #include	<string.h>
  #include	<unistd.h>
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
index d9c0b620388c..e3e2019a48a7 100644
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="The notorious fortune program"
 HOMEPAGE="http://www.redellipse.net/code/fortune"
@@ -16,9 +17,13 @@ IUSE="offensive elibc_glibc"
 DEPEND="app-text/recode:0="
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/01_all_fortune_all-fix.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/01_all_fortune_all-fix.patch
+	default
 
 	sed -i \
 		-e 's:/games::' \
@@ -37,9 +42,11 @@ src_prepare() {
 			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
@@ -48,7 +55,7 @@ src_prepare() {
 src_compile() {
 	local myrex=
 	[[ ${CHOST} == *-interix* ]] && myrex="REGEXDEFS=-DNO_REGEX"
-	emake prefix="${EPREFIX}" CC="$(tc-getCC)" $myrex
+	emake prefix="${EPREFIX}" CC="$(tc-getCC)" ${myrex}
 }
 
 src_install() {