gentoo resync : 05.02.2020

6 files changed, 116 insertions, 18 deletions

diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 574471ef36b5..e12ba6a923fd 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -3,11 +3,17 @@ DIST metagen-0.6.3.tar.bz2 6118 BLAKE2B 1356111b23a96c6435bd997ff824682fd76074d0
 DIST metagen-0.6.4.2.tar.bz2 6837 BLAKE2B a9595045fea006e53fd23e3b96da0acd884b6f33e0089fc56bc7fb118ba1d205ddc81754a8cc2bc3e5207ad9cd9f537e1a3e7b25be0e5c804ebed5e66b481abc SHA512 cec88403ee06449f30524e0fe485b2e76f4f3bdc23feee0eb60503ab6e9c351bab3f55cdf3847ccec14a8f1e1b9ebe820a5f76feb095b13be11fe5fcf258ed2c
 DIST metagen-0.6.5.tar.bz2 6973 BLAKE2B 2cac99056bde1e6420ef3bb54e6655b17fb43b27dc0024cd3eb2b5c09dcb05b5db318dc4f52c3389d562275e46c901fab863ab50bd0555a6409a8fe5c0bd8de7 SHA512 6a95ce78c7b8ead89a28ea927d9e36cf806a1d363cc703c86c553a74499304081ac360d3fba390d5cc54de08572e8305ab1896d73eceff35166de32760162fe0
 DIST metagen-0.6.6.tar.bz2 6341 BLAKE2B e45e06570cbe6c690b4fdfef036282c5828ec1c86b1773c35000f19c557df7784e777a59e20f1c27fc5ae0edf5169a6d1ebcfc2d08ffa1cc4ab77265041550ac SHA512 0accac41957a555a35261c72053fb93ade62eb449d9ee4a2b1683afddb853d7bfb6394dc06c90643044cba1b573932663f1c7b559bf400ec15fce0c3f8c231ca
+DIST metagen-0.7.0.tar.bz2 6367 BLAKE2B 939fff83d9b6af7600ab7a89293d12fdcc79fb5ca47c5285989af31a6d0ea2ba539f7bb56489f50d6b8272afcf956b6e5a71b98a952ba829de60dde5766c820b SHA512 a41b8d0fb401b7fd8e2a3899cbe2ba95e42acae9dc274923b25a2933e12587838c6d599045c16387d895df0a5823ebf7b4b71ca383a75cb714959baa8355a77e
+DIST metagen-0.7.1.tar.gz 8276 BLAKE2B 7445e9729e8f7eab7d808ad95c3ee775bfb90c9264feabbc31d77d65a9eda7b61f9d7dded8c54e1b5cad5a5577cb0ef31b8d5fafd747804b957c8890ad0a7fea SHA512 7532c6a82fac10bc775b990605a8b5d23dab14e1d8a7f166c37640ffb6bebdfff57885e129a727e78ffb926b164f716f5171ea333d640030316271d0b354af88
+DIST metagen-0.7.2.tar.gz 8391 BLAKE2B 3ec53ff7fa12ea816c88bcbd4e45a3cc66527e6a507f01bc8934abc6bb6ae142e6c6620f82af7c6775b9001d6549832d6fab42c1b44c966f72a40ec0a0f66b2a SHA512 8a78d47ce8228df73a36d4c0f346d75250fbf8568ca6c8cc9ff9313b61c43ba514cf6dc13b36ea90f1ea5b194337748224ff81449d56527fbfc6b7a91e408054
 EBUILD metagen-0.6.2-r1.ebuild 827 BLAKE2B afd29b67e0a12245aed69718d6aff71771c33214768d32b9ef6c6a362e07bfd0769ac3aa86302864aebd20e2412f0d649e9524b83cad81f7de8596db77b3fb59 SHA512 e856e57d1cec091360241cc19e6273396af76ef10e84cf0691af6daec509546a79864a1850fd8fc37ec1e3acc6e6ae4552dfe02bc3846aa8dc6c5c7b87740c17
 EBUILD metagen-0.6.3.ebuild 825 BLAKE2B a4a5044861e9c83e27b449648616853ca2703b2a804f9b1017f0aed460c2cc3e177fddc2de2c400ae7259d4ef912d0fcfd5afb23952662a97bf29df3e04b11d2 SHA512 9b2089d4723b1542f8cb1cb44f39eb56e46bec7fff835e47c90fc5f8dae1d4bd66af142f9d5714da6887a757e3c2156e7a96ee12c87ec09bb1ee800d8e44504c
 EBUILD metagen-0.6.4.2.ebuild 829 BLAKE2B 0abf87e7e3e3be9bc00248fbb09a1fbff50cd4eee23dad358b02566a5c1e6a7de201eb6af364246db40f7b33b22ee062327d9e7f7e10c128f8d400d9542c8212 SHA512 542fd0585a00e849a8692540992b6de31becfc3ecaa35f37873cfd4b2878568328ae3c61f004ba2d05637e856c179fa17d05eee7688bf02600abb96373f77760
 EBUILD metagen-0.6.5-r1.ebuild 882 BLAKE2B 65e2033758c982cf7ffe0658988e88e1e3032ce307197543a50c79f6b438c51acc1d1f4431f1e740c6daa2a21bb9c331ad000624245b8f9571c1f4d66bc35027 SHA512 846e0aebd1433b283c34ae0324b76c6dfe20edfaf5a7aeffeacbada9f51d5aa7a52ce49131122172f55b60f3352e89d6f5025aa336a9a6e879b3d35e07cc7e17
 EBUILD metagen-0.6.5.ebuild 825 BLAKE2B 11b103026c9fec8053f87f7f460d0d91ed1623c7157c953af8c64a93e223b8efcbdce79a08688bb220c7ae2aa5a19dce52c02b87d9f7108be4b39abc7dcebc4f SHA512 8892e342ee8b999c42e7f90dfcdf50f568fa886cf313c9c869387a21be4c3eeb298ba069e8d6b23eb2305cb3d5dcbfb638692ee8c3f69bf0dfb7ce4fa5453402
 EBUILD metagen-0.6.6-r1.ebuild 818 BLAKE2B cc65686fab9403da53a80196cac102d6bff698c740d00830babc7b13d0f9f9b442f9062ffedf75ecec251bb576ef8a3d98b1a444ebd548aa4ebfa854f6b58565 SHA512 96a7ce22921e7729b18f5b80213cdd09b015b0ad3aa69484f2d49a062bd247b686559f8ae629f1a5fe2c4e1f229f06980286a74f387370aa283dcc8f04f13396
-EBUILD metagen-9999.ebuild 831 BLAKE2B 90b4e3e29c3a1b5e01ef9d6ff29ffc1190476db7f77b4bd6fb47a6a1ad51586b4f381aa251fbfd0828d621adfa8d1008ae7e60ac7cb4ecaa1f70107188f74309 SHA512 2493adb68d6c4ee139ede4af042d9e518ce1ae57774589ec0c4dacebde21084b54becfa5eea774e52d7df02072d8e1d5bf5c945e327cb67b3f348aab624b6d6c
-MISC metadata.xml 295 BLAKE2B b7dab399d97c12c36ca3d8312dc628a9b1d393d6eaec7c941d6cc03fc7bae3c6cf7385e91758708712fd7e155a5051e8de5bc155563f552707bc1dd0c74262b4 SHA512 68ea6ebd27bc287655010afbfa6ea291c8bb7de14cef145c91b3179c4d28e865701ef8dfe914457ea933785045731277d3b245877d935d1163915a76db9511b8
+EBUILD metagen-0.7.0.ebuild 759 BLAKE2B 8b5bd111e2853060aa740f37c26f025c41741f53e3b16d0ac12f8ee012f8c117bf0e2f91152a5036996b1e4f38237f6ff7f12f628d161127a0d05a5849e9ab63 SHA512 89a29aab9f4c403c7ffcabd7a5842df93baea90195d6bc1d35d72dc9c5c1ccee80e3e2549e2b75523733ccf50f4bb47359f29a3ba75b5dd89cd20c675486309f
+EBUILD metagen-0.7.1.ebuild 740 BLAKE2B 36488209622d0b0b463451b66f68ff9ff3653bf4bc5ebefc478687c11fa1ada94ea72d54f25a2ee01d91af457090222bff17ad48e8dff330fbbb8831c985f3d1 SHA512 5e15cc0e71aa7bd57adf3ba9d397d602cbfe27ef7936bf079d692657d98904dc89f5b7511abd168a5aca32f1db8c5d88ff997777ced8ae1f21a7724770657d21
+EBUILD metagen-0.7.2.ebuild 740 BLAKE2B 36488209622d0b0b463451b66f68ff9ff3653bf4bc5ebefc478687c11fa1ada94ea72d54f25a2ee01d91af457090222bff17ad48e8dff330fbbb8831c985f3d1 SHA512 5e15cc0e71aa7bd57adf3ba9d397d602cbfe27ef7936bf079d692657d98904dc89f5b7511abd168a5aca32f1db8c5d88ff997777ced8ae1f21a7724770657d21
+EBUILD metagen-9999.ebuild 875 BLAKE2B 9a188abcd348c848793c87acb0ec7fe1386a60de9fd8e11feabb8827d28ac880c221881a208388f4b8c304bd34c3b2911f9bc58c829a534171eaae7d4ea23f61 SHA512 c89c02b942df1df8058c4bdbe170d47fbc73e7887892fd1266a59947ff38e867f538e677bf61160ab62eae1c671f7c8929cd1bca0bff46b1277f84faad36ff02
+MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/app-portage/metagen/metadata.xml b/app-portage/metagen/metadata.xml
index eb3702fd181f..ab886b7f0382 100644
--- a/app-portage/metagen/metadata.xml
+++ b/app-portage/metagen/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-<maintainer type="person">
-	<email>sping@gentoo.org</email>
-</maintainer>
-<longdescription>metagen creates metadata.xml files for ebuilds</longdescription>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-portage/metagen/metagen-0.7.0.ebuild b/app-portage/metagen/metagen-0.7.0.ebuild
new file mode 100644
index 000000000000..b1219098e37f
--- /dev/null
+++ b/app-portage/metagen/metagen-0.7.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-0.7.1.ebuild b/app-portage/metagen/metagen-0.7.1.ebuild
new file mode 100644
index 000000000000..dff9c50a5517
--- /dev/null
+++ b/app-portage/metagen/metagen-0.7.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-0.7.2.ebuild b/app-portage/metagen/metagen-0.7.2.ebuild
new file mode 100644
index 000000000000..dff9c50a5517
--- /dev/null
+++ b/app-portage/metagen/metagen-0.7.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index f479716b4b3c..9880fd95a4b3 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 git-r3
 
 DESCRIPTION="metadata.xml generator for ebuilds"
 HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI=""
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/metagen.git"
 
 LICENSE="GPL-2"
@@ -16,20 +16,22 @@ SLOT="0"
 KEYWORDS=""
 
 IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 	doman docs/metagen.1
 }
 
+src_install() {
+	distutils-r1_src_install
+
+	# Address expected path warning for /usr/share/doc/metagen-<not-9999>
+	mv "${D}"/usr/share/doc/metagen-{*,${PV}}/ || die
+}
+
 python_test() {
 	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
 }