Version bump with a few bugfixes. Drop old.

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

4 files changed, 22 insertions, 56 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index c6f9fc98d59e..948054d7d9a7 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.523 2012/05/05 16:35:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.524 2012/05/15 06:22:46 tetromino Exp $
+
+*glib-2.32.3 (15 May 2012)
+
+  15 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -glib-2.32.1.ebuild,
+  -files/glib-2.32.1-gnustep-not-cocoa.patch, +glib-2.32.3.ebuild:
+  Version bump with a few bugfixes. Drop old.
 
   05 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> glib-2.32.1.ebuild,
   glib-2.32.2.ebuild:
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index a310f9efed72..1d43d65f100f 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -22,29 +22,28 @@ AUX glib-2.30.3-assert-test-failure.patch 752 RMD160 dc46838e72bf94e35c518cb915d
 AUX glib-2.30.3-closure-64bit-be.patch 8029 RMD160 aa1f9aa8312ade8f559095e85b45e6a0062c3fc1 SHA1 f0b679e9e638022c4a324cabdb9b881b0991a5a3 SHA256 15b0fc9e64411678321f00fd31e3622d1267f9b0c1a55b6b568a2f09e8b0f23f
 AUX glib-2.31.x-external-gdbus-codegen.patch 3504 RMD160 6e12014b5549beec7a5d5f6504a5f657699bb9e4 SHA1 6625bbb01a5b39970a28f78503bcc58e13cd5297 SHA256 47a0f2f2a99a50042063952994c8538097dee14ea5b2ca39f1c168092c645c6e
 AUX glib-2.32.1-fix-libelf-check.patch 245 RMD160 34090a40ab07d65fbe2422542d846d872a2ce91b SHA1 c7e9184c9e1318843d5769d1d58f3034ee104552 SHA256 9d93a16fad7cc0f6c3a47a6302d057f7f0b181e2551f3bdd3b647377da5f7f35
-AUX glib-2.32.1-gnustep-not-cocoa.patch 780 RMD160 6b7dc4c5d5da3dff970bb488ebe5812a928b8c38 SHA1 cccbdf338df0752f81bdd940ece4181df44dc8e1 SHA256 deaf68cd1743d23c63d7e03d6232d5d3198516b2a8cb53707da67a2dcde1922a
 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.30.2.tar.xz 5818860 RMD160 d8fc7c876bd15ea3a9255d4d0a67d745e3790488 SHA1 bc7be8572122997e4d5fc6691f51602f28cd4e3a SHA256 f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82
 DIST glib-2.30.3.tar.xz 5642448 RMD160 0887b08e2fff75c325ed1fb1123baaf42dc9779b SHA1 ec97dd659862dca05d18093a6ea6c309dcff0cdd SHA256 e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27
-DIST glib-2.32.1.tar.xz 6138200 RMD160 d56ab662502916574e2286f92c2c56dc8aad210d SHA1 3f94733d0e79e5ff10d5ca8735ae5d7f11f2edc0 SHA256 484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398
 DIST glib-2.32.2.tar.xz 6117764 RMD160 2ec828c54c31f07d9d28d182f1d6e8398e112928 SHA1 5898165e58c8f946c2b1fd05b910fe4476b64164 SHA256 b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136
+DIST glib-2.32.3.tar.xz 6164984 RMD160 204ddce09d6622926c7b2d51b995f503ec18673e SHA1 429355327aaf69d2c21cbefcb20c61db94e0acec SHA256 b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d
 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
 EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36
 EBUILD glib-2.30.2.ebuild 8732 RMD160 a846978168149534ac99b725c595bf4e509cc941 SHA1 5edfb6162bd3fb287a3f4168d2680452207640c4 SHA256 b7837f8c76e479f24c351465ea5d28068235862fff0511d5ff3c15b79dce1a60
 EBUILD glib-2.30.3.ebuild 8954 RMD160 76a8cb569db281cdd6a210eb33461e6682d31a45 SHA1 aa327e8fc70c1abb7e060e79b1c4659f68332477 SHA256 b4097937c7963cca3d968c50c14e207383b872359b3362984c9c2a57efa70a18
-EBUILD glib-2.32.1.ebuild 8822 RMD160 aff477bca9cc0495c7f09c91efc7b75bb6883bd0 SHA1 3b82519d764c832b89beebefbfd1cad5e3e3fc12 SHA256 f22d3c46675fd7ad9f8dba12aa7f92a6e13863087305cdd63dfcf6830145d41a
 EBUILD glib-2.32.2.ebuild 8473 RMD160 baf17e568a18875232cd65fdf8a9b34827bcde8c SHA1 e7d249d7c7edb75f04a1e2a5a1111f27f4e30aea SHA256 867496af9be5e4a572edd2a4aef66418c7d444a7dd288c558dcf6ae5ef44fab4
-MISC ChangeLog 70904 RMD160 75b2257e1ec9855c645ef54540d230118c06d104 SHA1 6f2fa83a9c2ea1c55de391843b0d96408456c2ca SHA256 9a5d992a6298ea978ab89dcd60cd6c95a81d7f65df5d67149afc615ec6534950
+EBUILD glib-2.32.3.ebuild 8361 RMD160 7ca87ed9046d2f148228c6f7816470925ee8f9dd SHA1 2b7c511d63d8ccd669264977a945cebc618502bf SHA256 7a0bd1f7ddd5100c2f7d1542832f22ef60c5ad683c7b288ae825f5448a3d60fd
+MISC ChangeLog 71126 RMD160 475769b5d22d9563a06ae76d771175deee438f6a SHA1 78c7e8649765d0499ae9357f5fd4c503d3aa730d SHA256 09534947d09ca42c0ce162678bf74368415530953b487a932e0098c12775e2fd
 MISC metadata.xml 396 RMD160 8f82fa2bbf203e04f92cb62f8d8b451a608cee0c SHA1 4c81e5cc8cfabca39381e3757853350a8aac31d9 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPpVbPAAoJEJ0WA1zPCt1hPbIH/0spRhYs+qEQZlfSQR1CPeL7
-m1RJm7IaLZIRUOgMMZfYmuhNwbt48lQKL36Olez/Y1eouAO/ZsvbDxbHGnnVcwk4
-+iDCZJzhIbAmNSFub3KfpI3i5VgGv45RyLOACIVh5wjwlk1GA9+lv03u6yWv1+7U
-6ZSdVaLCWoEJJH8Jgs8UpjVoD//AkVWfejABXwuY+dgwQtxKwleqCO4HS+3bk01J
-RBNFmDK2GDjTL27qlcz+rJgGblutqOn09tdwd9hhrtbxPx05/aQIjURKXiDR608G
-1O5FpSOqitjTn4xi5NByI35AqcJqcajvlDRhSUvnlW1XBl5avaAFY4I0IkTG7Oc=
-=CVmy
+iQEcBAEBAgAGBQJPsfY7AAoJEJ0WA1zPCt1hcAMIAJYvDwLOu0DtOmyhB4H5m9EF
+/2Fqj0U14JN0hIQO/Ynb5nil8paHzkii+qLuvMRuE2D0oCN/r1G3pB6RzLSXbvbf
+WOxc2k2EmAd+6GxIk4vH8fj4AXQS/dZFexto8u8n04OridDXsIzx7VVVZ5cHW/p+
+4o5pQF50ZBmjsKOYb+X/2f/o3uYRxQ2l+pjFAI+T/Gh2LosDNZBOXLd/t7rfn6O3
+IJFi1VgS68jIDlvFVJ5XX5SWxtXaVmzYbu6BxIjge4LTXS5fXCBxXp6cA74pIZon
+zrDf5j6wOBjkh1RcwH469mHaW9DpE/8gCd4vLoNpmpPVhqaYsJXOQqu9krG6H+s=
+=6t7U
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.32.1-gnustep-not-cocoa.patch b/dev-libs/glib/files/glib-2.32.1-gnustep-not-cocoa.patch
deleted file mode 100644
index 56014a9e3421..000000000000
--- a/dev-libs/glib/files/glib-2.32.1-gnustep-not-cocoa.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2d59182bfc3a799c140090c83db22a275aa858a0 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 15 Apr 2012 22:57:25 -0400
-Subject: [PATCH] Do not detect GNUstep as Cocoa
-
-GNUstep also installs Foundation/Foundation.h
-
-https://bugzilla.gnome.org/show_bug.cgi?id=674172
----
- configure.ac |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 825d42d..2ae07f1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -179,6 +179,9 @@ glib_have_cocoa=no
- AC_MSG_CHECKING([for Mac OS X Cocoa support])
- AC_TRY_CPP([
- #include <Foundation/Foundation.h>
-+#ifdef GNUSTEP_BASE_VERSION
-+#error "Detected GNUstep, not Cocoa"
-+#endif
- ], glib_have_cocoa=yes)
- 
- AC_MSG_RESULT([$glib_have_cocoa])
--- 
-1.7.8.5
-
diff --git a/dev-libs/glib/glib-2.32.1.ebuild b/dev-libs/glib/glib-2.32.3.ebuild
index 8355e635ac59..a3cb5549d0dd 100644
--- a/dev-libs/glib/glib-2.32.1.ebuild
+++ b/dev-libs/glib/glib-2.32.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.1.ebuild,v 1.9 2012/05/05 16:35:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.3.ebuild,v 1.1 2012/05/15 06:22:46 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@@ -72,22 +72,18 @@ src_prepare() {
 		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
 
-	# Do not try to remove files on live filesystem, upstream bug #619274
-	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-		-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
 	# need to build tests if USE=doc for bug #387385
 	if ! use test && ! use doc; then
 		# don't waste time building tests
 		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
 	else
+		# Do not try to remove files on live filesystem, upstream bug #619274
+		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
+			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
+
 		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
 		if ! has_version dev-util/desktop-file-utils ; then
 			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
@@ -117,12 +113,6 @@ src_prepare() {
 	# gdbus-codegen is a separate package
 	epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=673132
-	epatch "${FILESDIR}/${PN}-2.32.1-fix-libelf-check.patch"
-
-	# bug #411981, https://bugzilla.gnome.org/show_bug.cgi?id=674172
-	epatch "${FILESDIR}/${PN}-2.32.1-gnustep-not-cocoa.patch"
-
 	# disable pyc compiling
 	use test && python_clean_py-compile_files