gentoo new year resync : 01.01.2021

4 files changed, 18 insertions, 87 deletions

diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 35e77db85e08..788e2c65c5b1 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,12 +1,10 @@
 AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457a08ddbe98e85cd3c195c149215de8753aa72fec618ccf4bdf584002c507cc53532ee92af6e8097c7fa2573628de34b17c SHA512 f54fb5d006263f89ff8c376f100066d79883b68a30441e8665ca4d8a6aa061e5c697c715ccb93c67a692145a44a441862039e5249e4795159f1c43a12ffe1c97
 AUX units-2.20-WIN32.patch 395 BLAKE2B 5f6cee1a4ca07be73979efc6060b0225cf0a52114085dc31d1259d7a09f131d9a3d8ab91d3f2f995b41e9a3eb3299bbb09575e8c2677cee33e2ccad05abbd628 SHA512 b79d1cea6542a8360f9ba8e6a0bdbc69ade2ccd58bcda53851f6368b6c91a98ca6d2f757028bfc141c9ad8773117972d480e99063800394bcd9c5d3ba2ab61dc
 AUX units-2.20-readerror.patch 306 BLAKE2B 7007ed50539043f1b21a9676c8d1ff377d1d6e1d9e1d3e4bca9e4dcda520d77cddc28abe35333cd1cb4a5d451264d94f22bc6594a5f1fd15488d5d5e1d5bf12d SHA512 4d1acb3ca6e4bd2874854cfa27e8bc5418ef30d628589eace8011733556835feb30630a2b37bb1e5e975392fe75e684b48f31a9b2624b8703714dbb501f6f27d
-DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
-DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7
 DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8
 DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d
-EBUILD units-2.16-r1.ebuild 1330 BLAKE2B b074a88ff51d671c04e44320697fbf2884bfc401e9c676ac30eabbf101fbae971efe5138beca249e4761b814357f694440d26619059cd7fa0984a9655fb624f9 SHA512 c411be263fd2de4d0083cc46af7223dc0ad93967df3f5ce8e9d7b69bd06d5333baeb7737800f99669e215503020f423c19fc8a83d27da28d08c18a050babbcd6
-EBUILD units-2.18.ebuild 1438 BLAKE2B a49ae6dba4513c3826b6db73e43f5a4ba812d444f63f5cff0732b727cd04dc0cebfb0198f44c8a9c232385f1bb9662ba6e2e3c6913a6c15129b5e5e3af3e61ec SHA512 01d9c76ea3efb975941220aeb11cdb797968690b3c1808744ef0f276e8870bdfdd99be5756aa427242de91cd9990516c41c615b76818cc53f905e1273f8b1737
-EBUILD units-2.19-r1.ebuild 1418 BLAKE2B 97e4e8270c89c8d4b05cdbee68203a8032d6c7a60426d815b8863da333f17dc85597a7045e78a95cdd00204669757dc0b0851f1bf2e7e853f9965f3cd99536ea SHA512 06db229ce26135c7d2f7d81f77ae9b5421153f7769b94e35020dc1720c71e77a9ab0152764aaf9ce80090ee4df13ec4e4cef1ef07b30d7810cf8eb2e81462547
+DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62
+EBUILD units-2.19-r1.ebuild 1419 BLAKE2B efbb701fcfc0def5e41f6ad4f31e1f074fa7b01f297ecd19833601f27b3507aaa2241bcc9af032ae8e9dc95bc8de89e8c6c2ab69f3e5639b8c0d98453e6af96e SHA512 c31a7d1314d708528df556b19e1d18752ad1bb5d7a9c607e96559cf7dbd746bf16c110a3573740212c17c7c7296c8dd94dac2f0822074fa6fbd3e5a8bde05892
 EBUILD units-2.20.ebuild 1241 BLAKE2B 89aad89db4fe4804fbb8b009cf3dcc668f6f4fc58a80ecb734259bbddebfa89923e18f9ed4c3a9c0af5b53c8ac2f19757c51574d886c0e30cafed5d48e48e4f5 SHA512 a4acfcf9e14b4b8127af772f2ffbbd80e7cab00bd10af2f05e3f722b8cc0d364e439ed620a669cd333c038b3f157dad6b90848f3bda3e466b81c9cbd398609fd
+EBUILD units-2.21.ebuild 1202 BLAKE2B 8163a804f37dcf59f1fec0b9731ff7a1349e28d2f4b95b0bba3eeae1d5a3f2ef1b8436cf7a6eed5efcc26b5c35f3993ba96611e2446e253d42454bf4386a3399 SHA512 f842cc52b1dd7525a225d1716abad976cec91d1f2bc418ac7d0007fa93a781d4ef71d640ecb556218963b48d2e8948352e27537321bc9c20c7a76ef7e7c48406
 MISC metadata.xml 269 BLAKE2B 212fd839faa71081ff89c999bc77e37b69c5c618f9e1527ed9402ad14af7072432fcd3eaa3ced4dd20a45929c054095d652ab6c18a1642be436b345436ed48a7 SHA512 bcb2f5dd279dd126273909fdaf0c3ee89f0eb050938317ba26e75532a742e7eb496669bea134494071ec30b3475a3ffc70b47035de404e8c1f7bc1034012e917
diff --git a/sci-calculators/units/units-2.16-r1.ebuild b/sci-calculators/units/units-2.16-r1.ebuild
deleted file mode 100644
index 6bea3362ca40..000000000000
--- a/sci-calculators/units/units-2.16-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit eutils python-single-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+units-cur"
-REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/readline:=
-	units-cur? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-pkg_setup() {
-	use units-cur && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf ac_cv_path_PYTHON=no
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog NEWS README
-
-	# we're intentionally delaying this since 'make install' would
-	# get confused if we shove 'units_cur' there, and there is no real
-	# need to add more complexity for it
-	if use units-cur; then
-		sed \
-			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
-			-e 's|^#!|&/usr/bin/python|g' \
-			units_cur_inst > units_cur || die
-		python_fix_shebang units_cur
-		python_doscript units_cur
-	fi
-}
diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild
index b68b04a87f90..755e4b2d6df4 100644
--- a/sci-calculators/units/units-2.19-r1.ebuild
+++ b/sci-calculators/units/units-2.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+units-cur"
 REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.21.ebuild
index 8f8ba8b7c387..f62e7185316e 100644
--- a/sci-calculators/units/units-2.18.ebuild
+++ b/sci-calculators/units/units-2.21.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit eutils python-single-r1
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit python-r1
 
 DESCRIPTION="Unit conversion program"
 HOMEPAGE="https://www.gnu.org/software/units/units.html"
@@ -11,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+units-cur"
 REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -20,21 +21,19 @@ RDEPEND="
 	units-cur? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/future[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
 		')
 	)
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
+	"${FILESDIR}"/${PN}-2.20-readerror.patch
 )
 
-pkg_setup() {
-	use units-cur && python-single-r1_pkg_setup
-}
+DOCS=( ChangeLog NEWS README )
 
 src_configure() {
 	econf \
@@ -47,19 +46,13 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog NEWS README
+	default
 
-	# we're intentionally delaying this since 'make install' would
-	# get confused if we shove 'units_cur' there, and there is no real
-	# need to add more complexity for it
 	if use units-cur; then
 		sed \
 			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
 			-e 's|^#!|&/usr/bin/python|g' \
 			units_cur_inst > units_cur || die
-		python_fix_shebang units_cur
-		python_doscript units_cur
+		python_foreach_impl python_doscript units_cur
 	fi
 }