gentoo resync : 25.11.2020

6 files changed, 29 insertions, 32 deletions

diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 634a18ad0b61..35e77db85e08 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -5,8 +5,8 @@ DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf
 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 1335 BLAKE2B 6fd6f978c8577c2754a2b98566d4b48f13caf2e1af7c23a9854f5c8847f81e6c4d76d4f6d6723144fa575aef0c0395428c8607e85d65ea95654feb37f8ced2c6 SHA512 b5c9b5a411f4bedd431620632dee2650835fc986ecdd2f2fc0b1b6fcbd640621c2dbf7c6d86d52ae27d53ffda7dd3fd6dd05ec130404c19aeb65dce7afd2e8aa
-EBUILD units-2.18.ebuild 1441 BLAKE2B f6bcb25778a136c98c52d8d0e79562aa2b984f25e16ead86a1485e1bdbefd54a907581b73b867b31b6b584aa0488d6e11e1adc683dceb2bee6cd04d6d89df4ee SHA512 7518fd6a8b4964224380513dcfa623d27af1d2d43089e1dd86df50e48272f62366a8164ca9797ca42d1096792bbc2df43f661d466f0260daee4c669fb66264b0
-EBUILD units-2.19-r1.ebuild 1421 BLAKE2B d460307dbd13044a057748767f9b8c89c71336b69b7c9454111681e244f7f2a4600b16b4b20cb6167312759f023aa054d838bd06169660e2f377477ce32f361a SHA512 2bbcf9f78d4868d6f1ff113cb82ea5c0fd4b7108efcaded6b8f0420afc29c31f86381f735953c8827299735c2fd3ef2786b8985a01e758d866cddbfcb07e75f3
-EBUILD units-2.20.ebuild 1243 BLAKE2B cddb872c334127df99f642df0c1bb5dc3d8ca14d5803b5142d10c871134d4952b43aa6dc66950292dba5b5f87625bcd9d6ff8d268949748802a0419f1e317bdf SHA512 f5c7639a38a099338063abc48579bf15f076d271a04dae1268f28d80625573ab588f2d1488d8120fa1be27ec5cb9f470ef79e2ef63fb98c239b0f11a972907d8
-MISC metadata.xml 342 BLAKE2B 5dfe07ae92c9b1741b7c2f49f8f0ba853aebfaa20d156685ed5a8fe9c8f0bb094bc240f197e3fb57f65494d4a41b037d7d4e2631c11d26e4fbada04f2916b749 SHA512 c648f964163e26133e70b40687d317d57067fa3bdff11080a33123b7fbf9e9af3aff1d4890ce4e75283b86ef026896804606283c888cb2dbc0c66a171dca8657
+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
+EBUILD units-2.20.ebuild 1241 BLAKE2B 89aad89db4fe4804fbb8b009cf3dcc668f6f4fc58a80ecb734259bbddebfa89923e18f9ed4c3a9c0af5b53c8ac2f19757c51574d886c0e30cafed5d48e48e4f5 SHA512 a4acfcf9e14b4b8127af772f2ffbbd80e7cab00bd10af2f05e3f722b8cc0d364e439ed620a669cd333c038b3f157dad6b90848f3bda3e466b81c9cbd398609fd
+MISC metadata.xml 269 BLAKE2B 212fd839faa71081ff89c999bc77e37b69c5c618f9e1527ed9402ad14af7072432fcd3eaa3ced4dd20a45929c054095d652ab6c18a1642be436b345436ed48a7 SHA512 bcb2f5dd279dd126273909fdaf0c3ee89f0eb050938317ba26e75532a742e7eb496669bea134494071ec30b3475a3ffc70b47035de404e8c1f7bc1034012e917
diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml
index f0a40a93849f..fc2b9059d665 100644
--- a/sci-calculators/units/metadata.xml
+++ b/sci-calculators/units/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
-<flag name="units--cur">Install the units_cur python script that updates currencies</flag>
+<flag name="units-cur">Install the units_cur python script that updates currencies</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-calculators/units/units-2.16-r1.ebuild b/sci-calculators/units/units-2.16-r1.ebuild
index b6e116cc86eb..6bea3362ca40 100644
--- a/sci-calculators/units/units-2.16-r1.ebuild
+++ b/sci-calculators/units/units-2.16-r1.ebuild
@@ -12,12 +12,12 @@ 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} )"
+IUSE="+units-cur"
+REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-libs/readline:=
-	units--cur? (
+	units-cur? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-python/future[${PYTHON_MULTI_USEDEP}]
@@ -30,7 +30,7 @@ DEPEND="
 "
 
 pkg_setup() {
-	use units--cur && python-single-r1_pkg_setup
+	use units-cur && python-single-r1_pkg_setup
 }
 
 src_configure() {
@@ -49,7 +49,7 @@ src_install() {
 	# 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
+	if use units-cur; then
 		sed \
 			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
 			-e 's|^#!|&/usr/bin/python|g' \
diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild
index 119605f9309f..8f8ba8b7c387 100644
--- a/sci-calculators/units/units-2.18.ebuild
+++ b/sci-calculators/units/units-2.18.ebuild
@@ -12,12 +12,12 @@ 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} )"
+IUSE="+units-cur"
+REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-libs/readline:=
-	units--cur? (
+	units-cur? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-python/future[${PYTHON_MULTI_USEDEP}]
@@ -33,12 +33,12 @@ PATCHES=(
 )
 
 pkg_setup() {
-	use units--cur && python-single-r1_pkg_setup
+	use units-cur && python-single-r1_pkg_setup
 }
 
 src_configure() {
 	econf \
-		--sharedstatedir="${EROOT}/var/lib" \
+		--sharedstatedir="${EPREFIX}"/var/lib \
 		ac_cv_path_PYTHON=no
 }
 
@@ -54,7 +54,7 @@ src_install() {
 	# 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
+	if use units-cur; then
 		sed \
 			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
 			-e 's|^#!|&/usr/bin/python|g' \
diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild
index b6062ea69bb3..b68b04a87f90 100644
--- a/sci-calculators/units/units-2.19-r1.ebuild
+++ b/sci-calculators/units/units-2.19-r1.ebuild
@@ -12,12 +12,12 @@ 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} )"
+IUSE="+units-cur"
+REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-libs/readline:=
-	units--cur? (
+	units-cur? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-python/future[${PYTHON_MULTI_USEDEP}]
@@ -36,12 +36,12 @@ DOCS=(
 )
 
 pkg_setup() {
-	use units--cur && python-single-r1_pkg_setup
+	use units-cur && python-single-r1_pkg_setup
 }
 
 src_configure() {
 	econf \
-		--sharedstatedir="${EROOT}/var/lib" \
+		--sharedstatedir="${EPREFIX}"/var/lib \
 		ac_cv_path_PYTHON=no
 }
 
@@ -55,7 +55,7 @@ src_install() {
 	# 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
+	if use units-cur; then
 		sed \
 			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
 			-e 's|^#!|&/usr/bin/python|g' \
diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild
index 512e983f4b3a..40e4195d89a7 100644
--- a/sci-calculators/units/units-2.20.ebuild
+++ b/sci-calculators/units/units-2.20.ebuild
@@ -12,12 +12,12 @@ 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} )"
+IUSE="+units-cur"
+REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-libs/readline:=
-	units--cur? (
+	units-cur? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-python/future[${PYTHON_USEDEP}]
@@ -39,7 +39,7 @@ DOCS=(
 
 src_configure() {
 	econf \
-		--sharedstatedir="${EROOT}/var/lib" \
+		--sharedstatedir="${EPREFIX}"/var/lib \
 		ac_cv_path_PYTHON=no
 }
 
@@ -50,7 +50,7 @@ src_compile() {
 src_install() {
 	default
 
-	if use units--cur; then
+	if use units-cur; then
 		sed \
 			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
 			-e 's|^#!|&/usr/bin/python|g' \