commit: 835f13b3a99f06368c8b32fabf1681e40579c084
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 02:22:23 2020 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 02:25:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835f13b3
dev-util/pkgcheck: drop USE flags for optional checks
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
.../{pkgcheck-9999.ebuild => pkgcheck-0.7.6-r1.ebuild} | 13 ++++++++-----
dev-util/pkgcheck/pkgcheck-9999.ebuild | 13 ++++++++-----
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild
b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
similarity index 81%
copy from dev-util/pkgcheck/pkgcheck-9999.ebuild
copy to dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
index d3aed7fc337..677e2471a27 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
@@ -4,13 +4,13 @@
EAPI=6
PYTHON_COMPAT=( python3_{6,7,8} )
DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
+inherit distutils-r1 eutils
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
inherit git-r3
else
- KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
LICENSE="BSD"
SLOT="0"
-IUSE="network perl test"
+IUSE="test"
RESTRICT="!test? ( test )"
if [[ ${PV} == *9999 ]]; then
@@ -35,8 +35,6 @@ RDEPEND+="
dev-python/chardet[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/pathspec[${PYTHON_USEDEP}]
- network? ( dev-python/requests[${PYTHON_USEDEP}] )
- perl? ( dev-perl/Gentoo-PerlMod-Version )
"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
@@ -52,3 +50,8 @@ python_install_all() {
[[ ${PV} == *9999 ]] || doman man/*
distutils-r1_python_install_all
}
+
+pkg_postinst() {
+ optfeature "Network check support" dev-python/requests
+ optfeature "Perl module version check support"
dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild
b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index d3aed7fc337..677e2471a27 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -4,13 +4,13 @@
EAPI=6
PYTHON_COMPAT=( python3_{6,7,8} )
DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
+inherit distutils-r1 eutils
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
inherit git-r3
else
- KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
LICENSE="BSD"
SLOT="0"
-IUSE="network perl test"
+IUSE="test"
RESTRICT="!test? ( test )"
if [[ ${PV} == *9999 ]]; then
@@ -35,8 +35,6 @@ RDEPEND+="
dev-python/chardet[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/pathspec[${PYTHON_USEDEP}]
- network? ( dev-python/requests[${PYTHON_USEDEP}] )
- perl? ( dev-perl/Gentoo-PerlMod-Version )
"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
@@ -52,3 +50,8 @@ python_install_all() {
[[ ${PV} == *9999 ]] || doman man/*
distutils-r1_python_install_all
}
+
+pkg_postinst() {
+ optfeature "Network check support" dev-python/requests
+ optfeature "Perl module version check support"
dev-perl/Gentoo-PerlMod-Version
+}