new release, mark .6 x86

5 files changed, 76 insertions, 9 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index f1f0788123d1..23aae568dc30 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.97 2004/09/29 04:22:39 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.98 2004/10/09 15:18:16 foser Exp $
+
+*glib-2.4.7 (09 Oct 2004)
+
+  09 Oct 2004; foser <foser@gentoo.org> glib-2.4.7.ebuild :
+  New release
 
   29 Sep 2004; Lina Pezzella <j4rg0n@gentoo.org> glib-2.4.4.ebuild, glib-2.4.5.ebuild, glib-2.4.6.ebuild:
   Updated to not install charset.alias on macos.
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index cafda7fc86ac..b8a78888ddcc 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,15 +1,17 @@
-MD5 373d7bfc686a864fff1de17fb22c0c14 ChangeLog 12079
-MD5 5d838e6c24b33f545fc2f507243b5ad4 glib-1.2.10-r5.ebuild 2284
 MD5 04c3a0c7f6f3912dba2f21f856622583 glib-2.4.6.ebuild 1381
 MD5 fd2f66a83b030b479ef059a02996017c glib-2.4.1.ebuild 997
+MD5 3021290a955dbc4d4a88418cf4ee7194 glib-2.4.5.ebuild 1370
+MD5 b11170daad403e0ce37bd3711d5d4c37 glib-2.4.7.ebuild 1382
 MD5 33374c66124d4339d26a7241a0fdd6c9 glib-2.4.2.ebuild 1046
 MD5 cba6ad1f65d64c20d4e206ad643efd56 glib-2.4.4.ebuild 1388
+MD5 373d7bfc686a864fff1de17fb22c0c14 ChangeLog 12079
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 3021290a955dbc4d4a88418cf4ee7194 glib-2.4.5.ebuild 1370
-MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
-MD5 560ff41071c92560f9de1990dcdde70f files/digest-glib-2.4.6 64
+MD5 5d838e6c24b33f545fc2f507243b5ad4 glib-1.2.10-r5.ebuild 2284
 MD5 9409a054bd000d556e84987a855b10f0 files/digest-glib-2.4.1 64
 MD5 bb11efe8c19407a4742056f67df25dd7 files/digest-glib-2.4.2 64
 MD5 524c2c1cfb5ab43d0b402cefb8da4a9a files/digest-glib-2.4.4 64
-MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
 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 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
diff --git a/dev-libs/glib/files/digest-glib-2.4.7 b/dev-libs/glib/files/digest-glib-2.4.7
new file mode 100644
index 000000000000..7d0725cba100
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.4.7
@@ -0,0 +1 @@
+MD5 eff6fec89455addf8b0dee5a19e343be glib-2.4.7.tar.bz2 2105444
diff --git a/dev-libs/glib/glib-2.4.6.ebuild b/dev-libs/glib/glib-2.4.6.ebuild
index f42f3eecd4fe..12edc0de9328 100644
--- a/dev-libs/glib/glib-2.4.6.ebuild
+++ b/dev-libs/glib/glib-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.5 2004/09/29 04:22:39 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.4.6.ebuild,v 1.6 2004/10/09 15:18:16 foser Exp $
 
 inherit libtool
 
@@ -10,7 +10,7 @@ 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 ~macos ~ppc-macos"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~macos ~ppc-macos"
 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.4.7.ebuild
new file mode 100644
index 000000000000..cdb14a3b9d10
--- /dev/null
+++ b/dev-libs/glib/glib-2.4.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 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.1 2004/10/09 15:18:16 foser 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 ~macos ~ppc-macos"
+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 macos; then
+		glibtoolize
+	elif 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 macos || 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*
+
+}