Let it compile against glib-2.32, drop old.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

5 files changed, 40 insertions, 42 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/Manifest b/x11-terms/tilda/Manifest
index bab3ab3a3ded..f41cba4b972b 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -1,7 +1,16 @@
-AUX tilda-0.9.6-gdk_resources.patch 624 RMD160 eb0ff92fdd1d4b80474cc0ccf4aca44dc671a7ab SHA1 17dc2caa1a8c62c3494f5e20899b0ef908b2bc2c SHA256 39f255a190218c2df0d202dac94acc3496936e22ee24a0dd0484d1f8f27bc267
-DIST tilda-0.9.5.tar.gz 269163 RMD160 2decee6dce8a2bf87c3430c5d14f90def41ebdee SHA1 90606e3686a0518a35b587fbd14cc63e1d7cd560 SHA256 bf345fa53bc6ded8050402c94742a89c9e04b8263834d434fbdcbb5d86ef4d7a
-DIST tilda-0.9.6.tar.gz 307517 RMD160 b52d3269b2af1d7061f3cb849d7cdc02c5628270 SHA1 bb16b78d1622311bf6de9f91db32ea5dc2019ca6 SHA256 b3bd0f63eb83a5001ef26056ca116e5f8005d454f8f82a94f334868862068411
-EBUILD tilda-0.9.5.ebuild 663 RMD160 421a07e4dd86b1134f2080d2621f65269e63d1d4 SHA1 cbe5da94c282339516a24d429451a24c3ee0170f SHA256 d7f5fffc81317ab76057001c203b73c1984d6794db20f3bd21727af4ed92a528
-EBUILD tilda-0.9.6.ebuild 819 RMD160 d95ca19fbe3ce707a2690bcadeabb95bf60f8786 SHA1 75c5ac852a595dea4fc6e50a11087922c5d23699 SHA256 9bb2f66dee01c588f03359233027767251ebe0a4ad88ce1e06ce63f38032748a
-MISC ChangeLog 3975 RMD160 2897757d8bb27222e5517492e5d50c5a9f8b264e SHA1 c012c6b3d0f04b179d3b7c1a85dd1ab1d3bbb2c2 SHA256 b125dfed9f2e3b9757094ce24aa6d89180723add565d108dc85286ffd07754dd
-MISC metadata.xml 200 RMD160 b8ba75f177aacc3fb70a6c5bfe906d90301bb2b0 SHA1 36073ba33542f3fa53c9876df6032010752959df SHA256 c533d875f5fa74bd08653f78f7c7a5b47de14a530ade976703073cd4194a31fb
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX tilda-0.9.6-gdk_resources.patch 624 SHA256 39f255a190218c2df0d202dac94acc3496936e22ee24a0dd0484d1f8f27bc267 SHA512 c32268a172c97551debcf9c5b57159546b5657f6726998bd6fadeeab1ae6a2e05d1efdfd1f61cae5f0d0972e3ac8c4d2b7409aaac31df921c417c99e22af9fcd WHIRLPOOL 4a0091e53d05012f8d28160ea5fff3de2fee480bd579acb1dcd9ea824b6acaa6c58fa095af542be3df59241e7a78932b12a35a4c6e971d93b5aa57c92c7f32dd
+AUX tilda-0.9.6-glib-single-include.patch 338 SHA256 c387b349e3971320dee3326d5bb9d89a577a181b84b61982fb1989fc7bc6d1f2 SHA512 e161ac8d6ac2e645efcdbed7247baff2a360128a7c5dff3aa9ecf4fcfe0c8e05bab2276fbe5970674f4b59385515e4c9aaaab5619687e41c1ab9390d34b93500 WHIRLPOOL dd81b5eb67929ebb2c22c52fe7756e12ec6ab6f1d62f1390c6a150c0f1eb33d9accd032cb3a806852aa5a835e54d0fdbf1af836917e6691ca59fc70316a86e74
+DIST tilda-0.9.6.tar.gz 307517 SHA256 b3bd0f63eb83a5001ef26056ca116e5f8005d454f8f82a94f334868862068411 SHA512 7d0ddaf289de2c3f9f48f5cce3ee71534b9fdd91f79a4e56a32a301fd8fc82c4a3d760cfcd16d8d2e2d9f0d963b8130547720563ab15c2bb2220ff546ea562b0 WHIRLPOOL 1f3b25f508291b79872947441a981d1582bdbab57996f1e3673c1b575079fadaf6f39912f9e94cfc8559fead39615383c3515a3c4a8f6178e4a568ad7a67c088
+EBUILD tilda-0.9.6.ebuild 789 SHA256 bb90c25685ac1df579eaea66f9cd4f8ef3da1e166eaa26ca8fd76867c614c976 SHA512 0ec97a7484f2967370709d122768dcb146e10b1d843f60a56b14a06ffe2f757e8a9c717e17c467ccc99b84b88ced8cba1c0a143108a627655f0774cb70d99e50 WHIRLPOOL 2bcb9460dee61e69fe6f1889ac12fa69560eba504a71e1173c50b5bf10072cf4bba57cb5199a50fce6e707a556f429beabfa5763a42c9d624cbfc7b70b6f6f9f
+MISC ChangeLog 4157 SHA256 b8075a89dbf73b017674cb22403e2330e561de4a4d449477f5757dbaed664378 SHA512 5b3b53fe470e79b3da6abee66d8123cff8df9f22d62e2ad78a1037e1b765670a712aaadac080158f52c2b93ab4494f8fa31247fe6779ed4dcca1882f587f5fe9 WHIRLPOOL dcf5e34c63bd6ad062993ccd0e5ca8d849ce04093d775a89ca97d701ff4b813d9438dc547f9cf3c4a07015f63cb4ba6f458c762872edabcd66a2c1e47113a4b1
+MISC metadata.xml 200 SHA256 c533d875f5fa74bd08653f78f7c7a5b47de14a530ade976703073cd4194a31fb SHA512 909981bcdd86bf989e0b7c56cf22e7b227b9b1622e863ef94f0f284fba8ddb20b9e0921e5a711056931bc352ecc3f043ba9a5b3e393d023344a714fef5f37c50 WHIRLPOOL 3f1aa54df18e3682976ef437423cc6f68fbfaab73807e9b1e3f201234164368b9d7b2c28a7a1ac2b8548e1d5acd4b254db27a1f6f22e392ed570c55270aa0358
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAKsTsACgkQCaWpQKGI+9QJiACggKYQbSWhHmYhG1kclSP4Zdtw
+IaoAn1s+gFepHzgSTDATknc0yk2Oqtxj
+=W2OY
+-----END PGP SIGNATURE-----
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
 }