Fix compilation with gcc-4 on ppc64; bug #117750

(paludis 0.1.0 svn 68:104M)

4 files changed, 28 insertions, 9 deletions

diff --git a/gnome-base/gnome-libs/ChangeLog b/gnome-base/gnome-libs/ChangeLog
index 46423e027b3f..e5ff5db00ddd 100644
--- a/gnome-base/gnome-libs/ChangeLog
+++ b/gnome-base/gnome-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-libs
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/ChangeLog,v 1.34 2005/05/29 22:47:14 halcy0n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/ChangeLog,v 1.35 2006/01/16 03:58:47 halcy0n Exp $
+
+  16 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/gnome-libs-1.4.2-ppc64.patch, gnome-libs-1.4.2.ebuild:
+  Fix compilation with gcc-4 on ppc64; bug #117750
 
   29 May 2005; Mark Loeser <halcy0n@gentoo.org>
   +files/gnome-libs-1.4.2-gcc4.patch, gnome-libs-1.4.2.ebuild:
diff --git a/gnome-base/gnome-libs/Manifest b/gnome-base/gnome-libs/Manifest
index 58026a29eca5..b97caa5ddbb8 100644
--- a/gnome-base/gnome-libs/Manifest
+++ b/gnome-base/gnome-libs/Manifest
@@ -1,7 +1,8 @@
-MD5 3438ca9c45b6bbc220e7cf42449163bb ChangeLog 4489
-MD5 80579102bff1fdf4d389a63ae51ce128 gnome-libs-1.4.2.ebuild 2486
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 3ec488af51217e5d9a1cd8f17d9c7b3e ChangeLog 4653
 MD5 e0991b18209dfd87a7d6f2ed771dc00b files/digest-gnome-libs-1.4.2 70
+MD5 a49f7096a16de9d5e0f310cdf845a189 files/gnome-libs-1.4.2-gcc4.patch 530
 MD5 f331a840d47fda5b17211d968f974f14 files/gnome-libs-1.4.2-gtkdoc_fixes.patch 1089
 MD5 fb16550517db1b4f3993031c0695cc31 files/gnome-libs-1.4.2-m4.patch 274
-MD5 a49f7096a16de9d5e0f310cdf845a189 files/gnome-libs-1.4.2-gcc4.patch 530
+MD5 d9033c7a33a43ad866042b2214f27244 files/gnome-libs-1.4.2-ppc64.patch 475
+MD5 1a093161ef201a01695658c1849ca24b gnome-libs-1.4.2.ebuild 2598
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ppc64.patch b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ppc64.patch
new file mode 100644
index 000000000000..36ca703d3a83
--- /dev/null
+++ b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ppc64.patch
@@ -0,0 +1,11 @@
+diff -ur gnome-libs-1.4.2-orig/configure.in gnome-libs-1.4.2/configure.in
+--- gnome-libs-1.4.2-orig/configure.in	2006-01-16 03:30:34.000000000 +0000
++++ gnome-libs-1.4.2/configure.in	2006-01-16 03:34:06.000000000 +0000
+@@ -304,7 +304,6 @@
+ AC_CHECK_FUNCS(strdup)
+ AC_CHECK_HEADERS(utime.h)
+ AC_FUNC_MMAP
+-AC_CHECK_TYPE(umode_t, int)
+ 
+ AC_ARG_ENABLE(prefer-db1, [  --enable-prefer-db1     Prefer Berkeley DB 1.x] [default=no]],[prefer_db1="$enableval"],[prefer_db1=no])
+ dnl
diff --git a/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild b/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
index a2f0ad32779b..70e5012db7dc 100644
--- a/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
+++ b/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild,v 1.30 2005/05/29 22:47:14 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild,v 1.31 2006/01/16 03:58:47 halcy0n Exp $
 
-inherit eutils libtool multilib
+inherit eutils libtool multilib autotools
 
 DESCRIPTION="GNOME Core Libraries"
 HOMEPAGE="http://www.gnome.org/"
@@ -32,6 +32,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-gtkdoc_fixes.patch
 	# Fix compilation with GCC4 ; bug #94321
 	epatch "${FILESDIR}"/${P}-gcc4.patch
+	# Fix compilation with GCC4 on ppc64 ; bug #117750
+	epatch "${FILESDIR}"/${P}-ppc64.patch
+	eautoconf
 }
 
 src_compile() {