gentoo resync : 28.04.2021

3 files changed, 10 insertions, 9 deletions

diff --git a/games-misc/fortune-mod-osfortune/Manifest b/games-misc/fortune-mod-osfortune/Manifest
index ef08288c42eb..fa6fb7c99656 100644
--- a/games-misc/fortune-mod-osfortune/Manifest
+++ b/games-misc/fortune-mod-osfortune/Manifest
@@ -1,4 +1,4 @@
-AUX spelling.patch 6416 BLAKE2B 2cfd9616407a3d66b8fd2529ef93db60e27701f31609f8954a1c6e45af4188b577570f75b4fbaecf0be2eb2c2ed60f45d7be4ca06f6697dbb43f0f02b780cab0 SHA512 657c015bf53105a12981308ecae9fadd9e76892d1f1010e84c48b391b2d37e180d60a0e959f5ce30969ba98fa3733e63fad5a6079950dc93fc48a45c24dede6b
+AUX spelling.patch 6343 BLAKE2B 81168cc38bac3e44852a588ad495cf363d41185cf7a04f77a7aeedf6b7ba2c6e904aabbcb77c78d85e4aabe0a39bbfb2a48b45a520897f125d5be1bd119837fe SHA512 9643e5de9f946330c6076dc5769e3f9b08172ea6c45938d1060d9561845c6f3de9016c7e16c1b5fa42801f3b79aed63fe83ad028487587422487e516b5797277
 DIST osfortune.tar.gz 3097 BLAKE2B 2c6dff9c81762b36f37df682d9f13f1b4c49ec52128f2bce206895ece64af4a2bb31f8e548cca928f674541eebc23cb4f76a7d5db9150740d4a480c91318179e SHA512 e78f40bbbbe94bc70984f01bc4be9c44a15716d60a526797606a6f38fab3533a0cf428a473e479479a7db2c391e44515294519b24cdd3bda33d82c9081919d3e
-EBUILD fortune-mod-osfortune-1.ebuild 748 BLAKE2B da208fce3cf54ab340722d1083595602be25dc3aea96a8324b51b121813dfed8f681eed07d95386182d264045b97a8914535a599ba821e3c9ac9d628f5a4e111 SHA512 e2a8922938d4d55068d954941a64253fc234eaade5b621db4379f9498db083fa7609ac5d61d542b2310f59c93588ee108ff66c9313124d6a892cdbaef692d638
+EBUILD fortune-mod-osfortune-1.ebuild 741 BLAKE2B 25c06b35ab7c018b6c0c0895b03658bd3aa614ba7f108a32e1fda9f3cfa0be24e7e5e8e28bce2e3b1b12b0877dd25e5c6b5932c1d312132c8ed6c437a2e3ebaa SHA512 a718c188fa5bd482637c77fc391fe5faf4b9db0c68cca93553a32ebd2bf7a390f97999f82a182b4cdbeb86ab063c2f06def1eaec001f7d0c8d3af611dea5c564
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-osfortune/files/spelling.patch b/games-misc/fortune-mod-osfortune/files/spelling.patch
index 2871ec2c00e3..70929db65b9e 100644
--- a/games-misc/fortune-mod-osfortune/files/spelling.patch
+++ b/games-misc/fortune-mod-osfortune/files/spelling.patch
@@ -1,5 +1,5 @@
---- osfortune.orig	2004-08-18 07:40:54.000000000 -0400
-+++ osfortune	2004-08-19 07:14:41.008409016 -0400
+--- a/osfortune
++++ b/osfortune
 @@ -15,7 +15,7 @@
  
    -- Bruce Perens, on the future of Open Source software. (Open Sources, 1999 O'Reilly and Associates)
diff --git a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
index 4f66714592db..2c8783a0b9a3 100644
--- a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
+++ b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Open sources fortune file"
 HOMEPAGE="https://web.archive.org/web/20030803031143/http://www.dibona.com/opensources/index.shtml"
 SRC_URI="https://web.archive.org/web/20030919200547/http://www.dibona.com/opensources/osfortune.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 DEPEND="games-misc/fortune-mod"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}
+PATCHES=(
+	"${FILESDIR}"/spelling.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/spelling.patch
+	default
 	strfile osfortune || die
 }