summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-08-05 11:51:04 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-08-05 11:51:04 +0000
commit0fa6ac160d04bcde30ccad2553656dea3fef5a9f (patch)
tree3c1372899918b2a0d742bfd8ba8eda7232238682 /x11-terms
parentVersion bump, supports all Objective-C language features currently in OS X 10... (diff)
downloadgentoo-2-0fa6ac160d04bcde30ccad2553656dea3fef5a9f.tar.gz
gentoo-2-0fa6ac160d04bcde30ccad2553656dea3fef5a9f.tar.bz2
gentoo-2-0fa6ac160d04bcde30ccad2553656dea3fef5a9f.zip
Block gnustep-apps/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)
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/terminal/ChangeLog7
-rw-r--r--x11-terms/terminal/terminal-0.4.6.ebuild5
-rw-r--r--x11-terms/terminal/terminal-0.4.8.ebuild5
3 files changed, 12 insertions, 5 deletions
diff --git a/x11-terms/terminal/ChangeLog b/x11-terms/terminal/ChangeLog
index cbe1eaa1045e..0bb58acd9d6a 100644
--- a/x11-terms/terminal/ChangeLog
+++ b/x11-terms/terminal/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-terms/terminal
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminal/ChangeLog,v 1.69 2011/08/04 21:36:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminal/ChangeLog,v 1.70 2011/08/05 11:51:04 ssuominen Exp $
+
+ 05 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> terminal-0.4.6.ebuild,
+ terminal-0.4.8.ebuild:
+ Block gnustep-apps/terminal until upstream has renamed binary to something
+ different wrt #376257 by Diego Elio Pettenò
04 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> terminal-0.4.8.ebuild:
x86 stable wrt bug #372989
diff --git a/x11-terms/terminal/terminal-0.4.6.ebuild b/x11-terms/terminal/terminal-0.4.6.ebuild
index 23e7bb5175e0..3623b708be72 100644
--- a/x11-terms/terminal/terminal-0.4.6.ebuild
+++ b/x11-terms/terminal/terminal-0.4.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminal/terminal-0.4.6.ebuild,v 1.9 2011/05/19 22:16:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminal/terminal-0.4.6.ebuild,v 1.10 2011/08/05 11:51:04 ssuominen Exp $
EAPI=4
MY_P=${P/t/T}
@@ -20,7 +20,8 @@ RDEPEND=">=dev-libs/glib-2.16:2
x11-libs/libX11
>=x11-libs/vte-0.22.5:0
>=xfce-base/exo-0.6
- dbus? ( >=dev-libs/dbus-glib-0.88 )"
+ dbus? ( >=dev-libs/dbus-glib-0.88 )
+ !gnustep-apps/terminal" #376257
DEPEND="${RDEPEND}
dev-util/intltool
dev-util/pkgconfig
diff --git a/x11-terms/terminal/terminal-0.4.8.ebuild b/x11-terms/terminal/terminal-0.4.8.ebuild
index b97f21a5dd2c..1d763578c56e 100644
--- a/x11-terms/terminal/terminal-0.4.8.ebuild
+++ b/x11-terms/terminal/terminal-0.4.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminal/terminal-0.4.8.ebuild,v 1.5 2011/08/04 21:36:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminal/terminal-0.4.8.ebuild,v 1.6 2011/08/05 11:51:04 ssuominen Exp $
EAPI=4
MY_P=${P/t/T}
@@ -20,7 +20,8 @@ RDEPEND=">=dev-libs/glib-2.16:2
x11-libs/libX11
>=x11-libs/vte-0.22.5:0
>=xfce-base/exo-0.6
- dbus? ( >=dev-libs/dbus-glib-0.88 )"
+ dbus? ( >=dev-libs/dbus-glib-0.88 )
+ !gnustep-apps/terminal" #376257
DEPEND="${RDEPEND}
dev-util/intltool
dev-util/pkgconfig