From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id ADFC9138010 for ; Sun, 7 Oct 2012 09:19:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75527E02DF; Sun, 7 Oct 2012 09:18:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DB4FEE02DF for ; Sun, 7 Oct 2012 09:18:55 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23DB433D762 for ; Sun, 7 Oct 2012 09:18:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CBE14E5446 for ; Sun, 7 Oct 2012 09:18:53 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1347722414.e7295ec08afc5b4611b1ed7c103d10465e01c1c5.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: app-admin/eselect/files/, app-admin/eselect/ X-VCS-Repository: proj/sci X-VCS-Files: app-admin/eselect/ChangeLog app-admin/eselect/eselect-1.3.2-r1.ebuild app-admin/eselect/files/eselect-1.3.2-eroot.patch X-VCS-Directories: app-admin/eselect/files/ app-admin/eselect/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: e7295ec08afc5b4611b1ed7c103d10465e01c1c5 X-VCS-Branch: master Date: Sun, 7 Oct 2012 09:18:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 27b9c2d9-ad2d-4dc8-8d64-aacc78e68d34 X-Archives-Hash: fdaa258c5f78447918b841026befaba0 commit: e7295ec08afc5b4611b1ed7c103d10465e01c1c5 Author: Justin Lecher gentoo org> AuthorDate: Sat Sep 15 15:20:14 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Sep 15 15:20:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e7295ec0 app-admin/eselect: Version BUmp (Portage version: 2.2.0_alpha128/git/Linux x86_64, unsigned Manifest commit) --- app-admin/eselect/ChangeLog | 6 ++ app-admin/eselect/eselect-1.3.2-r1.ebuild | 80 +++++++++++++++++++++ app-admin/eselect/files/eselect-1.3.2-eroot.patch | 11 +++ 3 files changed, 97 insertions(+), 0 deletions(-) diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog index 99f036e..4ed313a 100644 --- a/app-admin/eselect/ChangeLog +++ b/app-admin/eselect/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.179 2011/01/22 21:38:52 ulm Exp $ +*eselect-1.3.2-r1 (15 Sep 2012) + + 15 Sep 2012; Justin Lecher +eselect-1.3.2-r1.ebuild, + +files/eselect-1.3.2-eroot.patch: + Version BUmp + 04 Jun 2012; Justin Lecher eselect-1.3.1-r1.ebuild, metadata.xml: Fix eaclocal call diff --git a/app-admin/eselect/eselect-1.3.2-r1.ebuild b/app-admin/eselect/eselect-1.3.2-r1.ebuild new file mode 100644 index 0000000..90435a2 --- /dev/null +++ b/app-admin/eselect/eselect-1.3.2-r1.ebuild @@ -0,0 +1,80 @@ +# 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 eutils autotools + +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_prepare() { + epatch "${FILESDIR}/${P}-eroot.patch" + epatch "${FILESDIR}"/${PN}-alternatives.patch + AT_M4DIR="." eautoreconf +} + +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 + if ! use prefix; then + fowners root:portage /var/lib/gentoo/news || die + fperms g+w /var/lib/gentoo/news || die + fi + + # band aid for prefix + if use prefix; then + cd "${ED}"/usr/share/eselect/libs + sed -i "s:ALTERNATIVESDIR_ROOTLESS=\"${EPREFIX}:ALTERNATIVESDIR_ROOTLESS=\":" alternatives.bash + fi +} + +pkg_postinst() { + # fowners in src_install doesn't work for the portage group: + # merging changes the group back to root + if ! use prefix; then + chgrp portage "${EROOT}/var/lib/gentoo/news" \ + && chmod g+w "${EROOT}/var/lib/gentoo/news" + fi +} diff --git a/app-admin/eselect/files/eselect-1.3.2-eroot.patch b/app-admin/eselect/files/eselect-1.3.2-eroot.patch new file mode 100644 index 0000000..81e5bb6 --- /dev/null +++ b/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.