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

(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

5 files changed, 28 insertions, 10 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/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"