Fix glibc-2.10 build, bug 270492. ++ to Martin Väth <vaeth@mathematik.uni-wuerzburg.de> for the patch.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 48 insertions, 5 deletions

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index 22a5f03a38f5..42e99db16a29 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-portage/eix
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.282 2009/05/08 04:27:10 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.283 2009/05/22 18:13:24 loki_val Exp $
+
+  22 May 2009; Peter Alfredsen <loki_val@gentoo.org> eix-0.16.0.ebuild,
+  +files/eix-0.16.0-glibc-2.10.patch:
+  Fix glibc-2.10 build, bug 270492. ++ to Martin Väth
+  <vaeth@mathematik.uni-wuerzburg.de> for the patch.
 
   08 May 2009; Jeremy Olexa <darkside@gentoo.org> -eix-0.15.5.ebuild,
   -eix-0.15.6.ebuild:
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index f3a079e9780c..f16971085c05 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,9 +1,10 @@
 AUX eix-0.13.3-numeric-compare.patch 2926 RMD160 97358f846158d12e6599292b6896070727fe0ef9 SHA1 21fdef7d2397fca0229ca277c7da297baacf957e SHA256 e2b18c92483cc6055d33953cf075d1a417c08f28494ec41ad2a4376e91bc930a
+AUX eix-0.16.0-glibc-2.10.patch 832 RMD160 6dc4e6234a1e2ba9853d5901ad6335af4e6df41c SHA1 bc0e5ce7a06790433d2cfcf5635c8c4778f78ad9 SHA256 6deac2e4511aaf80836189f4b73016cf129c41c6a0d00ba46c92d31173b5d883
 DIST eix-0.15.4.tar.lzma 276673 RMD160 8c2ffc1e7fbf2802eb8073984fc28011532abf0a SHA1 b73d28693431767086da22cd840a4c8c6b2566c6 SHA256 cece8d8a289e1565b1d4ef878fc43ae06dd7d2d64c2ef7d112e6742c6e484858
 DIST eix-0.15.7.tar.lzma 277424 RMD160 f2e170ad4cb2a1c3d6c803cd9185ace567cc6dd9 SHA1 c3283978beb03e55bea83ea58f3aabcea8d24537 SHA256 2529b96ca5594e79af628e9d171f407b47a0a8c4235ea38f8d8d2f498bad6cbd
 DIST eix-0.16.0.tar.lzma 469113 RMD160 0faa7b79f87a023bbc9f94a33d71faa55426cbb0 SHA1 92ea90ed10cb6b70d070e1d313666e1308d86bcb SHA256 335cce35962de621811b4e73afa6a443e65f3a87cbff14fd0d4e111df2aa7112
 EBUILD eix-0.15.4.ebuild 1602 RMD160 291af452db7672b200e4252f4512c38fd13f5132 SHA1 13604eec96d92abd0948290cf45850bb16a30322 SHA256 a60f73f7ea0b48e56ac1505a5c174a409cf964b93335c5a03b0b302e6dc915f7
 EBUILD eix-0.15.7.ebuild 1615 RMD160 e95d7c04477ca674830e0a7ccfb63eaedb24a103 SHA1 ff62b534958e7300c965a174bdb3ae4564074a14 SHA256 42aa7d781b38c3797685637f78a26c23737717b98422aaa7d80b589e84ecedf4
-EBUILD eix-0.16.0.ebuild 1736 RMD160 cdae723d05b1257e6f3cf67b21a00b7d04513768 SHA1 a3f877c589ab2c923f4a2c8aa2b44ce39abfc036 SHA256 86adf7e4ce4abc9c4fc528e24fea21ba90f1a6ec0ef54c90e2981bddb6a44b4f
-MISC ChangeLog 34630 RMD160 9d5cb6dfe93f771918a06c387666210661f103c6 SHA1 f390913cecef401e95de39659c1157cef0f71107 SHA256 b421af60464634bd6231e47db45646c0f3a22ccad729ebb33a9a38e02e1df8a3
+EBUILD eix-0.16.0.ebuild 1837 RMD160 41024a5cf65f7d8252ccd8335b58be2b5592b310 SHA1 457cc343b26987dce0b733d9374db663a9f6e75f SHA256 eef216b2f0be8a3968c55db03695d1c864e06ebf115ccae92ea5edd0495f4e68
+MISC ChangeLog 34849 RMD160 2a8a98a8b49df98f5d1da10fcac45b79d41334a9 SHA1 ae91152268d7c2aa37c16beba9ebe263ac681ec9 SHA256 4094f10f2b4475673196449f9c8f967b333256c1d9bd9d7fadc13c6bbbe825ba
 MISC metadata.xml 987 RMD160 94bf3919917fcb3d5ac5f8852282a1ef2355243e SHA1 c1ce835bfc2a631fe598715cfc3a086614f8b686 SHA256 6000899d7e4d56ce006d88f58cf88cfebc4589544fa72469036ef73174d2e67f
diff --git a/app-portage/eix/eix-0.16.0.ebuild b/app-portage/eix/eix-0.16.0.ebuild
index 94a4aca6ebe9..e5624ccd0c7a 100644
--- a/app-portage/eix/eix-0.16.0.ebuild
+++ b/app-portage/eix/eix-0.16.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.16.0.ebuild,v 1.1 2009/05/08 04:24:40 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.16.0.ebuild,v 1.2 2009/05/22 18:13:24 loki_val Exp $
 
-inherit multilib
+inherit multilib eutils
 
 DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext.
 overlays, version changes, and more"
@@ -22,6 +22,12 @@ DEPEND="${RDEPEND}
 	doc? ( dev-python/docutils )
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.16.0-glibc-2.10.patch"
+}
+
 src_compile() {
 	econf --with-bzip2 $(use_with sqlite) $(use_with doc rst) \
 		$(use_enable nls) $(use_enable tools separate-tools) \
diff --git a/app-portage/eix/files/eix-0.16.0-glibc-2.10.patch b/app-portage/eix/files/eix-0.16.0-glibc-2.10.patch
new file mode 100644
index 000000000000..24d6c7e2fbc6
--- /dev/null
+++ b/app-portage/eix/files/eix-0.16.0-glibc-2.10.patch
@@ -0,0 +1,31 @@
+--- src/eixTk/ptr_list.h
++++ src/eixTk/ptr_list.h
+@@ -47,7 +47,7 @@
+ 	/// A list that only stores pointers to type.
+ 	template<typename type>
+ 	class ptr_list
+-		: virtual public std::list<type*>
++		: public std::list<type*>
+ 	{
+ 		public:
+ 			using std::list<type*>::begin;
+--- src/output/formatstring.cc
++++ src/output/formatstring.cc
+@@ -278,7 +278,7 @@
+ FormatParser::ParserState
+ FormatParser::state_COLOR()
+ {
+-	char *q = strchr(band_position, ')');
++	const char *q = strchr(band_position, ')');
+ 	if(q == NULL) {
+ 		last_error = _("'(' without closing ')'");
+ 		return ERROR;
+@@ -299,7 +299,7 @@
+ FormatParser::ParserState
+ FormatParser::state_PROPERTY()
+ {
+-	char *q = strchr(band_position, '>');
++	const char *q = strchr(band_position, '>');
+ 	if(q == NULL) {
+ 		last_error = _("'<' without closing '>'");
+ 		return ERROR;