gentoo resync : 16.09.2020

4 files changed, 19 insertions, 23 deletions

diff --git a/net-mail/ripmime/Manifest b/net-mail/ripmime/Manifest
index 9f8366b7ac86..fec64d23f185 100644
--- a/net-mail/ripmime/Manifest
+++ b/net-mail/ripmime/Manifest
@@ -1,5 +1,5 @@
-AUX ripmime-1.4.0.9-buffer-overflow.patch 595 BLAKE2B 48d9b98e62ae27ad929d7b3d0a0905d568c83683d4789852fd41f561ade9e365d16b7c55492ea53808ebf59304e44c71c61e54121ffee535d5be3c5ebb30ae4e SHA512 1ee8fd284ddfd1dcd77351f08e0c25a8605529c57ce6109cb9afefd37a5c9e410c6f639d4dbd529b975e50430aca5bfd2fec030bb0f5c805453d7e4af0885055
-AUX ripmime-1.4.0.9-makefile.patch 2162 BLAKE2B 9167e9103d28f0dc8f182c61d5fadd1dfa23ad6375cf57bed2971cbef5165c8a480776572995a045f40ca997c6548f41d62e1b2ba7989eddad09869f7351dbdd SHA512 3b4935a57aebc581f907610852b465f64ebaef11317823c45b0cd5501ac1b19fb7c86565850565d88cb77ca68cf764e597f7c80080e1d8887983e03430e081e0
+AUX ripmime-1.4.0.9-buffer-overflow.patch 562 BLAKE2B 31f00e0d4da02eef3bfea294cb125cb0199b9ae536346c24a8bb203122a279957d10e2086f24902631e44e8fb5487308e7e0f2eb10f0284ab866a358c11fd75b SHA512 e3f6abc11d4c6d5dc426cfe70a04b0fde2f04c3f7259402f1cbe7995204ad62725f29627fe888d1a0989dcb6b19df15640cbed83ca9386d6504cc72023a766c2
+AUX ripmime-1.4.0.9-makefile.patch 2129 BLAKE2B c492852a9c8e66fc7b33e1a40a9ebd51b74a2e7d400e4bb6f60c2494aec4fc7df8c2a946075d11d0102f5d87583462c7a02a60b3d67092f7468a86aa38652dc3 SHA512 45cf86e952d6e2fc14d729d57a0848e42cc1484af824f94e1b54de5a2dc616522eee2ea20e4aa1e7f79405c5ccd1d36fd574e77288b82e3ce637956f2ca92f97
 DIST ripmime-1.4.0.10.tar.gz 172155 BLAKE2B 83e7500a8cc48d29d31515487968dfd7a2b1768b12f296e11ac5e55420dc765498859608328618dcd0295f3a9901a06a189ad8ae24c6a6c20e604d48a3dd29ea SHA512 1c2d2180d60a56c70046e95a29925e39d3f76da98cc2fa153b6fc3a8eb0fc5ec5f45524e9f5ae8706a955366a752d25a0a2f560f1d75de3f2733ec31befb83d3
-EBUILD ripmime-1.4.0.10.ebuild 1077 BLAKE2B 1a9bdf8bd8647457a2bf514cafe9fbef88dc1c3abe09b77b466633d9cb348d58d3b38b7e3de2db2d65cb2ee418ffd449add07b029ccad91abd14065341921b5d SHA512 12b3923d72cd64fcf6b34fcc917196172eca4a111ae6d8578177670f19dc62eb60a94708f1c8109150c7a3d12680902f57d02ce7d205c45a4046dd3f7d6058eb
+EBUILD ripmime-1.4.0.10-r1.ebuild 883 BLAKE2B ec97e9ea5adfd43159daf5446759d2f46f4056ea390be8bce1de31a37b06f0018f72fc21045ed6775d24b4a58a36d7101c9e1193c5393a37c5ecc929b60f0353 SHA512 ca6d45189e81451160f16921a7916ba9788d1d3a0877c3e615ba8d6fbcc448ec4a6577f60d67eded04a803520e7f937261b0eb54a73c2041a735a50bfb2e68df
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch b/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch
index 418a204101e9..3b9cd7a60cba 100644
--- a/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch
+++ b/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch
@@ -1,5 +1,5 @@
---- ripmime-1.4.0.9/MIME_headers.c.orig	2010-11-07 12:38:52.994063648 -0800
-+++ ripmime-1.4.0.9/MIME_headers.c	2010-11-07 12:39:06.395161970 -0800
+--- a/MIME_headers.c	2010-11-07 12:38:52.994063648 -0800
++++ b/MIME_headers.c	2010-11-07 12:39:06.395161970 -0800
 @@ -2239,7 +2239,7 @@
  		{
  			if (MIMEH_DNORMAL) LOGGER_log("%s:%d:MIME_parse_contentlocation:DEBUG: filename = %s\n", FL, p);
diff --git a/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch b/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch
index 856319bf63b7..088e6fa5523d 100644
--- a/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch
+++ b/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch
@@ -1,5 +1,5 @@
---- ripmime-1.4.0.9.orig/Makefile	2008-11-06 19:33:33.000000000 -0800
-+++ ripmime-1.4.0.9/Makefile	2010-11-07 12:53:03.898947384 -0800
+--- a/Makefile	2008-11-06 19:33:33.000000000 -0800
++++ b/Makefile	2010-11-07 12:53:03.898947384 -0800
 @@ -42,22 +42,22 @@
  	./generate-buildcodes.sh
  
diff --git a/net-mail/ripmime/ripmime-1.4.0.10.ebuild b/net-mail/ripmime/ripmime-1.4.0.10-r1.ebuild
index 36bdac2eeef9..b1ab63c6d983 100644
--- a/net-mail/ripmime/ripmime-1.4.0.10.ebuild
+++ b/net-mail/ripmime/ripmime-1.4.0.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="extract attachment files out of a MIME-encoded email pack"
 HOMEPAGE="http://pldaniels.com/ripmime/"
@@ -12,18 +12,18 @@ SRC_URI="http://www.pldaniels.com/ripmime/${P}.tar.gz"
 LICENSE="Sendmail"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE="static-libs"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.0.9-makefile.patch \
-		"${FILESDIR}"/${PN}-1.4.0.9-buffer-overflow.patch
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.0.9-makefile.patch"
+	"${FILESDIR}/${PN}-1.4.0.9-buffer-overflow.patch"
+)
 
 src_compile() {
-	local maketargets="default solib"
-	use static-libs && maketargets="${maketargets} libripmime.a"
-
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" CFLAGS="${CFLAGS}" ${maketargets}
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		CFLAGS="${CFLAGS}" \
+		default solib
 }
 
 src_install() {
@@ -37,8 +37,4 @@ src_install() {
 	dolib.so libripmime.so.1.4.0
 	dosym libripmime.so.1.4.0 /usr/$(get_libdir)/libripmime.so
 	dosym libripmime.so.1.4.0 /usr/$(get_libdir)/libripmime.so.1
-
-	if use static-libs ; then
-		dolib.a libripmime.a
-	fi
 }