new release, mark 2.6.3 x86

(Portage version: 2.0.51.19)

4 files changed, 89 insertions, 14 deletions

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index aa503455ffcf..456cdc0bfded 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,19 +1,21 @@
 MD5 242a9882e6ff545eee939df0be09a8f9 glib-2.4.8.ebuild 1464
+MD5 3ce389078341b385211c167a398a24fc glib-2.6.2-r1.ebuild 1622
+MD5 827acf729f72f19466c2f76c2a841204 glib-2.6.4.ebuild 1643
 MD5 3cef3109de5d8f2e45f3041f4788559a glib-2.6.1.ebuild 1495
+MD5 6901ecf48140dd3c71b25f2ad85e0691 glib-2.4.2.ebuild 1042
+MD5 02e7eae5daff7482226f3333d19a27fa glib-2.6.3.ebuild 1629
+MD5 bcbcda0343269aed0f4e78dec5830806 ChangeLog 16196
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 1df68769597f0ec7fafd6df3b51df2a8 glib-2.6.0.ebuild 1494
-MD5 02e7eae5daff7482226f3333d19a27fa glib-2.6.3.ebuild 1629
 MD5 fbe384551ef03d610758ad3e919020c9 glib-1.2.10-r5.ebuild 1596
-MD5 6901ecf48140dd3c71b25f2ad85e0691 glib-2.4.2.ebuild 1042
-MD5 bcbcda0343269aed0f4e78dec5830806 ChangeLog 16196
-MD5 3ce389078341b385211c167a398a24fc glib-2.6.2-r1.ebuild 1622
-MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
-MD5 7fec226893c96f1126810906e2fb3e5b files/glib-2.6.3-testglib-ssp.patch 344
-MD5 759cd49ef581f9266d68b23a74313e8a files/digest-glib-2.6.2-r1 64
-MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
-MD5 a260a5af18d5f068411c03f094fdd680 files/digest-glib-2.6.3 64
-MD5 c5265ab52225b51ac7feb1d75bbf4266 files/digest-glib-2.6.0 64
-MD5 1a4565b760afb02416ff0d674c89c83f files/glib-2-macos.patch 989
-MD5 9a002ab796c6ae648f61aa78d2987450 files/digest-glib-2.6.1 64
 MD5 bb11efe8c19407a4742056f67df25dd7 files/digest-glib-2.4.2 64
 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 0d475655c887a08ddbfccb827a1f46b5 files/digest-glib-2.6.4 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
+MD5 7fec226893c96f1126810906e2fb3e5b files/glib-2.6.3-testglib-ssp.patch 344
diff --git a/dev-libs/glib/files/digest-glib-2.6.4 b/dev-libs/glib/files/digest-glib-2.6.4
new file mode 100644
index 000000000000..8c5184476290
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.6.4
@@ -0,0 +1 @@
+MD5 af7eeb8aae764ff763418471ed6eb93d glib-2.6.4.tar.bz2 2377430
diff --git a/dev-libs/glib/glib-2.6.3.ebuild b/dev-libs/glib/glib-2.6.3.ebuild
index 9ac2bdca6fc4..77b8af6cf020 100644
--- a/dev-libs/glib/glib-2.6.3.ebuild
+++ b/dev-libs/glib/glib-2.6.3.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.3.ebuild,v 1.5 2005/04/07 03:55:26 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.3.ebuild,v 1.6 2005/04/16 22:37:58 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="~x86 ~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 sparc"
+KEYWORDS="x86 ~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 sparc"
 IUSE="doc hardened"
 
 DEPEND=">=dev-util/pkgconfig-0.14
diff --git a/dev-libs/glib/glib-2.6.4.ebuild b/dev-libs/glib/glib-2.6.4.ebuild
new file mode 100644
index 000000000000..594de8734edc
--- /dev/null
+++ b/dev-libs/glib/glib-2.6.4.ebuild
@@ -0,0 +1,72 @@
+# 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.4.ebuild,v 1.1 2005/04/16 22:37:58 foser Exp $
+
+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.6/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc"
+IUSE="doc hardened static"
+
+DEPEND=">=dev-util/pkgconfig-0.14
+	>=sys-devel/gettext-0.11
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+RDEPEND="virtual/libc"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	use ppc-macos && epatch ${FILESDIR}/${PN}-2-macos.patch
+
+	if use ppc64 && use hardened; then
+		replace-flags -O[2-3] -O1
+		epatch ${FILESDIR}/glib-2.6.3-testglib-ssp.patch
+	fi
+
+}
+
+src_compile() {
+
+	epunt_cxx
+
+	if use ppc-macos; then
+		glibtoolize
+		append-ldflags "-L/usr/lib -lpthread"
+	fi
+
+	# enable static for PAM
+	econf \
+		--with-threads=posix \
+		`use_enable static` \
+		`use_enable doc gtk-doc` \
+		|| die
+
+	emake || die
+
+}
+
+src_install() {
+
+	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*
+
+}