updates

(Portage version: 2.0.51.22-r2)

10 files changed, 48 insertions, 66 deletions

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index 287bc448914d..65e67435f644 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-portage/eix
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.39 2005/08/29 19:52:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.40 2005/09/03 12:29:59 hollow Exp $
+
+*eix-0.3.0-r1 (03 Sep 2005)
+
+  03 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/0.3.0-dbmatchcriteria-fix.patch, -eix-0.2.1.ebuild,
+  eix-0.2.6.ebuild, -eix-0.3.0_beta.ebuild, eix-0.3.0.ebuild,
+  +eix-0.3.0-r1.ebuild:
+  add a nice patch to minimize search time even more
+  0.2.6 to stable + clean-up
 
   29 Aug 2005; Benedikt Boehm <hollow@gentoo.org>
   +files/0.3.0-datatype-mix.patch, eix-0.3.0.ebuild:
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index dfe59ed99023..7c0294badc92 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,28 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9c5308dbda5fe62f96abe0d53b74a55a ChangeLog 5154
-MD5 68a279a35a3f34c3c9562ad4509938db eix-0.2.1.ebuild 916
+MD5 1a93a3368ea150ed7762c8c3ed939047 ChangeLog 5463
 MD5 49642086df408e27d9c50e8759b6f8e3 eix-0.2.2.ebuild 1152
 MD5 74c5aadf8e3e9d642a20e64d1afefec8 metadata.xml 239
-MD5 3ddb302ff870c03e4c516e07298417e2 eix-0.2.6.ebuild 1303
-MD5 85087764ba2c23688b9cc5399ec65fc7 eix-0.3.0_beta.ebuild 1082
-MD5 bea626864c451169e0eb7d03dfea29c5 eix-0.3.0.ebuild 1270
+MD5 f5ca1e23cbc4698a05e0a6b3c1c38bc7 eix-0.2.6.ebuild 1302
+MD5 1895163440af318e76f43a840e4ead6c eix-0.3.0.ebuild 1179
+MD5 70dc29bc19e859f5b021ba1f092122e6 eix-0.3.0-r1.ebuild 1231
 MD5 b012df8992488da6f22e677cba2e1f9c files/0.2.2-incorrect-masks.patch 1661
 MD5 9033adc2410fa5477618aa28ae6d8582 files/0.2.2-unistd.h.patch 716
 MD5 3a36ef63cff165b67afeb774a7edf9d1 files/0.2.6-package.cc.patch 461
 MD5 1df3eabe7a20b27cf2d3c1c0b2b5a090 files/0.2.6-cdb-cast.patch 516
 MD5 451cd103e930d34810d0c426b7ad0ddb files/0.3.0-if-else-fi.patch 635
 MD5 309a6ba7043e7941a8effc552ec3a1a0 files/0.3.0-datatype-mix.patch 2066
-MD5 943e6938455bf034be166ecbe03c88aa files/digest-eix-0.2.1 62
+MD5 026ea1bfa86dd00de37c3e3d1305c9c7 files/0.3.0-dbmatchcriteria-fix.patch 445
 MD5 3eff250e62af117080bac27f4f2a9655 files/digest-eix-0.2.2 62
 MD5 79cb9eb15d5c16732f94bf126ee8ca2f files/digest-eix-0.2.6 62
+MD5 f0687628fdeca80bbcebef82a7a82e6f files/digest-eix-0.3.0-r1 62
 MD5 f0687628fdeca80bbcebef82a7a82e6f files/digest-eix-0.3.0 62
-MD5 462758982cd4c3d424f0f84313959993 files/digest-eix-0.3.0_beta 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDE2e0mPFBzbX68WERAs0+AJ9O+0qtIlrQreuKUuX9iSSWEr9PcACeOryp
-lh66L+e6pH83A0BCrwgL0jQ=
-=CT7p
------END PGP SIGNATURE-----
diff --git a/app-portage/eix/eix-0.2.1.ebuild b/app-portage/eix/eix-0.2.1.ebuild
deleted file mode 100644
index 58aca38e48aa..000000000000
--- a/app-portage/eix/eix-0.2.1.ebuild
+++ /dev/null
@@ -1,36 +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/eix/eix-0.2.1.ebuild,v 1.8 2005/07/09 02:38:36 swegener Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
-HOMEPAGE="http://eixwiki.unfoog.de"
-SRC_URI="mirror://sourceforge/eix/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ~alpha ia64 ~ppc sparc"
-
-DEPEND="sys-devel/gcc
-	virtual/libc"
-RDEPEND="sys-apps/portage
-	virtual/libc"
-
-src_compile() {
-	aclocal
-	libtoolize --force --copy
-	autoconf
-
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-}
-
-pkg_postinst() {
-	einfo "Please run '/usr/bin/eix -u' to setup the portage search database."
-	einfo "The database file will be located at /var/cache/eix"
-}
diff --git a/app-portage/eix/eix-0.2.6.ebuild b/app-portage/eix/eix-0.2.6.ebuild
index 765a3355272a..3fab93e7e89d 100644
--- a/app-portage/eix/eix-0.2.6.ebuild
+++ b/app-portage/eix/eix-0.2.6.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/eix/eix-0.2.6.ebuild,v 1.4 2005/07/07 19:52:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.2.6.ebuild,v 1.5 2005/09/03 12:29:59 hollow Exp $
 
 inherit eutils flag-o-matic bash-completion
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/eix/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="sys-apps/portage"
diff --git a/app-portage/eix/eix-0.3.0_beta.ebuild b/app-portage/eix/eix-0.3.0-r1.ebuild
index 5ac6a0a82ecc..b47e8e69e828 100644
--- a/app-portage/eix/eix-0.3.0_beta.ebuild
+++ b/app-portage/eix/eix-0.3.0-r1.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/eix/eix-0.3.0_beta.ebuild,v 1.1 2005/08/16 08:08:41 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.3.0-r1.ebuild,v 1.1 2005/09/03 12:29:59 hollow Exp $
 
 inherit eutils flag-o-matic bash-completion
 
@@ -15,9 +15,18 @@ IUSE=""
 
 DEPEND="sys-apps/portage"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/0.3.0-if-else-fi.patch
+	epatch ${FILESDIR}/0.3.0-datatype-mix.patch
+	epatch ${FILESDIR}/0.3.0-dbmatchcriteria-fix.patch
+}
+
 src_compile() {
-	econf || die "configure failed"
-	emake || die "emake failed"
+	econf
+	emake || die "make failed"
 }
 
 src_install() {
diff --git a/app-portage/eix/eix-0.3.0.ebuild b/app-portage/eix/eix-0.3.0.ebuild
index 2f380e5e3df0..33b15f215f65 100644
--- a/app-portage/eix/eix-0.3.0.ebuild
+++ b/app-portage/eix/eix-0.3.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/eix/eix-0.3.0.ebuild,v 1.2 2005/08/29 19:52:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.3.0.ebuild,v 1.3 2005/09/03 12:29:59 hollow Exp $
 
 inherit eutils flag-o-matic bash-completion
 
@@ -19,13 +19,13 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/0.3.0-if-else-fi.patch || die "if-else-fi patch failed"
-	epatch ${FILESDIR}/0.3.0-datatype-mix.patch || die "datatype patch failed"
+	epatch ${FILESDIR}/0.3.0-if-else-fi.patch
+	epatch ${FILESDIR}/0.3.0-datatype-mix.patch
 }
 
 src_compile() {
-	econf || die "configure failed"
-	emake || die "emake failed"
+	econf
+	emake || die "make failed"
 }
 
 src_install() {
diff --git a/app-portage/eix/files/0.3.0-dbmatchcriteria-fix.patch b/app-portage/eix/files/0.3.0-dbmatchcriteria-fix.patch
new file mode 100644
index 000000000000..a6d21c601735
--- /dev/null
+++ b/app-portage/eix/files/0.3.0-dbmatchcriteria-fix.patch
@@ -0,0 +1,12 @@
+--- eix-0.3.0/src/databaseTk/dbmatchcriteria.h.orig	2005-09-02 13:22:16.000000000 +0200
++++ eix-0.3.0/src/databaseTk/dbmatchcriteria.h	2005-09-02 13:23:03.000000000 +0200
+@@ -81,6 +81,9 @@
+ 		Package::HasType need_flags;
+ 
+ 	public:
++		BasicTest() {
++			need_flags = Package::NONE;
++		}
+ 		/** So, wtf? `class BasicTest' has virtual functions but non-virtual destructor .. */
+ 		virtual ~BasicTest(){};
+ 		M_TYPE m_flags; /**< What to match. */
diff --git a/app-portage/eix/files/digest-eix-0.2.1 b/app-portage/eix/files/digest-eix-0.2.1
deleted file mode 100644
index 1519caa90636..000000000000
--- a/app-portage/eix/files/digest-eix-0.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c2b6bea87d14993dc9f8a1cf8252741 eix-0.2.1.tar.bz2 221258
diff --git a/app-portage/eix/files/digest-eix-0.3.0-r1 b/app-portage/eix/files/digest-eix-0.3.0-r1
new file mode 100644
index 000000000000..f710b5a177cd
--- /dev/null
+++ b/app-portage/eix/files/digest-eix-0.3.0-r1
@@ -0,0 +1 @@
+MD5 3fc734b6e01dcae577092a513e5d68e5 eix-0.3.0.tar.bz2 288210
diff --git a/app-portage/eix/files/digest-eix-0.3.0_beta b/app-portage/eix/files/digest-eix-0.3.0_beta
deleted file mode 100644
index 7531b7f0f02b..000000000000
--- a/app-portage/eix/files/digest-eix-0.3.0_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 17d46397f9459f887971158b8848c724 eix-0.3.0_beta.tar.bz2 288581