| 1 |
commit: 7f6a775d281e36b474dcf988b6d1e95050cdba6f |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 28 10:10:14 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 28 10:58:02 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f6a775d |
| 7 |
|
| 8 |
sys-apps/pkgcore: Modernize |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-apps/pkgcore/pkgcore-0.11.0.ebuild | 11 +++-------- |
| 13 |
sys-apps/pkgcore/pkgcore-9999.ebuild | 13 ++++--------- |
| 14 |
2 files changed, 7 insertions(+), 17 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/pkgcore/pkgcore-0.11.0.ebuild b/sys-apps/pkgcore/pkgcore-0.11.0.ebuild |
| 17 |
index 783660fe4b7..2998f6377a3 100644 |
| 18 |
--- a/sys-apps/pkgcore/pkgcore-0.11.0.ebuild |
| 19 |
+++ b/sys-apps/pkgcore/pkgcore-0.11.0.ebuild |
| 20 |
@@ -1,7 +1,7 @@ |
| 21 |
# Copyright 1999-2021 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI=6 |
| 25 |
+EAPI=7 |
| 26 |
PYTHON_COMPAT=( python3_{8..9} ) |
| 27 |
DISTUTILS_IN_SOURCE_BUILD=1 |
| 28 |
inherit distutils-r1 |
| 29 |
@@ -19,8 +19,6 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore" |
| 30 |
|
| 31 |
LICENSE="BSD MIT" |
| 32 |
SLOT="0" |
| 33 |
-IUSE="test" |
| 34 |
-RESTRICT="!test? ( test )" |
| 35 |
|
| 36 |
RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]" |
| 37 |
if [[ ${PV} == *9999 ]]; then |
| 38 |
@@ -28,17 +26,14 @@ if [[ ${PV} == *9999 ]]; then |
| 39 |
else |
| 40 |
RDEPEND+=" >=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]" |
| 41 |
fi |
| 42 |
-DEPEND="${RDEPEND} |
| 43 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 44 |
+BDEPEND=" |
| 45 |
test? ( |
| 46 |
dev-python/pytest[${PYTHON_USEDEP}] |
| 47 |
dev-vcs/git |
| 48 |
) |
| 49 |
" |
| 50 |
|
| 51 |
-python_test() { |
| 52 |
- esetup.py test |
| 53 |
-} |
| 54 |
+distutils_enable_tests setup.py |
| 55 |
|
| 56 |
python_install_all() { |
| 57 |
local DOCS=( NEWS.rst ) |
| 58 |
|
| 59 |
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild |
| 60 |
index 5a984c9250d..2998f6377a3 100644 |
| 61 |
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild |
| 62 |
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild |
| 63 |
@@ -1,7 +1,7 @@ |
| 64 |
-# Copyright 1999-2020 Gentoo Authors |
| 65 |
+# Copyright 1999-2021 Gentoo Authors |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
|
| 68 |
-EAPI=6 |
| 69 |
+EAPI=7 |
| 70 |
PYTHON_COMPAT=( python3_{8..9} ) |
| 71 |
DISTUTILS_IN_SOURCE_BUILD=1 |
| 72 |
inherit distutils-r1 |
| 73 |
@@ -19,8 +19,6 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore" |
| 74 |
|
| 75 |
LICENSE="BSD MIT" |
| 76 |
SLOT="0" |
| 77 |
-IUSE="test" |
| 78 |
-RESTRICT="!test? ( test )" |
| 79 |
|
| 80 |
RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]" |
| 81 |
if [[ ${PV} == *9999 ]]; then |
| 82 |
@@ -28,17 +26,14 @@ if [[ ${PV} == *9999 ]]; then |
| 83 |
else |
| 84 |
RDEPEND+=" >=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]" |
| 85 |
fi |
| 86 |
-DEPEND="${RDEPEND} |
| 87 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 88 |
+BDEPEND=" |
| 89 |
test? ( |
| 90 |
dev-python/pytest[${PYTHON_USEDEP}] |
| 91 |
dev-vcs/git |
| 92 |
) |
| 93 |
" |
| 94 |
|
| 95 |
-python_test() { |
| 96 |
- esetup.py test |
| 97 |
-} |
| 98 |
+distutils_enable_tests setup.py |
| 99 |
|
| 100 |
python_install_all() { |
| 101 |
local DOCS=( NEWS.rst ) |
Archives