Bump to 2.20.1. Update internal copy of libprcre to 7.8, gio and GHashTable enhancements.

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

3 files changed, 111 insertions, 2 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 9ceeae8dacd2..740a99d558fc 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.366 2009/04/27 13:07:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.367 2009/05/04 21:24:07 eva Exp $
+
+*glib-2.20.1 (04 May 2009)
+
+  04 May 2009; Gilles Dartiguelongue <eva@gentoo.org> +glib-2.20.1.ebuild:
+  Bump to 2.20.1. Update internal copy of libprcre to 7.8, gio and
+  GHashTable enhancements.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> glib-2.18.4-r1:
   Stable for HPPA (bug #260063).
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 37dc25194615..36ac7a8293d7 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX glib-1.2.10-automake.patch 827 RMD160 3b1485f89a157b60f31f5ae8ffe2333ab842d217 SHA1 cd40e4dc579190a89e09fad9ac7b209f24b231b3 SHA256 db6d22caf4054c09467b50b6d85566eec7479a29169460950e423c083332ef67
 AUX glib-1.2.10-configure-LANG.patch 1464 RMD160 91481ba6b3f7a1d6e22a4ab7003fcee17450f3c1 SHA1 d98cc2f4ac6cc4aae55270ad0e5705af4de9b3ad SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4
 AUX glib-1.2.10-gcc34-fix.patch 2008 RMD160 7e92b8842a8232cada12453d7f5e5a587a2bf496 SHA1 cb9c6e2f5320590713b3fba61f1d984e569d5d08 SHA256 848620bc200c2a42d726744fe6c36e20a396624e82b0c742b726dd72287e6cdd
@@ -12,8 +15,17 @@ DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 RMD160 5b7a21da6dc10112409bd885501a
 DIST glib-1.2.10.tar.gz 421480 RMD160 f19efe8c87ebeea979a4d36902d8a8209640cd95 SHA1 e5a9361c594608d152d5d9650154c2e3260b87fa SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
 DIST glib-2.16.6.tar.bz2 4575345 RMD160 3ab0a0353a4d890841cc1b5e640ea41c58e57a6e SHA1 d481c9a99d5fe89ff8137da7fd7d690f5a479795 SHA256 c3d8f831b8d127905f8e7f066ff5398668fa26f6a180945b32a5641c03c42925
 DIST glib-2.18.4.tar.bz2 4809051 RMD160 c47a71708fd13ade70d72d3443799d3e74a0459d SHA1 3e21395c6980e3970d5260b46ecb6b87f2482c61 SHA256 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100
+DIST glib-2.20.1.tar.bz2 5000484 RMD160 b2f1b23c8db482b335e7fa5f1c2fbb3165d43e9a SHA1 4a0eceb959daa81ee1c867bfc7df8e1459d408a2 SHA256 5bade2d900514cf00fb5131c2f42b697bc3cb6ce7b3c5579bc43de8f19d4af59
 EBUILD glib-1.2.10-r5.ebuild 1764 RMD160 dc6544841f2acb73d5951100ce9c9182f4d9560e SHA1 e6649f70934720527f69995ab0b8c845032cfb0f SHA256 24442b44089e15432a4f1411d2d59dff9d5c2fbfb91c801b96087588ff71373b
 EBUILD glib-2.16.6-r1.ebuild 2502 RMD160 c209350ec44cb1289cb1f07738c97be79f91ab30 SHA1 4f8fd4134d331774a9cd7053ed85ad26e80e678e SHA256 586877a1ab275ebaca61bf58c2884711629b386c63465a9854a6e9ba54ef223b
 EBUILD glib-2.18.4-r1.ebuild 2552 RMD160 064211c357cab6429e6fb2f02711f9db5ab3682d SHA1 70f546b98cf0f8a1be389e5ca442d529eee5dfc8 SHA256 b698695ef88300974051b63549b4ee4c3ddad94027d110fb8de2ec14c3399c8c
-MISC ChangeLog 44650 RMD160 cc587858b01f1dbf90d46f7efddff6be0b5270ce SHA1 867ab324b0114877071873a1f4f17ac0b2350072 SHA256 a8be525c6bce7d3ec4a78ef72463cbe7a7881eb1f1969d7288b62ff100897ff2
+EBUILD glib-2.20.1.ebuild 2599 RMD160 a41df5162459a1688bd701bd96981310074b6d50 SHA1 c04209ff65fb07f22a7e017e1520fcf953a5c52c SHA256 740fa80baee38085f43ca5f079781487abe379c00157017c62b42a5b79cb1cf2
+MISC ChangeLog 44848 RMD160 728c2230da7101432b4d56bc890eb5641b47f422 SHA1 eeeb8f7c0853211a61c8eb9eda1e0276291fa493 SHA256 aa2181e569f802dd67162bc9cb9eb33fa994478a0f5b12c257137e3b1c77f6f8
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn/XP0ACgkQ1fmVwcYIWAbOYACfWIYR7HVHXF5eII6KJitbxU0/
+tDgAoMy4jfY1kBw2kGFLLG811czu32Os
+=RDtE
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.20.1.ebuild b/dev-libs/glib/glib-2.20.1.ebuild
new file mode 100644
index 000000000000..5e680c3cbb9a
--- /dev/null
+++ b/dev-libs/glib/glib-2.20.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.20.1.ebuild,v 1.1 2009/05/04 21:24:07 eva Exp $
+
+EAPI="2"
+
+inherit gnome.org libtool eutils flag-o-matic
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug doc fam hardened selinux xattr"
+
+RDEPEND="virtual/libc
+	virtual/libiconv
+	xattr? ( sys-apps/attr )
+	fam? ( virtual/fam )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.16
+	>=sys-devel/gettext-0.11
+	doc? (
+		>=dev-libs/libxslt-1.0
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )"
+
+src_prepare() {
+	if use ppc64 && use hardened ; then
+		replace-flags -O[2-3] -O1
+		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
+	fi
+
+	if use ia64 ; then
+		# Only apply for < 4.1
+		local major=$(gcc-major-version)
+		local minor=$(gcc-minor-version)
+		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+		fi
+	fi
+
+	# Don't fail gio tests when ran without userpriv, upstream bug 552912
+	# This is only a temporary workaround, remove as soon as possible
+	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
+
+	# Fix gmodule issues on fbsd; bug #184301
+	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
+
+	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
+}
+
+src_configure() {
+	local myconf
+
+	epunt_cxx
+
+	# Building with --disable-debug highly unrecommended.  It will build glib in
+	# an unusable form as it disables some commonly used API.  Please do not
+	# convert this to the use_enable form, as it results in a broken build.
+	# -- compnerd (3/27/06)
+	use debug && myconf="--enable-debug"
+
+	# always build static libs, see #153807
+	# Always use internal libpcre, bug #254659
+	econf ${myconf}                 \
+		  $(use_enable xattr)       \
+		  $(use_enable doc man)     \
+		  $(use_enable doc gtk-doc) \
+		  $(use_enable fam)         \
+		  $(use_enable selinux)     \
+		  --enable-static           \
+		  --enable-regex            \
+		  --with-pcre=internal      \
+		  --with-threads=posix
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${D}/usr/lib/charset.alias"
+
+	dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check || die "tests failed"
+}