From c5283d322accc6097afec74eab24550829788bab Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Mar 2018 04:19:44 +0000 Subject: gentoo resync : 23.03.2018 --- app-portage/gentoolkit/Manifest | 4 +- app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild | 70 +++++++++++++++++++++++ app-portage/gentoolkit/gentoolkit-0.4.2.ebuild | 66 --------------------- app-portage/gentoolkit/gentoolkit-9999.ebuild | 6 +- 4 files changed, 77 insertions(+), 69 deletions(-) create mode 100644 app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild delete mode 100644 app-portage/gentoolkit/gentoolkit-0.4.2.ebuild (limited to 'app-portage/gentoolkit') diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest index 89b07d0b3033..99af562b45d2 100644 --- a/app-portage/gentoolkit/Manifest +++ b/app-portage/gentoolkit/Manifest @@ -5,6 +5,6 @@ DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c5 EBUILD gentoolkit-0.3.3.ebuild 2190 BLAKE2B 14e659c8159365d4d1317952cff7241f5629571b7264018b082dd4aee393a4414b3d97b101f26a252a3dfd8f372e2711c9857033e5e0c68f675cf33996104b0b SHA512 6f95f1af8e2ae139ef6058b3798f75e331890bc05efb8abb4cc3c0e4014176424a424e9663f748f3cbae510186d8a7dce1b9d11e0813aa5e65ac9e4ee6d3aaa8 EBUILD gentoolkit-0.4.0.ebuild 2164 BLAKE2B 7a4d91380523e5355a68e4320907375e49b69acd3f48a549a46576277da776c5be47113828f757affe0439b6803a2a0ebef7c7f6a7c4438f1800584e4439d321 SHA512 aa0fe594f28562a24ee73cb2eae52f1797758ec4c80d0db24f52de3f81aac7a64de5f59b6b273ce4f84d88a88b058f0f880b5498fc118e4b2f4572c459b99fca EBUILD gentoolkit-0.4.1.ebuild 2180 BLAKE2B f141489aaf43bf65d686166a4fc66f1acb58c16d4eab35566d323077ad8730b413f11beed94af79f03f30b1daf7bf6954d2b0ef791504c7f47c3c90e222e506c SHA512 92016e7cab3aa9c2a2fcdc42d9958f47a1bb41da5c88664128aeb0c9a86fa00ff79c99cb100be03f056df23a506e2e52b6b4068b828885ee08173a4ef4404726 -EBUILD gentoolkit-0.4.2.ebuild 2163 BLAKE2B 169a94d11af69764cd5d85748dd9c54cb3dd2dfdd98c6d0d8b99299533ea2e919ca0f56239b64b99845277d1e3102937e82e7fe9323694d60028624bb4bd2aa4 SHA512 41f136f4341c8713ada6e918924bf5fa7874e94a0a5669a257aa1e6b4aa48d353e0b1f2364d2c6c5aef305e780e8c4dbff2049453504c3e2767088b3c75db0ab -EBUILD gentoolkit-9999.ebuild 1982 BLAKE2B 0888c0f52854fd7cae18fa46252691f0599c2854f34e03caf286f21f25bf43a51f89956734f78836c120b85110bbdb5ede5546ae449686a3953130ddcb49c864 SHA512 b77aeb8574d8b5cd687ba57108d1630b9e31f7eda573bbcfa1929c42866a972fc248ba125c21bc10eab2eb7435d3cd7f6aa242700126d6fcecd90d1b8b9f082d +EBUILD gentoolkit-0.4.2-r1.ebuild 2219 BLAKE2B ffea1f1091baca733452321ae072345969b914d5536ef03532160415eafc23dd242f5f62858475acdcf6581b7551eeae2ee8c967ca10e9c29567677b6bd830fd SHA512 e67c0c0b7d1ebcddd922f2af1fe0a8934db7ee119d86a4d7a39e51772cb56470cd2457caefe357e8536228aaf2b3e3ceca7442107a8415f5b74b90f085619185 +EBUILD gentoolkit-9999.ebuild 2038 BLAKE2B b73ca2d3af0a6d7adf65e489cceb6bd4ff29c61e2e657dd28c0ab17e3050cc1031d0db237ff9467dc80f3c463ad0c1f3efdd9ec5d13f35ca0983a435c61329d0 SHA512 d0110f470a871858b3ffad3617714db71b1b015c72fc9f3c39921f3c4b6ab80192c1b060f2de3fdc673a8a8ccca7b5be92a43fb52b5dfe664d832ae093bec7f2 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704 diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild new file mode 100644 index 000000000000..9307a8289711 --- /dev/null +++ b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy) +PYTHON_REQ_USE="xml(+),threads(+)" + +inherit distutils-r1 + +DESCRIPTION="Collection of administration scripts for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" +SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +DEPEND=" + || ( + sys-apps/portage[${PYTHON_USEDEP}] + sys-apps/portage-mgorny[${PYTHON_USEDEP}] + )" +RDEPEND="${DEPEND} + !app-portage/gentoolkit-dev + sys-apps/gawk + sys-apps/gentoo-functions" + +python_prepare_all() { + python_setup + echo VERSION="${PVR}" "${PYTHON}" setup.py set_version + VERSION="${PVR}" "${PYTHON}" setup.py set_version + distutils-r1_python_prepare_all +} + +python_install_all() { + distutils-r1_python_install_all +} + +pkg_postinst() { + # Create cache directory for revdep-rebuild + mkdir -p -m 0755 "${EROOT%/}"/var/cache + mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild + + einfo "Starting with version 0.4.0, ebump, ekeyword and imlate are now" + einfo "part of the gentoolkit package." + einfo "The gentoolkit-dev package is now deprecated in favor of a single" + einfo "gentoolkit package. The remaining tools from gentoolkit-dev" + einfo "are now obsolete/unused with the git based tree." + + # Only show the elog information on a new install + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog + elog "For further information on gentoolkit, please read the gentoolkit" + elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit" + elog + elog "Another alternative to equery is app-portage/portage-utils" + elog + elog "Additional tools that may be of interest:" + elog + elog " app-admin/eclean-kernel" + elog " app-portage/diffmask" + elog " app-portage/flaggie" + elog " app-portage/install-mask" + elog " app-portage/portpeek" + elog " app-portage/smart-live-rebuild" + fi +} diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2.ebuild deleted file mode 100644 index df5293c2d9f3..000000000000 --- a/app-portage/gentoolkit/gentoolkit-0.4.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy) -PYTHON_REQ_USE="xml(+),threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Collection of administration scripts for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -DEPEND="sys-apps/portage[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - !app-portage/gentoolkit-dev - sys-apps/gawk - sys-apps/gentoo-functions" - -python_prepare_all() { - python_setup - echo VERSION="${PVR}" "${PYTHON}" setup.py set_version - VERSION="${PVR}" "${PYTHON}" setup.py set_version - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all -} - -pkg_postinst() { - # Create cache directory for revdep-rebuild - mkdir -p -m 0755 "${EROOT%/}"/var/cache - mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild - - einfo "Starting with version 0.4.0, ebump, ekeyword and imlate are now" - einfo "part of the gentoolkit package." - einfo "The gentoolkit-dev package is now deprecated in favor of a single" - einfo "gentoolkit package. The remaining tools from gentoolkit-dev" - einfo "are now obsolete/unused with the git based tree." - - # Only show the elog information on a new install - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog - elog "For further information on gentoolkit, please read the gentoolkit" - elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit" - elog - elog "Another alternative to equery is app-portage/portage-utils" - elog - elog "Additional tools that may be of interest:" - elog - elog " app-admin/eclean-kernel" - elog " app-portage/diffmask" - elog " app-portage/flaggie" - elog " app-portage/install-mask" - elog " app-portage/portpeek" - elog " app-portage/smart-live-rebuild" - fi -} diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild index 7583a0910da3..084927bf88c8 100644 --- a/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -20,7 +20,11 @@ IUSE="" KEYWORDS="" -DEPEND="sys-apps/portage[${PYTHON_USEDEP}]" +DEPEND=" + || ( + sys-apps/portage[${PYTHON_USEDEP}] + sys-apps/portage-mgorny[${PYTHON_USEDEP}] + )" RDEPEND="${DEPEND} !app-portage/gentoolkit-dev sys-apps/gawk -- cgit v1.2.3