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 EE363138010 for ; Thu, 20 Sep 2012 21:25:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60ED0E04CB; Thu, 20 Sep 2012 21:25:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 17983E04CB for ; Thu, 20 Sep 2012 21:25:20 +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 5797C33C88F for ; Thu, 20 Sep 2012 21:25:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 11CEDE5444 for ; Thu, 20 Sep 2012 21:25:18 +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: <1348176301.f59f0441fff322533f04a5205c30665b2ec02178.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.1-r1.ebuild 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: f59f0441fff322533f04a5205c30665b2ec02178 X-VCS-Branch: master Date: Thu, 20 Sep 2012 21:25:18 +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: 4b739baf-2bca-4997-84b7-389974fe79d7 X-Archives-Hash: 25cc5721040a6c46be790ab6547b1624 commit: f59f0441fff322533f04a5205c30665b2ec02178 Author: Justin Lecher gentoo org> AuthorDate: Thu Sep 20 21:25:01 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Sep 20 21:25:01 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f59f0441 Version Bump --- app-admin/eselect/ChangeLog | 6 ++++++ ...ect-1.3.1-r1.ebuild => eselect-1.3.2-r1.ebuild} | 18 +++++++++++------- app-admin/eselect/files/eselect-1.3.2-eroot.patch | 11 +++++++++++ 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog index 99f036e..ecfbe1a 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 (20 Sep 2012) + + 20 Sep 2012; Justin Lecher -eselect-1.3.1-r1.ebuild, + +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.1-r1.ebuild b/app-admin/eselect/eselect-1.3.2-r1.ebuild similarity index 73% rename from app-admin/eselect/eselect-1.3.1-r1.ebuild rename to app-admin/eselect/eselect-1.3.2-r1.ebuild index 1bbfdb5..f26fecb 100644 --- a/app-admin/eselect/eselect-1.3.1-r1.ebuild +++ b/app-admin/eselect/eselect-1.3.2-r1.ebuild @@ -4,7 +4,7 @@ EAPI=3 -inherit bash-completion-r1 eutils autotools +inherit autotools eutils bash-completion-r1 DESCRIPTION="Gentoo's multi-purpose configuration and management tool" HOMEPAGE="http://www.gentoo.org/proj/en/eselect/" @@ -12,7 +12,7 @@ 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 @@ -34,6 +34,7 @@ RDEPEND="!app-admin/eselect-news # vim-syntax? ( app-vim/eselect-syntax )" src_prepare() { + epatch "${FILESDIR}/${P}-eroot.patch" epatch "${FILESDIR}"/${PN}-alternatives.patch AT_M4DIR="." eautoreconf } @@ -57,8 +58,10 @@ 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 + 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 @@ -70,7 +73,8 @@ 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" + 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.