From 20bf4102a38766a216f9aff7a72ed6156a3be8ae Mon Sep 17 00:00:00 2001 From: Paul Varner Date: Wed, 24 Aug 2011 18:18:49 +0000 Subject: [PATCH] Revision bump. Fix traversal of cascading profiles by euse (Bug 379599). Fix equery changes Invalid CPV errors (Bug 375293). Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- app-portage/gentoolkit/ChangeLog | 11 ++- app-portage/gentoolkit/Manifest | 6 +- .../files/0.3.0.4-euse-376393.patch | 21 +++++ .../files/0.3.0.4-euse-379599.patch | 37 +++++++++ .../files/0.3.0.4-gentoolkit-375293.patch | 25 ++++++ .../gentoolkit/gentoolkit-0.3.0.4-r2.ebuild | 83 +++++++++++++++++++ 6 files changed, 181 insertions(+), 2 deletions(-) create mode 100644 app-portage/gentoolkit/files/0.3.0.4-euse-376393.patch create mode 100644 app-portage/gentoolkit/files/0.3.0.4-euse-379599.patch create mode 100644 app-portage/gentoolkit/files/0.3.0.4-gentoolkit-375293.patch create mode 100644 app-portage/gentoolkit/gentoolkit-0.3.0.4-r2.ebuild diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog index 12aaeb143ae0..08650bad1d5e 100644 --- a/app-portage/gentoolkit/ChangeLog +++ b/app-portage/gentoolkit/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-portage/gentoolkit # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.229 2011/07/28 03:00:24 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.230 2011/08/24 18:18:49 fuzzyray Exp $ + +*gentoolkit-0.3.0.4-r2 (24 Aug 2011) + + 24 Aug 2011; Paul Varner +gentoolkit-0.3.0.4-r2.ebuild, + +files/0.3.0.4-gentoolkit-375293.patch, +files/0.3.0.4-euse-376393.patch, + +files/0.3.0.4-euse-379599.patch: + Revision bump. + Fix traversal of cascading profiles by euse (Bug 379599). + Fix equery changes Invalid CPV errors (Bug 375293). 28 Jul 2011; Paul Varner -files/0.3.0_rc11-cpv.py.patch, -files/0.3.0_rc11-eshowkw_indir.patch, diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest index 56005cec6544..8814fab67be5 100644 --- a/app-portage/gentoolkit/Manifest +++ b/app-portage/gentoolkit/Manifest @@ -1,9 +1,13 @@ +AUX 0.3.0.4-euse-376393.patch 857 RMD160 980e8614def7fb25c0957ff55d067c3c39c24d9d SHA1 0a7518fbac7c96aca5f44fa9f98b0932d6f2a6fe SHA256 1c8a97107417bb87e455425cd92b3cf62e09c268e959dfabaee9b6d4b082059b +AUX 0.3.0.4-euse-379599.patch 1091 RMD160 78579fce2806eed8217458689c7a7896f0a8267e SHA1 95c95aa58873b6b0e016403854b0c2f4b8d18802 SHA256 e1904b39ecb5a7f9e2bb2dc1ecf02e5ca6095479c8c545d5cc6dd39c3f80884b AUX 0.3.0.4-euse.patch 857 RMD160 980e8614def7fb25c0957ff55d067c3c39c24d9d SHA1 0a7518fbac7c96aca5f44fa9f98b0932d6f2a6fe SHA256 1c8a97107417bb87e455425cd92b3cf62e09c268e959dfabaee9b6d4b082059b +AUX 0.3.0.4-gentoolkit-375293.patch 783 RMD160 8ed8290cf695952747af9cfd1b3232295c04a396 SHA1 c9e184b10e0b23baedd45e5e1858f409a896d5c4 SHA256 ab903ceb3afcaf0f893d1600339ed04800794af89c2a155de0593e3a60b9124b DIST gentoolkit-0.2.4.6.1.tar.gz 90135 RMD160 7cfe8a8a6e697bbab0d93ec6d82f5b0aee8bcc03 SHA1 82e8a785a753a9e86063dd4fff2f4f864e4224bb SHA256 d057ce14e037e313ae085ac70871a56bbc147efe9beae8fcf8c818afcaa63896 DIST gentoolkit-0.3.0.4.tar.gz 180411 RMD160 f61d5532a90269a34c26d2c1731d5ba31359048f SHA1 eb373ba5069da8f2858f8afa4e40fe158501e94c SHA256 cc1fc031bf69a095a5cd2aab433f06e8eb3b5af2fef743bce5958c7f7f38803c EBUILD gentoolkit-0.2.4.6.1-r1.ebuild 2068 RMD160 0d340f33a4b80ab28c851cdf380851a532283bba SHA1 a7d0c0d82414dc8c086059815393ebdc9aedb406 SHA256 2995cfcc97fa965c6dcab8eb9ebbdcaddf32c99e019545403a7f66b17d7685ad EBUILD gentoolkit-0.3.0.4-r1.ebuild 2740 RMD160 39c25434d49da1d06798aa7555564cda8d3bf96a SHA1 ccb51d3444774669c93d7df92afe037232ab5c84 SHA256 066a4446aed621cd7739beaf875fef81d272fea04dd4274361170afc9d730ff1 +EBUILD gentoolkit-0.3.0.4-r2.ebuild 2845 RMD160 ca5d6b52b85b990ccb52eb311acff7fff9576cb8 SHA1 e3a8eb335d1de7c19493324f8f73f49beb0a68cb SHA256 fde95d24d38fd73f330234e3a8b28379599b7fe26637e07d5a3c44e5b0e3935f EBUILD gentoolkit-0.3.0.4.ebuild 2667 RMD160 821a8de610472379b7495ec535a9806dc10a0481 SHA1 a19140ff5aca6f86a582b5be9aeef6fe55661830 SHA256 277430a4a0c299c9c0aca4c347038414b96c3dd60a987fc66b268a4145716ae1 EBUILD gentoolkit-9999.ebuild 2138 RMD160 52e0a1a8ce72b73a7a23ba9f88dd10ed74e8fd4f SHA1 770efb12989efbc440e247272d19a04107f0867c SHA256 7352e4625b86a4f894776016e358eeace57f603e3b6b64b50cbb80d864bc390b -MISC ChangeLog 64352 RMD160 7e404b426c0e67d25a55b44945554474e1cff324 SHA1 22d156b9a05afe0b98f1d610304074020dc69608 SHA256 b5700f42f2a0917e290b6a25352536458dd80f02f604d2bf830e4f6091fc84a7 +MISC ChangeLog 64714 RMD160 596efedf06221a1d0612e4a4fc241bf9cd587c54 SHA1 3fb9ce9721905eaa78b9e49c84ff0187be7a9765 SHA256 bd9f1c9d929687e60a6c3734b0a863e94fd7398b5a920d7385c76b85287e90c4 MISC metadata.xml 451 RMD160 b1cce9123da273149c731793696937f9b3d02c60 SHA1 6126c34edcb6ed5f4274e060881378cc1cf10757 SHA256 1a2def4d28f69d6bffeb0b09e97ce53e6822e457d5d9308000a1010dca32abeb diff --git a/app-portage/gentoolkit/files/0.3.0.4-euse-376393.patch b/app-portage/gentoolkit/files/0.3.0.4-euse-376393.patch new file mode 100644 index 000000000000..17dc804c8fed --- /dev/null +++ b/app-portage/gentoolkit/files/0.3.0.4-euse-376393.patch @@ -0,0 +1,21 @@ +From: Paul Varner +Date: Wed, 27 Jul 2011 19:01:34 +0000 (-0500) +Subject: Fix missing parenthises in euse. Bug 376393 +X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fgentoolkit.git;a=commitdiff_plain;h=9ad547e5f33fce1dfb378809252d871265a82c58;hp=af81292035e8d3559b11ab16fc54ccd921cb3587 + +Fix missing parenthises in euse. Bug 376393 +--- + +diff --git a/bin/euse b/bin/euse +index 65fb119..be47cc9 100755 +--- a/bin/euse ++++ b/bin/euse +@@ -508,7 +508,7 @@ get_flagstatus_helper_pkg() { + atoms=($( + echo "${atoms[@]}" | python -c " + from __future__ import print_function;import portage.dep as dep, sys +-print(' '.join(dep.match_to_list('$5-$6',sys.stdin.read().split()))")) ++print(' '.join(dep.match_to_list('$5-$6',sys.stdin.read().split())))")) + fi + flags=$(for atom in ${atoms[@]}; do + [[ -z $atom ]] && continue diff --git a/app-portage/gentoolkit/files/0.3.0.4-euse-379599.patch b/app-portage/gentoolkit/files/0.3.0.4-euse-379599.patch new file mode 100644 index 000000000000..dc43784e2eb4 --- /dev/null +++ b/app-portage/gentoolkit/files/0.3.0.4-euse-379599.patch @@ -0,0 +1,37 @@ +From 6edc15a5690a3c26a3c530669a922e01f50ab830 Mon Sep 17 00:00:00 2001 +From: Paul Varner +Date: Wed, 24 Aug 2011 12:28:06 -0500 +Subject: [PATCH] Fix traversal of cascading profiles by euse (Bug 379559). + Thanks to Ian Abbot for the patch! + +--- + bin/euse | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bin/euse b/bin/euse +index be47cc9..bedba35 100755 +--- a/bin/euse ++++ b/bin/euse +@@ -439,7 +439,6 @@ traverse_profile() { + + curdir="${2:-$(get_real_path ${MAKE_PROFILE_PATH})}" + +- [[ -f "${curdir}/${1}" ]] && rvalue="${curdir}/${1} ${rvalue}" + if [[ -f "${curdir}/parent" ]]; then + for parent in $(egrep -v '(^#|^ *$)' ${curdir}/parent); do + # Bug 231394, handle parent path being absolute +@@ -448,9 +447,10 @@ traverse_profile() { + else + pdir="$(get_real_path ${curdir}/${parent})" + fi +- rvalue="$(traverse_profile ${1} ${pdir}) ${rvalue}" ++ rvalue="${rvalue} $(traverse_profile ${1} ${pdir})" + done + fi ++ [[ -f "${curdir}/${1}" ]] && rvalue="${rvalue} ${curdir}/${1}" + + echo "${rvalue}" + } # }}} +-- +1.7.3.4 + diff --git a/app-portage/gentoolkit/files/0.3.0.4-gentoolkit-375293.patch b/app-portage/gentoolkit/files/0.3.0.4-gentoolkit-375293.patch new file mode 100644 index 000000000000..bc0bad5323c0 --- /dev/null +++ b/app-portage/gentoolkit/files/0.3.0.4-gentoolkit-375293.patch @@ -0,0 +1,25 @@ +From 0382df255affced93b59322611a58bf98aec6c64 Mon Sep 17 00:00:00 2001 +From: Paul Varner +Date: Fri, 15 Jul 2011 14:59:23 -0500 +Subject: [PATCH] Do not index ChangeLog entries with an invalid CPV. (Bug 375293) + +--- + pym/gentoolkit/helpers.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/pym/gentoolkit/helpers.py b/pym/gentoolkit/helpers.py +index 225a198..a0b29ab 100644 +--- a/pym/gentoolkit/helpers.py ++++ b/pym/gentoolkit/helpers.py +@@ -175,7 +175,7 @@ class ChangeLog(object): + if not pkg_name.strip(): + continue + try: +- entry_ver = CPV(pkg_name) ++ entry_ver = CPV(pkg_name, validate=True) + except errors.GentoolkitInvalidCPV: + if self.invalid_entry_is_fatal: + raise ValueError(entry_ver) +-- +1.7.3.4 + diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r2.ebuild new file mode 100644 index 000000000000..01747fbd6ed2 --- /dev/null +++ b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.4-r2.ebuild,v 1.1 2011/08/24 18:18:49 fuzzyray Exp $ + +EAPI="3" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="2.[45]" +PYTHON_USE_WITH="xml" +PYTHON_NONVERSIONED_EXECUTABLES=(".*") + +inherit distutils python eutils + +DESCRIPTION="Collection of administration scripts for Gentoo" +HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +# Drop "~m68k ~s390 ~sh ~sparc-fbsd ~x86-fbsd" due to dev-python/argparse dependency +# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005) +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +DEPEND="sys-apps/portage" +RDEPEND="${DEPEND} + !<=app-portage/gentoolkit-dev-0.2.7 + dev-python/argparse + || ( app-misc/realpath sys-freebsd/freebsd-bin ) + sys-apps/gawk + sys-apps/grep" + +distutils_src_compile_pre_hook() { + echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version + VERSION="${PVR}" "$(PYTHON)" setup.py set_version \ + || die "setup.py set_version failed" +} + +src_prepare() { + epatch "${FILESDIR}/${PV}-euse-376393.patch" + epatch "${FILESDIR}/${PV}-euse-379599.patch" + epatch "${FILESDIR}/${PV}-gentoolkit-375293.patch" +} + +src_install() { + python_convert_shebangs -r "" build-*/scripts-* + distutils_src_install + + # Create cache directory for revdep-rebuild + dodir /var/cache/revdep-rebuild + keepdir /var/cache/revdep-rebuild + use prefix || fowners root:root /var/cache/revdep-rebuild + fperms 0700 /var/cache/revdep-rebuild + + # remove on Gentoo Prefix platforms where it's broken anyway + if use prefix; then + elog "The revdep-rebuild command is removed, the preserve-libs" + elog "feature of portage will handle issues." + rm "${ED}"/usr/bin/revdep-rebuild + rm "${ED}"/usr/share/man/man1/revdep-rebuild.1 + rm -rf "${ED}"/etc/revdep-rebuild + rm -rf "${ED}"/var + fi + + # Can distutils handle this? + dosym eclean /usr/bin/eclean-dist + dosym eclean /usr/bin/eclean-pkg +} + +pkg_postinst() { + distutils_pkg_postinst + + einfo + einfo "For further information on gentoolkit, please read the gentoolkit" + einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml" + einfo + einfo "Another alternative to equery is app-portage/portage-utils" + ewarn + ewarn "glsa-check since gentoolkit 0.3 has modified some output," + ewarn "options and default behavior. The list of injected GLSAs" + ewarn "has moved to /var/lib/portage/glsa_injected, please" + ewarn "run 'glsa-check -p affected' before copying the existing checkfile." +} -- 2.26.2