| 1 |
commit: a46018e1791946e438c3e7cd36e2ccfdc514055e |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 21 14:07:26 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 21 14:10:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a46018e1 |
| 7 |
|
| 8 |
app-portage/gemato: Set DISTUTILS_USE_SETUPTOOLS, update tests |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/709892 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
app-portage/gemato/gemato-14.3.ebuild | 16 +++++----------- |
| 14 |
app-portage/gemato/gemato-9999.ebuild | 13 ++++--------- |
| 15 |
2 files changed, 9 insertions(+), 20 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-portage/gemato/gemato-14.3.ebuild b/app-portage/gemato/gemato-14.3.ebuild |
| 18 |
index 1c2e6cc874a..7903d882e70 100644 |
| 19 |
--- a/app-portage/gemato/gemato-14.3.ebuild |
| 20 |
+++ b/app-portage/gemato/gemato-14.3.ebuild |
| 21 |
@@ -3,8 +3,10 @@ |
| 22 |
|
| 23 |
EAPI=7 |
| 24 |
|
| 25 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
| 26 |
PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 ) |
| 27 |
PYTHON_REQ_USE='threads(+)' |
| 28 |
+ |
| 29 |
inherit distutils-r1 |
| 30 |
|
| 31 |
DESCRIPTION="Stand-alone Manifest generation & verification tool" |
| 32 |
@@ -14,24 +16,16 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" |
| 33 |
LICENSE="BSD-2" |
| 34 |
SLOT="0" |
| 35 |
KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux" |
| 36 |
-IUSE="+blake2 bzip2 +gpg lzma sha3 test tools" |
| 37 |
-RESTRICT="!test? ( test )" |
| 38 |
+IUSE="+blake2 bzip2 +gpg lzma sha3 tools" |
| 39 |
|
| 40 |
-MODULE_RDEPEND=" |
| 41 |
+RDEPEND=" |
| 42 |
blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) ) |
| 43 |
bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) ) |
| 44 |
gpg? ( app-crypt/gnupg ) |
| 45 |
lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) ) |
| 46 |
sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )" |
| 47 |
|
| 48 |
-RDEPEND="${MODULE_RDEPEND} |
| 49 |
- dev-python/setuptools[${PYTHON_USEDEP}]" |
| 50 |
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}] |
| 51 |
- test? ( ${MODULE_RDEPEND} )" |
| 52 |
- |
| 53 |
-python_test() { |
| 54 |
- esetup.py test |
| 55 |
-} |
| 56 |
+distutils_enable_tests setup.py |
| 57 |
|
| 58 |
python_install_all() { |
| 59 |
distutils-r1_python_install_all |
| 60 |
|
| 61 |
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild |
| 62 |
index 840a8c6afc7..a52943c5d57 100644 |
| 63 |
--- a/app-portage/gemato/gemato-9999.ebuild |
| 64 |
+++ b/app-portage/gemato/gemato-9999.ebuild |
| 65 |
@@ -3,8 +3,10 @@ |
| 66 |
|
| 67 |
EAPI=7 |
| 68 |
|
| 69 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
| 70 |
PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 ) |
| 71 |
PYTHON_REQ_USE='threads(+)' |
| 72 |
+ |
| 73 |
inherit distutils-r1 git-r3 |
| 74 |
|
| 75 |
DESCRIPTION="Stand-alone Manifest generation & verification tool" |
| 76 |
@@ -18,21 +20,14 @@ KEYWORDS="" |
| 77 |
IUSE="+blake2 bzip2 +gpg lzma sha3 test tools" |
| 78 |
RESTRICT="!test? ( test )" |
| 79 |
|
| 80 |
-MODULE_RDEPEND=" |
| 81 |
+RDEPEND=" |
| 82 |
blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) ) |
| 83 |
bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) ) |
| 84 |
gpg? ( app-crypt/gnupg ) |
| 85 |
lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) ) |
| 86 |
sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )" |
| 87 |
|
| 88 |
-RDEPEND="${MODULE_RDEPEND} |
| 89 |
- dev-python/setuptools[${PYTHON_USEDEP}]" |
| 90 |
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}] |
| 91 |
- test? ( ${MODULE_RDEPEND} )" |
| 92 |
- |
| 93 |
-python_test() { |
| 94 |
- esetup.py test |
| 95 |
-} |
| 96 |
+distutils_enable_tests setup.py |
| 97 |
|
| 98 |
python_install_all() { |
| 99 |
distutils-r1_python_install_all |
Archives