gentoo resync : 28.04.2021

3 files changed, 5 insertions, 16 deletions

diff --git a/app-text/talkfilters/Manifest b/app-text/talkfilters/Manifest
index abc52b2dcc89..2dd35af20166 100644
--- a/app-text/talkfilters/Manifest
+++ b/app-text/talkfilters/Manifest
@@ -1,4 +1,4 @@
-AUX talkfilters-2.3.8-format-security.patch 862 BLAKE2B f8050b5527c9777a2a500611989ee0eaa90fc1360ddb76a659ef334ec97cb3904f5051605bcf6b10dcad8b1b571d0a0001613358f1aa9c1b617a75ee893e6af6 SHA512 b210777c038878cdd06365a13591c723151356864c08bee700005e509b2f0f6aec4819730ca631d401e4cbb9d3dbd3a4a6551f0920819fa6097585ae43f6c8f4
+AUX talkfilters-2.3.8-format-security.patch 732 BLAKE2B 84cd1350e015bd366448f4721b233c45d1f55259ddfaeab86e83f8af2973438ecfb6919cb83349e937ae2fd7e701f87cdf4a9ce5147e40c8bf1dcd11dce37168 SHA512 a0d1fe6aba72d1783ef151bf4a0b2e4ecaf0b3db7abe4278e6f92d49dc385516f36b71fcf348a4f0e0bab3c3496830f9aed6b8cfee14e4cc03369319ce39df37
 DIST talkfilters-2.3.8.tar.gz 821338 BLAKE2B 1ed5904829380858e5599458d54d3e7a339c10f057a94ce17f38b330d89ad5aba972cf234c10aa2ed7ffbf67c8b4c01a9bba0ebe73b4ba2bf32230e9e36eda3d SHA512 3fb317c572e95756fea9dcbaeac01e9576b05f5b0710e64513ecd05ec219f8050dec3bc5bc5d0d5f00c642487925765843da03525cfcb23925cab3c321272b28
-EBUILD talkfilters-2.3.8-r1.ebuild 649 BLAKE2B b9f0150bd0398bbda3ab3521b06fe2507835bd354bccc0c1ccb65890c216f238030ffe62a1c8773f52005ec5717d27db2d2a4d642a9e23258a5a5ee90bf22534 SHA512 60446283924f32a51ba87027d0ad8fc0ddcb1992a906d6399ad2a969c286d65b279d21bb2c7de20860d2a99d0b03a464b2023ab569697dc94685ee727583ba07
+EBUILD talkfilters-2.3.8-r1.ebuild 589 BLAKE2B 24be9cb420a1537aab23710360c003dfd3b7957af10090511bf933da71b2ca9a0dbe695f0dcdf2c8bc9d0da55563e28114aab5c5d9cc71fd3b8223156a0a3f59 SHA512 84452aa30269414d4d2316ffd10bc36445052a466e57c30a59b4bf9f64ef96c612a0072d47000c778333871e9b97604c77556ca7bb271e7a30fd09cba0d9de0e
 MISC metadata.xml 957 BLAKE2B 2f66b167131788d1df1195fd9f4d372cfe2ada94c10ad6ce6d0a1bcd28582f3249344ef5733e39838453dca5b54456066ae93e976437e239a4a556982b436426 SHA512 d1b664bff6db93a8289a01b6ef00df35a06207722360ca753853fde6cd667abd739acbbadc9eacb16d46536326c61d6b1673ab50940f778c7ed7c228a082b52e
diff --git a/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch b/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch
index cf59574694a6..6d8df6565843 100644
--- a/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch
+++ b/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch
@@ -1,8 +1,3 @@
- wrap.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/wrap.c b/wrap.c
-index 7c89dc8..745d1ec 100644
 --- a/wrap.c
 +++ b/wrap.c
 @@ -105,7 +105,7 @@ int main(int argc, char **argv)
diff --git a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
index d8b9123d8f39..df98a4f5428d 100644
--- a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Convert ordinary English text into text that mimics a stereotyped dialect"
 HOMEPAGE="http://www.hyperrealm.com/talkfilters/talkfilters.html"
@@ -15,11 +13,7 @@ KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format-security.patch
-	)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
+)
 
 src_configure() {
 	econf --disable-static