Fix revdep-rebuild to work with portage-2.1 Bug #118124

(Portage version: 2.1_pre3-r1)

7 files changed, 23 insertions, 64 deletions

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index 1f142cf97b7d..ef30d5f3326f 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-portage/gentoolkit
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.63 2005/12/29 17:43:20 fuzzyray Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.64 2006/01/07 18:01:26 fuzzyray Exp $
+
+*gentoolkit-0.2.2_pre2 (07 Jan 2006)
+
+  07 Jan 2006; Paul Varner <fuzzyray@gentoo.org>
+  -files/qpkg-security-fix-68846.diff, -files/glsa.py-revmatch.diff,
+  -gentoolkit-0.2.2_pre1.ebuild, +gentoolkit-0.2.2_pre2.ebuild:
+  Fix revdep-rebuild to work with portage-2.1 Bug #118124
+  Add support for python eclass to manage python modules
+  Clean up files directory
 
 *gentoolkit-0.2.2_pre1 (29 Dec 2005)
 *gentoolkit-0.2.1 (29 Dec 2005)
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index a25887182c25..9f823e81f2ec 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -2,7 +2,7 @@ MD5 834b610a733d1b1c73ea6400343d3a79 ChangeLog 32894
 MD5 99dee3ece4f06bd49f471db77a5cea21 files/digest-gentoolkit-0.2.0 67
 MD5 99dee3ece4f06bd49f471db77a5cea21 files/digest-gentoolkit-0.2.0-r3 67
 MD5 995990de80fff3d09b1da6ce7119a974 files/digest-gentoolkit-0.2.1 67
-MD5 8a5163d6c11adbb4b52aaf1b723009f7 files/digest-gentoolkit-0.2.2_pre1 72
+MD5 3ae430489bb3ba890cbfec92a119f156 files/digest-gentoolkit-0.2.2_pre2 72
 MD5 c5f0ee94504ceba66944b93e3db772d3 files/glsa.py-revmatch.diff 796
 MD5 35d6ebb9b58acec73ac1c363df947347 files/qpkg-deprecated.patch 1870
 MD5 2a64dd5b5e7e57ffc34102eca6b936b3 files/qpkg-security-fix-68846.diff 645
@@ -10,5 +10,5 @@ MD5 54512c5b6ccfdad8c9bd5e7785cd3f4c files/revdep-rebuild.112099.patch 1040
 MD5 210c6b284b9407d52d7dc5cfc860e54f gentoolkit-0.2.0-r3.ebuild 1387
 MD5 83de6e1010084bfb0ed83caa6c522d5d gentoolkit-0.2.0.ebuild 1007
 MD5 197d5201a4a635bcbf667b5f3850173f gentoolkit-0.2.1.ebuild 1569
-MD5 4806749b423508ad8b2f3a23f22ea81a gentoolkit-0.2.2_pre1.ebuild 1574
+MD5 596b9ef053a5d3d78da632d51f81670a gentoolkit-0.2.2_pre2.ebuild 1440
 MD5 c36d3e9465a96d7220228d2ef5457bd3 metadata.xml 451
diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.2_pre1 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.2_pre1
deleted file mode 100644
index b96e09cfd674..000000000000
--- a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.2_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b0e105c24e3762e0455fb80006f8442 gentoolkit-0.2.2_pre1.tar.gz 83032
diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.2_pre2 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.2_pre2
new file mode 100644
index 000000000000..67ee467e613e
--- /dev/null
+++ b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.2_pre2
@@ -0,0 +1 @@
+MD5 9f3e693004bcf9edf3439f4c013ff3b5 gentoolkit-0.2.2_pre2.tar.gz 83134
diff --git a/app-portage/gentoolkit/files/glsa.py-revmatch.diff b/app-portage/gentoolkit/files/glsa.py-revmatch.diff
deleted file mode 100644
index 79f4ea2b515e..000000000000
--- a/app-portage/gentoolkit/files/glsa.py-revmatch.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: glsa.py
-===================================================================
-RCS file: /var/cvsroot/gentoolkit/src/glsa-check/glsa.py,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -r1.7 -r1.8
---- src/glsa-check/glsa.py	8 Dec 2004 10:52:43 -0000	1.7
-+++ src/glsa-check/glsa.py	9 Dec 2004 17:37:16 -0000	1.8
-@@ -315,12 +315,12 @@
- 	@rtype:		list of strings
- 	@return:	a list with the matching versions
- 	"""
--	mylist = portdb.match(revisionAtom[2:])
-+	mylist = portdb.match(re.sub("-r[0-9]+$", "", revisionAtom[2:]))
- 	rValue = []
- 	for v in mylist:
- 		r1 = "\""+portage.pkgsplit(v)[-1]+"\""
- 		r2 = "\""+portage.pkgsplit(revisionAtom[3:])[-1]+"\""
--		if eval(r1+" "+revisionAtom[0:1]+" "+r2):
-+		if eval(r1+" "+revisionAtom[0:2]+" "+r2):
- 			rValue.append(v)
- 	return rValue
- 		
diff --git a/app-portage/gentoolkit/files/qpkg-security-fix-68846.diff b/app-portage/gentoolkit/files/qpkg-security-fix-68846.diff
deleted file mode 100644
index a5f5717eda05..000000000000
--- a/app-portage/gentoolkit/files/qpkg-security-fix-68846.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/qpkg/qpkg	1 Aug 2004 17:31:46 -0000	1.15
-+++ src/qpkg/qpkg	31 Oct 2004 00:43:00 -0000	1.16
-@@ -9,7 +9,9 @@
- ID='$Id: qpkg-security-fix-68846.diff,v 1.1 2004/10/31 01:08:35 genone Exp $'
- VERSION=0.`echo ${ID} | cut -d\  -f3`
- 
--TMP="/tmp/qpkg-${$}/"
-+umask 0077
-+
-+TMP="$(mktemp -d -t qpkg-XXXXXX)" || exit 1
- rm -rf ${TMP}
- mkdir -p ${TMP}
- 
-@@ -228,6 +230,7 @@
- 			the older ones will have \"damaged\" files.
-   ${PROG} -f /bin/ls	print package(s) that own /bin/ls
- "
-+	rm -rf ${TMP}
- 	exit
- fi
- 
-@@ -292,6 +295,7 @@
- 					-e "s:-[0-9].*$::" \
- 					-e "s:\(^[^/]*/\)\(.*\):${BR}\1${CY}\2${NO}:"|uniq
- 	fi
-+	rm -rf ${TMP}
- 	exit
- fi
- 
diff --git a/app-portage/gentoolkit/gentoolkit-0.2.2_pre1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.2_pre2.ebuild
index 6ebad29dcb0c..5d8a6f75d2cb 100644
--- a/app-portage/gentoolkit/gentoolkit-0.2.2_pre1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.2.2_pre2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.2_pre1.ebuild,v 1.1 2005/12/29 17:43:20 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.2_pre2.ebuild,v 1.1 2006/01/07 18:01:26 fuzzyray Exp $
 
-inherit eutils
+inherit eutils python
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
@@ -26,14 +26,12 @@ src_install() {
 }
 
 pkg_preinst() {
-	# FIXME: remove old python runtime files, should use python.eclass
+	# FIXME: Remove from future ebuilds after gentoolkit-0.2.2 is stable
 	rm -f ${ROOT}/usr/lib/gentoolkit/pym/gentoolkit.py[co] ${ROOT}/usr/lib/gentoolkit/pym/gentoolkit/*.py[co]
 }
 
 pkg_postinst() {
-	echo
-	einfo "The following older scripts have been removed in this release:"
-	einfo "    dep-clean, ewhich, mkebuild, pkg-clean, pkg-size"
+	python_mod_optimize ${ROOT}usr/lib/gentoolkit
 	echo
 	ewarn "The qpkg and etcat tools are deprecated in favor of equery and"
 	ewarn "are no longer installed in ${ROOT}usr/bin in this release."
@@ -44,3 +42,7 @@ pkg_postinst() {
 	einfo "app-portage/portage-utils"
 	echo
 }
+
+pkg_postrm() {
+	python_mod_cleanup ${ROOT}usr/lib/gentoolkit
+}