From: Paul Varner Date: Thu, 8 Sep 2011 01:30:38 +0000 (+0000) Subject: Revison bump to fix missing quotes in euse. Bug 382219 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=587183c8b5edc086940d16096a9b1cff224ab62e;p=gentoo.git Revison bump to fix missing quotes in euse. Bug 382219 Package-Manager: portage-2.1.10.13/cvs/Linux x86_64 --- diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog index 7427ee5e6f66..3e128ed39ec1 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.231 2011/08/26 21:42:17 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.232 2011/09/08 01:30:37 fuzzyray Exp $ + +*gentoolkit-0.3.0.4-r4 (08 Sep 2011) + + 08 Sep 2011; Paul Varner +gentoolkit-0.3.0.4-r4.ebuild, + +files/0.3.0.4-euse-382219.patch: + Revison bump to fix missing quotes in euse. Bug 382219 *gentoolkit-0.3.0.4-r3 (26 Aug 2011) diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest index 19a97730753e..739f78947e9d 100644 --- a/app-portage/gentoolkit/Manifest +++ b/app-portage/gentoolkit/Manifest @@ -1,6 +1,7 @@ AUX 0.3.0.4-equery-380573.patch 1091 RMD160 1fbff307fbb13198fbbe9b5ee94f67b95f932820 SHA1 96d50dd712573f5caa77a9a15fd1fa669b907ce4 SHA256 34e1ae2b1b05f57330dff9aafecc42bbace48072aac94856d71ecf9ca0d098ae 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-382219.patch 1281 RMD160 b46acd5a8a8aa1d909a8f416a2f1277efbed8086 SHA1 ec671550ee471d21be844881b07274c1cfdac7a1 SHA256 c7ab9a06925db24f4a928329cb4ad611c5ddb3347a048dcc23a4aecbceb8e7b3 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 @@ -9,7 +10,8 @@ EBUILD gentoolkit-0.2.4.6.1-r1.ebuild 2068 RMD160 0d340f33a4b80ab28c851cdf380851 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-r3.ebuild 2893 RMD160 b2e0742a62c9d4e3bcc5616d6918b1597dca824d SHA1 f9d44103a508fcd024e468a854cf1b1ad5418bf9 SHA256 bd8876fac46b87731ce04786a04554f286013553b861c05faddcd05e3b907a17 +EBUILD gentoolkit-0.3.0.4-r4.ebuild 2939 RMD160 5b005fa0a8a5cf3179d2f1a5a14ceb82728c4b97 SHA1 6ed440e6c3a9968afa4a71ecaa9905510380c970 SHA256 74c5d8ce902e99d3d95c24ed4e04e7a6193442768344bb2b7b68d0cf31eddda5 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 64928 RMD160 ec81b75ca3475e6e2bbc4da6feb8fa12424b6c78 SHA1 5546a8764c435d1cca7f61367eb755d91692b485 SHA256 2a4ba728894f375ed0b7b6c3bf366eedabf6b9112c847261b04b5088f7db16b4 +MISC ChangeLog 65140 RMD160 a4f1d258180f22bf10564c3aa0ba3be42fa7d02a SHA1 d01ac14167311b63bbba803baa8e19e32cd53609 SHA256 ca9e4db72fbd4330add5076fc236f1b081a16c3fbd3b20512a263b570f2b9bfd MISC metadata.xml 451 RMD160 b1cce9123da273149c731793696937f9b3d02c60 SHA1 6126c34edcb6ed5f4274e060881378cc1cf10757 SHA256 1a2def4d28f69d6bffeb0b09e97ce53e6822e457d5d9308000a1010dca32abeb diff --git a/app-portage/gentoolkit/files/0.3.0.4-euse-382219.patch b/app-portage/gentoolkit/files/0.3.0.4-euse-382219.patch new file mode 100644 index 000000000000..168ca3db99cb --- /dev/null +++ b/app-portage/gentoolkit/files/0.3.0.4-euse-382219.patch @@ -0,0 +1,42 @@ +From 4a1fe09bfdff516e28aab23eea102984fedb429a Mon Sep 17 00:00:00 2001 +From: Christian Ruppert +Date: Wed, 7 Sep 2011 14:39:10 +0200 +Subject: [PATCH] Add missing quotes + +--- + bin/euse | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/bin/euse b/bin/euse +index bedba35..febe732 100755 +--- a/bin/euse ++++ b/bin/euse +@@ -275,21 +275,21 @@ get_useflags() { + # backup portdir so get_portdir() doesn't give false results later + portdir_backup="${PORTDIR}" + +- ACTIVE_FLAGS[0]="$(reduce_incrementals ${USE})" ++ ACTIVE_FLAGS[0]="$(reduce_incrementals "${USE}")" + USE="" + for x in $(get_all_make_conf); do + source "${x}" +- ACTIVE_FLAGS[1]="$(reduce_incrementals ${ACTIVE_FLAGS[1]} ${USE})" ++ ACTIVE_FLAGS[1]="$(reduce_incrementals "${ACTIVE_FLAGS[1]}" "${USE}")" + done + USE="" + for x in $(get_all_make_defaults); do + source "${x}" + ACTIVE_FLAGS[2]="${ACTIVE_FLAGS[2]} ${USE}" + done +- ACTIVE_FLAGS[2]="$(reduce_incrementals ${ACTIVE_FLAGS[2]})" ++ ACTIVE_FLAGS[2]="$(reduce_incrementals "${ACTIVE_FLAGS[2]}")" + USE="" + source "${MAKE_GLOBALS_PATH}" +- ACTIVE_FLAGS[3]="$(reduce_incrementals ${USE})" ++ ACTIVE_FLAGS[3]="$(reduce_incrementals "${USE}")" + + # restore saved env variables + USE="${ACTIVE_FLAGS[0]}" +-- +1.7.3.4 + diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r4.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r4.ebuild new file mode 100644 index 000000000000..7af84c6f4837 --- /dev/null +++ b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r4.ebuild @@ -0,0 +1,85 @@ +# 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-r4.ebuild,v 1.1 2011/09/08 01:30:37 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" + epatch "${FILESDIR}/${PV}-equery-380573.patch" + epatch "${FILESDIR}/${PV}-euse-382219.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." +}