| 1 |
commit: 25e747a74e49788c2409bf7314424b641ce24532 |
| 2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 28 21:03:18 2022 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 28 21:20:42 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e747a7 |
| 7 |
|
| 8 |
app-portage/metagen: Python 3.11 + DistutilsNonPEP517Build + MissingRemoteId |
| 9 |
|
| 10 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
| 11 |
|
| 12 |
app-portage/metagen/metadata.xml | 3 +++ |
| 13 |
.../{metagen-9999.ebuild => metagen-0.7.3-r2.ebuild} | 17 ++++++++++------- |
| 14 |
app-portage/metagen/metagen-9999.ebuild | 3 ++- |
| 15 |
3 files changed, 15 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-portage/metagen/metadata.xml b/app-portage/metagen/metadata.xml |
| 18 |
index 6a22e9e318bb..32307ccfc35f 100644 |
| 19 |
--- a/app-portage/metagen/metadata.xml |
| 20 |
+++ b/app-portage/metagen/metadata.xml |
| 21 |
@@ -5,4 +5,7 @@ |
| 22 |
<email>sping@g.o</email> |
| 23 |
<name>Sebastian Pipping</name> |
| 24 |
</maintainer> |
| 25 |
+ <upstream> |
| 26 |
+ <remote-id type="pypi">metagen</remote-id> |
| 27 |
+ </upstream> |
| 28 |
</pkgmetadata> |
| 29 |
|
| 30 |
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-0.7.3-r2.ebuild |
| 31 |
similarity index 56% |
| 32 |
copy from app-portage/metagen/metagen-9999.ebuild |
| 33 |
copy to app-portage/metagen/metagen-0.7.3-r2.ebuild |
| 34 |
index 3c5877d7288b..431d7950baec 100644 |
| 35 |
--- a/app-portage/metagen/metagen-9999.ebuild |
| 36 |
+++ b/app-portage/metagen/metagen-0.7.3-r2.ebuild |
| 37 |
@@ -2,17 +2,18 @@ |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
|
| 40 |
EAPI="8" |
| 41 |
-PYTHON_COMPAT=( python3_{8..10} ) |
| 42 |
+DISTUTILS_USE_PEP517=setuptools |
| 43 |
+PYTHON_COMPAT=( python3_{8..11} ) |
| 44 |
|
| 45 |
-inherit distutils-r1 git-r3 |
| 46 |
+inherit distutils-r1 |
| 47 |
|
| 48 |
DESCRIPTION="metadata.xml generator for ebuilds" |
| 49 |
HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git" |
| 50 |
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/metagen.git" |
| 51 |
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 52 |
|
| 53 |
LICENSE="GPL-2" |
| 54 |
SLOT="0" |
| 55 |
-KEYWORDS="" |
| 56 |
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux" |
| 57 |
|
| 58 |
IUSE="" |
| 59 |
DEPEND="dev-python/lxml[${PYTHON_USEDEP}] |
| 60 |
@@ -23,9 +24,11 @@ python_install_all() { |
| 61 |
distutils-r1_python_install_all |
| 62 |
doman docs/metagen.1 |
| 63 |
|
| 64 |
- # Address expected path warning for /usr/share/doc/metagen-<not-9999> |
| 65 |
- mv "${ED}"/usr/share/doc/metagen-{*.*.*/*,${PV}/} || die |
| 66 |
- rmdir "${ED}"/usr/share/doc/metagen-*.*.*/ || die |
| 67 |
+ # Bug 814545 and 832069 |
| 68 |
+ if [[ ${PF} != ${P} ]]; then # to be robust across bumps |
| 69 |
+ mv "${ED}"/usr/share/doc/${P}/* "${ED}"/usr/share/doc/${PF}/ || die |
| 70 |
+ rmdir "${ED}"/usr/share/doc/${P}/ || die |
| 71 |
+ fi |
| 72 |
} |
| 73 |
|
| 74 |
python_test() { |
| 75 |
|
| 76 |
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild |
| 77 |
index 3c5877d7288b..d7077d243ebb 100644 |
| 78 |
--- a/app-portage/metagen/metagen-9999.ebuild |
| 79 |
+++ b/app-portage/metagen/metagen-9999.ebuild |
| 80 |
@@ -2,7 +2,8 @@ |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
|
| 83 |
EAPI="8" |
| 84 |
-PYTHON_COMPAT=( python3_{8..10} ) |
| 85 |
+DISTUTILS_USE_PEP517=setuptools |
| 86 |
+PYTHON_COMPAT=( python3_{8..11} ) |
| 87 |
|
| 88 |
inherit distutils-r1 git-r3 |
Archives