5 files changed, 36 insertions, 11 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 696af268eb13..9902c5b9d38b 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.125 2005/02/12 21:26:51 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.126 2005/02/13 01:02:39 j4rg0n Exp $
+
+  12 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> glib-2.6.0.ebuild,
+  glib-2.6.1.ebuild, glib-2.6.2-r1.ebuild:
+  Applied pthread fix to 2.6 ebuilds.
 
   12 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> +files/glib-2-macos.patch,
   glib-2.4.8.ebuild:
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 05ab64980293..bc7788764948 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,4 +1,4 @@
-MD5 1ef39679d1fe53126fa7cec192c89c48 ChangeLog 15194
+MD5 ae7969f56c88516ed1d98ce2bd92ba9a ChangeLog 15344
 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
@@ -7,9 +7,9 @@ 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 1fa107c8ffaba75d885ba73f67b3da65 glib-2.6.1.ebuild 1338
-MD5 8a39311d06b5b9ff39c795e2114f735e glib-2.6.2-r1.ebuild 1351
+MD5 1df68769597f0ec7fafd6df3b51df2a8 glib-2.6.0.ebuild 1494
+MD5 3cef3109de5d8f2e45f3041f4788559a glib-2.6.1.ebuild 1495
+MD5 05ff301fd2894fa028bb04d122059746 glib-2.6.2-r1.ebuild 1502
 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
diff --git a/dev-libs/glib/glib-2.6.0.ebuild b/dev-libs/glib/glib-2.6.0.ebuild
index 9ec27cc17914..6fd7af5d871b 100644
--- a/dev-libs/glib/glib-2.6.0.ebuild
+++ b/dev-libs/glib/glib-2.6.0.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.6.0.ebuild,v 1.4 2005/01/28 02:12:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.0.ebuild,v 1.5 2005/02/13 01:02:39 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,17 @@ DEPEND=">=dev-util/pkgconfig-0.14
 
 RDEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	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
diff --git a/dev-libs/glib/glib-2.6.1.ebuild b/dev-libs/glib/glib-2.6.1.ebuild
index 38421fef50e6..c5fa3aff8e4e 100644
--- a/dev-libs/glib/glib-2.6.1.ebuild
+++ b/dev-libs/glib/glib-2.6.1.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.6.1.ebuild,v 1.2 2005/01/28 02:12:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.1.ebuild,v 1.3 2005/02/13 01:02:39 j4rg0n Exp $
 
-inherit libtool
+inherit libtool eutils flag-o-matic
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -18,10 +18,17 @@ DEPEND=">=dev-util/pkgconfig-0.14
 	doc? ( >=dev-util/gtk-doc-1 )"
 RDEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	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
diff --git a/dev-libs/glib/glib-2.6.2-r1.ebuild b/dev-libs/glib/glib-2.6.2-r1.ebuild
index f9a75884582a..1013395b3048 100644
--- a/dev-libs/glib/glib-2.6.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.6.2-r1.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.6.2-r1.ebuild,v 1.1 2005/02/11 13:07:39 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.2-r1.ebuild,v 1.2 2005/02/13 01:02:39 j4rg0n Exp $
 
-inherit libtool eutils
+inherit libtool eutils flag-o-matic
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -18,12 +18,19 @@ DEPEND=">=dev-util/pkgconfig-0.14
 	doc? ( >=dev-util/gtk-doc-1 )"
 RDEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use ppc-macos && epatch ${FILESDIR}/${PN}-2-macos.patch
+}
+
 src_compile() {
 
 	epunt_cxx
 
 	if use ppc-macos; then
 		glibtoolize
+		append-ldflags "-L/usr/lib -lpthread"
 	fi
 
 	# enable static for PAM