Don't check for python, and don't install gdb python scripts, bug 291328. Also, fix test failure in assert-msg-test, bug 323667

Package-Manager: portage-2.1.8.3/cvs/Linux i686

6 files changed, 165 insertions, 4 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 03faac90ed86..472f0ebcb0c8 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,14 @@
 # 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.410 2010/07/07 19:17:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.411 2010/07/08 15:28:33 nirbheek Exp $
+
+*glib-2.24.1-r1 (08 Jul 2010)
+
+  08 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +glib-2.24.1-r1.ebuild, +files/glib-2.24-assert-test-failure.patch,
+  +files/glib-2.24-punt-python-check.patch:
+  Don't check for python, and don't install gdb python scripts, bug 291328.
+  Also, fix test failure in assert-msg-test, bug 323667
 
   07 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> glib-2.22.5.ebuild:
   ppc64 stable wrt #314899
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index f2357d941096..1a8ceb01239f 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,6 +5,8 @@ AUX glib-1.2.10-m4.patch 225 RMD160 65218d0099218a1008827c1364b6e51c073d236b SHA
 AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f773118323f53ea774 SHA1 13c22e2f75a77e9e0546e495fd28015ddcb8bade SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8
 AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d
 AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb
+AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd401968464608d SHA1 76149f52677a337569dbab1b5f664c8fc16d44ff SHA256 1e3d290455d6bbc3a4f69d7b8abdeb559a01c8cd30dc311641e1cb0b7f84c6af
+AUX glib-2.24-punt-python-check.patch 541 RMD160 8783f765b97814bc95a6143b75f317dbbdd8ba0c SHA1 dbaf420d3b8acd7691bc677f1fcc6e2fca04ed54 SHA256 0bdcc11d1434f695a5b5f6ec4c54ab7fa5a9f8a5c22d71b94f97378e92aaff84
 AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
 AUX glib2-CVE-2008-4316.patch 2692 RMD160 3143c4df4f1063f8177a545d8cb5678a68c2980f SHA1 f89222a8f09e4e841480bbfbd4defd1e3d402e91 SHA256 c249ef6513c2490e9efe836e9d41a4a5f1056979748e2535b8ec7d13a71b1bf0
 AUX glib2-CVE-2009-3289.patch 3658 RMD160 659328e525ea1c1d0828c9776dfd865b73c1b9c5 SHA1 bf0c5cb7afc89dee5bb7d13041e99bb68e617eaf SHA256 baf5a6739c2cae4c9b50d1f70e08f4c7cfcebf9b82bca5e42cc8454321fdc812
@@ -20,6 +22,7 @@ EBUILD glib-2.20.5-r1.ebuild 2764 RMD160 36b82bded5d46abd6f786ceb40bb9a5ea7a654c
 EBUILD glib-2.22.2.ebuild 2699 RMD160 e4ae7c825f9547b5628b854da36267aa819e601a SHA1 8adc11d2cd8b9e7faca39ae800cd6d80f438b030 SHA256 6994ab96fe5546effa3b53516434417ce0dcb906f08716bcc403a1bbbd90e8b6
 EBUILD glib-2.22.4.ebuild 2867 RMD160 df24757da42438c1f60b248b768bbc16927bd25c SHA1 459b59f64e9784f23729f7d3ddce36e575f395dd SHA256 b5ff0719930157317dcfa53a93bf2e156c43972712a4799e1b2f4529ea54eccf
 EBUILD glib-2.22.5.ebuild 2877 RMD160 ad350770b8d36eb0c325acb33a3fabc0da4f6999 SHA1 37104a8fd9137ea683c2b580d0e0022ce75eeb24 SHA256 ea30482203ab87916e570e9cfe3b6f2848c62213e471d7fc89e206b1846af6da
+EBUILD glib-2.24.1-r1.ebuild 3469 RMD160 4d60ba55a3a17b5c1022e30ffd27d8ba0b849e31 SHA1 13ddd0a6f8103ebfde315bec11a3aec039ae6e1e SHA256 c33b8c7d0b39287ecd27848e7822e26ba068ab51687d2c62db0ccf6b46ae4f08
 EBUILD glib-2.24.1.ebuild 2877 RMD160 b4d2ced337826b13cae7816074bb6393e1dd7576 SHA1 ae9040b5d3e698fef8a06e3f5d188ce9c2d3e24f SHA256 78f1f6a15c37bee883af6c7c192defd290f81a344177f8e804a233e553962e03
-MISC ChangeLog 50518 RMD160 8bd9d555eb2a8f0701f500aab62a0f0e69efe496 SHA1 3801af87597e568cf89a8b7b9137b7ddc1a85353 SHA256 f3f96f8eadadaf32747b4ab339452b40de9947a190d4d250041913559fe239c5
+MISC ChangeLog 50849 RMD160 2c9e70a46a57c55ea19ce6391295000c07e8b7b1 SHA1 b54a0205d83cc9a41e64a48af46226eaad97e78d SHA256 f8992800a862fceb5e9d6a8551fe1f13e6834ed5d75f3db53e7c2f781f147d5a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
new file mode 100644
index 000000000000..6d8e74f32500
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
@@ -0,0 +1,19 @@
+Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed
+because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This
+causes gdb to use the system-wide glib instead, and fail on the test.
+
+This patch exports LD_LIBRARY_PATH before running gdb
+
+https://bugzilla.gnome.org/621368
+
+---
+--- tests/run-assert-msg-test.sh
++++ tests/run-assert-msg-test.sh
+@@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then
+        msg_test="lt-$msg_test"
+ fi
+ echo_v "Running gdb on assert-msg-test"
++export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH"
+ OUT=$(gdb --batch --ex run --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
+   fail "failed to run gdb"
+ 
diff --git a/dev-libs/glib/files/glib-2.24-punt-python-check.patch b/dev-libs/glib/files/glib-2.24-punt-python-check.patch
new file mode 100644
index 000000000000..3cbd6dc15155
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.24-punt-python-check.patch
@@ -0,0 +1,20 @@
+Remove python detection from configure.in, we won't be installing the gdb python
+scripts anymore. They use a redhat-specific gdb module that has not been
+upstreamed yet.
+
+https://bugs.gentoo.org/291328
+https://bugzilla.gnome.org/623552
+---
+--- configure.in
++++ configure.in
+@@ -379,10 +379,6 @@ if test "x$PERL_PATH" = x ; then
+ fi
+ AC_SUBST(PERL_PATH)
+ 
+-# Need suitable python path for greport
+-AM_PATH_PYTHON(2.4,,PYTHON="/usr/bin/env python2.4")
+-
+-
+ dnl ***********************
+ dnl *** Tests for iconv ***
+ dnl ***********************
diff --git a/dev-libs/glib/glib-2.24.1-r1.ebuild b/dev-libs/glib/glib-2.24.1-r1.ebuild
new file mode 100644
index 000000000000..6a1ff707fb18
--- /dev/null
+++ b/dev-libs/glib/glib-2.24.1-r1.ebuild
@@ -0,0 +1,111 @@
+# 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.1-r1.ebuild,v 1.1 2010/07/08 15:28:33 nirbheek 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
+	doc? (
+		>=dev-libs/libxslt-1.0
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )"
+# 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.
+	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"
+}
diff --git a/dev-libs/mozldap/Manifest b/dev-libs/mozldap/Manifest
index 0e8121dd0c2a..d4f6b881f59f 100644
--- a/dev-libs/mozldap/Manifest
+++ b/dev-libs/mozldap/Manifest
@@ -3,6 +3,6 @@ AUX mozldap-6.0.4-pkgconfig.patch 552 RMD160 b7428141f1b064a56bc6732d67b57670a5e
 AUX nspr-m4.patch 1447 RMD160 fc7a95a21274cf7785b74296022d1413d27d25df SHA1 43a8dacf0c2b8e29232ca9e620992455ad73c24c SHA256 6fcb31a73e34a8187444e9469e118277d338c52c5c46b80d86f1f84439199915
 AUX nss-m4.patch 1446 RMD160 81f18f2170f590e46b6824347edfae623677e0bb SHA1 00c6acb1d55bad86a68d36a76e8c0816808fa630 SHA256 2322409a792cea0b235ee0ae2f8700111bd878008eac3c16db3f0654fd5398c5
 DIST mozldap-6.0.6.tar.gz 708821 RMD160 d932813f0b6f5808c8f0b255718a413d6a6e6ba5 SHA1 db7b8d845f8917638512ae92381675fe76432eff SHA256 3a7b94c6698e2acb91a577decee5eb6103f183d6b9833abb169124818ba80d06
-EBUILD mozldap-6.0.6-r1.ebuild 3921 RMD160 340361bf4fe52a54e312cba9ad1dc940a756c300 SHA1 360932f61ea1ab63a445ada78ec84d3ac97c3346 SHA256 17ef11f665910fb8c53d66f4a2ff30237e8fbc9b12514c2342d9096b67f17f43
-MISC ChangeLog 614 RMD160 38304e199664716ba189bc659628d38f2c36a876 SHA1 2285f86d5938b190925c9e99638ffc43d86e5949 SHA256 702cee736f255f9508dcbae86c933dc073560bb1cfa34a3d8874ca4d7bb8596d
+EBUILD mozldap-6.0.6-r1.ebuild 3892 RMD160 e9bcdd06108c63f96ecf14ceba4ec6ba83407597 SHA1 9d781e233546e23f45e57790c255b55808e788bf SHA256 69b0f8dbb4efcffcb96025735aa1674eceb18014a87fcdb6bbed4a6070c9ba9a
+MISC ChangeLog 749 RMD160 ccab08b27596badd4041dace7779bdf20f613752 SHA1 d397e8dee2f636597ec781d01b5799a8c1fc62de SHA256 c1b2e211458172aac2e17fb27b1e1579c276cf6a351852a7973bd52d7fa02b70
 MISC metadata.xml 220 RMD160 07c52cb369217fc5bbfffc4ba5ffc957d0810313 SHA1 83c1ba4fbc439d17563b2fe65df6c88cd594394d SHA256 e1f3a2843ea0147b5aa40aaf5ed41d3cb748d26e484a4abd07b5dc65c5e0e134