fix #105935

(Portage version: 2.0.52-r1)

4 files changed, 50 insertions, 11 deletions

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index e567c90724c0..2d0d89f6dbc6 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,10 @@
 # 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.48 2005/09/17 21:16:26 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.49 2005/09/19 13:26:05 hollow Exp $
+
+  19 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/0.3.0-getParentProfile.patch, eix-0.3.0-r1.ebuild:
+  fix #105935
 
   17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> eix-0.3.0-r1.ebuild:
   Stable on ppc.
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 9cb434ee7304..043f00aad915 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,17 +1,18 @@
 MD5 49642086df408e27d9c50e8759b6f8e3 eix-0.2.2.ebuild 1152
 MD5 74c5aadf8e3e9d642a20e64d1afefec8 metadata.xml 239
-MD5 776bfe04ac499c07fe2cd322daf1a3a1 ChangeLog 6205
-MD5 aacd1596c38ba22f1c381322cd926325 eix-0.3.0-r1.ebuild 1234
-MD5 39e8d718b4e1c785eeafdb242a99ed29 eix-0.3.0.ebuild 1179
 MD5 c54871b1c3d77224848568572d63c710 eix-0.2.6.ebuild 1301
-MD5 451cd103e930d34810d0c426b7ad0ddb files/0.3.0-if-else-fi.patch 635
-MD5 9033adc2410fa5477618aa28ae6d8582 files/0.2.2-unistd.h.patch 716
+MD5 39e8d718b4e1c785eeafdb242a99ed29 eix-0.3.0.ebuild 1179
+MD5 88223da7bd5303657968f93105d69139 ChangeLog 6330
+MD5 a2b09bcb051405d5dec0e0513b968a48 eix-0.3.0-r1.ebuild 1283
 MD5 b012df8992488da6f22e677cba2e1f9c files/0.2.2-incorrect-masks.patch 1661
-MD5 f0687628fdeca80bbcebef82a7a82e6f files/digest-eix-0.3.0-r1 62
-MD5 f0687628fdeca80bbcebef82a7a82e6f files/digest-eix-0.3.0 62
+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 3eff250e62af117080bac27f4f2a9655 files/digest-eix-0.2.2 62
-MD5 79cb9eb15d5c16732f94bf126ee8ca2f files/digest-eix-0.2.6 62
+MD5 451cd103e930d34810d0c426b7ad0ddb files/0.3.0-if-else-fi.patch 635
 MD5 309a6ba7043e7941a8effc552ec3a1a0 files/0.3.0-datatype-mix.patch 2066
 MD5 026ea1bfa86dd00de37c3e3d1305c9c7 files/0.3.0-dbmatchcriteria-fix.patch 445
+MD5 7efa28889b9a45d2abc52e51c5155a7f files/0.3.0-getParentProfile.patch 1016
+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
diff --git a/app-portage/eix/eix-0.3.0-r1.ebuild b/app-portage/eix/eix-0.3.0-r1.ebuild
index f75ad1f6db6e..c903891f7f9b 100644
--- a/app-portage/eix/eix-0.3.0-r1.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-r1.ebuild,v 1.6 2005/09/17 21:16:26 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.3.0-r1.ebuild,v 1.7 2005/09/19 13:26:05 hollow Exp $
 
 inherit eutils flag-o-matic bash-completion
 
@@ -22,6 +22,7 @@ src_unpack() {
 	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
+	epatch ${FILESDIR}/0.3.0-getParentProfile.patch
 }
 
 src_compile() {
diff --git a/app-portage/eix/files/0.3.0-getParentProfile.patch b/app-portage/eix/files/0.3.0-getParentProfile.patch
new file mode 100644
index 000000000000..1561acdf34c5
--- /dev/null
+++ b/app-portage/eix/files/0.3.0-getParentProfile.patch
@@ -0,0 +1,33 @@
+--- eix-0.3.0/src/cascadingprofile.cc.orig	2005-08-26 21:10:43.000000000 +0200
++++ eix-0.3.0/src/cascadingprofile.cc	2005-09-19 14:39:13.000000000 +0200
+@@ -59,8 +59,7 @@
+  * if there is no parent profile. */
+ bool CascadingProfile::getParentProfile(string &path_buffer)
+ {
+-	int _buflen = 128;
+-	char _buf[_buflen];
++	string buf;
+ 
+ 	/* Open stream and check if it's open */
+ 	ifstream ifstr((path_buffer + "parent").c_str());
+@@ -68,16 +67,14 @@
+ 		return false;
+ 
+ 	/* while there are lines in the file */
+-	while(ifstr.getline(_buf, _buflen))
++	while(getline(ifstr, buf))
+ 	{
++		buf = trim(buf, "\t\n\r ");
+ 		/* If it's a comment or a empty line continue with the next line */
+-		int p = strspn(_buf,"\t ");
+-		if(_buf[p] == '#' || _buf[p] == '\0')
++		if(buf.size() == 0 || buf[0] == '#')
+ 			continue;
+-		_buf[ strcspn(_buf + p, "\t ") + p] = 0;
+ 
+-		/* Check if the line would fit into the buffer */
+-		path_buffer.append(_buf + p);
++		path_buffer.append(buf);
+ 		path_buffer.append("/");
+ 		return true;
+ 	}