Fix build issues with glib-2.32 and drop SCROLLKEEPER_UPDATE which had no effect since there is no scrollkeeper usage at all in the package.

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

4 files changed, 37 insertions, 10 deletions

diff --git a/media-video/camorama/ChangeLog b/media-video/camorama/ChangeLog
index 0115b6fbb804..e7d29b72db8e 100644
--- a/media-video/camorama/ChangeLog
+++ b/media-video/camorama/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/camorama
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.24 2011/10/04 14:07:44 nativemad Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.25 2012/05/02 20:58:38 eva Exp $
+
+  02 May 2012; Gilles Dartiguelongue <eva@gentoo.org> camorama-0.19-r1.ebuild,
+  camorama-0.19-r2.ebuild, +files/camorama-0.19-glib-232.patch:
+  Fix build issues with glib-2.32 and drop SCROLLKEEPER_UPDATE which had no
+  effect since there is no scrollkeeper usage at all in the package.
 
   04 Oct 2011; Andreas Schuerch <nativemad@gentoo.org> camorama-0.19-r2.ebuild:
   x86 stable, see bug 385343
diff --git a/media-video/camorama/camorama-0.19-r1.ebuild b/media-video/camorama/camorama-0.19-r1.ebuild
index daddd0e102c1..712d904f3f34 100644
--- a/media-video/camorama/camorama-0.19-r1.ebuild
+++ b/media-video/camorama/camorama-0.19-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.19-r1.ebuild,v 1.3 2011/03/23 08:24:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.19-r1.ebuild,v 1.4 2012/05/02 20:58:38 eva Exp $
 
 EAPI=1
 
@@ -24,8 +24,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
 
-SCROLLKEEPER_UPDATE="0"
-
 pkg_setup() {
 	G2CONF="${G2CONF} --disable-schemas-install"
 }
diff --git a/media-video/camorama/camorama-0.19-r2.ebuild b/media-video/camorama/camorama-0.19-r2.ebuild
index 9de2d6eef8cd..152935dc0b65 100644
--- a/media-video/camorama/camorama-0.19-r2.ebuild
+++ b/media-video/camorama/camorama-0.19-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.19-r2.ebuild,v 1.4 2011/10/04 14:07:44 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.19-r2.ebuild,v 1.5 2012/05/02 20:58:39 eva Exp $
 
 EAPI=2
 inherit eutils gnome2
@@ -26,7 +26,6 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	G2CONF="${G2CONF} --disable-schemas-install"
-	SCROLLKEEPER_UPDATE="0"
 }
 
 src_prepare() {
@@ -34,7 +33,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gconf.patch \
 		"${FILESDIR}"/${P}-fixes.patch \
 		"${FILESDIR}"/${P}-libv4l.patch \
-		"${FILESDIR}"/${P}-no-more-videodev_h.patch
+		"${FILESDIR}"/${P}-no-more-videodev_h.patch \
+		"${FILESDIR}"/${P}-glib-232.patch
 
 	gnome2_src_prepare
 }
diff --git a/media-video/camorama/files/camorama-0.19-glib-232.patch b/media-video/camorama/files/camorama-0.19-glib-232.patch
new file mode 100644
index 000000000000..d6a76b8e45c2
--- /dev/null
+++ b/media-video/camorama/files/camorama-0.19-glib-232.patch
@@ -0,0 +1,24 @@
+diff -Nu a/src/camorama-stock-items.h b/src/camorama-stock-items.h
+--- a/src/camorama-stock-items.h	2007-06-14 16:05:33.000000000 +0200
++++ b/src/camorama-stock-items.h	2012-05-02 22:40:21.000000000 +0200
+@@ -1,7 +1,7 @@
+ #ifndef CAMORAMA_STOCK_ITEMS_H
+ #define CAMORAMA_STOCK_ITEMS_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff -Nu a/src/glib-helpers.h b/src/glib-helpers.h
+--- a/src/glib-helpers.h	2007-06-14 16:05:33.000000000 +0200
++++ b/src/glib-helpers.h	2012-05-02 22:46:06.000000000 +0200
+@@ -24,7 +24,7 @@
+ #ifndef GLIB_HELPERS_H
+ #define GLIB_HELPERS_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+