| 1 |
commit: c7ae212843e7d26bdacbc17d8aa327b73f038459 |
| 2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 25 19:31:20 2022 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 25 19:39:17 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7ae2128 |
| 7 |
|
| 8 |
app-portage/metagen: Python 3.10 + EAPI 8 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/845576 |
| 11 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 13 |
|
| 14 |
...metagen-9999.ebuild => metagen-0.7.3-r1.ebuild} | 25 ++++++++++------------ |
| 15 |
app-portage/metagen/metagen-9999.ebuild | 11 +++------- |
| 16 |
2 files changed, 14 insertions(+), 22 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-0.7.3-r1.ebuild |
| 19 |
similarity index 52% |
| 20 |
copy from app-portage/metagen/metagen-9999.ebuild |
| 21 |
copy to app-portage/metagen/metagen-0.7.3-r1.ebuild |
| 22 |
index 65f6e64cdfda..eb29b0bd9fb6 100644 |
| 23 |
--- a/app-portage/metagen/metagen-9999.ebuild |
| 24 |
+++ b/app-portage/metagen/metagen-0.7.3-r1.ebuild |
| 25 |
@@ -1,19 +1,18 @@ |
| 26 |
-# Copyright 1999-2021 Gentoo Authors |
| 27 |
+# Copyright 1999-2022 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
-EAPI="7" |
| 31 |
-PYTHON_COMPAT=( python3_{7..9} ) |
| 32 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
| 33 |
+EAPI="8" |
| 34 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 35 |
|
| 36 |
-inherit distutils-r1 git-r3 |
| 37 |
+inherit distutils-r1 |
| 38 |
|
| 39 |
DESCRIPTION="metadata.xml generator for ebuilds" |
| 40 |
HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git" |
| 41 |
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/metagen.git" |
| 42 |
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 43 |
|
| 44 |
LICENSE="GPL-2" |
| 45 |
SLOT="0" |
| 46 |
-KEYWORDS="" |
| 47 |
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux" |
| 48 |
|
| 49 |
IUSE="" |
| 50 |
DEPEND="dev-python/lxml[${PYTHON_USEDEP}] |
| 51 |
@@ -23,14 +22,12 @@ RDEPEND="${DEPEND}" |
| 52 |
python_install_all() { |
| 53 |
distutils-r1_python_install_all |
| 54 |
doman docs/metagen.1 |
| 55 |
-} |
| 56 |
- |
| 57 |
-src_install() { |
| 58 |
- distutils-r1_src_install |
| 59 |
|
| 60 |
- # Address expected path warning for /usr/share/doc/metagen-<not-9999> |
| 61 |
- mv "${ED}"/usr/share/doc/metagen-{*.*.*/*,${PV}/} || die |
| 62 |
- rmdir "${ED}"/usr/share/doc/metagen-*.*.*/ || die |
| 63 |
+ # Bug 814545 and 832069 |
| 64 |
+ if [[ ${PF} != ${P} ]]; then # to be robust across bumps |
| 65 |
+ mv "${ED}"/usr/share/doc/${P}/* "${ED}"/usr/share/doc/${PF}/ || die |
| 66 |
+ rmdir "${ED}"/usr/share/doc/${P}/ || die |
| 67 |
+ fi |
| 68 |
} |
| 69 |
|
| 70 |
python_test() { |
| 71 |
|
| 72 |
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild |
| 73 |
index 65f6e64cdfda..3c5877d7288b 100644 |
| 74 |
--- a/app-portage/metagen/metagen-9999.ebuild |
| 75 |
+++ b/app-portage/metagen/metagen-9999.ebuild |
| 76 |
@@ -1,9 +1,8 @@ |
| 77 |
-# Copyright 1999-2021 Gentoo Authors |
| 78 |
+# Copyright 1999-2022 Gentoo Authors |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
|
| 81 |
-EAPI="7" |
| 82 |
-PYTHON_COMPAT=( python3_{7..9} ) |
| 83 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
| 84 |
+EAPI="8" |
| 85 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 86 |
|
| 87 |
inherit distutils-r1 git-r3 |
| 88 |
|
| 89 |
@@ -23,10 +22,6 @@ RDEPEND="${DEPEND}" |
| 90 |
python_install_all() { |
| 91 |
distutils-r1_python_install_all |
| 92 |
doman docs/metagen.1 |
| 93 |
-} |
| 94 |
- |
| 95 |
-src_install() { |
| 96 |
- distutils-r1_src_install |
| 97 |
|
| 98 |
# Address expected path warning for /usr/share/doc/metagen-<not-9999> |
| 99 |
mv "${ED}"/usr/share/doc/metagen-{*.*.*/*,${PV}/} || die |
Archives