gentoo resync : 28.04.2021

3 files changed, 10 insertions, 10 deletions

diff --git a/games-misc/fortune-mod-kernelcookies/Manifest b/games-misc/fortune-mod-kernelcookies/Manifest
index 9d528ad4296e..1fa7c99f7f4c 100644
--- a/games-misc/fortune-mod-kernelcookies/Manifest
+++ b/games-misc/fortune-mod-kernelcookies/Manifest
@@ -1,4 +1,4 @@
-AUX 9-offensive.patch 4789 BLAKE2B 2778f35d39fd213e215ec679ecabdd145168c35c3a41df0d02a0600f3b2d8e551020cf7ce88f7e4bbe266858593f65642a670935b44b2716acdc2af60e338c74 SHA512 6bf0ae401b55b6e83523ad0b930ff06627499c9b45ba98687843b7d96ffea24dfe92799a581f37ed7d33efb951ab07157467f6034ad8aab9ee86df865005846c
+AUX 9-offensive.patch 4793 BLAKE2B 742dd02a66be1a35e8e1e379040e4d2edede92b0bb5a81412462667ba4a0625b372960da201eae05428c8b50eef29f02119caa3ef904339b783efe82d4084c11 SHA512 0ad9befa6e05b7d1f3d0e68f68b54f66c69a5e3fb759ef22c9ef28be78ecf32aa0a8e73ff4bf4c06dce092c192b65f62d68c7803fa88a779fce640599eb8a4c7
 DIST kernelcookies-9.tar.gz 8966 BLAKE2B c6d503d0c01fe86ac2b59240ba2a1639210b7aef6fb167d8467c4fcad0283880ff00c59e34e811c7bbde3b0bf7e7bb89536e8c3d439b514fb180db2d326847cc SHA512 3d2601ad787928ef852af7d5833c5d32a7c7e364913d451e889eb883d4da450a989c0ff450aef4c07e3700ef3a87f535948d07789c7d2819305a6f36cded7aa3
-EBUILD fortune-mod-kernelcookies-9.ebuild 807 BLAKE2B 5b990ad379dee54708fbf04e49cd2969d27eb6c4906ee226a31e62c0565726a491cee3bb6a6a615fc0c8e775154b101329bca7a36d3ce6a62cbf47cb5310abb7 SHA512 53c6a552f42f4c169f64362ddfc8a3881288a40e86d5e859ff2f4d5c12ce463085bb854401b33a21a2d08c03b9a291c5d11fc265fcdf8ca4d13d598e221397ec
+EBUILD fortune-mod-kernelcookies-9.ebuild 810 BLAKE2B e26962959647add47439c865d172d8830eedb6b26c15047260654eab3b337f3ba1be7eb372cf3af87eb9e853d8e1d493495ff76fb8644f8136257bbfde90a961 SHA512 e02326a7e831654edace9c25d8632ffc8b5d3f798d50c5c5e6d3ffedc61c5438d42f95b43747af9e580851777b641d60c3d0a0613d44bc7f38a992c893d38367
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-kernelcookies/files/9-offensive.patch b/games-misc/fortune-mod-kernelcookies/files/9-offensive.patch
index 0ba0ee128907..cc66a2afbee5 100644
--- a/games-misc/fortune-mod-kernelcookies/files/9-offensive.patch
+++ b/games-misc/fortune-mod-kernelcookies/files/9-offensive.patch
@@ -1,5 +1,5 @@
---- kernelcookies
-+++ kernelcookies
+--- a/kernelcookies
++++ b/kernelcookies
 @@ -1,42 +1,3 @@
 -/* Only Sun can take such nice parts and fuck up the programming interface
 - * like this.  Good job guys...
diff --git a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
index ef3ab273cb8b..72de0e5553e3 100644
--- a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
+++ b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A collection of funny lines from the Linux kernel"
 HOMEPAGE="http://www.schwarzvogel.de/software-misc.shtml"
 SRC_URI="http://www.schwarzvogel.de/pkgs/kernelcookies-${PV}.tar.gz"
+S="${WORKDIR}"/kernelcookies-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,13 +16,13 @@ IUSE="offensive"
 DEPEND="games-misc/fortune-mod"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/kernelcookies-${PV}
-
 src_prepare() {
+	default
+
 	# bug #64985
 	if ! use offensive ; then
-		rm -f *.dat
-		epatch "${FILESDIR}"/${PV}-offensive.patch
+		rm -f *.dat || die
+		eapply "${FILESDIR}"/${PV}-offensive.patch
 		strfile -s kernelcookies || die
 	fi
 }