From 1db581847ff5f6814fcd0b3365bee047d0ca5a87 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 9 May 2012 15:00:28 -0400 Subject: [PATCH] portage-utils: upgrade to latest stable Upgraded app-portage/portage-utils to version 0.8 on amd64, arm, x86 BUG=chromium-os:24197 TEST=`qlist -Iv` worked TEST=`emerge-x86-alex pambase` worked Change-Id: I0e14c14dc8ffc421f7f6e135b49496f2901507c5 Reviewed-on: https://gerrit.chromium.org/gerrit/22293 Reviewed-by: David James Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger --- .../app-portage/portage-utils/Manifest | 2 +- .../portage-utils/files/q-reinitialize | 2 +- .../portage-utils/portage-utils-0.2.1.ebuild | 60 ------------------- .../portage-utils/portage-utils-0.8.ebuild | 56 +++++++++++++++++ .../md5-cache/app-portage/portage-utils-0.2.1 | 9 --- .../md5-cache/app-portage/portage-utils-0.8 | 11 ++++ 6 files changed, 69 insertions(+), 71 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.2.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.8.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/portage-utils-0.2.1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/portage-utils-0.8 diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest index 859ae1a147..dc35228cde 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest @@ -1 +1 @@ -DIST portage-utils-0.2.1.tar.bz2 88605 RMD160 43eb25843c23edc60b74f11fb27878435a2c8afa SHA1 3debae1a547ed39d6429c50dc6be3ff1e6144eed SHA256 545ae4d39b4df7277050becc81ee622357da0873aa215b94eacea0a38cd830bd +DIST portage-utils-0.8.tar.xz 378220 RMD160 df2d7cef2795564f57d63c53045d1b90627b1699 SHA1 00837e3d0def5c9b13ae70900030f1cbe4154485 SHA256 d7a0dd6f8afc959f965a0dfcba12e808f623035cf1a38f3be4a5765d42174c74 diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/files/q-reinitialize b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/files/q-reinitialize index 9e593769aa..7bca1a86b3 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/files/q-reinitialize +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/files/q-reinitialize @@ -1,3 +1,3 @@ #!/bin/sh -[ -x /usr/bin/q ] && /usr/bin/q -qr +[ -x /usr/bin/q ] && /usr/bin/q -r ${PORTAGE_QUIET:+-q} : diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.2.1.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.2.1.ebuild deleted file mode 100644 index 4d22041ee6..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.2.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.2.1.ebuild,v 1.2 2009/12/05 10:02:49 vapier Exp $ - -inherit toolchain-funcs eutils - -DESCRIPTION="small and fast portage helper tools written in C" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i -e 's:\[\[:[:' -e 's:\]\]:]:' Makefile -} - -src_compile() { - tc-export CC - emake || die -} - -src_install() { - emake install DESTDIR="${D}" || die -} - -pkg_postinst() { - [ -e "${ROOT}"/etc/portage/bin/post_sync ] && return 0 - mkdir -p "${ROOT}"/etc/portage/bin/ - -cat <<__EOF__ > "${ROOT}"/etc/portage/bin/post_sync -#!/bin/sh -# Copyright 2006-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -if [ -d /etc/portage/postsync.d/ ]; then - for f in /etc/portage/postsync.d/* ; do - if [ -x \${f} ] ; then - \${f} - fi - done -else - : -fi -__EOF__ - chmod 755 "${ROOT}"/etc/portage/bin/post_sync - if [ ! -e "${ROOT}"/etc/portage/postsync.d/q-reinitialize ]; then - mkdir -p "${ROOT}"/etc/portage/postsync.d/ - echo '[ -x /usr/bin/q ] && /usr/bin/q -qr' > "${ROOT}"/etc/portage/postsync.d/q-reinitialize - elog "${ROOT}/etc/portage/postsync.d/q-reinitialize has been installed for convenience" - elog "If you wish for it to be automatically run at the end of every --sync simply chmod +x ${ROOT}/etc/portage/postsync.d/q-reinitialize" - elog "Normally this should only take a few seconds to run but file systems such as ext3 can take a lot longer." - elog "If ever you find this to be an inconvenience simply chmod -x ${ROOT}/etc/portage/postsync.d/q-reinitialize" - fi - : -} diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.8.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.8.ebuild new file mode 100644 index 0000000000..495221c22a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.8.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.8.ebuild,v 1.6 2012/02/06 20:13:39 vapier Exp $ + +EAPI="3" + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="small and fast portage helper tools written in C" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="static" + +src_configure() { + use static && append-ldflags -static + + # Avoid slow configure+gnulib+make if on an up-to-date Linux system + if ! use kernel_linux || has_version '/dev/null + for x in etc/portage/postsync.d/* ; do + [[ -x ${ROOT}/${x} ]] && chmod +x "${x}" + done +} + +pkg_postinst() { + elog "/etc/portage/postsync.d/q-reinitialize has been installed for convenience" + elog "If you wish for it to be automatically run at the end of every --sync:" + elog " # chmod +x /etc/portage/postsync.d/q-reinitialize" + elog "Normally this should only take a few seconds to run but file systems" + elog "such as ext3 can take a lot longer. To disable, simply do:" + elog " # chmod -x /etc/portage/postsync.d/q-reinitialize" +} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/portage-utils-0.2.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/portage-utils-0.2.1 deleted file mode 100644 index 1bea258544..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/portage-utils-0.2.1 +++ /dev/null @@ -1,9 +0,0 @@ -DEFINED_PHASES=compile install postinst unpack -DESCRIPTION=small and fast portage helper tools written in C -HOMEPAGE=http://www.gentoo.org/ -KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd -LICENSE=GPL-2 -SLOT=0 -SRC_URI=mirror://gentoo/portage-utils-0.2.1.tar.bz2 -_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=6df3adf6c49fcd86bc153525aae1392e diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/portage-utils-0.8 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/portage-utils-0.8 new file mode 100644 index 0000000000..5e170160fd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-portage/portage-utils-0.8 @@ -0,0 +1,11 @@ +DEFINED_PHASES=configure install postinst preinst +DESCRIPTION=small and fast portage helper tools written in C +EAPI=3 +HOMEPAGE=http://www.gentoo.org/ +IUSE=static +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=GPL-2 +SLOT=0 +SRC_URI=mirror://gentoo/portage-utils-0.8.tar.xz +_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=c912bd5a9dce1057db4b416d1834420e