Be compatible with glib-2.16 and in general more future proof, bug 213340

Package-Manager: portage-2.1.4.4

4 files changed, 19 insertions, 7 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 2941094fd968..a59e8c604805 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.163 2008/02/04 04:22:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.164 2008/03/14 09:01:14 leio Exp $
+
+  14 Mar 2008; Mart Raudsepp <leio@gentoo.org> gnome-terminal-2.18.2.ebuild,
+  gnome-terminal-2.18.4.ebuild:
+  Be compatible with glib-2.16 and in general more future proof, bug 213340
 
   04 Feb 2008; Jeroen Roovers <jer@gentoo.org> gnome-terminal-2.18.4.ebuild:
   Stable for HPPA (bug #208366).
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 68d56deb217f..0455ecd92699 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -3,7 +3,7 @@ AUX gnome-terminal-2-dnd_url_add_space.patch 1000 RMD160 e83cf094681389b3a82b5f9
 AUX gnome-terminal-2.13.90-TERM-gnome.patch 413 RMD160 d2dd09acd8ac4b185316a09727cc5e3ebee100c3 SHA1 b83a85153e2c29fd287f97e873d1a851e57aac9a SHA256 812ffb7e6966b6ba813223af276c95d3a6efddceddc24b5637b085d4695dcd62
 DIST gnome-terminal-2.18.2.tar.bz2 2057415 RMD160 b38a45f8f6c9fbffaedd8d4d9dfc9c1a21738746 SHA1 a37dff35e90ab1c2e15d47d5731ff0fb596dbd4d SHA256 f046e938f14aa2ec5cc6db5a85d7ffaf470b3cc233257ca55d2fa7530daa28d1
 DIST gnome-terminal-2.18.4.tar.bz2 2072290 RMD160 0d4125cf7d4cf6f04b648f4fe10c623af84018b0 SHA1 3ad03fd96f9ba51bc654e824d7177921d42f2f85 SHA256 1a6b1cbf81ed1a21b9ae628533f60511aa9495e02dfed6583df17db30d8d2282
-EBUILD gnome-terminal-2.18.2.ebuild 1521 RMD160 86042735495af4d6d086cb34db28a856e1ab5c38 SHA1 e6b295959c9b491ce07e7f82d83ca93da58227f6 SHA256 1032b8173ec23f333001253a4ab356ec652177013844cfeaf4e8f6cfd483bc0f
-EBUILD gnome-terminal-2.18.4.ebuild 1414 RMD160 591ba4a214e81a6d643f8e0e1996e5fc258d10c0 SHA1 2e30ef055bf8c0bee8ccfaafb7c5c2be8e521518 SHA256 dfcfbcde6d5f144fe5c5d02b7b2a030d91bbf36e38d0f97844244424b7867767
-MISC ChangeLog 20595 RMD160 32babd8b6bd420ed6badcafc3159ef7fd6f9be6b SHA1 41130d2f63626aed6f2f555dc44a7a22944b69e3 SHA256 e947ffdf97e80c1e14fb1948145d35a874df030f409211e5e15f037669a75fa6
+EBUILD gnome-terminal-2.18.2.ebuild 1694 RMD160 7bc1b5c1cf3af2bd097615e4f94981f07b1f5a7b SHA1 502dd2359f6d77626056082fd56bc43aa0e4443e SHA256 2995775e4694b0592bbfa9df61869ac17648c57474fa58faa427b0b719fdd672
+EBUILD gnome-terminal-2.18.4.ebuild 1590 RMD160 05da1c0d37e9202211bf0dfd996fd655555f7b45 SHA1 694de7dfae22ea4bcaaf3cb10757918e4ca6d04a SHA256 1b3db3f9fce6100ce47124e483b07fa2d9c4aea8e57509c138e2fe29e8988f8f
+MISC ChangeLog 20782 RMD160 50060aa0f1058c71bec9e4da453a3af3cb01da2c SHA1 eaf3db8d13332029cfc6c328b5b7bf42c76d0589 SHA256 cf59d52212a2b1c191c1dd2ebde2594e2b79d0cd34894e31c4b358cec1786698
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.18.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.18.2.ebuild
index 5d0fd4d2d85d..d5d10357a8fb 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.18.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.18.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.18.2.ebuild,v 1.8 2007/12/11 11:00:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.18.2.ebuild,v 1.9 2008/03/14 09:01:14 leio Exp $
 
 inherit eutils gnome2
 
@@ -41,6 +41,10 @@ src_unpack() {
 	# patch by Zach Bagnall <yem@y3m.net> in #13801
 	epatch "${FILESDIR}"/${PN}-2-dnd_url_add_space.patch
 
+	# Fix deprecated API disabling in used libraries - this is not future-proof, bug 213340
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		"${S}/src/Makefile.am" "${S}/src/Makefile.in"
+
 	# patch gnome terminal to report as GNOME rather than xterm
 	# This needs to resolve a few bugs (#120294,)
 	# Leave out for now; causing too many problems
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.18.4.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.18.4.ebuild
index 423b568dc625..cf3ccffa47c3 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.18.4.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.18.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.18.4.ebuild,v 1.7 2008/02/04 04:22:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.18.4.ebuild,v 1.8 2008/03/14 09:01:14 leio Exp $
 
 inherit eutils gnome2
 
@@ -41,6 +41,10 @@ src_unpack() {
 	# patch by Zach Bagnall <yem@y3m.net> in #13801
 	epatch "${FILESDIR}"/${PN}-2-dnd_url_add_space.patch
 
+	# Fix deprecated API disabling in used libraries - this is not future-proof, bug 213340
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		"${S}/src/Makefile.am" "${S}/src/Makefile.in"
+
 	# patch gnome terminal to report as GNOME rather than xterm
 	# This needs to resolve a few bugs (#120294,)
 	# Leave out for now; causing too many problems