summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-04-12 23:59:37 -0400
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-04-12 23:59:37 -0400
commitca022a4f79b0140e4726390ec7216cac51aa4ab7 (patch)
treeb7781496a17cc6020bfbcc756d4a9b3651e678af /x11-terms
parentgnome-base/libgnome-keyring: 3.3.5 → 3.4.0 (diff)
downloadgnome-ca022a4f79b0140e4726390ec7216cac51aa4ab7.tar.gz
gnome-ca022a4f79b0140e4726390ec7216cac51aa4ab7.tar.bz2
gnome-ca022a4f79b0140e4726390ec7216cac51aa4ab7.zip
x11-terms/gnome-terminal: sync with gx86
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/gnome-terminal/Manifest2
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-9999.ebuild9
2 files changed, 6 insertions, 5 deletions
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index ad7a7880..e3fba9b5 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,2 +1,2 @@
AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
-EBUILD gnome-terminal-9999.ebuild 1383 RMD160 5fb2e47d380db65b766fe625dc7adef93fa7391a SHA1 8a3eadc4c1ce5a3d050c9be6eb3203dadbb471f2 SHA256 fd34af675ffd98f7869d33fef4b9031ae802f2d0f2460e6da6297c93b1de15b9
+EBUILD gnome-terminal-9999.ebuild 1362 RMD160 43646a77ad607607df7b803f6ce6cbc92c5d9bee SHA1 82087484251744a17cac3b1d7b1ea98d4d485d08 SHA256 f72f255963608c2691bdd92e0bd6b601bad0f2bebdb7b38c33f11ed3184fb092
diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
index 22c0635f..f571eff3 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.32.1.ebuild,v 1.1 2010/11/19 22:17:31 pacho Exp $
+# $Header: $
EAPI="4"
GCONF_DEBUG="no"
@@ -22,8 +22,9 @@ else
fi
IUSE=""
+# FIXME: automagic dependency on gtk+[X]
RDEPEND=">=dev-libs/glib-2.26.0:2
- >=x11-libs/gtk+-3.0:3
+ >=x11-libs/gtk+-3.3.17:3[X]
>=x11-libs/vte-0.30.0:2.90
>=gnome-base/gconf-2.31.3
>=gnome-base/gsettings-desktop-schemas-0.1.0
@@ -31,7 +32,7 @@ RDEPEND=">=dev-libs/glib-2.26.0:2
x11-libs/libICE"
# gtk+:2 needed for gtk-builder-convert, bug 356239
DEPEND="${RDEPEND}
- x11-libs/gtk+:2
+ || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
>=dev-util/intltool-0.40
>=dev-util/pkgconfig-0.9
>=app-text/gnome-doc-utils-0.3.2