lets try this again: fixed makefile and more sticky tape

(Portage version: 1.586-cvs)

5 files changed, 21 insertions, 18 deletions

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index ef0263803731..69770bb2a0d7 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/gentoolkit
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.36 2005/04/25 04:20:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.37 2005/04/26 02:13:29 genone Exp $
+
+*gentoolkit-0.2.1_pre2 (26 Apr 2005)
+
+  26 Apr 2005; Marius Mauch <genone@gentoo.org>
+  -gentoolkit-0.2.1_pre1.ebuild, +gentoolkit-0.2.1_pre2.ebuild:
+  New version fixing a few bugs in the Makefile and cleaning out old .pyc and
+  .pyo files.
 
 *gentoolkit-0.2.1_pre1 (25 Apr 2005)
 
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index f9e48e84a453..6451971bc6bb 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c36d3e9465a96d7220228d2ef5457bd3 metadata.xml 451
 MD5 79d45005a06184f0fff5fbc05bbfc7ee ChangeLog 27259
 MD5 c1c49ed5ddf93ee64033213a554907c9 gentoolkit-0.2.0.ebuild 1004
-MD5 7280ee55dc96b76f2743a9d7ead6abcd gentoolkit-0.2.1_pre1.ebuild 1286
+MD5 c6db3a839c9c5cb8fbd89882c9f927a2 gentoolkit-0.2.1_pre2.ebuild 1500
 MD5 2a64dd5b5e7e57ffc34102eca6b936b3 files/qpkg-security-fix-68846.diff 645
 MD5 c5f0ee94504ceba66944b93e3db772d3 files/glsa.py-revmatch.diff 796
 MD5 99dee3ece4f06bd49f471db77a5cea21 files/digest-gentoolkit-0.2.0 67
-MD5 7727c907dfd43d6352ba6015452d22a5 files/digest-gentoolkit-0.2.1_pre1 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCbHEP6J2i8a8J4okRAloAAJ0dYyatHjv+JzBqT02u44UigV2elACfes2K
-7AZ361+djFDvseD9sJ7CYTk=
-=rLpc
------END PGP SIGNATURE-----
+MD5 cc8542fcb7f8ca99e133942999b492e1 files/digest-gentoolkit-0.2.1_pre2 72
diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.1_pre1 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.1_pre1
deleted file mode 100644
index f60c74794e82..000000000000
--- a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.1_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ded7b50d108a16aecdf82a29fe6ea22 gentoolkit-0.2.1_pre1.tar.gz 62723
diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.1_pre2 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.1_pre2
new file mode 100644
index 000000000000..b9fdccc79d5d
--- /dev/null
+++ b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.1_pre2
@@ -0,0 +1 @@
+MD5 d3d565e10262f47c87712da79d890ea5 gentoolkit-0.2.1_pre2.tar.gz 62897
diff --git a/app-portage/gentoolkit/gentoolkit-0.2.1_pre1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.1_pre2.ebuild
index be092dac8d4c..50cf518c4ff9 100644
--- a/app-portage/gentoolkit/gentoolkit-0.2.1_pre1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.2.1_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.1_pre1.ebuild,v 1.1 2005/04/25 04:20:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.1_pre2.ebuild,v 1.1 2005/04/26 02:13:29 genone Exp $
 
 inherit eutils
 
@@ -11,11 +11,12 @@ SRC_URI="mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~genone/distfiles/${P
 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"
-#KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 ppc-macos"
 
-DEPEND=">=sys-apps/portage-2.0.51
-	>=dev-lang/python-2.2
+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"
@@ -24,6 +25,11 @@ src_install() {
 	make DESTDIR=${D} install-gentoolkit || die
 }
 
+pkg_preinst() {
+	# FIXME: remove old python runtime files, should use python.eclass
+	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:"