Fix bug 122005 and make backport default for portage-2.1

(Portage version: 2.1_pre4-r1)

6 files changed, 189 insertions, 3 deletions

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index 5dbd04b610be..6f7c651107da 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/eix
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.68 2006/02/06 07:48:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.69 2006/02/08 19:48:13 genstef Exp $
+
+*eix-0.5.1-r2 (08 Feb 2006)
+
+  08 Feb 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/eix-0.5.1-bug122005.patch, metadata.xml, +eix-0.5.1-r2.ebuild:
+  Fix bug 122005 and make backport default for portage-2.1
 
   06 Feb 2006; Markus Rothe <corsair@gentoo.org> eix-0.5.0.ebuild,
   eix-0.5.0-r1.ebuild, eix-0.5.1.ebuild, eix-0.5.1-r1.ebuild:
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index a636817cae99..8eafee4065b0 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,21 +1,72 @@
-MD5 585900ad0609ad5bfc632a2fe83caa46 ChangeLog 8951
+MD5 813d8d3a9e3439493156480707eede44 ChangeLog 9165
+RMD160 04de5fb504dd29f18792149dd084ab28612f0144 ChangeLog 9165
+SHA256 0750ac17e91e1ac79f18f38c4d3e8e7a36433dee0d6af52d39fc9c0fde954623 ChangeLog 9165
 MD5 9453c685fa99329b88b782086419847f eix-0.3.0-r1.ebuild 1283
+RMD160 0e1b9094475ff91604d050f4f0870572940656c2 eix-0.3.0-r1.ebuild 1283
+SHA256 7abc2eff07c2dbd8fbf86f6fd321ec55d7f2d29da6541b22a112a43e4ae6c132 eix-0.3.0-r1.ebuild 1283
 MD5 831f9fa6fc48726ee59ba48841b396e9 eix-0.3.0-r2.ebuild 1332
+RMD160 6df26a33ab5dcaf20bc742241b24ef0d2ae27f09 eix-0.3.0-r2.ebuild 1332
+SHA256 ccd980b9b110ca41a55d1d7ceb73398b3870e8e34361782b687f2a2e3aa885d5 eix-0.3.0-r2.ebuild 1332
 MD5 ba898eda874ee46c5fdf9d43e27f7b6a eix-0.5.0-r1.ebuild 1294
+RMD160 6529440181811472f26c1f06ebe860b35f1dd08a eix-0.5.0-r1.ebuild 1294
+SHA256 8a35d99d52f7e58a383da468a511e96e184a8d66b6d1168ac8fb93729c8c525e eix-0.5.0-r1.ebuild 1294
 MD5 265d69766bd35bbfc0bf3de033b6db89 eix-0.5.0.ebuild 1347
+RMD160 06a3e7c77fd9b18e194555c4efb1ea20b46bf43c eix-0.5.0.ebuild 1347
+SHA256 2b53a1adb14ed892b18c5c1affcd70a8e760eab760a13e1c41a4d54bab79bdce eix-0.5.0.ebuild 1347
 MD5 fd116b1081e001b7dfb206d3571d4b0f eix-0.5.1-r1.ebuild 1184
+RMD160 eeb0ab18f4f0f1eecbef4a2c10a6c5f112bf4ec2 eix-0.5.1-r1.ebuild 1184
+SHA256 45c76a33618d9debfaee8ba623cd2ca9b994536237489e19f8ba5a2efda2d273 eix-0.5.1-r1.ebuild 1184
+MD5 2ca45b122178d2278800b1e2bfc28610 eix-0.5.1-r2.ebuild 1479
+RMD160 25e583c2de730c0cb2f3d0a917dc579be420e8fe eix-0.5.1-r2.ebuild 1479
+SHA256 d59471f6ed70602b38b5261744626cf6c643fce292bdfe53abbe1b0ccc29a55a eix-0.5.1-r2.ebuild 1479
 MD5 97086d475fa377d8253abbc1bdf372da eix-0.5.1.ebuild 1095
+RMD160 71bb3a61c534ca8ca310ba9ee6b69899be91bb12 eix-0.5.1.ebuild 1095
+SHA256 b9ada0081411afc75ee7bd5d921ffd909344cbaa6eae93dc8cfc65ef7e77b8b8 eix-0.5.1.ebuild 1095
 MD5 309a6ba7043e7941a8effc552ec3a1a0 files/0.3.0-datatype-mix.patch 2066
+RMD160 de072f7f0138d583c41361dca2afa14a5a80658c files/0.3.0-datatype-mix.patch 2066
+SHA256 a09a81d38b6edb06a3b97f0b8f93c625b6bea27cb6f933b40f9b0927f72f8815 files/0.3.0-datatype-mix.patch 2066
 MD5 026ea1bfa86dd00de37c3e3d1305c9c7 files/0.3.0-dbmatchcriteria-fix.patch 445
+RMD160 4508e3081e7bef47f5079f45b00be5b71ffdaae4 files/0.3.0-dbmatchcriteria-fix.patch 445
+SHA256 bf3a628d00c76fdfa408bd718721bff09d7ab349d174d516ced9c386a2f3ee01 files/0.3.0-dbmatchcriteria-fix.patch 445
 MD5 7efa28889b9a45d2abc52e51c5155a7f files/0.3.0-getParentProfile.patch 1016
+RMD160 abf3ff1c9e625f7de1a62e1c626109ef9ff4231e files/0.3.0-getParentProfile.patch 1016
+SHA256 446ad597147bbd3bf36239bbad75a9500e9dcce8ea23334e95d935af4df5775a files/0.3.0-getParentProfile.patch 1016
 MD5 451cd103e930d34810d0c426b7ad0ddb files/0.3.0-if-else-fi.patch 635
+RMD160 3d1f3b89772de1beda9edf677895314b48dd377f files/0.3.0-if-else-fi.patch 635
+SHA256 35c7ed2dfe9a37e932d5c427cfb3dae747693612f1b776e2705c245382cd76bd files/0.3.0-if-else-fi.patch 635
 MD5 d8f3f2eb38eac66200e8a7d95f7660af files/0.3.0-insecure-tmpfile.patch 891
+RMD160 a4d5127a6dc354db92cd0bc5ccb615f9bae81c2b files/0.3.0-insecure-tmpfile.patch 891
+SHA256 74db8f532bd6aac325383143d3eb507afc401eb0ccafb933eb0541dc260bbade files/0.3.0-insecure-tmpfile.patch 891
 MD5 f0687628fdeca80bbcebef82a7a82e6f files/digest-eix-0.3.0-r1 62
+RMD160 f6a63def47a2a9067ca0385282ab158b3594451b files/digest-eix-0.3.0-r1 62
+SHA256 faa2fdcaebcb274e78fb860f05529f866b04e29bfc0d3c3ac7d3f36e19d681e1 files/digest-eix-0.3.0-r1 62
 MD5 f0687628fdeca80bbcebef82a7a82e6f files/digest-eix-0.3.0-r2 62
+RMD160 f6a63def47a2a9067ca0385282ab158b3594451b files/digest-eix-0.3.0-r2 62
+SHA256 faa2fdcaebcb274e78fb860f05529f866b04e29bfc0d3c3ac7d3f36e19d681e1 files/digest-eix-0.3.0-r2 62
 MD5 ae92b4d4f1cdc58d8bb0d13221c4e856 files/digest-eix-0.5.0 62
+RMD160 911c097a3a249a8425692c03af4e1bd6636dca01 files/digest-eix-0.5.0 62
+SHA256 0216e6f64d57958144dbd1e15acb2473f015cb8d0733148fcd3fc4d310227f4b files/digest-eix-0.5.0 62
 MD5 ae92b4d4f1cdc58d8bb0d13221c4e856 files/digest-eix-0.5.0-r1 62
+RMD160 911c097a3a249a8425692c03af4e1bd6636dca01 files/digest-eix-0.5.0-r1 62
+SHA256 0216e6f64d57958144dbd1e15acb2473f015cb8d0733148fcd3fc4d310227f4b files/digest-eix-0.5.0-r1 62
 MD5 c7ec2118ea206fd1614b8c9418f0fbb3 files/digest-eix-0.5.1 232
+RMD160 ac665d798246a70e2332cb93f8e50f74a2224ff3 files/digest-eix-0.5.1 232
+SHA256 d4f511e1a2e2cd86194feda1d45560da3bd592c68a1c0a9d7b5b2faae6c43a23 files/digest-eix-0.5.1 232
 MD5 c7ec2118ea206fd1614b8c9418f0fbb3 files/digest-eix-0.5.1-r1 232
+RMD160 ac665d798246a70e2332cb93f8e50f74a2224ff3 files/digest-eix-0.5.1-r1 232
+SHA256 d4f511e1a2e2cd86194feda1d45560da3bd592c68a1c0a9d7b5b2faae6c43a23 files/digest-eix-0.5.1-r1 232
+MD5 c7ec2118ea206fd1614b8c9418f0fbb3 files/digest-eix-0.5.1-r2 232
+RMD160 ac665d798246a70e2332cb93f8e50f74a2224ff3 files/digest-eix-0.5.1-r2 232
+SHA256 d4f511e1a2e2cd86194feda1d45560da3bd592c68a1c0a9d7b5b2faae6c43a23 files/digest-eix-0.5.1-r2 232
 MD5 f634c8f0297b381c7b178c9c75202e43 files/eix-0.5.0-redir-fix.patch 342
+RMD160 e2748f30326e221e6fc0cfdd35050b8e7b6d0af9 files/eix-0.5.0-redir-fix.patch 342
+SHA256 bc9066d10e06a943b866543f457ee2bf31f7b51ed7b7156a1813cc1ae0bdc319 files/eix-0.5.0-redir-fix.patch 342
 MD5 272145169b4ded93245ef18866fbe5f1 files/eix-0.5.1-bug121360.patch 757
-MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
+RMD160 932c28d0f97a31761843ee890793b83cce8836df files/eix-0.5.1-bug121360.patch 757
+SHA256 6c7c928f7145c58ebd81ed21f73346c3aaafaab97cc6eaafa3ce27e2a192fa48 files/eix-0.5.1-bug121360.patch 757
+MD5 d49568728f1c4f806614ae6ead679b22 files/eix-0.5.1-bug122005.patch 1681
+RMD160 51cff5a7a89c3a68c52bc889f4bf240203f624b2 files/eix-0.5.1-bug122005.patch 1681
+SHA256 798046d822a067aa851e8de1a68937ee82fc813ab309705e81bda901ed4a290b files/eix-0.5.1-bug122005.patch 1681
+MD5 ee74c7f02bf2436a61be85649d0bfade metadata.xml 344
+RMD160 ec0927471a6846e1b8fb8947120d8acb5516d903 metadata.xml 344
+SHA256 b04265fc6674d6a6c9a148a50b8b373eafd6db6ef87f32ad6d70d333a58171c7 metadata.xml 344
diff --git a/app-portage/eix/eix-0.5.1-r2.ebuild b/app-portage/eix/eix-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..38764085d49a
--- /dev/null
+++ b/app-portage/eix/eix-0.5.1-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.5.1-r2.ebuild,v 1.1 2006/02/08 19:48:13 genstef Exp $
+
+inherit eutils
+
+DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
+HOMEPAGE="http://dev.croup.de/proj/eix"
+SRC_URI="http://stovokor.unfoog.de/pub/eix/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-apps/portage"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/eix-0.5.1-bug121360.patch
+	epatch ${FILESDIR}/eix-0.5.1-bug122005.patch
+}
+
+src_compile() {
+	local myconf
+	has_version =sys-apps/portage-2.1* && \
+		myconf="--with-portdir-cache-method=backport"
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+}
+
+pkg_postinst() {
+	einfo "Please run 'update-eix' to setup the portage search database."
+	einfo "The database file will be located at /var/cache/eix"
+	echo
+	einfo "If you want to use cdb support, you need to add"
+	einfo "    PORTDIR_CACHE_METHOD=\"cdb\""
+	einfo "to /etc/eixrc or ~/.eixrc"
+	echo
+	einfo "If you want to use the backported cache patch of portage-2.1"
+	einfo "you need to add"
+	einfo "    PORTDIR_CACHE_METHOD=\"backport\""
+	einfo "to /etc/eixrc or ~/.eixrc"
+	einfo "backport is default when merging with portage-2.1"
+}
diff --git a/app-portage/eix/files/digest-eix-0.5.1-r2 b/app-portage/eix/files/digest-eix-0.5.1-r2
new file mode 100644
index 000000000000..ebf294164fe6
--- /dev/null
+++ b/app-portage/eix/files/digest-eix-0.5.1-r2
@@ -0,0 +1,3 @@
+MD5 317d7cf3f77313fdf9de1e4b5d23a02e eix-0.5.1.tar.bz2 310073
+RMD160 b9812a714a163c769c08486240a6650618d48881 eix-0.5.1.tar.bz2 310073
+SHA256 cd183e3c392797571a483518f798355d60c3c57b40f0b4696623e7c8d4465f68 eix-0.5.1.tar.bz2 310073
diff --git a/app-portage/eix/files/eix-0.5.1-bug122005.patch b/app-portage/eix/files/eix-0.5.1-bug122005.patch
new file mode 100644
index 000000000000..d28c98731add
--- /dev/null
+++ b/app-portage/eix/files/eix-0.5.1-bug122005.patch
@@ -0,0 +1,72 @@
+Index: src/portage/package.cc
+===================================================================
+--- src/portage/package.cc	(revision 78)
++++ src/portage/package.cc	(working copy)
+@@ -139,13 +139,14 @@
+ 	if(version == NULL) {
+ 		for(unsigned int i = 0; i<size(); ++i)
+ 			for(unsigned int j = 0; j<size(); ++j)
+-				if(i != j && *((*this)[i]) == *((*this)[j])) {
++				if(i != j
++				   && *(BasicVersion*)((*this)[i]) == *(BasicVersion*)((*this)[j])) {
+ 					return true;
+ 				}
+ 	}
+ 	else {
+ 		for(unsigned int i = 0; i<size(); ++i)
+-			if( *((*this)[i]) == *version ) {
++			if( *(BasicVersion*)((*this)[i]) == *(BasicVersion*)version ) {
+ 				return true;
+ 			}
+ 	}
+Index: src/search/packagetest.cc
+===================================================================
+--- src/search/packagetest.cc	(revision 78)
++++ src/search/packagetest.cc	(working copy)
+@@ -67,6 +67,16 @@
+ 			break;
+ 		}
+ 	}
++
++	if(installed && need < Package::NAME)
++	{
++		need = Package::NAME;
++	}
++
++	if(dup_versions && need < Package::VERSIONS)
++	{
++		need = Package::VERSIONS;
++	}
+ }
+ 
+ PackageTest::MatchField
+@@ -123,8 +133,6 @@
+ bool
+ PackageTest::stringMatch(Package *pkg) const
+ {
+-	pkg->readNeeded(need);
+-
+ 	if(field & NAME && (*algorithm)(pkg->name.c_str(), pkg))
+ 	{
+ 		return true;
+@@ -167,6 +175,9 @@
+ PackageTest::match(Package *pkg) const
+ {
+ 	bool is_match = true;
++
++	pkg->readNeeded(need);
++
+ 	if(algorithm.get() != NULL) {
+ 		is_match = stringMatch(pkg);
+ 	}
+@@ -176,8 +187,9 @@
+ 		is_match = vardbpkg->isInstalled(pkg);
+ 	}
+ 
+-	if(dup_versions && is_match)
++	if(dup_versions && is_match) {
+ 		is_match = pkg->have_duplicate_versions;
++	}
+ 
+ 	return (invert ? !is_match : is_match);
+ }
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index 8de04905940e..b11ae493a5aa 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
+    <email>emilbeinroth@gmx.net</email>
+    <name>Emil Beinroth</name>
+  </maintainer>
+  <maintainer>
     <email>genstef@gentoo.org</email>
     <name>Stefan Schweizer</name>
   </maintainer>