Block x11-terms/terminal until upstream has renamed binary to something different wrt #376257 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

6 files changed, 43 insertions, 15 deletions

diff --git a/gnustep-apps/terminal/ChangeLog b/gnustep-apps/terminal/ChangeLog
index 6db2e2a96623..9d6fe23c5a29 100644
--- a/gnustep-apps/terminal/ChangeLog
+++ b/gnustep-apps/terminal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-apps/terminal
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/ChangeLog,v 1.23 2010/05/25 22:34:14 voyageur Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/ChangeLog,v 1.24 2011/08/05 11:55:22 ssuominen Exp $
+
+  05 Aug 2011; Samuli Suominen <ssuominen@gentoo.org>
+  terminal-0.9.5_pre20060324-r1.ebuild, terminal-0.9.5.ebuild,
+  terminal-0.9.6.ebuild, terminal-0.9.7.ebuild:
+  Block x11-terms/terminal until upstream has renamed binary to something
+  different wrt #376257 by Diego Elio Pettenò
 
 *terminal-0.9.7 (25 May 2010)
 
diff --git a/gnustep-apps/terminal/Manifest b/gnustep-apps/terminal/Manifest
index ee9f927f16d0..4372e1642dd9 100644
--- a/gnustep-apps/terminal/Manifest
+++ b/gnustep-apps/terminal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX terminal-0.9.5_pre20060324-gnustep-base1.15.patch 385 RMD160 a18e8eca243e7a1b04dd7fb483409e2541c5585a SHA1 f5ba7e57b0935d11555aa0f971514b783a9a505a SHA256 21aacf23dbdbdb5633a56b38740a30b01412bc59b005876c76373e2e6a2b72d5
 AUX terminal-0.9.5_pre20060324-size_t.patch 724 RMD160 6fecfd58e5d109e35bd96ac31f21f0b026df982d SHA1 fd54041589b3c9b565a20c152e71ba2343be8b72 SHA256 4134baf8a415dd9b46274f6be7ab0663c1ee150be3dc0b56d876228f19cc6ab5
 AUX terminal-0.9.5_pre20060324-solaris.patch 2270 RMD160 a1183a07a9f9b55586b32cec1ef6686ad86c8dee SHA1 f439e3687c477a0c6d0a77a79777d6de4fb1f786 SHA256 7c5687b7ca3231bbfd91daf6a29233e203fbaab72558d8a46c9b6e17653b57d8
@@ -5,9 +8,16 @@ DIST Terminal-0.9.5.tar.gz 108777 RMD160 51b0db034f9e1dbba0fc89cbcdea5c156cb561a
 DIST Terminal-0.9.6.tar.gz 95791 RMD160 dbc0a6456e0e529d7f443308c7dcef185ba27481 SHA1 7cb8df1d0b4de58a0cec99feacccdd1add8b28f9 SHA256 25c81debfb422ea16f5d21bdff1834df794ddf525f9ab630b655c558de213ed4
 DIST Terminal-0.9.7.tar.gz 99847 RMD160 900031131b652d5d986f20c787f2793808afb96f SHA1 eb417f7a379d59903718217d57b8faafd9ed7813 SHA256 bfe665b026949925fc25dcbbbba220f38bf09b5512d63fb02a8c3756c763ca47
 DIST terminal-0.9.5_pre20060324.tar.bz2 64141 RMD160 c38df5e80b705c349370165db7ff49398894e167 SHA1 1f3e550314c8648004391dafa99d14b2e330ad2d SHA256 7a893eaefcfa80b89fbf083899d7b6ebc85ce6e3559d62b946a7b8ca685680e4
-EBUILD terminal-0.9.5.ebuild 709 RMD160 cd2237b607141158b47d3277a4b9dee0a0d079f7 SHA1 de5b51e837899ae4f60b389e9b35a5a6006669c6 SHA256 16f5e9eeb48fe8a2261f697d5fd8b7fe4f02c072ca51222afee446dd51ca92ce
-EBUILD terminal-0.9.5_pre20060324-r1.ebuild 854 RMD160 f9cf11d2f628f36ad5c35471d4a6e4be7f48ca9a SHA1 ab1faca1c2bdd189161c665c32a5caa9b13a687a SHA256 278f9b1ececdbf1843c26312cd94a440f4178603f9f07cebf998febd480e48a0
-EBUILD terminal-0.9.6.ebuild 650 RMD160 6190d613b2acc0b806fa62b2db23a61423ed8ba7 SHA1 4d52bea85f7f67e61cbbfef1057a43650b154d73 SHA256 bbafedf6998a2004ae247622bdf0415000891cd76a785755501dd81fa271aa9e
-EBUILD terminal-0.9.7.ebuild 650 RMD160 9de209399bfaaecab75905c2f4b3262495a95480 SHA1 f3e40b92cdcc9fcb9307f3afe682144ce52078bb SHA256 32f4aadb5a254c42978627cff578901259e9432d410b35e6f07dc9b467ff39c5
-MISC ChangeLog 5093 RMD160 b478c81528af22a4431b87537690f2c554ba69f7 SHA1 828ad11b8666783ecc0270e2f0c6c8ad9244b424 SHA256 7b13fd0332221e481ae024f6796e9188f5b766e68113919a40943c47fda527e3
+EBUILD terminal-0.9.5.ebuild 769 RMD160 c8b489d0a9c0e236ee4adbb77141f947ccb5202b SHA1 8235494d11580e3d8db3e372746d4f682d868358 SHA256 4323ff78660b02cb4e6bf2523c3d35f8cb11d334c6f6bcf00f04fb90087fbfe4
+EBUILD terminal-0.9.5_pre20060324-r1.ebuild 914 RMD160 9447e530c1be90a4cfbeb9e3ec8ed25611427707 SHA1 e4cfed0d299ad1fad6a7944c1e544c4474b7ffe4 SHA256 24dbb3c2941544e1c75e6749f80a3caac47b56177a46c5ba8af2779a4d986555
+EBUILD terminal-0.9.6.ebuild 710 RMD160 2afb723f02812051d59e2a11267460c6d47c9384 SHA1 14606855a6b96a3826ba706f951a094430cffbcc SHA256 9c1b889bbccf52ec00c79f324223ad942eb711b419036e77cdb1a8be948f6602
+EBUILD terminal-0.9.7.ebuild 710 RMD160 a9234082e7135cddbccbcaa9ee0331e0477f11a0 SHA1 f9b735ff8637f932e8fdab61e4c9709a72f62ff6 SHA256 b41f47df74839c9922c87f6136633b4b38a980f0397c16df5d21be527fc7e9df
+MISC ChangeLog 5381 RMD160 692e27dfaa635f7355d8f77e8c1e4d76603eb951 SHA1 86cebb4c8b523aa001bfdd0a2eef5aea08d25aff SHA256 aea15ba1a570dd91c7346c379fd693f50474530e3cd696e4a79431fc781a1736
 MISC metadata.xml 306 RMD160 ef0ef7e6ae9a78330b131dd9fad394234f5e71a0 SHA1 b58bdb99fa625354e973f32d756019f62cb56021 SHA256 1cc3d55bb1dfc32ff10d088c87c7575b01995c2df075a28be159d75eaa6f780f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk472XMACgkQXkR9YqOcLPGzpwEAi2YdAMrZf6uhYM6roDJ/cjsB
+NwlY6mfzUx2mS5FZR9oA/34r4WDvqUCwaV7dJpFquBZvKoOx4kkReBXwEPHsTztM
+=b5UH
+-----END PGP SIGNATURE-----
diff --git a/gnustep-apps/terminal/terminal-0.9.5.ebuild b/gnustep-apps/terminal/terminal-0.9.5.ebuild
index 319a40aa0f98..4c3c11338438 100644
--- a/gnustep-apps/terminal/terminal-0.9.5.ebuild
+++ b/gnustep-apps/terminal/terminal-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.5.ebuild,v 1.1 2009/05/26 09:36:19 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.5.ebuild,v 1.2 2011/08/05 11:55:22 ssuominen Exp $
 
 EAPI=2
 
@@ -17,6 +17,9 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
 
+RDEPEND="!x11-terms/terminal" #376257
+DEPEND="${RDEPEND}"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9.5_pre20060324-size_t.patch
 	# Correct link command for --as-needed
diff --git a/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild b/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild
index f87a26b8ae11..f977b925d44b 100644
--- a/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild
+++ b/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild,v 1.6 2008/12/08 16:39:11 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild,v 1.7 2011/08/05 11:55:22 ssuominen Exp $
 
 inherit gnustep-2
 
@@ -15,6 +15,9 @@ KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
 
+RDEPEND="!x11-terms/terminal" #376257
+DEPEND="${RDEPEND}"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/gnustep-apps/terminal/terminal-0.9.6.ebuild b/gnustep-apps/terminal/terminal-0.9.6.ebuild
index 5642203170b4..b288d5e57163 100644
--- a/gnustep-apps/terminal/terminal-0.9.6.ebuild
+++ b/gnustep-apps/terminal/terminal-0.9.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.6.ebuild,v 1.1 2010/01/15 13:51:35 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.6.ebuild,v 1.2 2011/08/05 11:55:22 ssuominen Exp $
 
 EAPI=2
 
@@ -17,6 +17,9 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
 
+RDEPEND="!x11-terms/terminal" #376257
+DEPEND="${RDEPEND}"
+
 src_prepare() {
 	# Correct link command for --as-needed
 	sed -i -e "s/Terminal_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die "sed failed"
diff --git a/gnustep-apps/terminal/terminal-0.9.7.ebuild b/gnustep-apps/terminal/terminal-0.9.7.ebuild
index 644dea99b901..37679ef70175 100644
--- a/gnustep-apps/terminal/terminal-0.9.7.ebuild
+++ b/gnustep-apps/terminal/terminal-0.9.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.7.ebuild,v 1.1 2010/05/25 22:34:14 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.7.ebuild,v 1.2 2011/08/05 11:55:22 ssuominen Exp $
 
 EAPI=2
 
@@ -17,6 +17,9 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
 
+RDEPEND="!x11-terms/terminal" #376257
+DEPEND="${RDEPEND}"
+
 src_prepare() {
 	# Correct link command for --as-needed
 	sed -i -e "s/Terminal_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die "sed failed"