Fix compile against glibc2.10. Closes #273841

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 70 insertions, 10 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/Manifest b/dev-lang/qu-prolog/Manifest
index 304013098f90..d55a1a9f8e42 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,8 +1,10 @@
 AUX qu-prolog-8.8-portage.patch 6991 RMD160 27e5c867686883203a7924a8d461bc0b9802a260 SHA1 167a2d81bc8a4e9d3880a892653616713987b367 SHA256 68de243b3053b4e0ea6055cf757e3c659b4791afef50ec7e506866bcde39b399
+AUX qu-prolog-8.9-glibc2.10.patch 451 RMD160 b22f96a67852e277a6d69a731ab1d1b30499c7ce SHA1 5475907a77285c1b0094dd4aeeee6e6464ba865c SHA256 6caa4b3d44496aaac03ec6a82f94bb47b63b32493a922789627c576170f124f9
 AUX qu-prolog-8.9-portage.patch 7038 RMD160 7ab960d2569e0092d0488406098fc64ab57753d5 SHA1 896f7d32a6ec9a64a8f207e5fe6186d254d57423 SHA256 f6e9979681a037fa2d61c6f281126360eccb4bc2980e78b330a10d0eadacecfd
+AUX qu-prolog-8.9-print-atom.patch 848 RMD160 d2570b3e744d7797fbc650b003d6d92c438f1923 SHA1 4340b7f9719d4f3ba654ec49a63a48e9d1635516 SHA256 bddcd120f167867e58cddad174fffceb2dcf5a7a51c2e93df50df882bd1fb190
 DIST qp8.8.tar.gz 1228528 RMD160 efb624892c35fea9f3563fbddbab7eaceca7635c SHA1 6260436948e7ec688eaec9163979c6cfa324bb6e SHA256 9e63c5152cc6611ce19ab48f4b096b340b64487262b4ddfa7881991ddaa9b512
 DIST qp8.9.tar.gz 1244643 RMD160 1b93079c276048a71d94ee7666f01301cc2b6085 SHA1 481957e2b2779a4bacd0551c137f79084cd78d8b SHA256 a0adabba33535df14e8e543b5b040432cb0709f8a71ea0fc30ef51e1c28e15c2
-EBUILD qu-prolog-8.8.ebuild 1853 RMD160 4b509f1fa00606b20a1da198da91822d3b180890 SHA1 2ec765c540342d1c2975361b5a105796dacd8c0c SHA256 ec5fe04e62714bedf28ed08b9f3fa7945ea626bc195121069c6bc6d5d2574f23
-EBUILD qu-prolog-8.9.ebuild 1854 RMD160 184c7f441c40ae6c54e1769e2689b53d98ef2b40 SHA1 5f7d0173ea767b8748b209dd559e572bf1775db8 SHA256 043d49b419709f53721d52586f1349b76b68350b4cc7c1e31c50c8285e0ca801
-MISC ChangeLog 9675 RMD160 cc307941b7a2b1f4c414bff8daa393d2137968b3 SHA1 85de067029f601a8b372218829dc2759c813b8cc SHA256 05d655a3b904380919cfccec608e0368be1b004a850f7fda7e4fcaf5c99924fe
+EBUILD qu-prolog-8.8.ebuild 1873 RMD160 421ec2e4faefaea39a7192f2bd024253a23c8e1b SHA1 411c9f9007ddfc83fb8744f7c146d1472e0ce104 SHA256 eb6cd3e63704a741f3fc8f307f63f31191f0f2f4f00aadb40431cd0b2035bbac
+EBUILD qu-prolog-8.9.ebuild 1963 RMD160 e392fbfb90350b41e33d8d095dd6116da2cc0f89 SHA1 d2d71d83fd96e2993202a60656dac60df76b4597 SHA256 e24d9613e1c5f0ea572920cf1591493c55ac778b150aaaaf96e7c95bb0adae1c
+MISC ChangeLog 9860 RMD160 fdc330026c26a89af8fdb323a68268f935657dc9 SHA1 37f7cb68480b42e6b38943da5e73fa8c3f656979 SHA256 69c66e84e7b31d5af2979c2dfe9fa50e8e575fd9d4e1825040150dd742abb274
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
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() {