From 094d9f9ec0ee1b1fc8ab9a672cfd4069dcb8ebab Mon Sep 17 00:00:00 2001 From: Matt Tennant Date: Fri, 23 Sep 2011 11:02:31 -0700 Subject: [PATCH] Upgrade the following 2 Portage packages Upgraded app-admin/eselect to version 1.2.15 on amd64 Upgraded app-admin/eselect-ctags to version 1.13 on amd64 BUG=chromium-os:20770 TEST=trybot run of chromiumos-sdk Change-Id: I65874253d3d57d97ff0d047c78e80f7106d7ca53 Reviewed-on: http://gerrit.chromium.org/gerrit/8206 Commit-Ready: Matt Tennant Reviewed-by: Matt Tennant Tested-by: Matt Tennant --- .../eselect-ctags/eselect-ctags-1.13.ebuild | 27 +++++++++ .../app-admin/eselect/eselect-1.2.15.ebuild | 58 +++++++++++++++++++ .../eclass/bash-completion-r1.eclass | 52 +++++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.2.15.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass diff --git a/sdk_container/src/third_party/portage-stable/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild b/sdk_container/src/third_party/portage-stable/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild new file mode 100644 index 0000000000..e487909c19 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild,v 1.7 2010/06/06 18:12:45 angelos Exp $ + +MY_P="eselect-emacs-${PV}" +DESCRIPTION="Manages ctags implementations" +HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/" +SRC_URI="mirror://gentoo/${MY_P}.tar.bz2" + +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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="" +RDEPEND=">=app-admin/eselect-1.2.3 + !<=app-admin/eselect-emacs-1.3" + +S="${WORKDIR}/${MY_P}" + +src_compile() { :; } + +src_install() { + insinto /usr/share/eselect/modules + doins ctags.eselect || die + doman ctags.eselect.5 || die +} 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.2.15.ebuild new file mode 100644 index 0000000000..900b93a81e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.2.15.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2011 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 $ + +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" + +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" +IUSE="doc" + +RDEPEND="sys-apps/sed + || ( + sys-apps/coreutils + sys-freebsd/freebsd-bin + app-misc/realpath + )" +DEPEND="${RDEPEND} + doc? ( dev-python/docutils )" +RDEPEND="!app-admin/eselect-news + ${RDEPEND} + sys-apps/file + sys-libs/ncurses" + +# Commented out: only few users of eselect will edit its source +#PDEPEND="emacs? ( app-emacs/gentoo-syntax ) +# vim-syntax? ( app-vim/eselect-syntax )" + +src_compile() { + econf + emake || die "emake failed" + + if use doc; then + make html || die "failed to build html" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + newbashcomp misc/${PN}.bashcomp ${PN} || die + dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt + use doc && dohtml *.html doc/* + + # needed by news module + keepdir /var/lib/gentoo/news +} + +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" +} diff --git a/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass new file mode 100644 index 0000000000..04651df964 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass @@ -0,0 +1,52 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion-r1.eclass,v 1.2 2011/09/08 20:28:29 mgorny Exp $ + +# @ECLASS: bash-completion-r1.eclass +# @MAINTAINER: +# mgorny@gentoo.org +# @BLURB: A few quick functions to install bash-completion files +# @EXAMPLE: +# +# @CODE +# EAPI=4 +# +# src_install() { +# default +# +# newbashcomp contrib/${PN}.bash-completion ${PN} +# } +# @CODE + +case ${EAPI:-0} in + 0|1|2|3|4) ;; + *) die "EAPI ${EAPI} unsupported (yet)." +esac + +# @FUNCTION: dobashcomp +# @USAGE: file [...] +# @DESCRIPTION: +# Install bash-completion files passed as args. Has EAPI-dependant failure +# behavior (like doins). +dobashcomp() { + debug-print-function ${FUNCNAME} "${@}" + + ( + insinto /usr/share/bash-completion + doins "${@}" + ) +} + +# @FUNCTION: newbashcomp +# @USAGE: file newname +# @DESCRIPTION: +# Install bash-completion file under a new name. Has EAPI-dependant failure +# behavior (like newins). +newbashcomp() { + debug-print-function ${FUNCNAME} "${@}" + + ( + insinto /usr/share/bash-completion + newins "${@}" + ) +}