Fix building with GLIBC 2.10+ wrt #276719.

(Portage version: 2.2_rc36/cvs/Linux x86_64)

3 files changed, 58 insertions, 5 deletions

diff --git a/sci-biology/augustus/ChangeLog b/sci-biology/augustus/ChangeLog
index c6e8e8bef043..f33225181b05 100644
--- a/sci-biology/augustus/ChangeLog
+++ b/sci-biology/augustus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/augustus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/augustus/ChangeLog,v 1.2 2009/03/19 15:15:49 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/augustus/ChangeLog,v 1.3 2009/08/09 15:23:32 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> augustus-2.1.ebuild,
+  +files/augustus-2.1-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #276719.
 
 *augustus-2.1 (19 Mar 2009)
 
diff --git a/sci-biology/augustus/augustus-2.1.ebuild b/sci-biology/augustus/augustus-2.1.ebuild
index 8825b63ced79..d7a2c6eabd8a 100644
--- a/sci-biology/augustus/augustus-2.1.ebuild
+++ b/sci-biology/augustus/augustus-2.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/augustus/augustus-2.1.ebuild,v 1.1 2009/03/19 15:15:49 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/augustus/augustus-2.1.ebuild,v 1.2 2009/08/09 15:23:32 ssuominen Exp $
 
 EAPI="1"
+inherit eutils
 
 DESCRIPTION="Eukaryotic gene predictor"
 HOMEPAGE="http://augustus.gobics.de/"
@@ -13,10 +14,13 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=""
-RDEPEND=""
+S=${WORKDIR}/${PN}
 
-S="${WORKDIR}/${PN}"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
 
 src_compile() {
 	emake -C src clean || die
diff --git a/sci-biology/augustus/files/augustus-2.1-glibc-2.10.patch b/sci-biology/augustus/files/augustus-2.1-glibc-2.10.patch
new file mode 100644
index 000000000000..d3c163459801
--- /dev/null
+++ b/sci-biology/augustus/files/augustus-2.1-glibc-2.10.patch
@@ -0,0 +1,45 @@
+diff -ur augustus.orig/src/hints.cc augustus/src/hints.cc
+--- augustus.orig/src/hints.cc	2008-11-17 14:41:15.000000000 +0200
++++ augustus/src/hints.cc	2009-08-09 18:23:40.000000000 +0300
+@@ -137,11 +137,11 @@
+ 	/*
+ 	 * find groupname of hint, specified in gff as: group=xxx; or grp=xxx;
+ 	 */
+-	spos = strstr(feature.attributes.c_str(), "group=");
++	spos = const_cast<char*> (strstr(feature.attributes.c_str(), "group="));
+ 	if (spos)
+ 	    spos += 6;
+ 	if (!spos) {
+-	    spos = strstr(feature.attributes.c_str(), "grp=");
++	    spos = const_cast<char*> (strstr(feature.attributes.c_str(), "grp="));
+ 	    if (spos)
+ 		spos += 4;
+ 	}
+@@ -159,11 +159,11 @@
+ 	 * find priority of hint, specified in gff as: priority=N; or pri=N;
+ 	 * higher number means higher priority
+ 	 */
+-	spos = strstr(feature.attributes.c_str(), "priority=");
++	spos = const_cast<char*> (strstr(feature.attributes.c_str(), "priority="));
+ 	if (spos)
+ 	    spos += 9;
+ 	if (!spos) {
+-	    spos = strstr(feature.attributes.c_str(), "pri=");
++	    spos = const_cast<char*> (strstr(feature.attributes.c_str(), "pri="));
+ 	    if (spos)
+ 		spos += 4;
+ 	}
+@@ -176,11 +176,11 @@
+ 	/*
+ 	 * find source of extrinsic info, specified in gff as: source=X or src=X
+ 	 */
+-	spos = strstr(feature.attributes.c_str(), "source=");
++	spos = const_cast<char*> (strstr(feature.attributes.c_str(), "source="));
+ 	if (spos)
+ 	    spos += 7;
+ 	if (!spos) {
+-	    spos = strstr(feature.attributes.c_str(), "src=");
++	    spos = const_cast<char*> (strstr(feature.attributes.c_str(), "src="));
+ 	    if (spos)
+ 		spos += 4;
+ 	}