Fix compile against glibc2.10. Closes #273841

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 65 insertions, 7 deletions

diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog
index 853b5c898afb..72e4a11e4754 100644
--- a/dev-lang/qu-prolog/ChangeLog
+++ b/dev-lang/qu-prolog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/qu-prolog
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.59 2009/04/04 21:22:06 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.60 2009/08/07 06:24:27 keri Exp $
+
+  07 Aug 2009; <keri@gentoo.org> qu-prolog-8.9.ebuild,
+  +files/qu-prolog-8.9-glibc2.10.patch,
+  +files/qu-prolog-8.9-print-atom.patch:
+  Fix compile against glibc2.10. Closes #273841
 
 *qu-prolog-8.9 (04 Apr 2009)
 
diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.9-glibc2.10.patch b/dev-lang/qu-prolog/files/qu-prolog-8.9-glibc2.10.patch
new file mode 100644
index 000000000000..9a859088f260
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.9-glibc2.10.patch
@@ -0,0 +1,20 @@
+--- qp8.9.orig/src/io.cc	2009-03-25 16:46:20.000000000 +1300
++++ qp8.9/src/io.cc	2009-08-07 10:09:53.000000000 +1200
+@@ -526,7 +526,7 @@
+     }
+   else
+     {
+-      char* ptr = strrchr(s, '\n');
++      const char* ptr = strrchr(s, '\n');
+       if (ptr == NULL)
+ 	{
+ 	  stream << s;
+@@ -655,7 +655,7 @@
+     }
+   else
+     {
+-      char* ptr = strrchr(s, '\n');
++      const char* ptr = strrchr(s, '\n');
+       if (ptr == NULL)
+ 	{
+ 	  stream << s;
diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.9-print-atom.patch b/dev-lang/qu-prolog/files/qu-prolog-8.9-print-atom.patch
new file mode 100644
index 000000000000..55ddcd1dd34b
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.9-print-atom.patch
@@ -0,0 +1,27 @@
+--- qp8.9.orig/src/objects.h	2009-03-25 16:46:20.000000000 +1300
++++ qp8.9/src/objects.h	2009-08-07 10:07:20.000000000 +1200
+@@ -1233,18 +1233,12 @@
+        << this->getName() << "\" ";
+   
+ #ifndef WIN32
+-  switch (hasAssociatedItem())
+-    {
+-    case AssociatedNone:
+-	    std::cerr << "(no info)";
+-      break;
+-    case AssociatedInteger:
+-      std::cerr << "int: " << getAssociatedInteger();
+-      break;
+-    case AssociatedAtom:
+-      std::cerr << "atom: [" << std::hex << (word32) getAssociatedAtom() << std::dec << "]";
+-      break;
+-    }
++  if (!hasAssociatedItem())
++    std::cerr << "(no info)";
++  else if (hasAssociatedInteger())
++    std::cerr << "int: " << getAssociatedInteger();
++  else if (hasAssociatedAtom())
++    std::cerr << "atom: [" << std::hex << (word32) getAssociatedAtom() << std::dec << "]";
+ #endif
+ }
+ #endif
diff --git a/dev-lang/qu-prolog/qu-prolog-8.8.ebuild b/dev-lang/qu-prolog/qu-prolog-8.8.ebuild
index 06186f6da437..b39d02da2fc0 100644
--- a/dev-lang/qu-prolog/qu-prolog-8.8.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-8.8.ebuild,v 1.4 2009/01/18 16:50:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-8.8.ebuild,v 1.5 2009/08/07 06:24:27 keri Exp $
 
 EAPI=1
 
@@ -17,11 +17,13 @@ SLOT="0"
 KEYWORDS="-amd64 ppc -ppc64 sparc x86"
 IUSE="debug doc examples qt4 threads"
 
-DEPEND="dev-lang/perl
-	!dev-util/mpatch
+RDEPEND="!dev-util/mpatch
 	!dev-util/rej
 	qt4? ( || ( x11-libs/qt-gui:4 >=x11-libs/qt-4.1.0:4 ) )"
 
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
 S="${WORKDIR}"/${MY_P}
 
 src_unpack() {
diff --git a/dev-lang/qu-prolog/qu-prolog-8.9.ebuild b/dev-lang/qu-prolog/qu-prolog-8.9.ebuild
index 4691fb2e189f..4a71da4a1b6f 100644
--- a/dev-lang/qu-prolog/qu-prolog-8.9.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-8.9.ebuild,v 1.1 2009/04/04 21:22:06 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-8.9.ebuild,v 1.2 2009/08/07 06:24:27 keri Exp $
 
 EAPI=1
 
@@ -17,17 +17,21 @@ SLOT="0"
 KEYWORDS="-amd64 ~ppc -ppc64 ~sparc ~x86"
 IUSE="debug doc examples qt4 threads"
 
-DEPEND="dev-lang/perl
-	!dev-util/mpatch
+RDEPEND="!dev-util/mpatch
 	!dev-util/rej
 	qt4? ( || ( x11-libs/qt-gui:4 >=x11-libs/qt-4.1.0:4 ) )"
 
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
 S="${WORKDIR}"/${MY_P}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-portage.patch
+	epatch "${FILESDIR}"/${P}-print-atom.patch
+	epatch "${FILESDIR}"/${P}-glibc2.10.patch
 }
 
 src_compile() {