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

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

commit:     25e747a74e49788c2409bf7314424b641ce24532
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 21:03:18 2022 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 21:20:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e747a7

app-portage/metagen: Python 3.11 + DistutilsNonPEP517Build + MissingRemoteId

Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>

 app-portage/metagen/metadata.xml                        |  3 +++
 .../{metagen-9999.ebuild => metagen-0.7.3-r2.ebuild}    | 17 ++++++++++-------
 app-portage/metagen/metagen-9999.ebuild                 |  3 ++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app-portage/metagen/metadata.xml b/app-portage/metagen/metadata.xml
index 6a22e9e318bb..32307ccfc35f 100644
--- a/app-portage/metagen/metadata.xml
+++ b/app-portage/metagen/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">metagen</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-0.7.3-r2.ebuild
similarity index 56%
copy from app-portage/metagen/metagen-9999.ebuild
copy to app-portage/metagen/metagen-0.7.3-r2.ebuild
index 3c5877d7288b..431d7950baec 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-0.7.3-r2.ebuild
@@ -2,17 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
-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 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
@@ -23,9 +24,11 @@ python_install_all() {
 	distutils-r1_python_install_all
 	doman docs/metagen.1
 
-	# 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 3c5877d7288b..d7077d243ebb 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 git-r3