Add patch to fix bug 121360 thanks to appro

(Portage version: 2.1_pre4-r1)

5 files changed, 92 insertions, 4 deletions

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index 236d6fa72ffc..79859907b1bb 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.66 2006/02/02 20:05:32 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.67 2006/02/03 18:52:04 genstef Exp $
+
+*eix-0.5.1-r1 (03 Feb 2006)
+
+  03 Feb 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/eix-0.5.1-bug121360.patch, +eix-0.5.1-r1.ebuild:
+  Add patch to fix bug 121360 thanks to appro
 
 *eix-0.5.1 (02 Feb 2006)
 
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 6e625ee717b0..6ad2820c03d2 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,6 +1,6 @@
-MD5 96d46b9c58e5e4bba38d59001e8189bf ChangeLog 8606
-RMD160 88e3bfade87bd7a4f63bfeb2a48b60b1a0ec5656 ChangeLog 8606
-SHA256 ab348673030503c6d7bc00a39dbf2f63a08f92a6598284ec9137d5b83e78528a ChangeLog 8606
+MD5 47f66caf07117d5e4ec9cc8638957017 ChangeLog 8793
+RMD160 beb05832ffeadefd1baf2471f0b87c6ca0daec92 ChangeLog 8793
+SHA256 77a732122dd16ec453bd7db404470a99dbe9bb56d4a52b1ccab7da5d2d037ac2 ChangeLog 8793
 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
@@ -13,6 +13,9 @@ SHA256 bc159d31bca035b0d2d9fe9b4e22b5d4c2484acefc2eae6810755e2c7233e108 eix-0.5.
 MD5 70966afc5abec2721c69cac1275a559e eix-0.5.0.ebuild 1342
 RMD160 34e82d554870832aac095a212578073983439b4a eix-0.5.0.ebuild 1342
 SHA256 df6329d120c2e78efb20feabe04623004c281d85651844515a02a784518b474a eix-0.5.0.ebuild 1342
+MD5 bc1c760d8e93c259dcd77265a284c041 eix-0.5.1-r1.ebuild 1174
+RMD160 aebd01741d7e3dc96cb67b61944e7d55a703ccc5 eix-0.5.1-r1.ebuild 1174
+SHA256 eca825fa3f1e51a3ccb64650de5483617b8e0d18fc91666a9f18443ed317887a eix-0.5.1-r1.ebuild 1174
 MD5 53f73a5abc5442d11b2ae25c8f033a4f eix-0.5.1.ebuild 1088
 RMD160 ac3f50ba58de4a19bfbcb2010d0c63554c507b0d eix-0.5.1.ebuild 1088
 SHA256 3932bcade73d23a8ef5c6fa9dc892a647e26800f9c324f29c2119288ed98065e eix-0.5.1.ebuild 1088
@@ -46,9 +49,15 @@ SHA256 0216e6f64d57958144dbd1e15acb2473f015cb8d0733148fcd3fc4d310227f4b files/di
 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 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
+RMD160 932c28d0f97a31761843ee890793b83cce8836df files/eix-0.5.1-bug121360.patch 757
+SHA256 6c7c928f7145c58ebd81ed21f73346c3aaafaab97cc6eaafa3ce27e2a192fa48 files/eix-0.5.1-bug121360.patch 757
 MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242
 SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2 metadata.xml 242
diff --git a/app-portage/eix/eix-0.5.1-r1.ebuild b/app-portage/eix/eix-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..2ac85ef8e2e0
--- /dev/null
+++ b/app-portage/eix/eix-0.5.1-r1.ebuild
@@ -0,0 +1,40 @@
+# 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-r1.ebuild,v 1.1 2006/02/03 18:52:04 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 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-apps/portage"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/eix-0.5.1-bug121360.patch
+}
+
+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"
+}
diff --git a/app-portage/eix/files/digest-eix-0.5.1-r1 b/app-portage/eix/files/digest-eix-0.5.1-r1
new file mode 100644
index 000000000000..ebf294164fe6
--- /dev/null
+++ b/app-portage/eix/files/digest-eix-0.5.1-r1
@@ -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-bug121360.patch b/app-portage/eix/files/eix-0.5.1-bug121360.patch
new file mode 100644
index 000000000000..0388f46ffcef
--- /dev/null
+++ b/app-portage/eix/files/eix-0.5.1-bug121360.patch
@@ -0,0 +1,30 @@
+Index: src/portage/conf/cascadingprofile.cc
+===================================================================
+--- src/portage/conf/cascadingprofile.cc	(revision 75)
++++ src/portage/conf/cascadingprofile.cc	(working copy)
+@@ -141,6 +141,7 @@
+ 	if (remove)
+ 	{
+ 		ml->remove(m);
++		delete m;
+ 	}
+ 	else 
+ 	{
+@@ -172,7 +173,16 @@
+ 
+ void CascadingProfile::readPackageMasks(const string &line)
+ {
+-	m_package_masks.add(new Mask(line.c_str(), Mask::maskMask));
++	if(line[0] == '-')
++	{
++		Mask *m = new Mask(line.substr(1).c_str(), Mask::maskMask);
++		m_package_masks.remove(m);
++		delete m;
++	}
++	else
++	{
++		m_package_masks.add(new Mask(line.c_str(), Mask::maskMask));
++	}
+ }
+ 
+ /** Cycle through profile and put path to files into this->m_profile_files. */