fix bug 88148

(Portage version: 2.0.51.19)

4 files changed, 55 insertions, 15 deletions

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index a8d58a519052..a0659ba59305 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.26 2005/04/05 20:51:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.27 2005/04/07 14:36:55 hollow Exp $
+
+  07 Apr 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/0.2.2-incorrect-masks.patch, eix-0.2.2.ebuild:
+  fix bug 88148
 
   05 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> eix-0.2.2.ebuild:
   Stable on sparc
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 91e2c7c6b4c4..5eee3b56858a 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cc3fc0420b1a6493ce906576db063e15 ChangeLog 3672
+MD5 5c03ba5c698d01136446da2dc569ddb4 ChangeLog 3795
 MD5 b900933c2743b2042c6abcb036618864 eix-0.2.1.ebuild 934
+MD5 acc3fe3e73fdd9645c3afc6c37e7bc97 eix-0.2.2.ebuild 1132
 MD5 74c5aadf8e3e9d642a20e64d1afefec8 metadata.xml 239
-MD5 97e9644a0b39900c88dd9daa0d2695c5 eix-0.2.2.ebuild 1083
-MD5 3eff250e62af117080bac27f4f2a9655 files/digest-eix-0.2.2 62
+MD5 b012df8992488da6f22e677cba2e1f9c files/0.2.2-incorrect-masks.patch 1661
 MD5 943e6938455bf034be166ecbe03c88aa files/digest-eix-0.2.1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCUvpSKRy60XGEcJIRAmDfAKCpl5FoVy6yZgXDsHV4kVT4jre59QCgr3x2
-V19/YJeslb2kTV+dCDio2rE=
-=p0zO
------END PGP SIGNATURE-----
+MD5 3eff250e62af117080bac27f4f2a9655 files/digest-eix-0.2.2 62
diff --git a/app-portage/eix/eix-0.2.2.ebuild b/app-portage/eix/eix-0.2.2.ebuild
index 57482bf9cc26..3df1450689f4 100644
--- a/app-portage/eix/eix-0.2.2.ebuild
+++ b/app-portage/eix/eix-0.2.2.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.2.ebuild,v 1.3 2005/04/05 20:51:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.2.2.ebuild,v 1.4 2005/04/07 14:36:55 hollow Exp $
 
 inherit eutils flag-o-matic bash-completion
 
@@ -19,6 +19,8 @@ RDEPEND="sys-apps/portage
 		virtual/libc"
 
 src_compile() {
+	epatch ${FILESDIR}/0.2.2-incorrect-masks.patch
+
 	aclocal
 	libtoolize --force --copy
 	autoconf
diff --git a/app-portage/eix/files/0.2.2-incorrect-masks.patch b/app-portage/eix/files/0.2.2-incorrect-masks.patch
new file mode 100644
index 000000000000..2c372320b243
--- /dev/null
+++ b/app-portage/eix/files/0.2.2-incorrect-masks.patch
@@ -0,0 +1,43 @@
+diff -Naur eix-0.2.2.orig/ChangeLog eix-0.2.2/ChangeLog
+--- eix-0.2.2.orig/ChangeLog	2005-04-06 17:43:28.000000000 +0200
++++ eix-0.2.2/ChangeLog	2005-04-06 17:43:59.000000000 +0200
+@@ -18,6 +18,7 @@
+ 	- User root no longer needed to update database
+ 	- Moved some functionality into seperate toolkits.
+ 	- Added ~-operator to class Mask
++	- Fixed http://bugs.gentoo.org/show_bug.cgi?id=88148
+ 
+ *eix-0.2.1 (2005/02/24)
+ 
+diff -Naur eix-0.2.2.orig/src/cascadingprofile.cc eix-0.2.2/src/cascadingprofile.cc
+--- eix-0.2.2.orig/src/cascadingprofile.cc	2005-04-06 17:43:28.000000000 +0200
++++ eix-0.2.2/src/cascadingprofile.cc	2005-04-06 17:43:59.000000000 +0200
+@@ -42,6 +42,15 @@
+ /** Exclude this files from listing of files in profile. */
+ static const char *profile_exclude[] = { "parent", "..", "." , NULL };
+ 
++/** Key that should accumelate their content rathern then replace. */
++static const char *accumulating_keys[4] = {
++	"USE",
++	"CONFIG_*",
++	"FEATURES",
++	NULL
++};
++
++
+ CascadingProfile::~CascadingProfile()
+ {
+ 	for(unsigned int i = 0; i<system.size(); ++i)
+@@ -133,8 +142,10 @@
+ 		for(unsigned int i = 0; i<profile_files.size(); i++)
+ 			if( strcmp(strrchr(profile_files[i].c_str(), '/'), "/make.defaults") == 0)
+ 			{
+-				VarsReader parser(profile_files[i].c_str(), FSM_ALLOW_VAR_REFERENCES);
+-				mapAppendStrings(&this->make_defaults, parser.begin(), parser.end());
++				VarsReader parser(profile_files[i].c_str(), FSM_ALLOW_VAR_REFERENCES|FSM_USE_SUPPLIED_MAP|FSM_APPEND_VALUES);
++				parser.useMap(&make_defaults);
++				parser.accumulatingKeys(accumulating_keys);
++				parser.parse();
+ 			}
+ 		this->arch = make_defaults["ARCH"].c_str();
+ 	}