new release

(Portage version: 2.0.51.19)

5 files changed, 96 insertions, 16 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 65b26673754b..71680fdd9a4f 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.139 2005/05/19 20:24:02 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.140 2005/06/22 12:09:27 foser Exp $
+
+*glib-2.6.5 (22 Jun 2005)
+
+  22 Jun 2005; Marinus Schraal <foser@gentoo.org> glib-2.6.5.ebuild :
+  Add specific docbook dtd dep
 
   19 May 2005; Rene Nussbaumer <killerfox@gentoo.org> glib-2.6.3.ebuild:
   Stable on hppa
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index c6341608c4f0..ad674565ae18 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,22 +1,24 @@
-MD5 8c1840a3e7aa039ec3481e5064215a81 ChangeLog 16554
-MD5 caaf299f8602ffa102194fe32afefe07 glib-1.2.10-r5.ebuild 1549
+MD5 242a9882e6ff545eee939df0be09a8f9 glib-2.4.8.ebuild 1464
+MD5 3ce389078341b385211c167a398a24fc glib-2.6.2-r1.ebuild 1622
+MD5 ac03f9cb12d27d47b9025c3378bc91ea glib-2.6.4.ebuild 1641
+MD5 3cef3109de5d8f2e45f3041f4788559a glib-2.6.1.ebuild 1495
 MD5 6901ecf48140dd3c71b25f2ad85e0691 glib-2.4.2.ebuild 1042
 MD5 574e2539cc00ae5fb73120c4940125a8 glib-2.6.3.ebuild 1622
+MD5 8c1840a3e7aa039ec3481e5064215a81 ChangeLog 16554
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 ac03f9cb12d27d47b9025c3378bc91ea glib-2.6.4.ebuild 1641
-MD5 242a9882e6ff545eee939df0be09a8f9 glib-2.4.8.ebuild 1464
+MD5 ac03f9cb12d27d47b9025c3378bc91ea glib-2.6.5.ebuild 1641
 MD5 1df68769597f0ec7fafd6df3b51df2a8 glib-2.6.0.ebuild 1494
-MD5 3cef3109de5d8f2e45f3041f4788559a glib-2.6.1.ebuild 1495
-MD5 3ce389078341b385211c167a398a24fc glib-2.6.2-r1.ebuild 1622
-MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
-MD5 6da4b81e0a2656f101965a505c7cb6d4 files/glib-1.2.10-m4.patch 225
+MD5 caaf299f8602ffa102194fe32afefe07 glib-1.2.10-r5.ebuild 1549
 MD5 bb11efe8c19407a4742056f67df25dd7 files/digest-glib-2.4.2 64
-MD5 a260a5af18d5f068411c03f094fdd680 files/digest-glib-2.6.3 64
-MD5 0d475655c887a08ddbfccb827a1f46b5 files/digest-glib-2.6.4 64
-MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
-MD5 7fec226893c96f1126810906e2fb3e5b files/glib-2.6.3-testglib-ssp.patch 344
 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 759cd49ef581f9266d68b23a74313e8a files/digest-glib-2.6.2-r1 64
+MD5 a260a5af18d5f068411c03f094fdd680 files/digest-glib-2.6.3 64
+MD5 0d475655c887a08ddbfccb827a1f46b5 files/digest-glib-2.6.4 64
+MD5 60c45aba2f0c1b47590e8193b533d7c7 files/digest-glib-2.6.5 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 6da4b81e0a2656f101965a505c7cb6d4 files/glib-1.2.10-m4.patch 225
+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.5 b/dev-libs/glib/files/digest-glib-2.6.5
new file mode 100644
index 000000000000..1eaf7fddfeee
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.6.5
@@ -0,0 +1 @@
+MD5 777d2e34a60edad28319207b576cda91 glib-2.6.5.tar.bz2 2357089
diff --git a/dev-libs/glib/glib-2.6.4.ebuild b/dev-libs/glib/glib-2.6.4.ebuild
index 594de8734edc..64fd8d0edc31 100644
--- a/dev-libs/glib/glib-2.6.4.ebuild
+++ b/dev-libs/glib/glib-2.6.4.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.4.ebuild,v 1.1 2005/04/16 22:37:58 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.4.ebuild,v 1.2 2005/06/22 12:09:27 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 static"
 
 DEPEND=">=dev-util/pkgconfig-0.14
diff --git a/dev-libs/glib/glib-2.6.5.ebuild b/dev-libs/glib/glib-2.6.5.ebuild
new file mode 100644
index 000000000000..cb99e302d1c3
--- /dev/null
+++ b/dev-libs/glib/glib-2.6.5.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.5.ebuild,v 1.1 2005/06/22 12:09:27 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
+		=app-text/docbook-xml-dtd-4.1.2-r5 )"
+
+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
+
+	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*
+
+}