Version bump with a few bugfixes. Drop old.

(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

3 files changed, 12 insertions, 45 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/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