From da8ecd02b74ef086ce8b4c3e4015caa537637058 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 1 Dec 2012 15:13:32 -0500 Subject: [PATCH] eselect: upgraded package to upstream Upgraded app-admin/eselect to version 1.3.1 on amd64, arm, x86 BUG=chromium-os:26152 TEST=`cbuildbot chromiumos-sdk` worked Change-Id: Ib74a39c322be964a30e5affe37cb94bcb8624e93 Reviewed-on: https://gerrit.chromium.org/gerrit/39047 Tested-by: Mike Frysinger Reviewed-by: Matt Tennant Commit-Ready: Mike Frysinger --- .../portage-stable/app-admin/eselect/Manifest | 2 +- ...ect-1.2.15.ebuild => eselect-1.3.1.ebuild} | 36 ++++++++++++------- .../eselect/files/eselect-1.3.2-eroot.patch | 11 ++++++ .../{eselect-1.2.15 => eselect-1.3.1} | 9 ++--- 4 files changed, 40 insertions(+), 18 deletions(-) rename sdk_container/src/third_party/portage-stable/app-admin/eselect/{eselect-1.2.15.ebuild => eselect-1.3.1.ebuild} (52%) create mode 100644 sdk_container/src/third_party/portage-stable/app-admin/eselect/files/eselect-1.3.2-eroot.patch rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/{eselect-1.2.15 => eselect-1.3.1} (55%) diff --git a/sdk_container/src/third_party/portage-stable/app-admin/eselect/Manifest b/sdk_container/src/third_party/portage-stable/app-admin/eselect/Manifest index da01ba76d3..4ca7394f16 100644 --- a/sdk_container/src/third_party/portage-stable/app-admin/eselect/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-admin/eselect/Manifest @@ -1 +1 @@ -DIST eselect-1.2.15.tar.bz2 169358 RMD160 9b5c2174786466f6a32e8b823eb4140e2581f945 SHA1 4875545e001904ab6f9a5a8c96150739ee1cff29 SHA256 fa8e3b2af2bc4a951ddb6067ba1e786a04681555ab7e83d50d4eb85047f2e7d7 +DIST eselect-1.3.1.tar.xz 163908 RMD160 343f297d397952d23e24bd3cc0c6a652178d1a65 SHA1 ba99ce4b93f7268ef7d8ec50cfe85a6a8567eddc SHA256 4fc1c3f1b021dd8d28475ab2115f6a2de843bbbb941a0f70999389d1e0d56444 diff --git a/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.2.15.ebuild b/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.3.1.ebuild similarity index 52% rename from sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.2.15.ebuild rename to sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.3.1.ebuild index 900b93a81e..dc00e87b3b 100644 --- a/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.2.15.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.3.1.ebuild @@ -1,16 +1,18 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.15.ebuild,v 1.7 2011/09/09 10:43:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.1.ebuild,v 1.11 2012/07/31 16:30:56 ulm Exp $ + +EAPI=3 inherit bash-completion-r1 DESCRIPTION="Gentoo's multi-purpose configuration and management tool" HOMEPAGE="http://www.gentoo.org/proj/en/eselect/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" +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 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc" RDEPEND="sys-apps/sed @@ -20,6 +22,7 @@ RDEPEND="sys-apps/sed app-misc/realpath )" DEPEND="${RDEPEND} + app-arch/xz-utils doc? ( dev-python/docutils )" RDEPEND="!app-admin/eselect-news ${RDEPEND} @@ -31,28 +34,35 @@ RDEPEND="!app-admin/eselect-news # vim-syntax? ( app-vim/eselect-syntax )" src_compile() { - econf - emake || die "emake failed" + emake || die if use doc; then - make html || die "failed to build html" + emake html || die fi } src_install() { - emake DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die newbashcomp misc/${PN}.bashcomp ${PN} || die - dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt - use doc && dohtml *.html doc/* + dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt || die + + if use doc; then + dohtml *.html doc/* || die + fi # needed by news module keepdir /var/lib/gentoo/news + if ! use prefix; then + fowners root:portage /var/lib/gentoo/news || die + fperms g+w /var/lib/gentoo/news || die + fi } pkg_postinst() { # fowners in src_install doesn't work for the portage group: # merging changes the group back to root - [[ -z ${EROOT} ]] && local EROOT=${ROOT} - chgrp portage "${EROOT}/var/lib/gentoo/news" \ - && chmod g+w "${EROOT}/var/lib/gentoo/news" + if ! use prefix; then + chgrp portage "${EROOT}/var/lib/gentoo/news" \ + && chmod g+w "${EROOT}/var/lib/gentoo/news" + fi } diff --git a/sdk_container/src/third_party/portage-stable/app-admin/eselect/files/eselect-1.3.2-eroot.patch b/sdk_container/src/third_party/portage-stable/app-admin/eselect/files/eselect-1.3.2-eroot.patch new file mode 100644 index 0000000000..81e5bb65e8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-admin/eselect/files/eselect-1.3.2-eroot.patch @@ -0,0 +1,11 @@ +--- a/bin/eselect.in ++++ b/bin/eselect.in +@@ -43,7 +43,7 @@ + + # Support variables for Gentoo Prefix + EPREFIX="@EPREFIX@" +-EROOT="${ROOT%/}${EPREFIX}" ++EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}" + + # Remove all alias definitions. Unset functions and variables that are + # known to cause trouble. diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/eselect-1.2.15 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/eselect-1.3.1 similarity index 55% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/eselect-1.2.15 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/eselect-1.3.1 index 26d13b8042..de895f31a7 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/eselect-1.2.15 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-admin/eselect-1.3.1 @@ -1,12 +1,13 @@ DEFINED_PHASES=compile install postinst -DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils ) +DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) app-arch/xz-utils doc? ( dev-python/docutils ) DESCRIPTION=Gentoo's multi-purpose configuration and management tool +EAPI=3 HOMEPAGE=http://www.gentoo.org/proj/en/eselect/ IUSE=doc -KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-2 RDEPEND=!app-admin/eselect-news sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses SLOT=0 -SRC_URI=mirror://gentoo/eselect-1.2.15.tar.bz2 +SRC_URI=mirror://gentoo/eselect-1.3.1.tar.xz _eclasses_=bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2 -_md5_=1c90cc55d7a78705c8f100a64abfe0aa +_md5_=817cb900adbf524e965d7024cd709abd