Block gnustep-apps/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

4 files changed, 19 insertions, 12 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/Manifest b/x11-terms/terminal/Manifest
index a2f23c141149..924577c51294 100644
--- a/x11-terms/terminal/Manifest
+++ b/x11-terms/terminal/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST Terminal-0.4.6.tar.bz2 1577616 RMD160 f87a5933391c14a8ae9d1182ad51455f2df50b0c SHA1 092a2e4b037225cacbe00cf856d3ec45108cfa1a SHA256 3a8d55d3b1bf3454ac7a695bec46e0aa3a957af2232f8f1d7f2c3c71806f897f
 DIST Terminal-0.4.7.tar.bz2 1582320 RMD160 34c84e21065f8d96fc6a712826dc769a91378063 SHA1 bd4b51ce51a399bb5c98fd1e923bc9ec6532ec0a SHA256 12ab46043ebf2de07e5a1c6826c6b0a677eb3ba58cc1c883a1a906b83ac6fd01
 DIST Terminal-0.4.8.tar.bz2 1585791 RMD160 006b959f9a0ef054068a771de6a4965fe0aad242 SHA1 2f12c3a0fffad18976d47e531d404ee308cb2f05 SHA256 fe5db0b7127ce87efa1e10f44d8915be88005b6ce4f0bfea6b64533e25cc788d
-EBUILD terminal-0.4.6.ebuild 1045 RMD160 fbf9c158de28feaff43870cd9a477b73a1a2b11c SHA1 66f07bc27a72397e19a452619e74800b96c291a1 SHA256 c10cc3f008251021a07552f044b788d5b50cbd71173c2a938930b39ab72ab877
+EBUILD terminal-0.4.6.ebuild 1078 RMD160 3e439ed38b656b49ba878bef902558ddb1f1ec73 SHA1 b3ea33bafd2b2e95cfc691f403ebb766cb1022bf SHA256 c367cd83545e772274865bb0d6e6a4d9c2a21b63c0aa9cf2ffbf55d1c01e3c35
 EBUILD terminal-0.4.7.ebuild 1054 RMD160 85be986ae7a87e5e5f93c291c5ad3dc0ebcf2dd0 SHA1 10ee2113ac2f69239fc272fd03ffd9f90a943ab6 SHA256 7e7953eb842c578ddfa9fad55a92c5e0b95ced2e504fcdaa1bb56e0850e4ef55
-EBUILD terminal-0.4.8.ebuild 1050 RMD160 7743a2fcbe9e097908a9acf9f23d4e2a08ab076b SHA1 90ad026dea08cfeee4fc9014b5b60dcc8e086c2e SHA256 9ed8d008ed477da4c3e53fcd6430c0e8f2d642758ee0d76073c5b215762b1d45
-MISC ChangeLog 15597 RMD160 3ba8252311e04a8e3b576730ab2cecf27afec401 SHA1 272363b07fdaef3ad1a079d2b4502a02520e0fc3 SHA256 4af312d89bce297a0d6c745dfc390d5c69dd0699877af7918b1a7b578ff89bb0
+EBUILD terminal-0.4.8.ebuild 1081 RMD160 3ca872919be6612502e99d361c26db620ee8b91e SHA1 5bd3e4117a730b0667a2e9b6bc33fd8bdb9374e9 SHA256 028096e7e443a8e9a9d47355207b16f743023f011e7bcab5df3629cba0d2b2c5
+MISC ChangeLog 15823 RMD160 ae19c2ffa9c333260cbc7d68f8e0b242a1ee99b9 SHA1 d735de32584e82fc097318831a56929d49a6ccd5 SHA256 6d44ae9bb76317ed158a989586f3687cb70eb1e87da13a716ac860cc723b84af
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk47ENIACgkQuUQtlDBCeQJKVgCeMRhG87Xw7IW3WFW3gAARXfkg
-oR4An3FqyLr/6JWZEoihNq0IbYOSsw2v
-=aOQh
+iF4EAREIAAYFAk472HEACgkQXkR9YqOcLPFAZAD/fIrHBWKXAAXQLc/xHX7ZEQ7C
+t9YxUGNBqEhfp+Rh8ZEA/jZAyZdryRrhsqpuuGMy1IwAXx+ezLRV7aVhizasWzQZ
+=Q4x+
 -----END PGP SIGNATURE-----
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