From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rp5i1-0007a2-5Y for garchives@archives.gentoo.org; Sun, 22 Jan 2012 22:16:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8E09E07CB; Sun, 22 Jan 2012 22:16:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 745DAE07CB for ; Sun, 22 Jan 2012 22:16:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DDAF81B4019 for ; Sun, 22 Jan 2012 22:16:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DB00180044 for ; Sun, 22 Jan 2012 22:16:11 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <44bb7330d5a883f895e18f54ab4cd9a6677bcea4.bicatali@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.2.18-r1.ebuild app-admin/eselect/eselect-1.3-r1.ebuild app-admin/eselect/files/eselect-alternatives.patch app-admin/eselect/metadata.xml X-VCS-Directories: app-admin/eselect/files/ app-admin/eselect/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 44bb7330d5a883f895e18f54ab4cd9a6677bcea4 Date: Sun, 22 Jan 2012 22:16:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: bdbbf44f-1289-4bef-a37e-ae8a0823ea39 X-Archives-Hash: 76fdb26837526323687cd48be6433bd8 commit: 44bb7330d5a883f895e18f54ab4cd9a6677bcea4 Author: S=C3=A9bastien Fabbro gmail com> AuthorDate: Sun Jan 22 22:16:00 2012 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Sun Jan 22 22:16:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D44bb7330 app-admin/eselect: merge with main tree (Portage version: 2.1.10.41/git/Linux x86_64, unsigned Manifest commit) --- app-admin/eselect/ChangeLog | 9 ++- ...lect-1.2.18-r1.ebuild =3D> eselect-1.3-r1.ebuild} | 11 ++- app-admin/eselect/files/eselect-alternatives.patch | 86 ++++++++++----= ------ app-admin/eselect/metadata.xml | 3 +- 4 files changed, 59 insertions(+), 50 deletions(-) diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog index 2b3430a..e9b609f 100644 --- a/app-admin/eselect/ChangeLog +++ b/app-admin/eselect/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for app-admin/eselect -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.179 2= 011/01/22 21:38:52 ulm Exp $ =20 +*eselect-1.3-r1 (22 Jan 2012) + + 22 Jan 2012; S=C3=A9bastien Fabbro + -eselect-1.2.18-r1.ebuild, +eselect-1.3-r1.ebuild, + files/eselect-alternatives.patch, metadata.xml: + merge with main tree + *eselect-1.2.18-r1 (27 Sep 2011) =20 27 Sep 2011; Alexey Shvetsov -eselect-1.2.17-r1.eb= uild, diff --git a/app-admin/eselect/eselect-1.2.18-r1.ebuild b/app-admin/esele= ct/eselect-1.3-r1.ebuild similarity index 82% rename from app-admin/eselect/eselect-1.2.18-r1.ebuild rename to app-admin/eselect/eselect-1.3-r1.ebuild index 483018a..7ca2190 100644 --- a/app-admin/eselect/eselect-1.2.18-r1.ebuild +++ b/app-admin/eselect/eselect-1.3-r1.ebuild @@ -1,14 +1,14 @@ -# 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.18.ebui= ld,v 1.1 2011/09/25 16:24:18 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.ebuild,= v 1.1 2012/01/21 19:02:55 ulm Exp $ =20 EAPI=3D3 =20 -inherit autotools bash-completion-r1 eutils +inherit bash-completion-r1 eutils autotools =20 DESCRIPTION=3D"Gentoo's multi-purpose configuration and management tool" HOMEPAGE=3D"http://www.gentoo.org/proj/en/eselect/" -SRC_URI=3D"mirror://gentoo/${P}.tar.bz2" +SRC_URI=3D"mirror://gentoo/${P}.tar.xz" =20 LICENSE=3D"GPL-2" SLOT=3D"0" @@ -22,6 +22,7 @@ RDEPEND=3D"sys-apps/sed app-misc/realpath )" DEPEND=3D"${RDEPEND} + app-arch/xz-utils doc? ( dev-python/docutils )" RDEPEND=3D"!app-admin/eselect-news ${RDEPEND} @@ -56,6 +57,8 @@ src_install() { =20 # 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 } =20 pkg_postinst() { diff --git a/app-admin/eselect/files/eselect-alternatives.patch b/app-adm= in/eselect/files/eselect-alternatives.patch index a21632b..1aafdb0 100644 --- a/app-admin/eselect/files/eselect-alternatives.patch +++ b/app-admin/eselect/files/eselect-alternatives.patch @@ -1,48 +1,6 @@ -Index: libs/Makefile.am -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- libs/Makefile.am (revision 837) -+++ libs/Makefile.am (working copy) -@@ -1,6 +1,7 @@ - eselectlibsdir =3D $(datadir)/$(PACKAGE_NAME)/libs/ -=20 - eselectlibs_DATA =3D \ -+ alternatives.bash \ - config.bash \ - core.bash \ - default.eselect \ -@@ -14,6 +15,7 @@ - tests.bash -=20 - EXTRA_DIST =3D \ -+ alternatives.bash.in \ - config.bash.in \ - core.bash.in \ - default.eselect.in \ -@@ -30,7 +32,8 @@ - -e 's,\@SED\@,@SED@,g' \ - -e 's,\@PORTAGEQ\@,@PORTAGEQ@,g' \ - -e 's,\@ENV_UPDATE\@,@ENV_UPDATE@,g' \ -- -e 's,\@CANONICALISE\@,@CANONICALISE@,g' -+ -e 's,\@CANONICALISE\@,@CANONICALISE@,g' \ -+ -e 's,\@sysconfdir\@,@sysconfdir@,g' -=20 - %.bash : %.bash.in - @$(dosed) $< > $@ -Index: bin/Makefile.am -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- bin/Makefile.am (revision 837) -+++ bin/Makefile.am (working copy) -@@ -4,6 +4,7 @@ - dosed =3D @SED@ -e 's,\@BASH\@,$(BASH),g' \ - -e 's,\@DATADIR\@,$(datadir),g' \ - -e 's,\@EPREFIX\@,$(EPREFIX),g' \ -+ -e 's,\@LIBEXECDIR\@,$(datadir),g' \ - -e 's,\@VERSION\@,$(VERSION),g' -=20 - % : %.in Index: bin/eselect.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- bin/eselect.in (revision 837) +--- bin/eselect.in (revision 863) +++ bin/eselect.in (working copy) @@ -22,10 +22,15 @@ # Where are modules installed by default? @@ -63,6 +21,48 @@ Index: bin/eselect.in =20 # Look in this place for libraries ESELECT_CORE_PATH=3D"${ESELECT_DATA_PATH}/libs" +Index: bin/Makefile.am +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- bin/Makefile.am (revision 863) ++++ bin/Makefile.am (working copy) +@@ -4,6 +4,7 @@ + dosed =3D @SED@ -e 's,\@BASH\@,$(BASH),g' \ + -e 's,\@DATADIR\@,$(datadir),g' \ + -e 's,\@EPREFIX\@,$(EPREFIX),g' \ ++ -e 's,\@LIBEXECDIR\@,$(datadir),g' \ + -e 's,\@VERSION\@,$(VERSION),g' +=20 + % : %.in +Index: libs/Makefile.am +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- libs/Makefile.am (revision 863) ++++ libs/Makefile.am (working copy) +@@ -1,6 +1,7 @@ + eselectlibsdir =3D $(datadir)/$(PACKAGE_NAME)/libs/ +=20 + eselectlibs_DATA =3D \ ++ alternatives.bash \ + config.bash \ + core.bash \ + default.eselect \ +@@ -14,6 +15,7 @@ + tests.bash +=20 + EXTRA_DIST =3D \ ++ alternatives.bash.in \ + config.bash.in \ + core.bash.in \ + default.eselect.in \ +@@ -30,7 +32,8 @@ + -e 's,\@SED\@,@SED@,g' \ + -e 's,\@PORTAGEQ\@,@PORTAGEQ@,g' \ + -e 's,\@ENV_UPDATE\@,@ENV_UPDATE@,g' \ +- -e 's,\@CANONICALISE\@,@CANONICALISE@,g' ++ -e 's,\@CANONICALISE\@,@CANONICALISE@,g' \ ++ -e 's,\@sysconfdir\@,@sysconfdir@,g' +=20 + %.bash : %.bash.in + @$(dosed) $< > $@ --- libs/alternatives.bash.in.orig 1970-01-01 01:00:00.000000000 +0100 +++ libs/alternatives.bash.in 2011-09-06 18:55:43.000000000 +0100 @@ -0,0 +1,550 @@ diff --git a/app-admin/eselect/metadata.xml b/app-admin/eselect/metadata.= xml index dbaf8c8..d9f09c8 100644 --- a/app-admin/eselect/metadata.xml +++ b/app-admin/eselect/metadata.xml @@ -1,8 +1,7 @@ -no-herd - eselect@gentoo.org + bicatali@gentoo.org