Version bump. Couple of fixes, notably gtester race condition. Translation updates.

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

3 files changed, 128 insertions, 6 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index aa3f0036336f..1b8d37430826 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.419 2010/08/31 12:58:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.420 2010/09/03 10:39:05 eva Exp $
+
+*glib-2.24.2 (03 Sep 2010)
+
+  03 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> +glib-2.24.2.ebuild:
+  Version bump. Couple of fixes, notably gtester race condition. Translation
+  updates.
 
   31 Aug 2010; Pacho Ramos <pacho@gentoo.org> -glib-2.22.2.ebuild,
   -glib-2.24.1.ebuild, glib-2.24.1-r1.ebuild:
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index ae504211edfc..4433f174a200 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -19,17 +19,19 @@ DIST glib-2.20.5.tar.bz2 5037738 RMD160 c71ccaaf0a196e21e144041ec3286db18a03a960
 DIST glib-2.22.4.tar.bz2 5012207 RMD160 66dc6ec0f1b1d422f50f6d55700bee8d526318cc SHA1 be135a25c233a199f043161777d31ac30e42f435 SHA256 0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14
 DIST glib-2.22.5.tar.bz2 4988402 RMD160 2e2f06f956f63a75121b335e4150edc44f5e04f2 SHA1 a35acb06c3155937651aaffc1f1895c6e19a91a4 SHA256 802be9c9ffeb631725ffd6ed35af0af309776729a7fab4fcb48f2b0b8fe7245b
 DIST glib-2.24.1.tar.bz2 5332511 RMD160 c6ce09654c1bd28b8844435d150fcb51e6f4e872 SHA1 d4835bb1618fc1e1dfe88ef8443c12fcae69f90e SHA256 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04
+DIST glib-2.24.2.tar.bz2 5326328 RMD160 259d2d0a92b1a01bb624a2b759d0f82eefc227ea SHA1 882350c31af929cd4e78ee6aad46108748240e78 SHA256 3aeb521abd3642dd1224379f0e54915957e5010f888a4ae74afa0ad54da0160c
 EBUILD glib-1.2.10-r5.ebuild 1764 RMD160 dc6544841f2acb73d5951100ce9c9182f4d9560e SHA1 e6649f70934720527f69995ab0b8c845032cfb0f SHA256 24442b44089e15432a4f1411d2d59dff9d5c2fbfb91c801b96087588ff71373b
 EBUILD glib-2.20.5-r1.ebuild 2764 RMD160 36b82bded5d46abd6f786ceb40bb9a5ea7a654c9 SHA1 54daa7a36b3dafd74818b3769da523f06e5ed23d SHA256 3714c57070320eb4ba89a13e03f21f3fff281a82423c7609bdfabc77864ee6f1
 EBUILD glib-2.22.4.ebuild 2867 RMD160 df24757da42438c1f60b248b768bbc16927bd25c SHA1 459b59f64e9784f23729f7d3ddce36e575f395dd SHA256 b5ff0719930157317dcfa53a93bf2e156c43972712a4799e1b2f4529ea54eccf
 EBUILD glib-2.22.5.ebuild 2867 RMD160 509f8aec204b55e1689a0d75f152f88742b6a2be SHA1 b3029fc61a55c97a97c429dfa4f0387576018659 SHA256 426048c30016ebd837ff7d8eabfd03d946bf36ea45452c51ed78f17704eeb8a1
 EBUILD glib-2.24.1-r1.ebuild 3586 RMD160 2da351a70bc4c090f56b8bad67ffad8f17aa1287 SHA1 5ed64e3deeb03a0652792c85ee65827bd8e3b8bf SHA256 4b796a0b4982b1c6feb1b00b0d549771ce47f003ed8f4e829a94d547d9fdf36c
-MISC ChangeLog 51917 RMD160 75a8db41411216881e04f699a6357fab0554b813 SHA1 61265d9eb15188f62e22d8150fe80da6ff3a3268 SHA256 e913181bcfe6a06e91ba3489af243b843f43a16887c49c4c4cb44e2486b97055
+EBUILD glib-2.24.2.ebuild 3584 RMD160 7662ce1e6885edbf49965f849b393ff88b2c6b7b SHA1 03f8b0c4b0adba8062c2b5adfc912d923bcd49ec SHA256 0c142325eaae5e43c6a021645e083f3abb793453458126326cd824ec78fd0d6e
+MISC ChangeLog 52107 RMD160 68aaee584c88e2e025d5fce7d12bdbb0093e09f9 SHA1 387ed77d618820d2fcf23ef0c4d1b5409437b994 SHA256 26e437bd15986b6297ddf121c405c1fc5b5c5b621c3cca0c6024c94124ec8b93
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkx8/JkACgkQCaWpQKGI+9Qq4ACbBynimvFG5EYr3tbVPvOaCdBw
-sowAn0lXFjy1JOU2/IbFNwTOhZnEOrLv
-=5iKT
+iEYEARECAAYFAkyA0FYACgkQ1fmVwcYIWAYIawCg0t+ItUGpXnWIdo1HuPR8M2rn
+WzsAoKp7S+za4SvmAt+Ah0/Z49ZQPLhm
+=LKWw
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.24.2.ebuild b/dev-libs/glib/glib-2.24.2.ebuild
new file mode 100644
index 000000000000..dfcff2188815
--- /dev/null
+++ b/dev-libs/glib/glib-2.24.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.24.2.ebuild,v 1.1 2010/09/03 10:39:05 eva Exp $
+
+EAPI="2"
+
+inherit autotools 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 ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="debug doc fam hardened selinux xattr"
+
+RDEPEND="virtual/libiconv
+	xattr? ( sys-apps/attr )
+	fam? ( virtual/fam )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.16
+	>=sys-devel/gettext-0.11
+	>=dev-util/gtk-doc-am-1.13
+	doc? (
+		>=dev-libs/libxslt-1.0
+		>=dev-util/gtk-doc-1.13
+		~app-text/docbook-xml-dtd-4.1.2 )"
+# eautoreconf needs gtk-doc-am
+# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
+
+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
+
+	# Don't check for python, hence removing the build-time python dep.
+	# We remove the gdb python scripts in src_install due to bug 291328
+	epatch "${FILESDIR}/${PN}-2.24-punt-python-check.patch"
+
+	# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
+	epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
+
+	# Do not try to remove files on live filesystem, bug #XXX ?
+	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
+		-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
+
+	# Needed for the punt-python-check patch.
+	# Also needed to prevent croscompile failures, see bug #267603
+	eautoreconf
+
+	[[ ${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"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${D}/usr/share/gdb/" "${D}/usr/share/glib-2.0/gdb/"
+
+	dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export XDG_DATA_HOME="${T}"
+	emake check || die "tests failed"
+}