revbump to get another glsa.py fix out

5 files changed, 73 insertions, 11 deletions

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index 6f9f5576ba96..1d10c788dcdd 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/gentoolkit
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.32 2004/12/08 11:31:03 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.33 2004/12/09 17:45:39 genone Exp $
+
+*gentoolkit-0.2.0_rc1-r1 (09 Dec 2004)
+
+  09 Dec 2004; Marius Mauch <genone@gentoo.org>
+  +gentoolkit-0.2.0_rc1-r1.ebuild:
+  Fixing another bug in the glsa.py matching functions that caused glsa-check
+  to install masked versions.
 
 *gentoolkit-0.2.0_rc1 (08 Dec 2004)
 
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index e3a295c23d6c..c11678935ca2 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c36d3e9465a96d7220228d2ef5457bd3 metadata.xml 451
 MD5 1bc98dbc873369180a0360b470b7d925 gentoolkit-0.2.0_pre8.ebuild 1102
 MD5 6c4d39e4dd9b2859f94f8749ffd82d94 gentoolkit-0.2.0_pre10.ebuild 990
@@ -9,6 +6,7 @@ MD5 33f9f9c82b94b327238c4346dff17f16 gentoolkit-0.2.0_pre10-r1.ebuild 1105
 MD5 0127bed996ccfd70c67bba08db48222b gentoolkit-0.2.0_pre8-r1.ebuild 1219
 MD5 717e23872842dc3ac334a87d86cc9cc5 ChangeLog 26241
 MD5 7477f55f57944ada10de613a9a6bb42b gentoolkit-0.2.0_rc1.ebuild 1027
+MD5 ea70a9eb860a939419ee68248b3ea0ab gentoolkit-0.2.0_rc1-r1.ebuild 1069
 MD5 1b132e20e9de1c5163594b2cbd950d34 files/digest-gentoolkit-0.2.0_pre8 72
 MD5 ece108f9a9cf45a6cdd9211bb1b26db5 files/digest-gentoolkit-0.2.0_pre9 72
 MD5 096ea293c35570bd708ebd8cde10ca6b files/digest-gentoolkit-0.2.0_pre10 73
@@ -16,10 +14,5 @@ MD5 1b132e20e9de1c5163594b2cbd950d34 files/digest-gentoolkit-0.2.0_pre8-r1 72
 MD5 096ea293c35570bd708ebd8cde10ca6b files/digest-gentoolkit-0.2.0_pre10-r1 73
 MD5 2a64dd5b5e7e57ffc34102eca6b936b3 files/qpkg-security-fix-68846.diff 645
 MD5 20b8b5a62b58a621014f1e0922675564 files/digest-gentoolkit-0.2.0_rc1 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBtvQs6J2i8a8J4okRAnvtAJ9tW/GKmG+zH5XAglQwVZSb9EU7YgCfRrqY
-EJp59YepstAD/3GujwpHG7Y=
-=8XtY
------END PGP SIGNATURE-----
+MD5 7b41602e4b80bbd659081a1ad01f1359 files/glsa.py-revmatch.diff 1065
+MD5 20b8b5a62b58a621014f1e0922675564 files/digest-gentoolkit-0.2.0_rc1-r1 71
diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_rc1-r1 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_rc1-r1
new file mode 100644
index 000000000000..b825d83455cd
--- /dev/null
+++ b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_rc1-r1
@@ -0,0 +1 @@
+MD5 ac08bcd6c0fd20babe19fe3b5fdf38dd gentoolkit-0.2.0_rc1.tar.gz 61664
diff --git a/app-portage/gentoolkit/files/glsa.py-revmatch.diff b/app-portage/gentoolkit/files/glsa.py-revmatch.diff
new file mode 100644
index 000000000000..53d24aca9da4
--- /dev/null
+++ b/app-portage/gentoolkit/files/glsa.py-revmatch.diff
@@ -0,0 +1,29 @@
+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
+@@ -1,4 +1,4 @@
+-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/files/glsa.py-revmatch.diff,v 1.1 2004/12/09 17:45:39 genone Exp $
++# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/files/glsa.py-revmatch.diff,v 1.1 2004/12/09 17:45:39 genone Exp $
+ 
+ # This program is licensed under the GPL, version 2
+ 
+@@ -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/gentoolkit-0.2.0_rc1-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..221e02c580da
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.2.0_rc1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.0_rc1-r1.ebuild,v 1.1 2004/12/09 17:45:39 genone Exp $
+
+inherit eutils
+
+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/~genone/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+#KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~ppc-macos"
+
+DEPEND=">=sys-apps/portage-2.0.51_pre21
+	>=dev-lang/python-2.0
+	>=dev-util/dialog-0.7
+	>=dev-lang/perl-5.6
+	>=sys-apps/grep-2.4
+	sys-apps/debianutils"
+
+src_install() {
+	epatch ${FILESDIR}/glsa.py-revmatch.diff
+	make DESTDIR=${D} install-gentoolkit || die
+}
+
+pkg_postinst() {
+	einfo "The following older scripts have been removed in this release:"
+	einfo "    dep-clean, ewhich, mkebuild, pkg-clean, pkg-size"
+}