Version bump to backport lastest epkginfo to fix bug 308929. Remove older gentoolkit-0.2.4.6 releases. Bug 305793 tracks fixes to the gentoolkit-0.2.4.6 release.

(Portage version: 2.2_rc67/cvs/Linux i686)

4 files changed, 11 insertions, 86 deletions

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index 02fd4528ba7d..ccfd83daefa6 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-portage/gentoolkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.181 2010/03/01 20:12:56 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.182 2010/03/11 22:32:46 fuzzyray Exp $
+
+*gentoolkit-0.2.4.6.1 (11 Mar 2010)
+
+  11 Mar 2010; Paul Varner <fuzzyray@gentoo.org> -gentoolkit-0.2.4.6.ebuild,
+  -gentoolkit-0.2.4.6-r1.ebuild, +gentoolkit-0.2.4.6.1.ebuild,
+  -files/revdep-rebuild.143498.patch:
+  Version bump to backport lastest epkginfo to fix bug 308929. Remove older
+  gentoolkit-0.2.4.6 releases.
+  Bug 305793 tracks fixes to the gentoolkit-0.2.4.6 release.
 
   01 Mar 2010; Paul Varner <fuzzyray@gentoo.org>
   files/revdep-rebuild.143498.patch:
diff --git a/app-portage/gentoolkit/files/revdep-rebuild.143498.patch b/app-portage/gentoolkit/files/revdep-rebuild.143498.patch
deleted file mode 100644
index 88b1cff29e1b..000000000000
--- a/app-portage/gentoolkit/files/revdep-rebuild.143498.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gentoolkit-0.2.4.6/src/revdep-rebuild/revdep-rebuild	(revision 745)
-+++ gentoolkit-0.2.4.6/src/revdep-rebuild/revdep-rebuild	(working copy)
-@@ -18,7 +18,7 @@
- 
- # Readonly variables:
- declare -r APP_NAME="${0##*/}" # The name of this application
--declare -r VERSION="svn"
-+declare -r VERSION="genscripts-r230"
- declare -r OIFS="$IFS"         # Save the IFS
- declare -r     ENV_FILE=0_env.rr     # Contains environment variables
- declare -r   FILES_FILE=1_files.rr   # Contains a list of files to search
-@@ -757,8 +757,8 @@
- 						# FIXME: I hate duplicating code
- 						# Only rebuild for direct dependencies
- 						MISSING_LIBS=$(
--							expr="/$SONAME_SEARCH/s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p"
--							sort -u <<< "$ldd_output" | sed -n "$expr"
-+							expr="s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p"
-+							sort -u <<< "$ldd_output" | grep -E "$SONAME" | sed -n "$expr"
- 						)
- 						REQUIRED_LIBS=$(
- 							expr='s/^[[:space:]]*NEEDED[[:space:]]*\([^[:space:]]*\).*/\1/p';
diff --git a/app-portage/gentoolkit/gentoolkit-0.2.4.6-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.4.6-r1.ebuild
deleted file mode 100644
index 374c5a28dca4..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.2.4.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.4.6-r1.ebuild,v 1.1 2010/03/01 19:58:04 fuzzyray Exp $
-
-EAPI=2
-
-inherit eutils python
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
-SRC_URI="mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# Drop ~m68k ~s390 ~sh ~sparc-fbsd ~x86-fbsd due to app-misc/realpath dependency
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="sys-apps/portage
-	dev-lang/python[xml]
-	dev-lang/perl
-	sys-apps/grep"
-RDEPEND="${DEPEND}
-	 app-misc/realpath"
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}/revdep-rebuild.143498.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-gentoolkit || die "install-gentoolkit failed"
-
-	# Create cache directory for revdep-rebuild
-	dodir /var/cache/revdep-rebuild
-	keepdir /var/cache/revdep-rebuild
-	fowners root:root /var/cache/revdep-rebuild
-	fperms 0700 /var/cache/revdep-rebuild
-}
-
-pkg_postinst() {
-	# Make sure that our ownership and permissions stuck
-	chown root:root "${ROOT}/var/cache/revdep-rebuild"
-	chmod 0700 "${ROOT}/var/cache/revdep-rebuild"
-
-	python_mod_optimize /usr/lib/gentoolkit
-
-	einfo
-	elog "The default location for revdep-rebuild files has been moved"
-	elog "to /var/cache/revdep-rebuild when run as root."
-	einfo
-	einfo "Another alternative to equery is app-portage/portage-utils"
-	einfo
-	einfo "For further information on gentoolkit, please read the gentoolkit"
-	einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
-	einfo
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/gentoolkit
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.2.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.4.6.1.ebuild
index 146a2e9cb7b8..3c112f838c5b 100644
--- a/app-portage/gentoolkit/gentoolkit-0.2.4.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.2.4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.4.6.ebuild,v 1.1 2010/02/18 19:58:12 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.4.6.1.ebuild,v 1.1 2010/03/11 22:32:46 fuzzyray Exp $
 
 EAPI=2