1 |
commit: 835f13b3a99f06368c8b32fabf1681e40579c084 |
2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 24 02:22:23 2020 +0000 |
4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 24 02:25:51 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835f13b3 |
7 |
|
8 |
dev-util/pkgcheck: drop USE flags for optional checks |
9 |
|
10 |
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> |
11 |
|
12 |
.../{pkgcheck-9999.ebuild => pkgcheck-0.7.6-r1.ebuild} | 13 ++++++++----- |
13 |
dev-util/pkgcheck/pkgcheck-9999.ebuild | 13 ++++++++----- |
14 |
2 files changed, 16 insertions(+), 10 deletions(-) |
15 |
|
16 |
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild |
17 |
similarity index 81% |
18 |
copy from dev-util/pkgcheck/pkgcheck-9999.ebuild |
19 |
copy to dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild |
20 |
index d3aed7fc337..677e2471a27 100644 |
21 |
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild |
22 |
+++ b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild |
23 |
@@ -4,13 +4,13 @@ |
24 |
EAPI=6 |
25 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
26 |
DISTUTILS_IN_SOURCE_BUILD=1 |
27 |
-inherit distutils-r1 |
28 |
+inherit distutils-r1 eutils |
29 |
|
30 |
if [[ ${PV} == *9999 ]] ; then |
31 |
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git" |
32 |
inherit git-r3 |
33 |
else |
34 |
- KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
35 |
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
36 |
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
37 |
fi |
38 |
|
39 |
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck" |
40 |
|
41 |
LICENSE="BSD" |
42 |
SLOT="0" |
43 |
-IUSE="network perl test" |
44 |
+IUSE="test" |
45 |
RESTRICT="!test? ( test )" |
46 |
|
47 |
if [[ ${PV} == *9999 ]]; then |
48 |
@@ -35,8 +35,6 @@ RDEPEND+=" |
49 |
dev-python/chardet[${PYTHON_USEDEP}] |
50 |
dev-python/lxml[${PYTHON_USEDEP}] |
51 |
dev-python/pathspec[${PYTHON_USEDEP}] |
52 |
- network? ( dev-python/requests[${PYTHON_USEDEP}] ) |
53 |
- perl? ( dev-perl/Gentoo-PerlMod-Version ) |
54 |
" |
55 |
DEPEND="${RDEPEND} |
56 |
dev-python/setuptools[${PYTHON_USEDEP}] |
57 |
@@ -52,3 +50,8 @@ python_install_all() { |
58 |
[[ ${PV} == *9999 ]] || doman man/* |
59 |
distutils-r1_python_install_all |
60 |
} |
61 |
+ |
62 |
+pkg_postinst() { |
63 |
+ optfeature "Network check support" dev-python/requests |
64 |
+ optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version |
65 |
+} |
66 |
|
67 |
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild |
68 |
index d3aed7fc337..677e2471a27 100644 |
69 |
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild |
70 |
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild |
71 |
@@ -4,13 +4,13 @@ |
72 |
EAPI=6 |
73 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
74 |
DISTUTILS_IN_SOURCE_BUILD=1 |
75 |
-inherit distutils-r1 |
76 |
+inherit distutils-r1 eutils |
77 |
|
78 |
if [[ ${PV} == *9999 ]] ; then |
79 |
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git" |
80 |
inherit git-r3 |
81 |
else |
82 |
- KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
83 |
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
84 |
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
85 |
fi |
86 |
|
87 |
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck" |
88 |
|
89 |
LICENSE="BSD" |
90 |
SLOT="0" |
91 |
-IUSE="network perl test" |
92 |
+IUSE="test" |
93 |
RESTRICT="!test? ( test )" |
94 |
|
95 |
if [[ ${PV} == *9999 ]]; then |
96 |
@@ -35,8 +35,6 @@ RDEPEND+=" |
97 |
dev-python/chardet[${PYTHON_USEDEP}] |
98 |
dev-python/lxml[${PYTHON_USEDEP}] |
99 |
dev-python/pathspec[${PYTHON_USEDEP}] |
100 |
- network? ( dev-python/requests[${PYTHON_USEDEP}] ) |
101 |
- perl? ( dev-perl/Gentoo-PerlMod-Version ) |
102 |
" |
103 |
DEPEND="${RDEPEND} |
104 |
dev-python/setuptools[${PYTHON_USEDEP}] |
105 |
@@ -52,3 +50,8 @@ python_install_all() { |
106 |
[[ ${PV} == *9999 ]] || doman man/* |
107 |
distutils-r1_python_install_all |
108 |
} |
109 |
+ |
110 |
+pkg_postinst() { |
111 |
+ optfeature "Network check support" dev-python/requests |
112 |
+ optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version |
113 |
+} |