Fix arts-3.5.9.ebuild, glibc-2.8 compatibility bug #225763.

Package-Manager: portage-2.1.5.4

4 files changed, 27 insertions, 16 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 0c680f382c8a..f0c619a00279 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.269 2008/06/07 10:48:23 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.270 2008/06/11 22:37:11 tgurr Exp $
+
+  11 Jun 2008; Timo Gurr <tgurr@gentoo.org>
+  +files/arts-1.5.9-glibc2.8-build-fix.patch, arts-3.5.9.ebuild:
+  Fix arts-3.5.9.ebuild, glibc-2.8 compatibility bug #225763.
 
   07 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org> -arts-3.5.8.ebuild:
   Removed old versions.
diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index ac1b356a5af7..f648c095f7e3 100644
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX arts-1.5.0-bindnow.patch 795 RMD160 412bcf44fb499dd1f162768a604e603e819be508 SHA1 eb9a509c57afa0f5a80330082a24cbcafb864fa6 SHA256 05073dec5c390a6a474dc4e92141b4fd5b1132770b410f71050685994cf04dbb
 AUX arts-1.5.0-check_tmp_dir.patch 537 RMD160 b4e85c9710f55017bcf50d82f6bb323e17295b7c SHA1 3fd4a294e62fe7892cf35c077481a86ac8cdb9b1 SHA256 3c75415ccbbb79f91faea127316bccc060241a95b98df25485e9bbe1651cd10b
 AUX arts-1.5.4-multilib.patch 347 RMD160 537c12af56d0f1bdef618b1a0baa13757d6b18b1 SHA1 7e5baf74ef86655ac89ef26e0fe2bf4765c0f1a3 SHA256 65f6b51fad6b830a51fd4dd1583082fbd5a1ec21ed5b15040e465fbf59860792
 AUX arts-1.5.5-gcc4.3-build-fix.diff 252 RMD160 2ca9ed90eee2f6f5c77f7d45bcb236e061d402e5 SHA1 e65d35add0491404a1bbdd0281066e4008203ac8 SHA256 498cc8eafab5a25288d76b21caa6056910fdf79f68675014e5e6d03b615a3a53
+AUX arts-1.5.9-glibc2.8-build-fix.patch 358 RMD160 6e4f140f3448ab4f46653b57131d65e8c1711c8b SHA1 a84c71e6d2533644e5c84dcf5186ea207b7e9cd2 SHA256 00474d8b992802469e8fd3ca2e085552c34179d11e413472962a710d6e27c6cc
 DIST arts-1.5.9.tar.bz2 973190 RMD160 24766153ba9572c2b6fdc93dd3a2ac7ccd0ea19b SHA1 5543a6d82a6188d53eec32c09a0d2b3cc6cd4c5c SHA256 c80d70361aea4a8e2b62043b5fdf1c5f8df36a10c76b08681bd7b2065a6f024e
-EBUILD arts-3.5.9.ebuild 2782 RMD160 1a68546cc5839ec02ee20b4627eb23a025869892 SHA1 cfdfc8cb3f2ed1815a6615d1bb9be4cae9b94851 SHA256 5f7739c0af1f4ee135518a10097b9cc936d0abe1f5cf2d7906f3e0a0042670ab
-MISC ChangeLog 34365 RMD160 a5844856b956b4bca60e0945be1f4b94d55f85c2 SHA1 0e7e9f4a718d2700f6bc3857a3333d5857360701 SHA256 52eaf3f4608652bfccd3c5a45fc5daedf16a585019fd423a19fae3a830da78bb
+EBUILD arts-3.5.9.ebuild 2987 RMD160 226fa82b9ceea536fe09a02224ef9493109c22ca SHA1 4878721e24ee0aa3aeeeaea1eeeaee90e86b445c SHA256 85e5f550a6dfe63935bbd8071ccc8097fbfc3e57782b01368cd9ac6749cafc96
+MISC ChangeLog 34532 RMD160 8299f1c7a17929e7a406937b9016fe4f082371ac SHA1 d423ac5ed8cd1833791be98f77a68b2e753e9b1a SHA256 8cf8e6c8b7e6166414e1e47828cf8013e41c1df1f225031f851cb0c7f54ff1fb
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhKaBoACgkQKfQzuokD2IqDmACeOJAyobu4dsQJoqpY5aH0Z7jT
-WSkAn1s7nPOiy7jE852SjFhQSIRmuePw
-=a8e2
------END PGP SIGNATURE-----
diff --git a/kde-base/arts/arts-3.5.9.ebuild b/kde-base/arts/arts-3.5.9.ebuild
index 8df495f0032c..edc523d47efb 100644
--- a/kde-base/arts/arts-3.5.9.ebuild
+++ b/kde-base/arts/arts-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.9.ebuild,v 1.7 2008/05/18 14:32:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.9.ebuild,v 1.8 2008/06/11 22:37:11 tgurr Exp $
 
 EAPI="1"
 inherit kde flag-o-matic eutils versionator
@@ -34,12 +34,17 @@ RDEPEND="$(qt_min_version 3.3)
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-PATCHES="${FILESDIR}/arts-1.5.0-bindnow.patch
-	${FILESDIR}/arts-1.5.4-multilib.patch"
+#PATCHES="${FILESDIR}/arts-1.5.0-bindnow.patch
+#	${FILESDIR}/arts-1.5.4-multilib.patch
+#	${FILESDIR}/arts-1.5.9-glibc2.8-build-fix.patch"
 
 src_unpack() {
 	kde_src_unpack
 
+	epatch "${FILESDIR}/arts-1.5.0-bindnow.patch"
+	epatch "${FILESDIR}/arts-1.5.4-multilib.patch"
+	epatch "${FILESDIR}/arts-1.5.9-glibc2.8-build-fix.patch"
+
 	sed -i -e "s:GENTOO_LIB64:$(get_abi_LIBDIR amd64):" \
 		-e "s:GENTOO_LIB32:$(get_abi_LIBDIR x86):" artsc/artsdsp.in \
 		|| die "multilib-sed failed"
diff --git a/kde-base/arts/files/arts-1.5.9-glibc2.8-build-fix.patch b/kde-base/arts/files/arts-1.5.9-glibc2.8-build-fix.patch
new file mode 100644
index 000000000000..5ccfa8c08e4e
--- /dev/null
+++ b/kde-base/arts/files/arts-1.5.9-glibc2.8-build-fix.patch
@@ -0,0 +1,11 @@
+diff -Naur arts-1.5.9/mcop/mcoputils.cc arts-1.5.9.new/mcop/mcoputils.cc
+--- arts-1.5.9/mcop/mcoputils.cc	2008-02-13 10:35:23.000000000 +0100
++++ arts-1.5.9.new/mcop/mcoputils.cc	2008-06-11 02:07:41.349233625 +0200
+@@ -36,6 +36,7 @@
+ #include <cstring>
+ #include <stdio.h>
+ #include <map>
++#include <limits.h>
+ 	
+ using namespace std;
+ using namespace Arts;