Bug #73708 fix.

Package-Manager: portage-2.0.51-r15

4 files changed, 65 insertions, 19 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 1857d3cdc0dc..696af268eb13 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.124 2005/02/11 13:07:39 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.125 2005/02/12 21:26:51 j4rg0n Exp $
+
+  12 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> +files/glib-2-macos.patch,
+  glib-2.4.8.ebuild:
+  Fix for Bug #73708. Kudos to kito for the append-ldflags fix.
 
 *glib-2.6.2-r1 (11 Feb 2005)
 
@@ -40,7 +44,7 @@
   21 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> glib-2.4.8.ebuild:
   Stable on sparc
 
-  21 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> glib-2.4.8.ebuild:
+  21 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> glib-2.4.8.ebuild:
   Stable on alpha.
 
   20 Dec 2004; Dylan Carlson <absinthe@gentoo.org> glib-2.4.8.ebuild:
@@ -90,7 +94,7 @@
   11 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> glib-1.2.10-r5.ebuild:
   Fixed shared libraries compilation on macos. This closes bug #60580.
 
-  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> glib-2.4.6.ebuild:
+  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> glib-2.4.6.ebuild:
   Stable on alpha.
 
 *glib-2.4.7 (09 Oct 2004)
@@ -107,7 +111,7 @@
   06 Sep 2004; Guy Martin <gmsoft@gentoo.org> glib-2.4.5.ebuild:
   Marked stable on hppa.
 
-  06 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> glib-2.4.5.ebuild:
+  06 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> glib-2.4.5.ebuild:
   Stable on alpha.
 
   31 Aug 2004; Michael Hanselmann <hansmi@gentoo.org> glib-1.2.10-r5.ebuild:
@@ -121,7 +125,7 @@
   19 Aug 2004; foser <foser@gentoo.org> glib-2.4.6.ebuild :
   New release
 
-  08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> glib-2.4.4.ebuild:
+  08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> glib-2.4.4.ebuild:
   Stable on alpha.
 
   07 Aug 2004; Travis Tilley <lv@gentoo.org> glib-2.4.4.ebuild:
@@ -166,7 +170,7 @@
   19 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> glib-2.4.1.ebuild:
   sparc stable
 
-  16 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> glib-2.4.1.ebuild:
+  16 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> glib-2.4.1.ebuild:
   Stable on alpha.
 
 *glib-2.4.2 (15 Jun 2004)
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index a706643eddf3..05ab64980293 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,23 +1,24 @@
-MD5 4016bf284efe1df546dd789ccacb1d7c glib-2.4.6.ebuild 1315
-MD5 9c8a1138dec00a2f7c22a013d5878cde glib-2.4.8.ebuild 1315
-MD5 8a39311d06b5b9ff39c795e2114f735e glib-2.6.2-r1.ebuild 1351
-MD5 d377276364fa2e33b673386de1006d21 glib-2.4.5.ebuild 1313
-MD5 1fa107c8ffaba75d885ba73f67b3da65 glib-2.6.1.ebuild 1338
-MD5 1d23a6d2e43c75cc9be3ce863dd5c457 glib-2.4.7.ebuild 1322
+MD5 1ef39679d1fe53126fa7cec192c89c48 ChangeLog 15194
+MD5 3b34d991b2abc450f6aa972fc5f12ac6 glib-1.2.10-r5.ebuild 1493
 MD5 6901ecf48140dd3c71b25f2ad85e0691 glib-2.4.2.ebuild 1042
 MD5 0c29996d5087f76045bc82b26b5778d4 glib-2.4.4.ebuild 1331
-MD5 9058adcaf891c7351296ec39ebdc5c5d ChangeLog 15021
+MD5 d377276364fa2e33b673386de1006d21 glib-2.4.5.ebuild 1313
+MD5 4016bf284efe1df546dd789ccacb1d7c glib-2.4.6.ebuild 1315
+MD5 1d23a6d2e43c75cc9be3ce863dd5c457 glib-2.4.7.ebuild 1322
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 242a9882e6ff545eee939df0be09a8f9 glib-2.4.8.ebuild 1464
 MD5 69a26a76e16552390c8eca5d0271e88b glib-2.6.0.ebuild 1337
-MD5 3b34d991b2abc450f6aa972fc5f12ac6 glib-1.2.10-r5.ebuild 1493
+MD5 1fa107c8ffaba75d885ba73f67b3da65 glib-2.6.1.ebuild 1338
+MD5 8a39311d06b5b9ff39c795e2114f735e glib-2.6.2-r1.ebuild 1351
+MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
+MD5 394ed1e8214a881afbed68f0fa2546c9 files/digest-glib-2.4.8 64
 MD5 bb11efe8c19407a4742056f67df25dd7 files/digest-glib-2.4.2 64
 MD5 524c2c1cfb5ab43d0b402cefb8da4a9a files/digest-glib-2.4.4 64
 MD5 4f50760a1f3a23a715d8c07ff936bcf6 files/digest-glib-2.4.5 64
 MD5 560ff41071c92560f9de1990dcdde70f files/digest-glib-2.4.6 64
 MD5 c2049695996219f5b8c81ad1b89f40f0 files/digest-glib-2.4.7 64
-MD5 394ed1e8214a881afbed68f0fa2546c9 files/digest-glib-2.4.8 64
+MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
 MD5 c5265ab52225b51ac7feb1d75bbf4266 files/digest-glib-2.6.0 64
 MD5 9a002ab796c6ae648f61aa78d2987450 files/digest-glib-2.6.1 64
+MD5 1a4565b760afb02416ff0d674c89c83f files/glib-2-macos.patch 989
 MD5 759cd49ef581f9266d68b23a74313e8a files/digest-glib-2.6.2-r1 64
-MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
-MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
diff --git a/dev-libs/glib/files/glib-2-macos.patch b/dev-libs/glib/files/glib-2-macos.patch
new file mode 100644
index 000000000000..5b8da628eced
--- /dev/null
+++ b/dev-libs/glib/files/glib-2-macos.patch
@@ -0,0 +1,35 @@
+--- glib-2.4.8/configure.orig	Thu Dec  2 15:36:40 2004
++++ glib-2.4.8/configure	Sat Feb 12 14:28:37 2005
+@@ -31712,9 +31712,9 @@
+          # skip cygwin -pthread or -pthreads test
+          ;;
+       *)
+-        for flag in pthread pthreads; do
++        for flag in '-pthread' '-pthreads' ''; do
+           glib_save_CFLAGS="$CFLAGS"
+-          CFLAGS="$CFLAGS -$flag"
++          CFLAGS="$CFLAGS $flag"
+           if test "$cross_compiling" = yes; then
+   cat >conftest.$ac_ext <<_ACEOF
+ 
+@@ -31803,8 +31803,8 @@
+ fi
+           CFLAGS="$glib_save_CFLAGS"
+           if test $glib_flag_works = yes ; then
+-             G_THREAD_CFLAGS=-$flag
+-	     G_THREAD_LIBS=-$flag
++             G_THREAD_CFLAGS=$flag
++	     G_THREAD_LIBS=$flag
+           fi
+         done
+          ;;
+@@ -31861,6 +31861,9 @@
+ 	*-mingw*)
+ 		# No flag needed when using MSVCRT.DLL
+ 		G_THREAD_CFLAGS=""
++		;;
++	*-darwin*)
++		# Nothing needed.
+ 		;;
+ 	*)
+ 		G_THREAD_CFLAGS="-D_REENTRANT" # good default guess otherwise
diff --git a/dev-libs/glib/glib-2.4.8.ebuild b/dev-libs/glib/glib-2.4.8.ebuild
index 0b822737e3c4..9e04975c452d 100644
--- a/dev-libs/glib/glib-2.4.8.ebuild
+++ b/dev-libs/glib/glib-2.4.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.4.8.ebuild,v 1.10 2005/02/06 22:07:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.4.8.ebuild,v 1.11 2005/02/12 21:26:51 j4rg0n Exp $
 
-inherit libtool
+inherit libtool eutils flag-o-matic
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -19,10 +19,16 @@ DEPEND=">=dev-util/pkgconfig-0.14
 
 RDEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	use ppc-macos && epatch ${FILESDIR}/${PN}-2-macos.patch
+}
+
 src_compile() {
 
 	if use ppc-macos; then
 		glibtoolize
+		append-ldflags "-L/usr/lib -lpthread"
 	else
 		elibtoolize
 	fi