From bd3c6f11646b7601637fa3245cf8a363e9fa0034 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 12 Jul 2022 07:32:04 +0100 Subject: gentoo auto-resync : 12:07:2022 - 07:32:03 --- app-portage/Manifest.gz | Bin 9739 -> 9745 bytes app-portage/gentoolkit/Manifest | 7 +- .../files/gentoolkit-0.6.1-pkgindex.patch | 45 +++++++++++++ app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild | 4 +- app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild | 2 +- app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild | 71 -------------------- app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild | 72 +++++++++++++++++++++ 7 files changed, 124 insertions(+), 77 deletions(-) create mode 100644 app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch delete mode 100644 app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild create mode 100644 app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild (limited to 'app-portage') diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz index 96aeb7796ade..0d51f48caa1d 100644 Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest index 585916fa6d92..6d66f203b633 100644 --- a/app-portage/gentoolkit/Manifest +++ b/app-portage/gentoolkit/Manifest @@ -1,11 +1,12 @@ AUX gentoolkit-0.5.0-python3_9.patch 1425 BLAKE2B 51663e01d48f6f192cfe96972c584337e62495d553251ffe360c4e928e208d528b453faefeb3c2d1641c9e662151b8ba91ebb7f1ec6b3a2c67fcb18eaefe3495 SHA512 327ff6d6aa77293f7bff3be6e543e3bb1b4fcf226d3e913668c69fdb9de2d2e04a73d9e73526910ae4e2c3b0bce3f87249cb31d55928b58a9c4274b97525e9d3 AUX gentoolkit-0.5.0-r1-python3_9.patch 1220 BLAKE2B ce01d9a8cdd214d585b0e4ee61ce21aba2880deb76c666f6a0fd5833d340a24b741be68e6923a942353d53ad0c4d66014290548d52fe76bad4cc0069b6322d29 SHA512 19ab5bd0bd76571106e12f361ef41a7eb4fb573afe5e5d61c547e4df1d2697c80db8307623edbdffcdaee9472ab56c1b61e133cfbf3845b174a10f4e7aec7d44 AUX gentoolkit-0.6.1-data_files.patch 1157 BLAKE2B 1b6bebcc9de77532df7f3eef8e19cb82ed011e36eb20e8dc7f0fcaaabf856c7845cf3c46722c947b8235e3745e2754f227ac02f7ca48ed14af5aa0c4ff7ae906 SHA512 309d36852d4b631cb8767b85059a33f430021598b83fd26cffbddf4ce6487f10a8588ccd835335c48b62ebfd36ddf5f6cf6bc0cc980192f7ceaea90991089891 +AUX gentoolkit-0.6.1-pkgindex.patch 1637 BLAKE2B 836024b833e516dcf2aa005b1ca8ed7a542c9cf4ac5eef7b79f0e05474a0994ef02aa3f14b7fe71b8e4e823f79743e40f7f61bc5e8b0481d3d1ea261ffd90606 SHA512 6afb4dad8a74f8fe2cc285d34f70c7a50db5977dee22129b81160d2e2a069ca8fd7f9b67f57d59e6ebe750a1518447e6cf4f85c6468777a3cfe7e54162c496bc DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861 DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B de2cd69aec9be79f498b1180a90afb54e77f9d8a47636cd722f2028a906d43874132d55a71bf373b3d10c7c10034f5d8ce0280a35041b0c60a1d5aa2ed6296a1 SHA512 667e464853b17ae297c59fb06e8f4563119a1382470d064c5721ae898e61173e9af5b071c7618d315232e6974fec205e27559785d2816253711de3e83d9e1911 DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d SHA512 1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d -EBUILD gentoolkit-0.5.0-r3.ebuild 2400 BLAKE2B 8c3aaeb7089a3223ec1df18aea05eb0b69da3e95ce10d8f2bab23e1047ca5c0bfe71db5a5f3ad3293d5f1c6f33b10e79b15d0af5c2fe12d5c04c97129ae04019 SHA512 33e37394f2204bfe15f113c907067337e6393aec7293ad4002e846c6e984373b98c1fe2188097898604cf39e6e164dfc8e167372e3a651cd6f5f3b737bad388e -EBUILD gentoolkit-0.5.1-r1.ebuild 1934 BLAKE2B fdb476e07a1830dbfad24ef9f253c549fea39dab50c9b170f995c25880177e8d710c42ba46869cf2dde69ee85a9ab64f4b46642828e53841f61394c60612e04f SHA512 4bdd8c774fbe5d3114a0aa35eab1b040f679834d57bfd5dc64a6f6402a62fbc82b36420f909aa7d560e87a389f899a5d8884a46241669cfa5da1e81bbcda58e5 -EBUILD gentoolkit-0.6.1-r1.ebuild 2002 BLAKE2B 072b00a9d054576e31c2eb1dbfcc423140c98a7d70f1d34e2d553093046d0c08c9c8c7cda62184a0f2620ef2de445f3879ea5ced2f9a4f715d8182bc45db2d14 SHA512 7f932628d82010f5bec3756127946ed00c7295daf6efa5484c6edf3f7aeb79dcdd71911fca3a132bb23abc2051eca07663a751bb49b96516b4a541884d1cdf28 +EBUILD gentoolkit-0.5.0-r3.ebuild 2398 BLAKE2B 9ff7c63bbe1781290051b6a3479f23ee3fa8a81a1e5bb9fc696b0a8899dcf740470b8c4d31ede30084fc54fa99d93a64bd65123e5793862b68a420d26f4c1a12 SHA512 bc9fb3941d26b3c68641c72342af463a45b89be8de0ff0530422b5dffd5d3409f5ff4e62da307d14d9a6946806900368f24dd68825c7ffacaddd8567d7e80a08 +EBUILD gentoolkit-0.5.1-r1.ebuild 1934 BLAKE2B c510353ec768dcc7848475cd2f353c466cb93e59a52c2743e5236995a1bf6761dfa1f32fb0ec4de75bc14db3a17404b152cebe7121dece062350744e08bdd0d7 SHA512 763f276f1dca5148efd9ba93c9008296b7ecbdd9119fe818e868e7996306d5b8ccf7a42ac540908b8edcd271e64cd680be9b3c5d39af72037ed8eafd587bbf84 +EBUILD gentoolkit-0.6.1-r2.ebuild 2049 BLAKE2B a509871905d69123618831bda8006b85943aae29b39092a5d962bc29a795e2c8f937dcd87a2f4d935602e6146c49f9cb8835eaf6c5eef60ad980a3cf40b463e8 SHA512 ef894f8a78c362da4e750ea0decf11624beff586bb140af35d38ae4ccf67743462520cde5b180f7f563ae0dc58e6596488199b24f73483fadf2a1c3ab582a02f EBUILD gentoolkit-9999.ebuild 1940 BLAKE2B 76b9d10079ce996932ec1ca540d4be0ac4ecc97d5ebd2363e46490c87f0cf7834e936f21c2116d0da7e612ffdb59ee6cd0f3d8c28170789cc6ccdfa7398fde49 SHA512 e2c5272fa77c50779e98b4789fc1bc349bdcb2704b82d899adaa8b8ace72091d510465b0d2ce2dc4541c1a411fd27182a984f255e4dc964974d0bb5053873cb6 MISC metadata.xml 559 BLAKE2B bbd703786a8eee12a1dbdac88476a3444622841918bcb3011c77b444bff3f650c6f5fb6c6c9ca053f3d85d16aa7fbb7e617bae79eb95fe4b17569b26726e6859 SHA512 a4788b331c6fd201abfdfc5500f4f055bf3e75d7cce9cf25528559aa3eeb9c763c9c72cfb88b774f93b2c5e0ba7be8ca55f8d2337701e517e70f4ef04a618a62 diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch b/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch new file mode 100644 index 000000000000..193eacc2db8b --- /dev/null +++ b/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch @@ -0,0 +1,45 @@ +From bf3eb16e451fd1bdee8ef03a0d22e0040e033f19 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Sun, 10 Jul 2022 23:41:33 -0700 +Subject: [PATCH] eclean/pkgindex.py: Fix typo in function call + + File "/usr/lib/python3.10/site-packages/gentoolkit/eclean/pkgindex.py", line +60, in clean_pkgs_index + if self.get_emaint_binhost(): +AttributeError: 'PkgIndex' object has no attribute 'get_emaint_binhost'. Did +you mean: '_get_emaint_binhost'? + +Also fix too many parameters in line 68 for the self.controller() call + +Bug: https://bugs.gentoo.org/857555 + +Signed-off-by: Brian Dolbec +--- + pym/gentoolkit/eclean/pkgindex.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pym/gentoolkit/eclean/pkgindex.py b/pym/gentoolkit/eclean/pkgindex.py +index d0878a1..7d6fade 100644 +--- a/pym/gentoolkit/eclean/pkgindex.py ++++ b/pym/gentoolkit/eclean/pkgindex.py +@@ -57,15 +57,15 @@ class PkgIndex: + statinfo = os.stat(file_) + size1 = statinfo.st_size + show_progress = not quiet +- if self.get_emaint_binhost(): ++ if self._get_emaint_binhost(): + self.taskmaster = TaskHandler(show_progress_bar=show_progress) + tasks = [self.binhost] + self.taskmaster.run_tasks(tasks) + else: + self.call_emaint() + statinfo = os.stat(file_) + clean_size = size1 - statinfo.st_size +- self.controller("\n", clean_size, "Packages Index", file_, "Index") ++ self.controller(clean_size, "Packages Index", file_, "Index") + return clean_size + + def call_emaint(self): +-- +libgit2 1.4.3 + diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild index 436222faf8fa..2b97684c9887 100644 --- a/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{8,9} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" inherit distutils-r1 tmpfiles diff --git a/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild index 2c446359a9f8..95844ae6161b 100644 --- a/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7..10} pypy3 ) +PYTHON_COMPAT=( python3_{8..10} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" inherit distutils-r1 tmpfiles diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild deleted file mode 100644 index d176540989f7..000000000000 --- a/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{8..11} pypy3 ) -PYTHON_REQ_USE="xml(+),threads(+)" - -inherit distutils-r1 tmpfiles - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Collection of administration scripts for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" - -LICENSE="GPL-2" -SLOT="0" - -DEPEND=" - sys-apps/portage[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - virtual/awk - sys-apps/gentoo-functions" - -PATCHES=( - "${FILESDIR}/gentoolkit-0.6.1-data_files.patch" -) - -distutils_enable_tests setup.py - -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 - - if use prefix-guest ; then - # use correct repo name, bug #632223 - sed -i \ - -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ - pym/gentoolkit/profile.py || die - fi -} - -pkg_postinst() { - tmpfiles_process revdep-rebuild.conf - - # 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/portpeek" - elog " app-portage/smart-live-rebuild" - fi -} diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild new file mode 100644 index 000000000000..ea872764365b --- /dev/null +++ b/app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{8..11} pypy3 ) +PYTHON_REQ_USE="xml(+),threads(+)" + +inherit distutils-r1 tmpfiles + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Collection of administration scripts for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" + +LICENSE="GPL-2" +SLOT="0" + +DEPEND=" + sys-apps/portage[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND} + virtual/awk + sys-apps/gentoo-functions" + +PATCHES=( + "${FILESDIR}/gentoolkit-0.6.1-data_files.patch" + "${FILESDIR}/gentoolkit-0.6.1-pkgindex.patch" +) + +distutils_enable_tests setup.py + +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 + + if use prefix-guest ; then + # use correct repo name, bug #632223 + sed -i \ + -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ + pym/gentoolkit/profile.py || die + fi +} + +pkg_postinst() { + tmpfiles_process revdep-rebuild.conf + + # 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/portpeek" + elog " app-portage/smart-live-rebuild" + fi +} -- cgit v1.2.3