gentoo resync : 13.10.2019

5 files changed, 24 insertions, 23 deletions

diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 4e898bf720b9..1fac09b5cf59 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -2,7 +2,7 @@ AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457
 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
-EBUILD units-2.16.ebuild 1294 BLAKE2B dc631b71d06b87df88986faa03ee6b0ec48e4c7f07eb874b17ff1a2a53e7a48368d9299d24efd00602c66d23ddb5c35a03037ad3e818ff210c4a1ecbcf2c47e6 SHA512 7f42897d19beb48c360de689484a7483a74a26932d3a8749e53e7b26a99d24b10af9c76ed635f04a0cc5f6aadf27bff43895bfe26d2385c942ad8a7df89ccdc4
-EBUILD units-2.18.ebuild 1401 BLAKE2B 01ab9def5187dc6c9998b73178952dbcb2d3de02fd1984712e95b794a7f1e02a7ede68814eccd6c21b3225adf93f98cf743fd9cadab5d5905c5087ae3f28ee6a SHA512 70f9d4b4335ccc392e3cc843741188df403f61a255e2e67478151899f0fb8ee5c9334e79ca0da59bc80c971eb6fb1bebe53e8f4a891f5008cb053f6c0996ca25
-EBUILD units-2.19.ebuild 1397 BLAKE2B 88ab2561bb81e8032c815c1191a0ab71eeaef671b9894fbf2ac328712a0b1b7bb80fa64c69f5a397b10c94d80b6fac5b99de1c700ddbc21f8b49f8d61e7bf512 SHA512 2d4c83ee37cec61b3d66f26ae7d0e3086789991ddf18e9087211e9a6a5f66b0284c4ac004877a5c85af095e6c72744bf6f6a16c38c0dadc291d4832ffc89a950
-MISC metadata.xml 341 BLAKE2B 60596aa39a0a3810573ced2896624fe01b49ed1138c942969bcd97884078cf69ace3d6cb4d0121de7d548da422a4b823982dc2771dea21817c207285b402ad2a SHA512 b32fc161804c8cd09f6b67923911ddfbdc9c5ba6e5dc61e951bbbe6fd54dd495209c519ead1dd46cb62cf5fd90978472f0d58ed2b66cc079c3ca91a36d22e822
+EBUILD units-2.16.ebuild 1299 BLAKE2B 2840c373648241ad22d6c7954b23423282c8e7318cafada522dc7c81053d8d0af1d0cbaabdaf304c56c85e8e3a5b4d0283dfc8f7222d18c66f85413730c641a6 SHA512 fde3add2815161747ef71f6c33f900943e7e4b8ad0c3945cdc990b63fcaed0571fa6a918fbb5e03aef0342bf84164eee94646239378bd1abbcf1cabe41a73d6f
+EBUILD units-2.18.ebuild 1406 BLAKE2B 16bfcceca088b8ae90d91eb12f8d9bcba2edfffd849c5f342b45f0d6468c8d811aad5b6e6913f1479da57fdc115186dcbef7742ec3bd67ff0b272a79be951c41 SHA512 4137f56283b3b4fdbf621c6a7c9115fc58894eccb8ada3d202cd8b69ab27a7b61a0541d8bad42cb7109775e7db8f5b5f637f541b4885d8a51fb697bc18bd65cf
+EBUILD units-2.19.ebuild 1383 BLAKE2B 1195cdb44072d5da7a00bd9d85ace4ec1ececaf151c2811f7cd8184c2c70994c39a26ba7613b617547ef36416a222bd08807f1531d39385b0e49f27da75f4934 SHA512 9edce6bbb2c7d275fdfee29304a0a10c48a541d210e2d19b66210efe85f6b1dd25e35147cf2c816a52141683182f7b1f69b2b4af980c231b8034831006d4be3f
+MISC metadata.xml 342 BLAKE2B 5dfe07ae92c9b1741b7c2f49f8f0ba853aebfaa20d156685ed5a8fe9c8f0bb094bc240f197e3fb57f65494d4a41b037d7d4e2631c11d26e4fbada04f2916b749 SHA512 c648f964163e26133e70b40687d317d57067fa3bdff11080a33123b7fbf9e9af3aff1d4890ce4e75283b86ef026896804606283c888cb2dbc0c66a171dca8657
diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml
index 9aa83b1ef40a..f0a40a93849f 100644
--- a/sci-calculators/units/metadata.xml
+++ b/sci-calculators/units/metadata.xml
@@ -6,6 +6,6 @@
 <name>Jeroen Roovers</name>
 </maintainer>
 <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.ebuild b/sci-calculators/units/units-2.16.ebuild
index 0d30fa56ad00..f72ff8ee12f4 100644
--- a/sci-calculators/units/units-2.16.ebuild
+++ b/sci-calculators/units/units-2.16.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}
 		dev-python/future[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
@@ -28,7 +28,7 @@ DEPEND="
 "
 
 pkg_setup() {
-	use units_cur && python-single-r1_pkg_setup
+	use units--cur && python-single-r1_pkg_setup
 }
 
 src_configure() {
@@ -47,7 +47,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 4d61f6f6676c..3df5a8826c27 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}
 		dev-python/future[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
@@ -31,7 +31,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	use units_cur && python-single-r1_pkg_setup
+	use units--cur && python-single-r1_pkg_setup
 }
 
 src_configure() {
@@ -52,7 +52,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.ebuild b/sci-calculators/units/units-2.19.ebuild
index 9e35768509d5..5bbc862db247 100644
--- a/sci-calculators/units/units-2.19.ebuild
+++ b/sci-calculators/units/units-2.19.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}
 		dev-python/future[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
@@ -29,9 +29,12 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
 )
+DOCS=(
+	ChangeLog NEWS README
+)
 
 pkg_setup() {
-	use units_cur && python-single-r1_pkg_setup
+	use units--cur && python-single-r1_pkg_setup
 }
 
 src_configure() {
@@ -45,14 +48,12 @@ 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
+	if use units--cur; then
 		sed \
 			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
 			-e 's|^#!|&/usr/bin/python|g' \