new overdue version

(Portage version: 1.586-cvs)

12 files changed, 28 insertions, 127 deletions

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index ee25d69a43c9..ef0263803731 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,16 @@
 # 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.35 2005/01/01 15:52:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.36 2005/04/25 04:20:40 genone Exp $
+
+*gentoolkit-0.2.1_pre1 (25 Apr 2005)
+
+  25 Apr 2005; Marius Mauch <genone@gentoo.org>
+  -gentoolkit-0.2.0_pre8-r1.ebuild, -gentoolkit-0.2.0_pre10-r1.ebuild,
+  -gentoolkit-0.2.0_rc1.ebuild, -gentoolkit-0.2.0_rc1-r1.ebuild,
+  gentoolkit-0.2.0.ebuild, +gentoolkit-0.2.1_pre1.ebuild:
+  Finally getting this bugfix release out, should fix the following bugs:
+  #71136, #74344, #75233, #75525, #79819 and #84521 (and probably a few more).
+  Thanks to everyone who helped solving these and sorry for the long delay.
 
 *gentoolkit-0.2.0 (13 Dec 2004)
 
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 94c0bdc6f683..49b21156819d 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,14 +1,8 @@
+MD5 c36d3e9465a96d7220228d2ef5457bd3 metadata.xml 451
 MD5 493f87a625324272825c074d90fe5b57 ChangeLog 26753
-MD5 eb305a8a78fc1d637b7a5980c49b5ac4 gentoolkit-0.2.0_pre10-r1.ebuild 1109
-MD5 fd59e3538a6596d9c2dee488a59b910c gentoolkit-0.2.0_pre8-r1.ebuild 1223
 MD5 b7756d08f8f9c9fa484b60081faf34c3 gentoolkit-0.2.0.ebuild 986
-MD5 c36d3e9465a96d7220228d2ef5457bd3 metadata.xml 451
-MD5 2d40c40543200dee1a769cfb2822f0bd gentoolkit-0.2.0_rc1-r1.ebuild 1076
-MD5 70ac7ae15d84fcedc3ed58591f611903 gentoolkit-0.2.0_rc1.ebuild 1031
-MD5 096ea293c35570bd708ebd8cde10ca6b files/digest-gentoolkit-0.2.0_pre10-r1 73
-MD5 1b132e20e9de1c5163594b2cbd950d34 files/digest-gentoolkit-0.2.0_pre8-r1 72
+MD5 b7756d08f8f9c9fa484b60081faf34c3 gentoolkit-0.2.1_pre1.ebuild 986
 MD5 2a64dd5b5e7e57ffc34102eca6b936b3 files/qpkg-security-fix-68846.diff 645
-MD5 20b8b5a62b58a621014f1e0922675564 files/digest-gentoolkit-0.2.0_rc1 71
-MD5 20b8b5a62b58a621014f1e0922675564 files/digest-gentoolkit-0.2.0_rc1-r1 71
 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
diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre10-r1 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre10-r1
deleted file mode 100644
index 60e895963710..000000000000
--- a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3871f0ac879bc059b3fb58899aa7a507 gentoolkit-0.2.0_pre10.tar.gz 67645
diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre8-r1 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre8-r1
deleted file mode 100644
index b97989477b3c..000000000000
--- a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_pre8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b07d04363203b386e15a73bc745d3dfb gentoolkit-0.2.0_pre8.tar.gz 67168
diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_rc1 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_rc1
deleted file mode 100644
index b825d83455cd..000000000000
--- a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ac08bcd6c0fd20babe19fe3b5fdf38dd gentoolkit-0.2.0_rc1.tar.gz 61664
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
deleted file mode 100644
index b825d83455cd..000000000000
--- a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.0_rc1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ac08bcd6c0fd20babe19fe3b5fdf38dd gentoolkit-0.2.0_rc1.tar.gz 61664
diff --git a/app-portage/gentoolkit/files/digest-gentoolkit-0.2.1_pre1 b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.1_pre1
new file mode 100644
index 000000000000..f60c74794e82
--- /dev/null
+++ b/app-portage/gentoolkit/files/digest-gentoolkit-0.2.1_pre1
@@ -0,0 +1 @@
+MD5 6ded7b50d108a16aecdf82a29fe6ea22 gentoolkit-0.2.1_pre1.tar.gz 62723
diff --git a/app-portage/gentoolkit/gentoolkit-0.2.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.0.ebuild
index ec67dead9a95..79b404138549 100644
--- a/app-portage/gentoolkit/gentoolkit-0.2.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.2.0.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.0.ebuild,v 1.2 2005/01/01 15:52:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.0.ebuild,v 1.3 2005/04/25 04:20:40 genone Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ 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
diff --git a/app-portage/gentoolkit/gentoolkit-0.2.0_pre8-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.0_pre8-r1.ebuild
deleted file mode 100644
index 4bc55a54fb1c..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.2.0_pre8-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.0_pre8-r1.ebuild,v 1.2 2005/01/01 15:52:50 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="http://www.gentoo.org/~karltk/projects/gentoolkit/"
-SRC_URI="http://dev.gentoo.org/~genone/distfiles/${P}.tar.gz"
-#SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 ~ppc-macos"
-IUSE=""
-#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 "
-
-DEPEND=">=sys-apps/portage-2.0.50
-	>=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() {
-	# patch taken from cvs
-	pwd
-	epatch ${FILESDIR}/qpkg-security-fix-68846.diff
-	make DESTDIR=${D} install-gentoolkit || die
-}
-
-pkg_postinst() {
-	echo
-	einfo "This version of ${PN} has a script to test the upcoming"
-	einfo "portage GLSA integration (aka 'emerge security'). If you"
-	einfo "want to try it out run"
-	einfo "    glsa-check --help"
-	einfo "and read the output carefully."
-	echo
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.2.0_rc1-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.0_rc1-r1.ebuild
deleted file mode 100644
index 552a31edf3f8..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.2.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.0_rc1-r1.ebuild,v 1.2 2005/01/01 15:52:50 eradicator 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"
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.2.0_rc1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.0_rc1.ebuild
deleted file mode 100644
index 70db01691c51..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.2.0_rc1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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.0_rc1.ebuild,v 1.2 2005/01/01 15:52:50 eradicator 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() {
-	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"
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.2.0_pre10-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.1_pre1.ebuild
index d36747f0e2de..be092dac8d4c 100644
--- a/app-portage/gentoolkit/gentoolkit-0.2.0_pre10-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.2.1_pre1.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.0_pre10-r1.ebuild,v 1.2 2005/01/01 15:52:50 eradicator Exp $
+# $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 $
 
 inherit eutils
 
@@ -11,23 +11,27 @@ 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_pre21
-	>=dev-lang/python-2.0
-	>=dev-util/dialog-0.7
+DEPEND=">=sys-apps/portage-2.0.51
+	>=dev-lang/python-2.2
 	>=dev-lang/perl-5.6
 	>=sys-apps/grep-2.4
 	sys-apps/debianutils"
 
 src_install() {
-	# patch taken from cvs
-	epatch ${FILESDIR}/qpkg-security-fix-68846.diff
 	make DESTDIR=${D} install-gentoolkit || die
 }
 
 pkg_postinst() {
+	echo
 	einfo "The following older scripts have been removed in this release:"
 	einfo "    dep-clean, ewhich, mkebuild, pkg-clean, pkg-size"
+	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."
+	ewarn "They are still available in ${ROOT}usr/share/doc/${PF}/deprecated/"
+	ewarn "if you *really* want to use them."
+	echo
 }