[gentoo-commits] repo/gentoo:master commit in: app-portage/metagen/

["Sebastian Pipping" <sping@gentoo.org>]

commit:     22252f649823860fb39b9eb3dbae098b1f3f247e
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 22:56:55 2020 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 22:57:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22252f64

app-portage/metagen: 0.7.0 + EAPI 7 + Python 3 + sync 9999

Closes: https://bugs.gentoo.org/706216
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 app-portage/metagen/Manifest             |  1 +
 app-portage/metagen/metagen-0.7.0.ebuild | 30 ++++++++++++++++++++++++++++++
 app-portage/metagen/metagen-9999.ebuild  | 24 +++++++++++++-----------
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 525521774f5..9a05ec9711c 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -3,3 +3,4 @@ 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

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 00000000000..b1219098e37
--- /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-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index f479716b4b3..9880fd95a4b 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
 }