Let it compile against glib-2.32, drop old.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

4 files changed, 24 insertions, 35 deletions

diff --git a/x11-terms/tilda/ChangeLog b/x11-terms/tilda/ChangeLog
index b083546e5735..6e82bc6eca87 100644
--- a/x11-terms/tilda/ChangeLog
+++ b/x11-terms/tilda/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/tilda
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/tilda/ChangeLog,v 1.25 2012/05/03 07:11:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/tilda/ChangeLog,v 1.26 2012/07/21 13:40:06 pacho Exp $
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/tilda-0.9.6-glib-single-include.patch, -tilda-0.9.5.ebuild,
+  tilda-0.9.6.ebuild:
+  Let it compile against glib-2.32, drop old.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> tilda-0.9.5.ebuild,
   tilda-0.9.6.ebuild:
@@ -108,4 +113,3 @@
   +tilda-0.02.ebuild:
   Initial import; thanks to Tristan Sloughter <kungfooguru@gmail.com>; see bug
   #77052
-
diff --git a/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch b/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch
new file mode 100644
index 000000000000..fcc734f771d9
--- /dev/null
+++ b/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch
@@ -0,0 +1,13 @@
+Index: tilda-0.9.6/src/tomboykeybinder.h
+===================================================================
+--- tilda-0.9.6.orig/src/tomboykeybinder.h
++++ tilda-0.9.6/src/tomboykeybinder.h
+@@ -2,7 +2,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/x11-terms/tilda/tilda-0.9.5.ebuild b/x11-terms/tilda/tilda-0.9.5.ebuild
deleted file mode 100644
index 5af79ae17dc8..000000000000
--- a/x11-terms/tilda/tilda-0.9.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/tilda/tilda-0.9.5.ebuild,v 1.7 2012/05/03 07:11:34 jdhore Exp $
-
-EAPI=2
-
-DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters"
-HOMEPAGE="http://tilda.sourceforge.net"
-SRC_URI="mirror://sourceforge/tilda/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/vte:0
-	>=dev-libs/glib-2.8.4
-	dev-libs/confuse"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/x11-terms/tilda/tilda-0.9.6.ebuild b/x11-terms/tilda/tilda-0.9.6.ebuild
index 4ad262627ebc..2f5aacb584a2 100644
--- a/x11-terms/tilda/tilda-0.9.6.ebuild
+++ b/x11-terms/tilda/tilda-0.9.6.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/tilda/tilda-0.9.6.ebuild,v 1.9 2012/05/03 07:11:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/tilda/tilda-0.9.6.ebuild,v 1.10 2012/07/21 13:40:06 pacho Exp $
+
+EAPI=4
 
-EAPI=2
 inherit eutils
 
 DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters"
@@ -15,7 +16,7 @@ KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/vte:0
-	>=dev-libs/glib-2.8.4
+	>=dev-libs/glib-2.8.4:2
 	dev-libs/confuse
 	gnome-base/libglade"
 DEPEND="${RDEPEND}
@@ -23,9 +24,5 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9.6-gdk_resources.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README TODO
+	epatch "${FILESDIR}"/${PN}-0.9.6-glib-single-include.patch
 }