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

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

commit:     c7ae212843e7d26bdacbc17d8aa327b73f038459
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 19:31:20 2022 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed May 25 19:39:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7ae2128

app-portage/metagen: Python 3.10 + EAPI 8

Closes: https://bugs.gentoo.org/845576
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3

 ...metagen-9999.ebuild => metagen-0.7.3-r1.ebuild} | 25 ++++++++++------------
 app-portage/metagen/metagen-9999.ebuild            | 11 +++-------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-0.7.3-r1.ebuild
similarity index 52%
copy from app-portage/metagen/metagen-9999.ebuild
copy to app-portage/metagen/metagen-0.7.3-r1.ebuild
index 65f6e64cdfda..eb29b0bd9fb6 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-0.7.3-r1.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
 
 DESCRIPTION="metadata.xml generator for ebuilds"
 HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/metagen.git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
@@ -23,14 +22,12 @@ RDEPEND="${DEPEND}"
 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 "${ED}"/usr/share/doc/metagen-{*.*.*/*,${PV}/} || die
-	rmdir "${ED}"/usr/share/doc/metagen-*.*.*/ || die
+	# Bug 814545 and 832069
+	if [[ ${PF} != ${P} ]]; then  # to be robust across bumps
+		mv "${ED}"/usr/share/doc/${P}/* "${ED}"/usr/share/doc/${PF}/ || die
+		rmdir "${ED}"/usr/share/doc/${P}/ || die
+	fi
 }
 
 python_test() {

diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index 65f6e64cdfda..3c5877d7288b 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 git-r3
 
@@ -23,10 +22,6 @@ RDEPEND="${DEPEND}"
 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 "${ED}"/usr/share/doc/metagen-{*.*.*/*,${PV}/} || die