diff options
author | Ulrich Müller <ulm@gentoo.org> | 2012-06-09 14:02:29 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2012-06-09 14:02:29 +0000 |
commit | 932e29d03a3527508eee18c72433355ad3473604 (patch) | |
tree | 96809ee53840f0dba5e5412f5a73136ecf19bcba /app-admin | |
parent | Version bump. (diff) | |
download | gentoo-2-932e29d03a3527508eee18c72433355ad3473604.tar.gz gentoo-2-932e29d03a3527508eee18c72433355ad3473604.tar.bz2 gentoo-2-932e29d03a3527508eee18c72433355ad3473604.zip |
Remove assignment for EROOT; it is no longer needed in EAPI 3. Change live ebuild to use Git. Remove intermediate version.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/eselect/ChangeLog | 7 | ||||
-rw-r--r-- | app-admin/eselect/eselect-1.3.1.ebuild | 3 | ||||
-rw-r--r-- | app-admin/eselect/eselect-1.3.ebuild | 65 | ||||
-rw-r--r-- | app-admin/eselect/eselect-9999.ebuild | 13 |
4 files changed, 15 insertions, 73 deletions
diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog index 2ecce369560f..c0120710e13e 100644 --- a/app-admin/eselect/ChangeLog +++ b/app-admin/eselect/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/eselect # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.201 2012/06/09 08:59:27 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.202 2012/06/09 14:02:29 ulm Exp $ + + 09 Jun 2012; Ulrich Müller <ulm@gentoo.org> -eselect-1.3.ebuild, + eselect-1.3.1.ebuild, eselect-9999.ebuild: + Remove assignment for EROOT; it is no longer needed in EAPI 3. Change live + ebuild to use Git. Remove intermediate version. 09 Jun 2012; Markus Meier <maekke@gentoo.org> eselect-1.3.1.ebuild: arm stable, bug #420091 diff --git a/app-admin/eselect/eselect-1.3.1.ebuild b/app-admin/eselect/eselect-1.3.1.ebuild index 17ec7f62bdae..9c3dd7566728 100644 --- a/app-admin/eselect/eselect-1.3.1.ebuild +++ b/app-admin/eselect/eselect-1.3.1.ebuild @@ -1,6 +1,6 @@ # 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.3.1.ebuild,v 1.5 2012/06/09 08:59:27 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.1.ebuild,v 1.6 2012/06/09 14:02:29 ulm Exp $ EAPI=3 @@ -59,7 +59,6 @@ src_install() { 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/app-admin/eselect/eselect-1.3.ebuild b/app-admin/eselect/eselect-1.3.ebuild deleted file mode 100644 index 26376abec4b7..000000000000 --- a/app-admin/eselect/eselect-1.3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# 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.3.ebuild,v 1.1 2012/01/21 19:02:55 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.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" -IUSE="doc" - -RDEPEND="sys-apps/sed - || ( - sys-apps/coreutils - sys-freebsd/freebsd-bin - app-misc/realpath - )" -DEPEND="${RDEPEND} - app-arch/xz-utils - 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() { - emake || die - - if use doc; then - emake html || die - fi -} - -src_install() { - emake DESTDIR="${D}" install || die - newbashcomp misc/${PN}.bashcomp ${PN} || die - 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 - fowners root:portage /var/lib/gentoo/news || die - fperms g+w /var/lib/gentoo/news || die -} - -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/app-admin/eselect/eselect-9999.ebuild b/app-admin/eselect/eselect-9999.ebuild index 920017fa452e..e216c56343d3 100644 --- a/app-admin/eselect/eselect-9999.ebuild +++ b/app-admin/eselect/eselect-9999.ebuild @@ -1,12 +1,13 @@ -# 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-9999.ebuild,v 1.9 2011/09/09 10:43:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-9999.ebuild,v 1.10 2012/06/09 14:02:29 ulm Exp $ EAPI=4 -ESVN_REPO_URI="svn://anonsvn.gentoo.org/eselect/trunk" -ESVN_BOOTSTRAP="autogen.bash" -inherit subversion bash-completion-r1 +EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/eselect.git" +EGIT_BOOTSTRAP="autogen.bash" + +inherit git-2 bash-completion-r1 DESCRIPTION="Gentoo's multi-purpose configuration and management tool" HOMEPAGE="http://www.gentoo.org/proj/en/eselect/" @@ -47,6 +48,8 @@ src_install() { # needed by news module keepdir /var/lib/gentoo/news + fowners root:portage /var/lib/gentoo/news || die + fperms g+w /var/lib/gentoo/news || die } pkg_postinst() { |