new release, mark 2.6.2-r1 x86, cleanup

12 files changed, 36 insertions, 195 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 9902c5b9d38b..f16e3e8ce953 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.126 2005/02/13 01:02:39 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.127 2005/03/02 16:23:30 foser Exp $
+
+*glib-2.6.3 (02 Mar 2005)
+
+  02 Mar 2005; foser <foser@gentoo.org> glib-2.6.3.ebuild :
+  New release
 
   12 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> glib-2.6.0.ebuild,
   glib-2.6.1.ebuild, glib-2.6.2-r1.ebuild:
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index bc7788764948..0e6c1137af1a 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,24 +1,18 @@
-MD5 ae7969f56c88516ed1d98ce2bd92ba9a ChangeLog 15344
-MD5 3b34d991b2abc450f6aa972fc5f12ac6 glib-1.2.10-r5.ebuild 1493
+MD5 242a9882e6ff545eee939df0be09a8f9 glib-2.4.8.ebuild 1464
+MD5 d8b763e4877fe69fbb7f26af5ffc1eaf glib-2.6.2-r1.ebuild 1501
+MD5 3cef3109de5d8f2e45f3041f4788559a glib-2.6.1.ebuild 1495
 MD5 6901ecf48140dd3c71b25f2ad85e0691 glib-2.4.2.ebuild 1042
-MD5 0c29996d5087f76045bc82b26b5778d4 glib-2.4.4.ebuild 1331
-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 235e175a4bb4445bbb930b617689196c glib-2.6.3.ebuild 1505
+MD5 6b5acfcbf2b73316c38d8cfc0885bc97 ChangeLog 15446
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 242a9882e6ff545eee939df0be09a8f9 glib-2.4.8.ebuild 1464
 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 3b34d991b2abc450f6aa972fc5f12ac6 glib-1.2.10-r5.ebuild 1493
 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 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
+MD5 394ed1e8214a881afbed68f0fa2546c9 files/digest-glib-2.4.8 64
 MD5 c5265ab52225b51ac7feb1d75bbf4266 files/digest-glib-2.6.0 64
 MD5 9a002ab796c6ae648f61aa78d2987450 files/digest-glib-2.6.1 64
+MD5 a260a5af18d5f068411c03f094fdd680 files/digest-glib-2.6.3 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/digest-glib-2.4.4 b/dev-libs/glib/files/digest-glib-2.4.4
deleted file mode 100644
index 7db4b83e373e..000000000000
--- a/dev-libs/glib/files/digest-glib-2.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea37e29137cb988eb54ff43721143a81 glib-2.4.4.tar.bz2 2138838
diff --git a/dev-libs/glib/files/digest-glib-2.4.5 b/dev-libs/glib/files/digest-glib-2.4.5
deleted file mode 100644
index 6d17a2a56ed1..000000000000
--- a/dev-libs/glib/files/digest-glib-2.4.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c4fc13fb7575d158e9f211205ae9a5e0 glib-2.4.5.tar.bz2 2140793
diff --git a/dev-libs/glib/files/digest-glib-2.4.6 b/dev-libs/glib/files/digest-glib-2.4.6
deleted file mode 100644
index eb34ea0296aa..000000000000
--- a/dev-libs/glib/files/digest-glib-2.4.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a45db7d82480da431f6cd00ea041a534 glib-2.4.6.tar.bz2 2148445
diff --git a/dev-libs/glib/files/digest-glib-2.4.7 b/dev-libs/glib/files/digest-glib-2.4.7
deleted file mode 100644
index 7d0725cba100..000000000000
--- a/dev-libs/glib/files/digest-glib-2.4.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eff6fec89455addf8b0dee5a19e343be glib-2.4.7.tar.bz2 2105444
diff --git a/dev-libs/glib/files/digest-glib-2.6.3 b/dev-libs/glib/files/digest-glib-2.6.3
new file mode 100644
index 000000000000..9d0eefdfc7f4
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.6.3
@@ -0,0 +1 @@
+MD5 8f69ad5387197114b356efc64ce88d77 glib-2.6.3.tar.bz2 2300144
diff --git a/dev-libs/glib/glib-2.4.4.ebuild b/dev-libs/glib/glib-2.4.4.ebuild
deleted file mode 100644
index b8f8c09ba8cb..000000000000
--- a/dev-libs/glib/glib-2.4.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.4.ebuild,v 1.14 2005/01/28 02:12:21 vapier Exp $
-
-inherit libtool
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="x86 ppc sparc ~mips alpha ~arm hppa amd64 ~ia64 ~ppc64 ~s390 ~ppc-macos"
-IUSE="doc"
-
-DEPEND=">=dev-util/pkgconfig-0.14
-	>=sys-devel/gettext-0.11
-	doc? ( !s390? ( >=dev-util/gtk-doc-1 ) )"
-
-RDEPEND="virtual/libc"
-
-src_compile() {
-
-	if use ppc-macos; then
-		glibtoolize
-	else
-		elibtoolize
-	fi
-
-	econf \
-		--with-threads=posix \
-		`use_enable doc gtk-doc` \
-		|| die
-
-	emake || die
-
-}
-
-src_install() {
-
-	# einstall || die
-	make DESTDIR=${D} install || die
-
-	# Do not install charset.alias for ppc-macos since it already exists.
-	if use ppc-macos ; then
-		einfo "Not installing charset.alias on macos"
-		rm ${D}/usr/lib/charset.alias || die "Cannot remove charset.alias from the image"
-	fi
-
-	# Consider invalid UTF-8 filenames as locale-specific.
-	# FIXME : we should probably move to suggesting G_FILENAME_ENC
-	dodir /etc/env.d
-	echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
-
-	dodoc AUTHORS ChangeLog* README* INSTALL NEWS*
-
-}
diff --git a/dev-libs/glib/glib-2.4.5.ebuild b/dev-libs/glib/glib-2.4.5.ebuild
deleted file mode 100644
index 85ddcedcb047..000000000000
--- a/dev-libs/glib/glib-2.4.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.5.ebuild,v 1.14 2005/01/28 02:12:21 vapier Exp $
-
-inherit libtool
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha ~amd64 arm hppa ia64 mips ~ppc ~ppc64 ~ppc-macos s390 sparc x86"
-IUSE="doc"
-
-DEPEND=">=dev-util/pkgconfig-0.14
-	>=sys-devel/gettext-0.11
-	doc? ( >=dev-util/gtk-doc-1 )"
-RDEPEND="virtual/libc"
-
-src_compile() {
-	if use ppc-macos; then
-		glibtoolize
-	else
-		elibtoolize
-	fi
-
-	econf \
-		--with-threads=posix \
-		`use_enable doc gtk-doc` \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	# einstall || die
-	make DESTDIR=${D} install || die
-
-	# Do not install charset.alias for ppc-macos since it already exists.
-	if use ppc-macos ; then
-		einfo "Not installing charset.alias on macos"
-		rm ${D}/usr/lib/charset.alias || die "Cannot remove charset.alias from the image"
-	fi
-
-	# Consider invalid UTF-8 filenames as locale-specific.
-	# FIXME : we should probably move to suggesting G_FILENAME_ENC
-	dodir /etc/env.d
-	echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
-
-	dodoc AUTHORS ChangeLog* README* INSTALL NEWS*
-}
diff --git a/dev-libs/glib/glib-2.4.6.ebuild b/dev-libs/glib/glib-2.4.6.ebuild
deleted file mode 100644
index bf71e04f9233..000000000000
--- a/dev-libs/glib/glib-2.4.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.6.ebuild,v 1.15 2005/01/28 02:12:21 vapier Exp $
-
-inherit libtool
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 ~ppc-macos s390 sparc x86"
-IUSE="doc"
-
-DEPEND=">=dev-util/pkgconfig-0.14
-	>=sys-devel/gettext-0.11
-	doc? ( >=dev-util/gtk-doc-1 )"
-RDEPEND="virtual/libc"
-
-src_compile() {
-
-	if use ppc-macos; then
-		glibtoolize
-	else
-		elibtoolize
-	fi
-
-	econf \
-		--with-threads=posix \
-		`use_enable doc gtk-doc` \
-		|| die
-
-	emake || die
-
-}
-
-src_install() {
-
-	# einstall || die
-	make DESTDIR=${D} install || die
-
-	# Do not install charset.alias for ppc-macos since it already exists.
-	if use ppc-macos ; then
-		einfo "Not installing charset.alias on macos"
-		rm ${D}/usr/lib/charset.alias || die "Cannot remove charset.alias from the image"
-	fi
-
-	# Consider invalid UTF-8 filenames as locale-specific.
-	# FIXME : we should probably move to suggesting G_FILENAME_ENC
-	dodir /etc/env.d
-	echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
-
-	dodoc AUTHORS ChangeLog* README* INSTALL NEWS*
-
-}
diff --git a/dev-libs/glib/glib-2.6.2-r1.ebuild b/dev-libs/glib/glib-2.6.2-r1.ebuild
index 1013395b3048..eb1c9fa36743 100644
--- a/dev-libs/glib/glib-2.6.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/02/13 01:02:39 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.2-r1.ebuild,v 1.3 2005/03/02 16:23:30 foser Exp $
 
 inherit libtool eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+KEYWORDS="x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc"
 IUSE="doc"
 
 DEPEND=">=dev-util/pkgconfig-0.14
diff --git a/dev-libs/glib/glib-2.4.7.ebuild b/dev-libs/glib/glib-2.6.3.ebuild
index 5624623092ce..c4041ffa5a43 100644
--- a/dev-libs/glib/glib-2.4.7.ebuild
+++ b/dev-libs/glib/glib-2.6.3.ebuild
@@ -1,16 +1,16 @@
 # 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.7.ebuild,v 1.7 2005/01/28 02:12:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.3.ebuild,v 1.1 2005/03/02 16:23:30 foser Exp $
 
-inherit libtool
+inherit libtool eutils flag-o-matic
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="x86 ~ppc sparc ~mips ~alpha ~arm ~hppa amd64 ~ia64 ~ppc64 ~s390 ~ppc-macos"
+KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc"
 IUSE="doc"
 
 DEPEND=">=dev-util/pkgconfig-0.14
@@ -19,16 +19,27 @@ 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() {
 
+	epunt_cxx
+
 	if use ppc-macos; then
 		glibtoolize
-	else
-		elibtoolize
+		append-ldflags "-L/usr/lib -lpthread"
 	fi
 
+	# enable static for PAM
 	econf \
 		--with-threads=posix \
+		--enable-static \
 		`use_enable doc gtk-doc` \
 		|| die
 
@@ -38,7 +49,6 @@ src_compile() {
 
 src_install() {
 
-	# einstall || die
 	make DESTDIR=${D} install || die
 
 	# Do not install charset.alias for ppc-macos since it already exists.