gentoo resync : 07.05.2021

12 files changed, 149 insertions, 30 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 6d29b9044514..744575d54fd2 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 2c57330099af..ea62b4543462 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -2,5 +2,6 @@ AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649d
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
 EBUILD brotli-1.0.9-r1.ebuild 1764 BLAKE2B 8b90b73dacd0a643ed34441378026d5e20a5c50797e8dcac32f9627db5b7aebaa65cff74cf30ab6cb4c6cd6c1a5fc529c73fb0d7d2859e486e9a1406b274a0fd SHA512 6becec9055b96298bd5ce44c5af713901febe38db8160a2499bb63e41adb9386dd3b16160f5852e4df4d36bb26aa014dfb59fcc9d0ad37f85c5ac0a77def0c9f
 EBUILD brotli-1.0.9-r2.ebuild 1844 BLAKE2B 9ab0224a88f895446a0237d083fb85931436c5aac47c26001e9556eed631d15ad166d094e05bb44b73ea00acd38a105469a9e8017a89a48f3aafa7e1d7d14a78 SHA512 0043e2af0bde7cb003cdbdf3e07da80164097c7220ace7666888dacc7a54f8ab8f649758e9a140cbeb354600643b198d1fa4b406331cca419b8eeaecfb487225
-EBUILD brotli-9999.ebuild 1730 BLAKE2B ff641ac49dd29a27469afda38b84dff17a623aa7863e310b03b88723d35483bbdb622d2f9b7a6fb8b363bfacdacb275c8e9cbd29a1bf1d1c051a01c220a5e2c3 SHA512 258cc7962e09c5fe2e4f05b5fe82213f5ba607535b64579178af0661b85a768974061fc4a020920018f8ce1268251820f86277177d5d4cec195454e4eb8dc0f7
+EBUILD brotli-1.0.9-r3.ebuild 1833 BLAKE2B c4ff2490a81188445fc942911cd4dc0a3785a48c1f45393ebfcf14f22660f21794cbe5457d20cfaf00a1fe8e8a3810a5ebccf4d9899f15b709b28ab210a71861 SHA512 2bac326de36b35001984a866cfc6446caefebd1466c29187a3cf5ff5e7b349eaee834c227191c4f358123cdd541e6a91a42ffef4ff0f48f0b53a86c4466a3408
+EBUILD brotli-9999.ebuild 1719 BLAKE2B 6c394bca6ca053f958dc09df4b6dae3def33cf47c047c6b0a363ae556f00a6e2cb1413c29e5dca0a46ea66331d2e97b52ad272e83b5675928666cb01b63974a8 SHA512 eaec29d6e0221fd20464eea80173c47b21c75d2638111420a4dc1d004cf3a9ff01fbfdb6862cddeddf3ec686aa35d3582782d0c54fb8d9b1428a0b414c79b4f5
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.9-r3.ebuild b/app-arch/brotli/brotli-1.0.9-r3.ebuild
new file mode 100644
index 000000000000..9a372fb31664
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.9-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_IN_SOURCE_BUILD="1"
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib distutils-r1
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/$(ver_cut 1)"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+# tests are currently broken, see https://github.com/google/brotli/issues/850
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-linker.patch"
+)
+
+src_prepare() {
+	use python && distutils-r1_src_prepare
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+src_configure() {
+	cmake-multilib_src_configure
+	use python && distutils-r1_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+}
+src_compile() {
+	cmake-multilib_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test() {
+	esetup.py test || die
+}
+
+multilib_src_test() {
+	cmake_src_test
+}
+src_test() {
+	cmake-multilib_src_test
+	use python && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
+}
+multilib_src_install_all() {
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index 87affbe108c9..7dacb49548c2 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
+CMAKE_ECLASS=cmake
 
 inherit cmake-multilib distutils-r1
 
@@ -37,14 +38,14 @@ RESTRICT="!test? ( test )"
 
 src_prepare() {
 	use python && distutils-r1_src_prepare
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING="$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 src_configure() {
 	cmake-multilib_src_configure
@@ -52,7 +53,7 @@ src_configure() {
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 src_compile() {
 	cmake-multilib_src_compile
@@ -64,7 +65,7 @@ python_test() {
 }
 
 multilib_src_test() {
-	cmake-utils_src_test
+	cmake_src_test
 }
 src_test() {
 	cmake-multilib_src_test
@@ -72,7 +73,7 @@ src_test() {
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
 }
 multilib_src_install_all() {
diff --git a/app-arch/mt-st/Manifest b/app-arch/mt-st/Manifest
index 9e03abaa4ed9..241ba1460294 100644
--- a/app-arch/mt-st/Manifest
+++ b/app-arch/mt-st/Manifest
@@ -1,6 +1,6 @@
 DIST mt-st-1.3.tar.gz 35341 BLAKE2B c58eee9bd58a3fa5105fe3f8dfb56f1af1c5ed73f99e5179ea14bc11d66151d1e6b6c99f61194c700ed79ce10a7e7f75f78ffe9b7d2c45c85e620d4da1aaeb5c SHA512 1d026ae85e1ca367e72f1810042314070f592306d9ddec331b95ea4e1153dc3edee68d8798bdf7e055a4cf9c67ec8c539e5d188e87f0546f48b5f4ee4bc6a820
 DIST mt-st-1.4.tar.gz 37864 BLAKE2B 25ae656b6442e53570366405ba76da9150cf1d4fe33c612bf922d8be967ce6b60be191948507a62bb1881d4be63ed192f7d03f1d63c38f5772aec2f3d2fe455b SHA512 e6655a5957d3ac470c0cb0a1955a12397aa22f3ea1a427cf776f6bf2d6fd665439b2bfa54c3870b7974da537f0fe71d3be43126be1a7db903e6bc7be4cfb10ec
 EBUILD mt-st-1.3.ebuild 576 BLAKE2B 7d4d5548c23356bf97881e87fd122769bc6ee3b47ff454174ea33b7db96a374d9fa8ce8bca1dddfd7772fdf62bc8309a0a163644c18e0d1e5dd64b1cd437067e SHA512 55445e527238fbd7c74d28130d61f3e2c52a32546c8187981da1cfb9bcff6d9080c8249b641c42de7ddf1092655d0a09342dc414b24dc12f6647bcfc672403b5
-EBUILD mt-st-1.4.ebuild 533 BLAKE2B f8a88d6b0b0fb8f517a4d1d62de79e9c6e6ea0f15252f14eb7928d8090c7ebeb6ba25844203c5a0042e9e4b472f0a7850c92cbfe29db0f972512cdcc761562b8 SHA512 4a273e78c26eecc8272173e7d8c073336d600253ec42ec6cf1f2ac09daadc3da8f000e4843db944a8036a6a388808f1e112880bbf240014611e0257d5d38c5a0
+EBUILD mt-st-1.4.ebuild 528 BLAKE2B 2ce8b51f400288a3a20320a9371c6e4e8cc2c860c3d762fc30fbb229b74a3985a646c6ddce726eceac4df6b5c72d23dc8d06c10640efa8cf473ebdb1403079e0 SHA512 109e20d78bc5ced7268c7fbf0c3e36d365386bf03036dbab0e6b77df22b88e6b1196a2b69131812066c5d0cd669941e28d80b2f7b5ee75e8040afcb46d080f37
 EBUILD mt-st-9999.ebuild 442 BLAKE2B eec75acf65e5cf086bad28749243bf479c4fae4f314905277f2cb878519fdbf7095ba6430e69648c1deb742fe9bd21259f965ebf7b6d6965ca0ef7f4d62e8796 SHA512 d8e72531838ac93eb103f46cfb3707f00b2aa2cf0109cc5190114f9b0d8505458d502237b2b3aa3d0c8efe64e6dd6c830ca832ad39ea2e4998428e43f57f60e7
 MISC metadata.xml 244 BLAKE2B e551dd172f35c5abea703cec8f7c899f1fec22dff135d50208419088aaeb0b2464e3ab44fe7c759147d43e9d0897a3fc8c8087089b4dfdff158907e835d5626b SHA512 904a7d356000f52257174f15912a3b79fe0b6bee390128a2f9821e749b393964c626f9afd751d88414086d7e28eab2183ad41dbaab911aad6ac5480e3b265922
diff --git a/app-arch/mt-st/mt-st-1.4.ebuild b/app-arch/mt-st/mt-st-1.4.ebuild
index b63ab7081319..55b614c829d6 100644
--- a/app-arch/mt-st/mt-st-1.4.ebuild
+++ b/app-arch/mt-st/mt-st-1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/iustin/mt-st/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 src_configure() {
 	tc-export CC
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 0dc35974b0d1..59d23a0d0452 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,4 +1,4 @@
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 970 BLAKE2B 5288f515e3806394b540bd5187cc277467b462526fac35dc2112fde0529f952083a02dc3bdd349e8fd6d24598f1021904861dec683a03bf9c98d9bfc60bb0aa7 SHA512 070e4bb4c2e4f67d6c22743d82660506478fee8c6fd936508a2beb687a57fbb7325283fa2e9b3f6cdac599a5bc19519b35236752d1926554047444322ac7689f
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
 EBUILD snappy-1.1.8.ebuild 1825 BLAKE2B 4b19d78a843db8eda46fab568953a4f652dba370efa95f3fa8c8fec618b8a1dd35acf778fa1ca9fba4c5e49299218689feb7ef39a957d9bbd3c7d81afcee38aa SHA512 c1e57f6643737792ffc3ccfc11ad65e3255f8bed581b6ab2e41c2c2b7d7da916dad9d381bcedf9fb6e1587af6cd76386b8cf2516bcd378e2461fa0d5882c388c
-MISC metadata.xml 584 BLAKE2B 2d3686f675dacd34cd4577a0dcf304ac5556641d41c432447c89b5cecb82549a4aa4e82f702714b2cd1a31e6cc6b1cf098785a0ba557ebf90c5534d11221473a SHA512 0f09da2b9e381a8fcd8b0e0f1ef762228dd98287ac455bd526c0377b3269069d733467586aaf941d41bbe47c719613bc21ac9e0f08bb637afa27e3626c60a679
+MISC metadata.xml 504 BLAKE2B 4acd6fe7edce1448a36e1c304406c3094b67522349872703f3820a62eb99e04b8ba5cf43452703eb3f45382c89fcfee859e484e0e52379db98f9839daaea67b8 SHA512 b0f13292d7a92ed44a5e43e96d4f6f06d84147c74c5e5ef00dd72cd6f82ea6c984dd2b7ce13aba4111fa79f2c114b373acc1fc05565e2b7b585b0c6af74ec696
diff --git a/app-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml
index 3fb96763fd53..c149214b3101 100644
--- a/app-arch/snappy/metadata.xml
+++ b/app-arch/snappy/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">Snappy is a compression/decompression library. It does not aim for
 		maximum compression, or compatibility with any other compression
 		library; instead, it aims for very high speeds and reasonable
diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest
index 7b2f4b9db227..00e2268446ed 100644
--- a/app-arch/zoo/Manifest
+++ b/app-arch/zoo/Manifest
@@ -1,5 +1,6 @@
-AUX zoo-2.10-gentoo-fbsd-r1.patch 744 BLAKE2B 76c60ceef76f9325ed6212b8a879da4b11808e0fa1445f765f8fd60b2627b7b1b9becb844bca43de5e9eb82dada9050a732971f48914a7e79f4670332e8f9140 SHA512 083e94a0ab2089b046f6ddf469ec21d0c9d31223a9ae109c360de368b815e551f1ad28b53fb2e1497290b231a8fc6d67e5716c5cf604b3e8088569ddc439a068
+AUX zoo-2.10-gentoo-fbsd-r1.patch 634 BLAKE2B 79740ca1ca60733d67d2d614673bf4e62f5ff3d5bc740cb00658a806006d884a3ebc551863b1f537bc6d9edc55e4f43b3154ba1c9e0551af315db6b850bd49cb SHA512 c34169a11640a1852a284a93415e0cb5e3423cb2ca0a0413a8fb6cc8896c990ff5f6eebdec965f2efd4b3cfcf823e839908f8588705d2fa827e09558bc87e49c
+AUX zoo-2.10-makefile.patch 774 BLAKE2B 07ead9b6957163358b76b9f7b9e1497543e66e0d1462fd9cb306ca385d724f95ccc52682950f2d30e6c592132e8d55a45de501ab1f7e8cde9622fa8c297b6cda SHA512 b3d78a86c4808cd561d819bc061175107e983c5693581890704928c1726effe2adcf187ad10457296a9106b26b2b2aaed4e0fe7d319aa732de7d12d614f081e7
 DIST zoo_2.10-28.debian.tar.xz 14984 BLAKE2B e45ed5381e64d7ccac0e8100df12a8f55abbf7961e54a05ad6d3f07cca1a939f9320caa69196895a35dbea5d4aa82975ee2e5fb2202f793f33f4ebd7d5ff65e8 SHA512 07fdb16bf011ae8c8badbb0040ebd82777f11560dc231b70060fe8f71ba706707769934411043197e44b10ad38d7efd8432fdbea03e265f9f6aa58acb1cc2708
 DIST zoo_2.10.orig.tar.gz 172629 BLAKE2B 9789f0ca53b2dd538e0032c31fa945f3f4f0fc739cadf536ec38621824cc89409d9def036e5df893a7cd4c5873302273d638c087a51cf7b1477501567c6578b5 SHA512 1847fd6a6aac534386736ca04fa5a88db26c7c06315a0ea2c8e86ff944a133b7506c297cda67e44f797d9ef39446c132e847714732b9f138bf9b46c1525e574f
-EBUILD zoo-2.10-r5.ebuild 819 BLAKE2B 63ab99ddbd1516e22535d341cb8f9bf6146c2cef38f4fbe937ef7e877e555f4cfc3a9e4ce44e78324dfd6882ec188d05db369014a0637ca680a5c15fc5da4537 SHA512 03bf01cac9c4a398c9484fb00039a0c50c51026a4f3fc28afcf62002b722e0664e26273c8fc7d1f6de7f77cd130200ebe33c42c2888d5f03f9c112c7cdbcb38f
+EBUILD zoo-2.10-r5.ebuild 819 BLAKE2B 72cc0f4dd3bf3475ca9e42c03b2f2313a2b90e9ae9693c0d087e751bc017cd82c21c7757e34e7b72dda6d19237902cd1432c677842d7c6d950e8556f88b07dda SHA512 a6c7ff781001b686925681b3100f64fbf889025384c2e68cc297fda71ac53497b184a021a83a9475190436d79cca8bae2f306df8efdbae68259fada56063278d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch
index ba7d31e4a47d..b1e598359f6c 100644
--- a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch
+++ b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch
@@ -1,5 +1,5 @@
---- a/sysv.c	2007-06-16 15:01:53 +0200
-+++ b/sysv.c.new	2007-06-16 14:38:38 +0200
+--- a/sysv.c
++++ b/sysv.c
 @@ -63,8 +63,8 @@
     return (fname); /* default is no-op */
  }
@@ -11,8 +11,8 @@
  struct tm *localtime ();
  
  /* Function gettz(), returns the offset from GMT in seconds of the
---- a/zoo.h	2007-06-16 15:01:53 +0200
-+++ /zoo.h.new	2007-06-16 14:57:58 +0200
+--- a/zoo.h
++++ b/zoo.h
 @@ -95,6 +95,9 @@
  #endif
  
@@ -22,4 +22,4 @@
 +typedef unsigned short ushort;
  
  /* WARNING:  Static initialization in zooadd.c or zooext.c depends on the 
-    order of fields in struct zoo_header */
\ No newline at end of file
+    order of fields in struct zoo_header */
diff --git a/app-arch/zoo/files/zoo-2.10-makefile.patch b/app-arch/zoo/files/zoo-2.10-makefile.patch
new file mode 100644
index 000000000000..89269b480457
--- /dev/null
+++ b/app-arch/zoo/files/zoo-2.10-makefile.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/726376
+https://bugs.gentoo.org/721888
+https://bugs.gentoo.org/729126
+--- a/makefile
++++ b/makefile
+@@ -18,15 +18,12 @@
+ 
+ MAKE = make	      # needed for some systems e.g. older BSD
+ 
+-CC = cc
+-CFLAGS =
+ MODEL =
+ EXTRA = -DBIG_MEM -DNDEBUG
+ LINTFLAGS = -DLINT
+-OPTIM = `dpkg-buildflags --get CFLAGS`
++OPTIM = $(CFLAGS)
+ OPTIM += -Wall
+-OPTIM += `dpkg-buildflags --get CPPFLAGS`
+-LDFLAGS = `dpkg-buildflags --get LDFLAGS`
++OPTIM += $(CPPFLAGS)
+ 
+ DESTDIR = /usr/local/bin
+ 
+@@ -102,7 +99,7 @@ bsd:
+ 
+ # Linux
+ linux:
+-	$(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS)
++	$(MAKE) CC="$(CC)" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS)
+ 
+ # Linux64
+ linux64:
diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild
index 6c1f749c178c..0cda3159c240 100644
--- a/app-arch/zoo/zoo-2.10-r5.ebuild
+++ b/app-arch/zoo/zoo-2.10-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -9,23 +9,24 @@ DESCRIPTION="Manipulate archives of files in compressed form"
 HOMEPAGE="https://packages.debian.org/sid/utils/zoo"
 SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz
 	http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}-28.debian.tar.xz"
+S="${WORKDIR}"/${P}.orig
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
 
-S="${WORKDIR}/${P}.orig"
+PATCHES=(
+	"${WORKDIR}"/debian/patches/.
+	"${FILESDIR}"/${P}-gentoo-fbsd-r1.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
 
-PATCHES=( "${FILESDIR}/zoo-2.10-gentoo-fbsd-r1.patch" )
-
-src_prepare() {
-	eapply "${WORKDIR}"/debian/patches/*.patch
-	default
+src_configure() {
+	tc-export CC
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" linux
+	emake linux
 }
 
 src_install() {