Bump to 2.20.3. Bug fixes and translation updates. Define XDG environment variable for tests since they might not be present even when xdg-utils-1.0.2-r3 is installed, bug #269155.

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

5 files changed, 20 insertions, 196 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index dc3ead245b73..bff811ff8358 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,15 @@
 # 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.370 2009/05/18 21:37:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.371 2009/06/08 22:00:41 eva Exp $
+
+*glib-2.20.3 (08 Jun 2009)
+
+  08 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -glib-2.16.6-r1.ebuild, -glib-2.20.1.ebuild, -glib-2.20.1-r1.ebuild,
+  +glib-2.20.3.ebuild:
+  Bump to 2.20.3. Bug fixes and translation updates. Define XDG environment
+  variable for tests since they might not be present even when
+  xdg-utils-1.0.2-r3 is installed, bug #269155.
 
   18 May 2009; Gilles Dartiguelongue <eva@gentoo.org> glib-2.20.2.ebuild:
   Remove unused patch.
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 499516abf6fa..8257341b9c34 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -15,23 +15,20 @@ AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc
 AUX glib2-CVE-2008-4316.patch 2692 RMD160 3143c4df4f1063f8177a545d8cb5678a68c2980f SHA1 f89222a8f09e4e841480bbfbd4defd1e3d402e91 SHA256 c249ef6513c2490e9efe836e9d41a4a5f1056979748e2535b8ec7d13a71b1bf0
 DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 RMD160 5b7a21da6dc10112409bd885501a6976a2eb894d SHA1 468a7947b7d1688c2e7d61da80d40ca59422fbec SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731
 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
 DIST glib-2.20.2.tar.bz2 5019345 RMD160 5ab7863c97025bd5c1aa7659442aaee3020176ce SHA1 2c1f27bc4fb942ba93ccf934635879ffe0524f45 SHA256 13dea4a3f37ea927e0f2bbb312d6d1a3fb26668813604ae962e0db5a7902cedc
+DIST glib-2.20.3.tar.bz2 5008689 RMD160 75a1bede14759d3b7bc5ca320d2a094d242bc6dc SHA1 9cc9dc579f790d87dacc21413aec6600b9eccfce SHA256 37f098617c2fac11eee4c6289d576300abd0a01825d4c809462f5b698d1127b0
 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
 EBUILD glib-2.18.4-r2.ebuild 2777 RMD160 fe9fe4d460e8a8f66522ed80289339551c2d7550 SHA1 8f0c23e2dfbfa345e49db045143b97c5b772f194 SHA256 7ba89f6538dbdb32dcfc02ad506ed825bd7dae580061a423f6698bae891379e2
-EBUILD glib-2.20.1-r1.ebuild 2681 RMD160 a59a0ac5646ad239e8a6949dee76d29e4be14bcc SHA1 15e3675782ff69ed580b0019a2927279f034f1cf SHA256 ac003b813c3dd2fa8fd4b633c0dda09f31eac44cb8d9615c72a95000dc10a660
-EBUILD glib-2.20.1.ebuild 2599 RMD160 a41df5162459a1688bd701bd96981310074b6d50 SHA1 c04209ff65fb07f22a7e017e1520fcf953a5c52c SHA256 740fa80baee38085f43ca5f079781487abe379c00157017c62b42a5b79cb1cf2
 EBUILD glib-2.20.2.ebuild 2599 RMD160 6f2fac5cbc0688317e6768ddbe57ac58021d0f51 SHA1 d1749c4d635e72027df54c5665562b5d60a6a4e2 SHA256 4da1fb7498a3ff6a96375e6ceac51219a24c1766786f2c79d429a555b83c4f4c
-MISC ChangeLog 45403 RMD160 8c80ff3403aa6e36413eb06e5152ee63fa789a84 SHA1 8fd3753cf66def58ff07a27f5e575d1ec6310c47 SHA256 53e143ca775772b2c20d7f236fe14318216dd697d36f811b2e84f35414eebe8f
+EBUILD glib-2.20.3.ebuild 2682 RMD160 af82f4abe90f12f9af9b88da5bf5a9e21f2a023b SHA1 4e8d5e6712f13803c4da2d5ec19b164e8667cf82 SHA256 144d23b53a84265969b7b08e8b19c9491a8cd9d0bdb4c0034d93e436d64077d9
+MISC ChangeLog 45767 RMD160 25c168d47ef0f0ff3db6913925590616ef83b8d7 SHA1 2f0e08b70a6c50e5527c9126e7696c6d20b47071 SHA256 a3a1336aaf078ac1b70dff65874d4560c80e260a4faed9cd432511eceb0eedc8
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoR1QcACgkQ1fmVwcYIWAbAyACfczj6/Jqll0tQxsij1Nmdk9pY
-HjYAoKRKPiQW7+7MXeIMk/R85cH6XyUd
-=OIak
+iEYEARECAAYFAkotihUACgkQ1fmVwcYIWAazFgCfSVsZzFeEiuxeBCAYL5F4h/OC
+H9EAnjnUW8La8KpQcIq+QtWFk/ShVHds
+=dlQt
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.16.6-r1.ebuild b/dev-libs/glib/glib-2.16.6-r1.ebuild
deleted file mode 100644
index e719dabecfa5..000000000000
--- a/dev-libs/glib/glib-2.16.6-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.16.6-r1.ebuild,v 1.6 2009/03/26 14:03:45 armin76 Exp $
-
-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.8
-					~app-text/docbook-xml-dtd-4.1.2
-				)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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
-
-	# GNOME bug #538836, fix gio test failure on various arches
-	sed -i -e 's:|\\<g_atomic_int\\|:|\\<g_atomic_int\\|\\<g_atomic_pointer_get\\|:' \
-		"${S}/gio/pltcheck.sh"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	# Fix g_base64 overruns. bug #249214
-	epatch "${FILESDIR}"/glib2-CVE-2008-4316.patch
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-}
-
-src_compile() {
-	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
-	econf ${myconf}                 \
-		  $(use_enable xattr)       \
-		  $(use_enable doc man)     \
-		  $(use_enable doc gtk-doc) \
-		  $(use_enable fam)         \
-		  $(use_enable selinux)     \
-		  --enable-static           \
-		  --with-threads=posix || die "configure failed"
-
-	emake || die "make failed"
-}
-
-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
-}
diff --git a/dev-libs/glib/glib-2.20.1.ebuild b/dev-libs/glib/glib-2.20.1.ebuild
deleted file mode 100644
index 5e680c3cbb9a..000000000000
--- a/dev-libs/glib/glib-2.20.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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"
-}
diff --git a/dev-libs/glib/glib-2.20.1-r1.ebuild b/dev-libs/glib/glib-2.20.3.ebuild
index c8c706373147..afb1c51a340e 100644
--- a/dev-libs/glib/glib-2.20.1-r1.ebuild
+++ b/dev-libs/glib/glib-2.20.3.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2009/05/04 22:06:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.20.3.ebuild,v 1.1 2009/06/08 22:00:41 eva Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="debug doc fam hardened selinux xattr"
 
 RDEPEND="virtual/libc
@@ -48,9 +48,6 @@ src_prepare() {
 	# Fix gmodule issues on fbsd; bug #184301
 	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
 
-	# Fix GIO null unref, bug #260301
-	epatch "${FILESDIR}/${P}-gio-unref.patch"
-
 	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
 }
 
@@ -90,5 +87,7 @@ src_install() {
 
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
 	emake check || die "tests failed"
 }