Version bump. Remove old.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

5 files changed, 34 insertions, 104 deletions

diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index b7c783e3d041..78cb1c322abc 100644
--- a/app-admin/eselect/ChangeLog
+++ b/app-admin/eselect/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/eselect
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.113 2009/07/21 15:14:41 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.114 2009/08/16 11:12:08 ulm Exp $
+
+*eselect-1.1.3 (16 Aug 2009)
+
+  16 Aug 2009; Ulrich Mueller <ulm@gentoo.org> -eselect-1.0.10.ebuild,
+  -eselect-1.0.11-r1.ebuild,
+  -files/eselect-1.0.11-fix-paludis-command.patch, +eselect-1.1.3.ebuild:
+  Version bump. Remove old.
 
   21 Jul 2009; <chainsaw@gentoo.org> eselect-1.1.1.ebuild:
   Marked stable on AMD64 as requested by Ulrich Müller <ulm@gentoo.org> in
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 8be3ce2225f7..570155940c99 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX eselect-1.0.11-fix-paludis-command.patch 331 RMD160 4a35622b17e7f147a02ae0f432593f65a7021a9e SHA1 85fda1eae6f0d45a06dc0ec536a322a305bbba41 SHA256 a664d6e41b1ab3d4993b404126f205ddd8b64e622f3f20e2ee00a2fe1a11a9c7
-DIST eselect-1.0.10.tar.bz2 153077 RMD160 8d5abdf3ac3dec327891023a65ca5c3050bc25c2 SHA1 f40fa9565515fa4e43511634c97f8bbeb39295be SHA256 61b7c2238dc4316905944b9b6b3f570658df83c5c2281a19f848bc2bd56e4a25
-DIST eselect-1.0.11.tar.bz2 153348 RMD160 ef7ecd3c5e537478766f5d55f97fa527a5ad0c91 SHA1 272d58acd11238e033cefca274e9d4543390094e SHA256 711f945d1a7145f5a831dede33f8acb9806bd72833f76b5231ca11b488a01354
 DIST eselect-1.0.12.tar.bz2 145806 RMD160 e163c48b98457b2d779f21e999ab5f2eda574970 SHA1 262016f4025baab7b839f6ee9de47e0556480fd4 SHA256 0536d9b7806bd5acd669203c6aedda65b6b9d5306f58525b0ba5c7539ea242d7
 DIST eselect-1.1.1.tar.bz2 153059 RMD160 ec6dc9a5c6e03f433ea829ab5182246a335537b1 SHA1 410b43044f28032393cc3a7f4b33a0972b4b8920 SHA256 3e8d18c66bdfeff54a3f6ce51d5903fe88ebebbf0c36229a9429125992603733
 DIST eselect-1.1.2.tar.bz2 154578 RMD160 0c6d1ab25f4a9d739e333234c46e3b481dc55048 SHA1 de106e8ab8010a04f6d5f0dbbe891c774e4c7c11 SHA256 68b12b1ed8a5ecc34c490f2cc1f0de190ce71c98eb33cda52e663acc58864bc2
-EBUILD eselect-1.0.10.ebuild 1674 RMD160 4da86a84c9a6e80bbcaba8ecc6bfb8890909dbbc SHA1 c044e420d58810ec413fc56caad31bcd8e7c4b1c SHA256 27137beb143da8105e6cbcb51f6b55a2d3648d5f87da84c77e1e44444a39f2d0
-EBUILD eselect-1.0.11-r1.ebuild 1750 RMD160 93583418ff631d1bfc03dd3365e4f7741ffee2e8 SHA1 de59ca0bb7be7d8348ae23b65377a27d41834cc0 SHA256 4d1c01a785070e9fb411277c7f8ed8a9d8e3317d97c2d2d29a2b4cbeb3dd7457
+DIST eselect-1.1.3.tar.bz2 154862 RMD160 60b00e3a7959288da4bc1c2482ba7a2e8a9ec5db SHA1 f643b4c4bfdcf58ffd9399e6b7690f8394711bc7 SHA256 7810445c4967879d9c6d9ff98840e6e635d40b7169c16e3251fcaba6d5279767
 EBUILD eselect-1.0.12.ebuild 1711 RMD160 c2f27e483b39317eed3834bd699b315ab0d543b1 SHA1 140702ddc9fc3323560b7aa6cf193841aa678889 SHA256 cdf40c473cfef6a901c4a098b144785106a4d86aea83da35508272ba8369c37d
 EBUILD eselect-1.1.1.ebuild 1969 RMD160 c629c0558533f60ce390ddf3b0be5301fc29fd62 SHA1 89ba3d96cd24b9d41b8e8109e39e1d2447e1baf6 SHA256 981f984c425de4a8b29699a0d743947c3540df7ceb02146d5c3f47eb624facc0
 EBUILD eselect-1.1.2.ebuild 1975 RMD160 feb90dc1435b0221ec70acd816628c46adbc90b4 SHA1 85bef485ea7ca043df382c2cb9528ade348b29ad SHA256 6b0be5107fbfa5d5c741522c7cac2da2e90d98fed35e1a6315597b5c3396c286
-MISC ChangeLog 17456 RMD160 5c2fd9533ff37b5778ffce1e84f294b7b1ec72fd SHA1 55ad6f8dc8890eb1be5786ec9dd7ae71fa7b2e47 SHA256 003f43f9f322dcab30d7b8270a250efdb3039b6300791d5bcefbff4bdd3a905d
+EBUILD eselect-1.1.3.ebuild 1975 RMD160 18d0a2a4208fa01c6ec40ea4d63f1dcf2399a392 SHA1 a8168a71a2ab22fe37fe3a8de16f4c0f8cbd3d24 SHA256 f5cdfa3472b4d3454abab3285f4deef1cbf76c7ad1f6a34534f3f831260216f6
+MISC ChangeLog 17684 RMD160 2e314df296707699d77e9d91379c56a994674c43 SHA1 f62e8d2658784fb8cb595be4f6b2de718c57df35 SHA256 217ae629e2a70c8bcf41fc30d4337df87128d7f24e0e63afbddf9b868739b319
 MISC metadata.xml 223 RMD160 ad3a63ca53ae3d53a6be0caea0f00d5339415496 SHA1 c5430898aa8d251b7469d16f66dbd02018581bb9 SHA256 9bfa4e7551e380482c16cb288fa4f711543e15f6c00aabd2bb38fdbcbbc6dd26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkpl21gACgkQp5vW4rUFj5oBUwCeJgq2cK/wvZgEJO7sZh5x/NjZ
-Sj8An1cn2MMD9sYNg5N9fLq3bovphTVk
-=YIvu
+iEYEARECAAYFAkqH6gEACgkQOeoy/oIi7uw/3gCeLN8B+VXyPQrThwHv0ZGnLCpb
+z3QAoKT/mCvgzRHyxyHkYPxrCqznzprM
+=jc8T
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect/eselect-1.0.10.ebuild b/app-admin/eselect/eselect-1.0.10.ebuild
deleted file mode 100644
index cdea713739d5..000000000000
--- a/app-admin/eselect/eselect-1.0.10.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.0.10.ebuild,v 1.12 2009/05/24 19:30:15 ulm Exp $
-
-inherit eutils
-
-DESCRIPTION="Modular -config replacement utility"
-HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="doc bash-completion vim-syntax"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-admin/realpath
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
-	sys-apps/file"
-
-PDEPEND="vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		make html || die "failed to build html"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
-
-	# we don't use bash-completion.eclass since eselect
-	# is listed in RDEPEND.
-	if use bash-completion ; then
-		insinto /usr/share/bash-completion
-		newins misc/${PN}.bashcomp ${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	if use bash-completion ; then
-		elog "To enable command-line completion for eselect, run:"
-		elog
-		elog "  eselect bashcomp enable eselect"
-		elog
-	fi
-
-	elog "Modules cblas.eselect, blas.eselect and lapack.eselect have"
-	elog "been split-out to separate packages called:"
-	elog
-	elog "  app-admin/eselect-cblas"
-	elog "  app-admin/eselect-blas"
-	elog "  app-admin/eselect-lapack"
-}
diff --git a/app-admin/eselect/eselect-1.0.11-r1.ebuild b/app-admin/eselect/eselect-1.1.3.ebuild
index 7448320e88e9..7f5ecd62e8eb 100644
--- a/app-admin/eselect/eselect-1.0.11-r1.ebuild
+++ b/app-admin/eselect/eselect-1.1.3.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.0.11-r1.ebuild,v 1.11 2009/05/24 19:30:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.1.3.ebuild,v 1.1 2009/08/16 11:12:08 ulm Exp $
 
-inherit eutils
-
-DESCRIPTION="Modular -config replacement utility"
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
 HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="doc bash-completion vim-syntax"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc bash-completion"
 
 RDEPEND="sys-apps/sed
 	|| (
@@ -22,19 +20,15 @@ RDEPEND="sys-apps/sed
 DEPEND="${RDEPEND}
 	doc? ( dev-python/docutils )"
 RDEPEND="${RDEPEND}
-	sys-apps/file"
-
-PDEPEND="vim-syntax? ( app-vim/eselect-syntax )"
-
-src_unpack() {
-	unpack ${A}
+	sys-apps/file
+	sys-libs/ncurses"
 
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fix-paludis-command.patch"
-}
+# 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() {
-	econf || die "econf failed"
+	econf
 	emake || die "emake failed"
 
 	if use doc ; then
@@ -47,6 +41,9 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
 	use doc && dohtml *.html doc/*
 
+	# needed by news-tng module
+	keepdir /var/lib/gentoo/news
+
 	# we don't use bash-completion.eclass since eselect
 	# is listed in RDEPEND.
 	if use bash-completion ; then
@@ -56,6 +53,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	chgrp portage "${ROOT}/var/lib/gentoo/news" \
+		&& chmod g+w "${ROOT}/var/lib/gentoo/news"
+
 	if use bash-completion ; then
 		elog "In case you have not yet enabled command-line completion"
 		elog "for eselect, you can run:"
diff --git a/app-admin/eselect/files/eselect-1.0.11-fix-paludis-command.patch b/app-admin/eselect/files/eselect-1.0.11-fix-paludis-command.patch
deleted file mode 100644
index f76778c403ae..000000000000
--- a/app-admin/eselect/files/eselect-1.0.11-fix-paludis-command.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/paludis.bash.in.old	2008-03-20 16:31:40.000000000 +0100
-+++ libs/paludis.bash.in	2008-03-20 16:31:47.000000000 +0100
-@@ -18,7 +18,7 @@
- # Place, Suite 330, Boston, MA  02111-1307  USA
- 
- paludis_command() {
--    echo ${PALUDIS_COMMAND:-@PALUDIS@}
-+    echo ${PALUDIS_COMMAND:-paludis}
- }
- 
- # paludis_best-version PRIVATE