From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- dev-util/pkgcheck/Manifest | 6 ++-- dev-util/pkgcheck/metadata.xml | 4 --- dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild | 57 ++++++++++++++++++++++++++++++ dev-util/pkgcheck/pkgcheck-0.7.6.ebuild | 54 ---------------------------- dev-util/pkgcheck/pkgcheck-9999.ebuild | 13 ++++--- 5 files changed, 68 insertions(+), 66 deletions(-) create mode 100644 dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild delete mode 100644 dev-util/pkgcheck/pkgcheck-0.7.6.ebuild (limited to 'dev-util/pkgcheck') diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest index 20add417c4b2..33b5c682583f 100644 --- a/dev-util/pkgcheck/Manifest +++ b/dev-util/pkgcheck/Manifest @@ -1,4 +1,4 @@ DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136 -EBUILD pkgcheck-0.7.6.ebuild 1339 BLAKE2B 4ffced551a5b003351ed3495dab9c93482de13a88a28b3ff808241bb61c3d6058f16ac82b159f6f3a307617d40d81e7ee3b275ad5d8f07299e7a3ccc78231abd SHA512 545bd3d837581128a2b4c8d29cc10f116c984c915c34fa3ebf9da8f3f2b99e33a51f918840305bf90cd2feaf8eaa35281060304b67fd71aa0f877926cc3fed3f -EBUILD pkgcheck-9999.ebuild 1328 BLAKE2B 6c4e1486d82f4adf6bdbd84697bae4a74c28c9c380ed256fab6dc431d4abf7007b70a54e4065a9d010d50aca2626e4d83346c19102b976eb0a8b1c95a0fbd153 SHA512 3bf0d03e5e931913f0721ba3474f59542bae97721428ff6cac17dd8e7c26ca17aef695933d492b98999dda6ec34eea7877a40bcf1bcc59246df5a92bdba301e1 -MISC metadata.xml 551 BLAKE2B 69f4e4b0c2ae515433db1c0bbdc47d1bb06e5f17feb6183bf81e41f971994bbd6c1ef2b57f17ac7bfeb504351177cde249f8f81aef416be44606a436b487ad61 SHA512 dfb7087bfd20b8b435faf246d9c689e82c669790abde1886d88822692493ce08083b3a8b9fd1781519becf0399727ed7c65ce079039b5201a66e950ccb28280e +EBUILD pkgcheck-0.7.6-r1.ebuild 1394 BLAKE2B 250fff7d5ebd3de6495a561d6075effd102ac7d6d598867e1aeab94fd9d8fbea246446f1fb1f87515bfe3bdb11f49e9cf88f84ba87afdd1b1a432da3cd30f0c2 SHA512 d6b87229f1c205bab06b1f4154dfe2d157aa7ad689eb9a36b12dd3c0b297d74884846f13d136f32828e41de181c01e507cb9a5a168bd76454177ae03fc9efb81 +EBUILD pkgcheck-9999.ebuild 1394 BLAKE2B 250fff7d5ebd3de6495a561d6075effd102ac7d6d598867e1aeab94fd9d8fbea246446f1fb1f87515bfe3bdb11f49e9cf88f84ba87afdd1b1a432da3cd30f0c2 SHA512 d6b87229f1c205bab06b1f4154dfe2d157aa7ad689eb9a36b12dd3c0b297d74884846f13d136f32828e41de181c01e507cb9a5a168bd76454177ae03fc9efb81 +MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75 diff --git a/dev-util/pkgcheck/metadata.xml b/dev-util/pkgcheck/metadata.xml index 823ef4f00a2a..aa0ba050b3e0 100644 --- a/dev-util/pkgcheck/metadata.xml +++ b/dev-util/pkgcheck/metadata.xml @@ -5,10 +5,6 @@ mgorny@gentoo.org Michał Górny - - Enable support for network checks using dev-python/requests - Enable support for perl checks using dev-perl/Gentoo-PerlMod-Version - pkgcore/pkgcheck diff --git a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild new file mode 100644 index 000000000000..677e2471a279 --- /dev/null +++ b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_IN_SOURCE_BUILD=1 +inherit distutils-r1 eutils + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="pkgcore-based QA utility for ebuild repos" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" + +LICENSE="BSD" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +if [[ ${PV} == *9999 ]]; then + RDEPEND=" + ~dev-python/snakeoil-9999[${PYTHON_USEDEP}] + ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]" +else + RDEPEND=" + >=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}] + >=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]" +fi +RDEPEND+=" + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pathspec[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" + +python_test() { + esetup.py test +} + +python_install_all() { + local DOCS=( NEWS.rst ) + [[ ${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-0.7.6.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild deleted file mode 100644 index eb8f739d6267..000000000000 --- a/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_IN_SOURCE_BUILD=1 -inherit distutils-r1 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git" - inherit git-r3 -else - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="pkgcore-based QA utility for ebuild repos" -HOMEPAGE="https://github.com/pkgcore/pkgcheck" - -LICENSE="BSD" -SLOT="0" -IUSE="network perl test" -RESTRICT="!test? ( test )" - -if [[ ${PV} == *9999 ]]; then - RDEPEND=" - ~dev-python/snakeoil-9999[${PYTHON_USEDEP}] - ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]" -else - RDEPEND=" - >=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}] - >=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]" -fi -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}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" - -python_test() { - esetup.py test -} - -python_install_all() { - local DOCS=( NEWS.rst ) - [[ ${PV} == *9999 ]] || doman man/* - distutils-r1_python_install_all -} diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild index d3aed7fc337b..677e2471a279 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 +} -- cgit v1.2.3