From: Paul Varner Date: Thu, 28 Jul 2011 02:55:53 +0000 (+0000) Subject: Revison bump to fix missing parenthises in euse. Bug 376393 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8b97b62c617f0f3446693e31cf13407302c05824;p=gentoo.git Revison bump to fix missing parenthises in euse. Bug 376393 Package-Manager: portage-2.1.10.7/cvs/Linux x86_64 --- diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog index 37331dc7c98f..f8e8bccbe259 100644 --- a/app-portage/gentoolkit/ChangeLog +++ b/app-portage/gentoolkit/ChangeLog @@ -1,6 +1,12 @@ # 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.227 2011/07/18 21:58:26 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.228 2011/07/28 02:55:53 fuzzyray Exp $ + +*gentoolkit-0.3.0.4-r1 (28 Jul 2011) + + 28 Jul 2011; Paul Varner +files/0.3.0.4-euse.patch, + +gentoolkit-0.3.0.4-r1.ebuild: + Revison bump to fix missing parenthises in euse. Bug 376393 18 Jul 2011; Paul Varner -gentoolkit-0.3.0_rc10-r1.ebuild, -gentoolkit-0.3.0_rc11-r3.ebuild, diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest index 90918347ec3f..402886c1fe09 100644 --- a/app-portage/gentoolkit/Manifest +++ b/app-portage/gentoolkit/Manifest @@ -1,3 +1,4 @@ +AUX 0.3.0.4-euse.patch 857 RMD160 980e8614def7fb25c0957ff55d067c3c39c24d9d SHA1 0a7518fbac7c96aca5f44fa9f98b0932d6f2a6fe SHA256 1c8a97107417bb87e455425cd92b3cf62e09c268e959dfabaee9b6d4b082059b AUX 0.3.0_rc11-cpv.py.patch 695 RMD160 b914db3cced3dfe9820c909e6c086e1630ac8a1d SHA1 0db9298a48cdb165531b804bbaeaf2e023368d63 SHA256 32b5eebcfc7225059d381433d0da77cc840fa322d6390c91cb4e61a61db202a9 AUX 0.3.0_rc11-eshowkw_indir.patch 870 RMD160 be3da0ced1645a930190aa5b563b05ebbd791a89 SHA1 a589a81a65e96c050f7f85b34b246cf1a9f463dc SHA256 fac5774bf3b17a7d88cf8fd57cea70980e9dcd49b2a622c960de59302fb2793a AUX 0.3.0_rc11-euse.patch 3396 RMD160 874caa282d3463d92e3e778eb966ed63b1b8c899 SHA1 5322f8d621f5a9a3499980241be90adbc6848368 SHA256 4993cb19e8aea2077ce55fb420e4a78d5f880293990c0baa8db5e059ae22841e @@ -7,7 +8,8 @@ AUX eclean.313901.patch 1497 RMD160 21579445342977fe59a7a464605c963a43c59fa7 SHA 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.ebuild 2667 RMD160 821a8de610472379b7495ec535a9806dc10a0481 SHA1 a19140ff5aca6f86a582b5be9aeef6fe55661830 SHA256 277430a4a0c299c9c0aca4c347038414b96c3dd60a987fc66b268a4145716ae1 EBUILD gentoolkit-9999.ebuild 2138 RMD160 52e0a1a8ce72b73a7a23ba9f88dd10ed74e8fd4f SHA1 770efb12989efbc440e247272d19a04107f0867c SHA256 7352e4625b86a4f894776016e358eeace57f603e3b6b64b50cbb80d864bc390b -MISC ChangeLog 63841 RMD160 fd0ed003a92d197c7533be4e9b913789e0abbb30 SHA1 953a91105b07fc9795b27a497137b9d50789e3c3 SHA256 e0532fa102a8f2e54ceedaa04e4b275957b8d26ad3fac70ec4fba770dfa9ccaa +MISC ChangeLog 64051 RMD160 33eec52ad97821eb6f0fc9497e6e40424c81032e SHA1 941efe45b24129c444e732437236822c39c3b5ab SHA256 883eae01ca1fe2e5b378c68c6a6adf7def6904ea417212727a5c39b01fd28cd1 MISC metadata.xml 451 RMD160 b1cce9123da273149c731793696937f9b3d02c60 SHA1 6126c34edcb6ed5f4274e060881378cc1cf10757 SHA256 1a2def4d28f69d6bffeb0b09e97ce53e6822e457d5d9308000a1010dca32abeb diff --git a/app-portage/gentoolkit/files/0.3.0.4-euse.patch b/app-portage/gentoolkit/files/0.3.0.4-euse.patch new file mode 100644 index 000000000000..17dc804c8fed --- /dev/null +++ b/app-portage/gentoolkit/files/0.3.0.4-euse.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/gentoolkit-0.3.0.4-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r1.ebuild new file mode 100644 index 000000000000..7f5c8c57337b --- /dev/null +++ b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r1.ebuild @@ -0,0 +1,81 @@ +# 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-r1.ebuild,v 1.1 2011/07/28 02:55:53 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.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." +}