aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/eselect/ChangeLog9
-rw-r--r--app-admin/eselect/Manifest2
-rw-r--r--app-admin/eselect/eselect-1.3-r1.ebuild (renamed from app-admin/eselect/eselect-1.2.18-r1.ebuild)11
-rw-r--r--app-admin/eselect/files/eselect-alternatives.patch86
-rw-r--r--app-admin/eselect/metadata.xml3
5 files changed, 60 insertions, 51 deletions
diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index 2b3430acd..e9b609f29 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 2011/01/22 21:38:52 ulm Exp $
+*eselect-1.3-r1 (22 Jan 2012)
+
+ 22 Jan 2012; S├ębastien Fabbro <bicatali@gentoo.org>
+ -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)
27 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> -eselect-1.2.17-r1.ebuild,
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 45ea9ba1d..2c8556414 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1 +1 @@
-DIST eselect-1.2.18.tar.bz2 170120 SHA256 68581af8f7ca427dbd726b766071c833918fb5ae25ad03224def7e1599297b3c SHA512 e73c2503163e4c3400885ada32d4c7a4a2a511d7747c9add92522a9f3117eff6174092310ee0b5d56fb25546d11a881c643e00ef653d00d58e07a7742a1b5004 WHIRLPOOL 37b1bf6917b8e3dff48153a0c7af72d0b991392de79c95e3dcf484ed98077e20626ff967d6a0887167ec77536e12ac3fc4699e2d1b9f1d2c6fdce81f3218ef4d
+DIST eselect-1.3.tar.xz 163724 SHA256 1700cc381eb7acbb49204157038be16fb63d9291b7b23612db32897566be506e SHA512 bf875e7f802104a4c67a20d919d5742d2b8012dbb8daa4aef409d45573cad19ba903853c598fb831b0a789fe6063e3b6fbde5a3cfb9c920868f019909f6c9d11 WHIRLPOOL 9c2391d2d6ebdf7b10fe3cb7085b11bf01d0de08186434b3c9be8cb512adfdabce02f9c8865c45dd6fd2500a0df700ff5e06d9a566d442767780609adb824976
diff --git a/app-admin/eselect/eselect-1.2.18-r1.ebuild b/app-admin/eselect/eselect-1.3-r1.ebuild
index 483018a53..7ca2190cc 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.ebuild,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 $
EAPI=3
-inherit autotools bash-completion-r1 eutils
+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.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -22,6 +22,7 @@ RDEPEND="sys-apps/sed
app-misc/realpath
)"
DEPEND="${RDEPEND}
+ app-arch/xz-utils
doc? ( dev-python/docutils )"
RDEPEND="!app-admin/eselect-news
${RDEPEND}
@@ -56,6 +57,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() {
diff --git a/app-admin/eselect/files/eselect-alternatives.patch b/app-admin/eselect/files/eselect-alternatives.patch
index a21632bc7..1aafdb052 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
-===================================================================
---- libs/Makefile.am (revision 837)
-+++ libs/Makefile.am (working copy)
-@@ -1,6 +1,7 @@
- eselectlibsdir = $(datadir)/$(PACKAGE_NAME)/libs/
-
- eselectlibs_DATA = \
-+ alternatives.bash \
- config.bash \
- core.bash \
- default.eselect \
-@@ -14,6 +15,7 @@
- tests.bash
-
- EXTRA_DIST = \
-+ 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'
-
- %.bash : %.bash.in
- @$(dosed) $< > $@
-Index: bin/Makefile.am
-===================================================================
---- bin/Makefile.am (revision 837)
-+++ bin/Makefile.am (working copy)
-@@ -4,6 +4,7 @@
- dosed = @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'
-
- % : %.in
Index: bin/eselect.in
===================================================================
---- 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
# Look in this place for libraries
ESELECT_CORE_PATH="${ESELECT_DATA_PATH}/libs"
+Index: bin/Makefile.am
+===================================================================
+--- bin/Makefile.am (revision 863)
++++ bin/Makefile.am (working copy)
+@@ -4,6 +4,7 @@
+ dosed = @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'
+
+ % : %.in
+Index: libs/Makefile.am
+===================================================================
+--- libs/Makefile.am (revision 863)
++++ libs/Makefile.am (working copy)
+@@ -1,6 +1,7 @@
+ eselectlibsdir = $(datadir)/$(PACKAGE_NAME)/libs/
+
+ eselectlibs_DATA = \
++ alternatives.bash \
+ config.bash \
+ core.bash \
+ default.eselect \
+@@ -14,6 +15,7 @@
+ tests.bash
+
+ EXTRA_DIST = \
++ 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'
+
+ %.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 dbaf8c806..d9f09c811 100644
--- a/app-admin/eselect/metadata.xml
+++ b/app-admin/eselect/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>no-herd</herd>
<maintainer>
- <email>eselect@gentoo.org</email>
+ <email>bicatali@gentoo.org</email>
</maintainer>
</pkgmetadata>