Let it compile against glib-2.32, drop old.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

4 files changed, 26 insertions, 38 deletions

diff --git a/dev-cpp/gtksourceviewmm/ChangeLog b/dev-cpp/gtksourceviewmm/ChangeLog
index f07672a62e50..8d50dfc88f34 100644
--- a/dev-cpp/gtksourceviewmm/ChangeLog
+++ b/dev-cpp/gtksourceviewmm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/gtksourceviewmm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/ChangeLog,v 1.27 2012/05/24 13:35:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/ChangeLog,v 1.28 2012/07/21 14:39:30 pacho Exp $
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/gtksourceviewmm-3.2.0-glib-single-include.patch,
+  -gtksourceviewmm-3.0.0.ebuild, gtksourceviewmm-3.2.0.ebuild:
+  Let it compile against glib-2.32, drop old.
 
   24 May 2012; Samuli Suominen <ssuominen@gentoo.org>
   gtksourceviewmm-3.2.0.ebuild:
@@ -115,4 +120,3 @@
   +gtksourceviewmm-2.2.0.ebuild:
   New package gtksourceviewmm which is just a rename of libgtksourceviewmm,
   API and installed files are the same
-
diff --git a/dev-cpp/gtksourceviewmm/files/gtksourceviewmm-3.2.0-glib-single-include.patch b/dev-cpp/gtksourceviewmm/files/gtksourceviewmm-3.2.0-glib-single-include.patch
new file mode 100644
index 000000000000..c708ff1b27ea
--- /dev/null
+++ b/dev-cpp/gtksourceviewmm/files/gtksourceviewmm-3.2.0-glib-single-include.patch
@@ -0,0 +1,13 @@
+Index: gtksourceviewmm-3.2.0/tests/search/main.cc
+===================================================================
+--- gtksourceviewmm-3.2.0.orig/tests/search/main.cc
++++ gtksourceviewmm-3.2.0/tests/search/main.cc
+@@ -6,7 +6,7 @@
+ #include <cstring>
+ #include <gtkmm.h>
+ #include <gtksourceviewmm.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ using namespace std ;
+ using namespace Gtk;
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.0.0.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.0.0.ebuild
deleted file mode 100644
index cd9d949a926e..000000000000
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.0.0.ebuild,v 1.3 2012/05/04 03:44:57 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="C++ bindings for gtksourceview"
-HOMEPAGE="http://projects.gnome.org/gtksourceviewmm/"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-SLOT="3.0"
-LICENSE="LGPL-2.1"
-
-RDEPEND=">=dev-cpp/glibmm-2.28:2
-	>=dev-cpp/gtkmm-3:3.0
-	>=x11-libs/gtksourceview-3:3.0
-
-	dev-cpp/atkmm
-	dev-cpp/cairomm
-	dev-cpp/pangomm:1.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-	G2CONF="${G2CONF} $(use_enable doc documentation)"
-}
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild
index c5b7d78f974b..9ec868d0c727 100644
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild,v 1.5 2012/05/24 13:35:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.2.0.ebuild,v 1.6 2012/07/21 14:39:30 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="C++ bindings for gtksourceview"
 HOMEPAGE="http://projects.gnome.org/gtksourceviewmm/"
@@ -31,3 +31,8 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog* NEWS README"
 	G2CONF="${G2CONF} $(use_enable doc documentation)"
 }
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.2.0-glib-single-include.patch"
+	gnome2_src_prepare
+}