[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2018-10-07 Thread Mart Raudsepp
commit: b7c69a467dd75878328b52c71adda30def4a281c
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct  7 21:03:43 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct  7 21:20:51 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b7c69a46

x11-terms/gnome-terminal-: sync in dep updates from 3.30.1

Also remove gone --disable-migration configure argument

yelp-tools might actually be needed due to eautoreconf, but lets
see if anyone finds that to be the case..

Signed-off-by: Mart Raudsepp  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 x11-terms/gnome-terminal/gnome-terminal-.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
index de0e3912..d253183a 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,7 +23,7 @@ fi
 RDEPEND="
>=dev-libs/glib-2.42:2
>=x11-libs/gtk+-3.20:3
-   >=x11-libs/vte-0.52.2:2.91
+   >=x11-libs/vte-0.54.1:2.91
>=dev-libs/libpcre2-10
>=gnome-base/dconf-0.14
>=gnome-base/gsettings-desktop-schemas-0.1.0
@@ -31,13 +31,14 @@ RDEPEND="
gnome-shell? ( gnome-base/gnome-shell )
nautilus? ( >=gnome-base/nautilus-3 )
 "
-# itstool/yelp-tools required for help/* with non-en LINGUAS, see bug #549358
+# itstool required for help/* with non-en LINGUAS, see bug #549358
 # xmllint required for glib-compile-resources, see bug #549304
 DEPEND="${RDEPEND}
-   app-text/yelp-tools
-   dev-libs/libxml2
+   dev-libs/libxml2:2
dev-util/gdbus-codegen
+   dev-util/glib-utils
>=dev-util/intltool-0.50
+   dev-util/itstool
sys-devel/gettext
virtual/pkgconfig
 "
@@ -58,7 +59,6 @@ src_configure() {
 
gnome2_src_configure \
--disable-static \
-   --disable-migration \
$(use_enable debug) \
$(use_enable gnome-shell search-provider) \
$(use_with nautilus nautilus-extension) \



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2018-09-13 Thread Mart Raudsepp
commit: 717f463a88a91b79e3cc0457103789e411c5225f
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Sep 13 07:36:05 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Sep 13 07:36:05 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=717f463a

x11-terms/gnome-terminal-: partial sync

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 x11-terms/gnome-terminal/gnome-terminal-.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
index 6dbaeb11..de0e3912 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
@@ -15,9 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/;
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="debug +gnome-shell +nautilus"
-if [[ ${PV} =  ]]; then
-   KEYWORDS=""
-else
+if [[ ${PV} !=  ]]; then
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
@@ -25,7 +23,7 @@ fi
 RDEPEND="
>=dev-libs/glib-2.42:2
>=x11-libs/gtk+-3.20:3
-   >=x11-libs/vte-0.50.2:2.91
+   >=x11-libs/vte-0.52.2:2.91
>=dev-libs/libpcre2-10
>=gnome-base/dconf-0.14
>=gnome-base/gsettings-desktop-schemas-0.1.0



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2018-09-13 Thread Mart Raudsepp
commit: 5dacbcbc250d22ffd3cc8ee6dc1710b6320adc64
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Sep 13 07:35:01 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Sep 13 07:35:01 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5dacbcbc

x11-terms/gnome-terminal-3.26.2: remove, 3.28 available in ::gentoo

Main tree 3.28 also removed VALAC=/bin/true setting, as the non-installed
vala thing was ported away from vala in 3.28 or 3.26.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../gnome-terminal/gnome-terminal-3.26.2.ebuild| 81 --
 1 file changed, 81 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.26.2.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.26.2.ebuild
deleted file mode 100644
index 4cee5d9d..
--- a/x11-terms/gnome-terminal/gnome-terminal-3.26.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/;
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-SRC_URI="${SRC_URI} !vanilla? ( 
https://dev.gentoo.org/~tranquility/distfiles/${PN}/${P}-notify-open-title-transparency.patch.xz
 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X], just transitive but needs proper 
control, bug 624960
-RDEPEND="
-   >=dev-libs/glib-2.42:2
-   >=x11-libs/gtk+-3.20:3
-   >=x11-libs/vte-0.50.2:2.91[!vanilla?]
-   >=dev-libs/libpcre2-10
-   >=gnome-base/dconf-0.14
-   >=gnome-base/gsettings-desktop-schemas-0.1.0
-   sys-apps/util-linux
-   gnome-shell? ( gnome-base/gnome-shell )
-   nautilus? ( >=gnome-base/nautilus-3 )
-"
-# itstool/yelp-tools required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-DEPEND="${RDEPEND}
-   app-text/yelp-tools
-   dev-libs/libxml2
-   dev-util/gdbus-codegen
-   >=dev-util/intltool-0.50
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
-   notifications of long-running commands finishing, you will need
-   to add the following line to your ~/.bashrc:\n
-   . /etc/profile.d/vte-2.91.sh"
-
-src_prepare() {
-   if ! use vanilla; then
-   # https://bugzilla.gnome.org/show_bug.cgi?id=695371
-   # Fedora patches:
-   # Restore transparency support (with compositing WMs only)
-   # OSC 777 desktop notification support (notifications on tabs 
for long-running commands completing)
-   # Restore separate menuitems for opening tabs and windows
-   # Restore "Set title" support
-   # 
http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/plain/gnome-terminal-notify-open-title-transparency.patch
-   # Depends on vte[-vanilla] for OSC 777 patch in VTE
-   eapply "${WORKDIR}"/${P}-notify-open-title-transparency.patch
-   fi
-   gnome2_src_prepare
-}
-
-src_configure() {
-   gnome2_src_configure \
-   --disable-static \
-   --disable-migration \
-   $(use_enable debug) \
-   $(use_enable gnome-shell search-provider) \
-   $(use_with nautilus nautilus-extension) \
-   VALAC=$(type -P true)
-}
-
-src_install() {
-   DOCS="AUTHORS ChangeLog HACKING NEWS"
-   gnome2_src_install
-   readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-   gnome2_pkg_postinst
-   readme.gentoo_print_elog
-}



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2018-04-15 Thread Ole Reifschneider
commit: 09460f9bb47f0828df51910e7a3f5cade87d68dc
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Apr 15 18:49:15 2018 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Sun Apr 15 18:49:15 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=09460f9b

x11-terms/gnome-terminal: Bump version to 3.26.2

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Manifest-Sign-Key: 0xE9E568677E8B4D42

 .../gnome-terminal/gnome-terminal-3.26.2.ebuild| 82 ++
 1 file changed, 82 insertions(+)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.26.2.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.26.2.ebuild
new file mode 100644
index ..a6b9854a
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.26.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+SRC_URI="${SRC_URI} !vanilla? ( 
https://dev.gentoo.org/~tranquility/distfiles/${PN}/${P}-notify-open-title-transparency.patch.xz
 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper 
control, bug 624960
+# Needed vte in 3.24.2 is 0.48.2, but we add desktop notification patches in 
0.48.3 that non-vanilla needs
+RDEPEND="
+   >=dev-libs/glib-2.42:2
+   >=x11-libs/gtk+-3.20:3
+   >=x11-libs/vte-0.48.3:2.91[!vanilla?]
+   >=dev-libs/libpcre2-10
+   >=gnome-base/dconf-0.14
+   >=gnome-base/gsettings-desktop-schemas-0.1.0
+   sys-apps/util-linux
+   gnome-shell? ( gnome-base/gnome-shell )
+   nautilus? ( >=gnome-base/nautilus-3 )
+"
+# itstool/yelp-tools required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+DEPEND="${RDEPEND}
+   app-text/yelp-tools
+   dev-libs/libxml2
+   dev-util/gdbus-codegen
+   >=dev-util/intltool-0.50
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
+   notifications of long-running commands finishing, you will need
+   to add the following line to your ~/.bashrc:\n
+   . /etc/profile.d/vte-2.91.sh"
+
+src_prepare() {
+   if ! use vanilla; then
+   # https://bugzilla.gnome.org/show_bug.cgi?id=695371
+   # Fedora patches:
+   # Restore transparency support (with compositing WMs only)
+   # OSC 777 desktop notification support (notifications on tabs 
for long-running commands completing)
+   # Restore separate menuitems for opening tabs and windows
+   # Restore "Set title" support
+   # 
http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/plain/gnome-terminal-notify-open-title-transparency.patch
+   # Depends on vte[-vanilla] for OSC 777 patch in VTE
+   eapply "${WORKDIR}"/${P}-notify-open-title-transparency.patch
+   fi
+   gnome2_src_prepare
+}
+
+src_configure() {
+   gnome2_src_configure \
+   --disable-static \
+   --disable-migration \
+   $(use_enable debug) \
+   $(use_enable gnome-shell search-provider) \
+   $(use_with nautilus nautilus-extension) \
+   VALAC=$(type -P true)
+}
+
+src_install() {
+   DOCS="AUTHORS ChangeLog HACKING NEWS"
+   gnome2_src_install
+   readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+   gnome2_pkg_postinst
+   readme.gentoo_print_elog
+}



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2018-01-12 Thread Dennis Lamm
commit: 049f55f4a079051e5487c23b943f4fa280de23f5
Author: Dennis Lamm  gentoo  org>
AuthorDate: Fri Jan 12 15:05:00 2018 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Fri Jan 12 15:05:00 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=049f55f4

x11-terms/gnome-terminal: drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../gnome-terminal/gnome-terminal-3.20.2.ebuild| 78 --
 1 file changed, 78 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.20.2.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.20.2.ebuild
deleted file mode 100644
index 43c95fc5..
--- a/x11-terms/gnome-terminal/gnome-terminal-3.20.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 readme.gentoo
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/;
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd 
~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X]
-RDEPEND="
-   >=dev-libs/glib-2.42:2[dbus]
-   >=x11-libs/gtk+-3.12:3[X]
-   >=x11-libs/vte-0.44.2:2.91
-   >=gnome-base/dconf-0.14
-   >=gnome-base/gsettings-desktop-schemas-0.1.0
-   sys-apps/util-linux
-   x11-libs/libSM
-   x11-libs/libICE
-   gnome-shell? ( gnome-base/gnome-shell )
-   nautilus? ( >=gnome-base/nautilus-3 )
-"
-# itstool required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-DEPEND="${RDEPEND}
-   app-text/yelp-tools
-   dev-libs/libxml2
-   dev-util/desktop-file-utils
-   dev-util/gdbus-codegen
-   dev-util/itstool
-   >=dev-util/intltool-0.50
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened
-   tab you will need to add the following line to your ~/.bashrc:\n
-   . /etc/profile.d/vte.sh"
-
-src_prepare() {
-   # if ! use vanilla; then
-   # OpenSuSE patches, 
https://bugzilla.gnome.org/show_bug.cgi?id=695371
-   # FIXME: add transparency.patch
-   # epatch "${FILESDIR}"/${PN}-3.20.0-transparency.patch
-   # eautoreconf
-   # fi
-   gnome2_src_prepare
-}
-
-src_configure() {
-   gnome2_src_configure \
-   --disable-static \
-   --disable-migration \
-   $(use_enable debug) \
-   $(use_enable gnome-shell search-provider) \
-   $(use_with nautilus nautilus-extension) \
-   VALAC=$(type -P true)
-}
-
-src_install() {
-   DOCS="AUTHORS ChangeLog HACKING NEWS"
-   gnome2_src_install
-   readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-   gnome2_pkg_postinst
-   readme.gentoo_print_elog
-}



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2016-05-11 Thread Remi Cardona
commit: 8d3260cf2b4222f1526cec8ec8d6cc2d5a36ac5b
Author: Rémi Cardona  gentoo  org>
AuthorDate: Wed May 11 06:33:48 2016 +
Commit: Remi Cardona  gentoo  org>
CommitDate: Wed May 11 06:33:48 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8d3260cf

x11-terms/gnome-terminal: bump to 3.20.2

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE0663D48103108F8

 .../{gnome-terminal-3.20.0.ebuild => gnome-terminal-3.20.2.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.20.0.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.20.2.ebuild
similarity index 98%
rename from x11-terms/gnome-terminal/gnome-terminal-3.20.0.ebuild
rename to x11-terms/gnome-terminal/gnome-terminal-3.20.2.ebuild
index f6af0c7..43c95fc 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.20.0.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.20.2.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh 
~sparc ~x86 ~x86-fbsd ~
 RDEPEND="
>=dev-libs/glib-2.42:2[dbus]
>=x11-libs/gtk+-3.12:3[X]
-   >=x11-libs/vte-0.44.0:2.91
+   >=x11-libs/vte-0.44.2:2.91
>=gnome-base/dconf-0.14
>=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/util-linux



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/, x11-terms/gnome-terminal/files/

2015-10-18 Thread Ole Reifschneider
commit: 4779da4fee1996ade08527530c3f7a9a23e27f1c
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Oct 18 12:26:17 2015 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Sun Oct 18 12:26:17 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4779da4f

x11-terms/gnome-terminal: Bump version to 3.18.1 and add transparency patch

Package-Manager: portage-2.2.23
RepoMan-Options: --force
Manifest-Sign-Key: 0xE9E568677E8B4D42

 ...terminal-3.18.0-restore-dark-transparency.patch | 2232 
 ...-3.18.0.ebuild => gnome-terminal-3.18.1.ebuild} |   13 +-
 .../gnome-terminal/gnome-terminal-.ebuild  |   19 +-
 3 files changed, 2252 insertions(+), 12 deletions(-)

diff --git 
a/x11-terms/gnome-terminal/files/gnome-terminal-3.18.0-restore-dark-transparency.patch
 
b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.0-restore-dark-transparency.patch
new file mode 100644
index 000..5c186c2
--- /dev/null
+++ 
b/x11-terms/gnome-terminal/files/gnome-terminal-3.18.0-restore-dark-transparency.patch
@@ -0,0 +1,2232 @@
+From 0a97a742fc4153caa76548e075cb731e96376a67 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray 
+Date: Mon, 12 May 2014 14:57:18 +0200
+Subject: [PATCH 1/5] Restore transparency
+
+The transparency settings were removed as a side effect of
+2bff4b63ed3ceef6055e35563e9b0b33ad57349d
+
+This restores them and you will need a compositing window manager to
+use it. The background image setting, also known as faux transparency,
+was not restored.
+
+The transparency checkbox lost its mnemonic accelerator because 't'
+is already taken and using any other letter would make it hard to
+restore the translations of the string.
+---
+ src/org.gnome.Terminal.gschema.xml | 10 +
+ src/profile-editor.c   | 11 +
+ src/profile-preferences.ui | 92 ++
+ src/terminal-schemas.h |  3 ++
+ src/terminal-screen.c  | 22 -
+ src/terminal-window.c  |  7 +++
+ 6 files changed, 144 insertions(+), 1 deletion(-)
+
+diff --git a/src/org.gnome.Terminal.gschema.xml 
b/src/org.gnome.Terminal.gschema.xml
+index 6e24f564c91a..0a646370dd65 100644
+--- a/src/org.gnome.Terminal.gschema.xml
 b/src/org.gnome.Terminal.gschema.xml
+@@ -334,6 +334,16 @@
+   'narrow'
+   Whether ambiguous-width characters are narrow or wide when 
using UTF-8 encoding
+ 
++
++  false
++  Whether to use a transparent background
++
++
++  50
++  
++  Adjust the amount of transparency
++  A value between 0 and 100, where 0 is opaque and 100 is 
fully transparent.
++
+   
+ 
+   
+diff --git a/src/profile-editor.c b/src/profile-editor.c
+index c5019fd469ad..7ca953ef9ff4 100644
+--- a/src/profile-editor.c
 b/src/profile-editor.c
+@@ -1097,7 +1097,18 @@ terminal_profile_edit (GSettings  *profile,
+"active-id",
+G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+ 
++  g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
++   gtk_builder_get_object (builder, 
"use-transparent-background"),
++   "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++  g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
++   gtk_builder_get_object (builder, 
"background-transparent-scale-box"),
++   "sensitive", G_SETTINGS_BIND_GET | 
G_SETTINGS_BIND_NO_SENSITIVITY);
++  g_settings_bind (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT,
++   gtk_builder_get_object (builder, 
"background-transparent-adjustment"),
++   "value", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++
+   /* Finished! */
++
+   terminal_util_bind_mnemonic_label_sensitivity (editor);
+ 
+   terminal_util_dialog_focus_widget (editor, widget_name);
+diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
+index 579c28ff344f..edb264ba5d72 100644
+--- a/src/profile-preferences.ui
 b/src/profile-preferences.ui
+@@ -23,6 +23,11 @@
+ 1
+ 100
+   
++  
++100
++1
++10
++  
+   
+ 
+   
+@@ -991,6 +996,93 @@
+ 1
+   
+ 
++
++  
++True
++False
++horizontal
++12
++
++  
++Transparent background
++True
++True
++False
++True
++0
++True
++  
++  

[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2015-10-11 Thread Ole Reifschneider
commit: bb474b9fda256ab0fb0214c6c2f014481423f36f
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Oct 11 20:44:46 2015 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Sun Oct 11 20:46:14 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=bb474b9f

x11-terms/gnome-terminal: Bump version to 3.18.0

The patches couln't be applied so they are removed for now

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42

 ...al-.ebuild => gnome-terminal-3.18.0.ebuild} | 35 --
 .../gnome-terminal/gnome-terminal-.ebuild  | 22 +++---
 2 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.18.0.ebuild
similarity index 64%
copy from x11-terms/gnome-terminal/gnome-terminal-.ebuild
copy to x11-terms/gnome-terminal/gnome-terminal-3.18.0.ebuild
index 8673595..1809985 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.18.0.ebuild
@@ -7,27 +7,20 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2 readme.gentoo
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
 
 DESCRIPTION="The Gnome Terminal"
 HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/;
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-if [[ ${PV} =  ]]; then
-   KEYWORDS=""
-else
-   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-fi
+IUSE="debug +gnome-shell +nautilus"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd 
~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X]
 RDEPEND="
-   >=dev-libs/glib-2.40:2[dbus]
+   >=dev-libs/glib-2.42:2[dbus]
>=x11-libs/gtk+-3.10:3[X]
-   >=x11-libs/vte-0.40.2:2.91
+   >=x11-libs/vte-0.42.0:2.91
>=gnome-base/dconf-0.14
>=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/util-linux
@@ -52,32 +45,14 @@ DOC_CONTENTS="To get previous working directory inherited 
in new opened
tab you will need to add the following line to your ~/.bashrc:\n
. /etc/profile.d/vte.sh"
 
-src_prepare() {
-   gnome2_src_prepare
-   if ! use vanilla; then
-   # Fedora patch, 
https://bugzilla.gnome.org/show_bug.cgi?id=695371
-   epatch "${FILESDIR}"/${PN}-3.16.2-restore-transparency.patch
-   # Fedora patch, 
https://bugzilla.gnome.org/show_bug.cgi?id=721932
-   epatch "${FILESDIR}"/${PN}-3.16.2-restore-dark.patch
-   fi
-}
-
 src_configure() {
-   local myconf=""
-
-   if [[ ${PV} !=  ]]; then
-   myconf="${myconf}
-   VALAC=$(type -P true)
-   "
-   fi
-
gnome2_src_configure \
--disable-static \
--disable-migration \
$(use_enable debug) \
$(use_enable gnome-shell search-provider) \
$(use_with nautilus nautilus-extension) \
-   ${myconf}
+   VALAC=$(type -P true)
 }
 
 src_install() {

diff --git a/x11-terms/gnome-terminal/gnome-terminal-.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
index 8673595..e9be986 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
@@ -25,9 +25,9 @@ fi
 
 # FIXME: automagic dependency on gtk+[X]
 RDEPEND="
-   >=dev-libs/glib-2.40:2[dbus]
+   >=dev-libs/glib-2.42:2[dbus]
>=x11-libs/gtk+-3.10:3[X]
-   >=x11-libs/vte-0.40.2:2.91
+   >=x11-libs/vte-0.42.0:2.91
>=gnome-base/dconf-0.14
>=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/util-linux
@@ -52,15 +52,15 @@ DOC_CONTENTS="To get previous working directory inherited 
in new opened
tab you will need to add the following line to your ~/.bashrc:\n
. /etc/profile.d/vte.sh"
 
-src_prepare() {
-   gnome2_src_prepare
-   if ! use vanilla; then
-   # Fedora patch, 
https://bugzilla.gnome.org/show_bug.cgi?id=695371
-   epatch "${FILESDIR}"/${PN}-3.16.2-restore-transparency.patch
-   # Fedora patch, 
https://bugzilla.gnome.org/show_bug.cgi?id=721932
-   epatch "${FILESDIR}"/${PN}-3.16.2-restore-dark.patch
-   fi
-}
+# src_prepare() {
+#  gnome2_src_prepare
+#  if ! use vanilla; then
+#  # Fedora patch, 
https://bugzilla.gnome.org/show_bug.cgi?id=695371
+#  epatch "${FILESDIR}"/${PN}-3.16.2-restore-transparency.patch
+#  # Fedora patch, 
https://bugzilla.gnome.org/show_bug.cgi?id=721932
+#  epatch "${FILESDIR}"/${PN}-3.16.2-restore-dark.patch
+#  fi
+# }
 
 src_configure() {
local myconf=""



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/, x11-terms/gnome-terminal/files/

2015-05-25 Thread Alexandre Rostovtsev
commit: 2b33aadd991940ba2b539b5296b95ce1b36db3ef
Author: Alexandre Rostovtsev tetromino AT gentoo DOT org
AuthorDate: Mon May 25 17:22:41 2015 +
Commit: Alexandre Rostovtsev tetromino AT gentoo DOT org
CommitDate: Mon May 25 17:28:14 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2b33aadd

x11-terms/gnome-terminal: add Fedora patches to re-add transparency, dark theme 
(bug #534060)

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

 .../files/gnome-terminal-3.16.2-restore-dark.patch |  196 +++
 ...nome-terminal-3.16.2-restore-transparency.patch | 1604 
 ...2-r1.ebuild = gnome-terminal-3.16.2-r2.ebuild} |   14 +-
 .../gnome-terminal/gnome-terminal-.ebuild  |   14 +-
 4 files changed, 1824 insertions(+), 4 deletions(-)

diff --git 
a/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-dark.patch 
b/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-dark.patch
new file mode 100644
index 000..0b98c35
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-dark.patch
@@ -0,0 +1,196 @@
+From 7da7309d203e51fb03c002f87a9a6ddd8ee67978 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray debars...@gnome.org
+Date: Tue, 17 Feb 2015 13:22:11 +0100
+Subject: [PATCH 1/2] Revert prefs: Remove dark theme pref
+
+This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18.
+---
+ src/org.gnome.Terminal.gschema.xml |  5 +
+ src/preferences.ui | 16 
+ src/terminal-app.c |  4 
+ src/terminal-prefs.c   |  9 -
+ src/terminal-schemas.h |  1 +
+ 5 files changed, 34 insertions(+), 1 deletion(-)
+
+diff --git a/src/org.gnome.Terminal.gschema.xml 
b/src/org.gnome.Terminal.gschema.xml
+index 051bdc4..95c5405 100644
+--- a/src/org.gnome.Terminal.gschema.xml
 b/src/org.gnome.Terminal.gschema.xml
+@@ -656,6 +656,11 @@
+   summaryWhether to show the menubar in new windows/summary
+ /key
+ 
++key name=dark-theme type=b
++  defaultfalse/default
++  summaryWhether to use a dark theme variant/summary
++/key
++
+ key name=new-terminal-mode enum=org.gnome.Terminal.NewTerminalMode
+   default'window'/default
+   summaryWhether to open new terminals as windows or tabs/summary
+diff --git a/src/preferences.ui b/src/preferences.ui
+index f64a11b..df82508 100644
+--- a/src/preferences.ui
 b/src/preferences.ui
+@@ -139,6 +139,22 @@
+   /packing
+ /child
+ child
++  object class=GtkCheckButton id=dark-theme-checkbutton
++property name=label translatable=yesUse _dark theme 
variant/property
++property name=visibleTrue/property
++property name=can_focusTrue/property
++property name=receives_defaultFalse/property
++property name=use_underlineTrue/property
++property name=xalign0/property
++property name=draw_indicatorTrue/property
++  /object
++  packing
++property name=expandFalse/property
++property name=fillTrue/property
++property name=position3/property
++  /packing
++/child
++child
+   object class=GtkBox id=hbox140
+ property name=visibleTrue/property
+ property name=can_focusFalse/property
+diff --git a/src/terminal-app.c b/src/terminal-app.c
+index 8a9434f..95302c5 100644
+--- a/src/terminal-app.c
 b/src/terminal-app.c
+@@ -362,6 +362,10 @@ terminal_app_init (TerminalApp *app)
+ 
+   /* Terminal global settings */
+   app-global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA);
++  g_settings_bind (app-global_settings, TERMINAL_SETTING_DARK_THEME_KEY,
++   gtk_settings_get_default (),
++   gtk-application-prefer-dark-theme,
++   G_SETTINGS_BIND_GET);
+ 
+   /* Check if we need to migrate from gconf to dconf */
+   maybe_migrate_settings (app);
+diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
+index 97f6c33..a57dde6 100644
+--- a/src/terminal-prefs.c
 b/src/terminal-prefs.c
+@@ -562,7 +562,7 @@ terminal_prefs_show_preferences (GtkWindow 
*transient_parent,
+   GtkWidget *show_menubar_button, *disable_mnemonics_button, 
*disable_menu_accel_button;
+   GtkWidget *disable_shortcuts_button;
+   GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, 
*remove_button;
+-  GtkWidget *new_terminal_mode_combo;
++  GtkWidget *dark_theme_button, *new_terminal_mode_combo;
+   GtkWidget *default_hbox, *default_label;
+   GtkTreeSelection *selection;
+   GSettings *settings;
+@@ -583,6 +583,7 @@ terminal_prefs_show_preferences (GtkWindow 
*transient_parent,
+preferences-dialog,
+  

[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2015-05-19 Thread Alexandre Rostovtsev
commit: 22589c72543186954d630965fec901685a921222
Author: Alexandre Rostovtsev tetromino AT gentoo DOT org
AuthorDate: Tue May 19 13:55:35 2015 +
Commit: Alexandre Rostovtsev tetromino AT gentoo DOT org
CommitDate: Tue May 19 13:55:35 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=22589c72

x11-terms/gnome-terminal: XMLLINT override broke glib-compile-resources (bug 
#549304)

Thanks to Harris Landgarten, bingquick, Mike Auty, mkloesges.

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

 ...{gnome-terminal-3.16.2.ebuild = gnome-terminal-3.16.2-r1.ebuild} | 5 +++--
 x11-terms/gnome-terminal/gnome-terminal-.ebuild  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r1.ebuild
similarity index 93%
rename from x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild
rename to x11-terms/gnome-terminal/gnome-terminal-3.16.2-r1.ebuild
index b6cd7d2..622dd35 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r1.ebuild
@@ -30,8 +30,10 @@ RDEPEND=
nautilus? ( =gnome-base/nautilus-3 )
 
 # itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
 DEPEND=${RDEPEND}
app-text/yelp-tools
+   dev-libs/libxml2
dev-util/gdbus-codegen
dev-util/itstool
=dev-util/intltool-0.50
@@ -50,8 +52,7 @@ src_configure() {
$(use_enable debug) \
$(use_enable gnome-shell search-provider) \
$(use_with nautilus nautilus-extension) \
-   VALAC=$(type -P true) \
-   XMLLINT=$(type -P true)
+   VALAC=$(type -P true)
 }
 
 src_install() {

diff --git a/x11-terms/gnome-terminal/gnome-terminal-.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
index aab80a3..7dfd8c1 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
@@ -37,8 +37,10 @@ RDEPEND=
nautilus? ( =gnome-base/nautilus-3 )
 
 # itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
 DEPEND=${RDEPEND}
app-text/yelp-tools
+   dev-libs/libxml2
dev-util/gdbus-codegen
dev-util/itstool
=dev-util/intltool-0.50
@@ -56,7 +58,6 @@ src_configure() {
if [[ ${PV} !=  ]]; then
myconf=${myconf}
VALAC=$(type -P true)
-   XMLLINT=$(type -P true)

fi
 



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2015-05-18 Thread Alexandre Rostovtsev
commit: c6d4d07436b5bdcd08b9dced04158829ff4ccce9
Author: Alexandre Rostovtsev tetromino AT gentoo DOT org
AuthorDate: Tue May 19 00:34:55 2015 +
Commit: Alexandre Rostovtsev tetromino AT gentoo DOT org
CommitDate: Tue May 19 00:34:55 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=c6d4d074

x11-terms/gnome-terminal: itstool really is required (bug #549358)

Thanks to mkloesges, Felix Janda.

Package-Manager: portage-2.2.19
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

 x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild | 3 ++-
 x11-terms/gnome-terminal/gnome-terminal-.ebuild   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild
index 352648b..b6cd7d2 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild
@@ -29,9 +29,11 @@ RDEPEND=
gnome-shell? ( gnome-base/gnome-shell )
nautilus? ( =gnome-base/nautilus-3 )
 
+# itstool required for help/* with non-en LINGUAS, see bug #549358
 DEPEND=${RDEPEND}
app-text/yelp-tools
dev-util/gdbus-codegen
+   dev-util/itstool
=dev-util/intltool-0.50
sys-devel/gettext
virtual/pkgconfig
@@ -49,7 +51,6 @@ src_configure() {
$(use_enable gnome-shell search-provider) \
$(use_with nautilus nautilus-extension) \
VALAC=$(type -P true) \
-   ITSTOOL=$(type -P true) \
XMLLINT=$(type -P true)
 }
 

diff --git a/x11-terms/gnome-terminal/gnome-terminal-.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
index a14d829..aab80a3 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
@@ -36,9 +36,11 @@ RDEPEND=
gnome-shell? ( gnome-base/gnome-shell )
nautilus? ( =gnome-base/nautilus-3 )
 
+# itstool required for help/* with non-en LINGUAS, see bug #549358
 DEPEND=${RDEPEND}
app-text/yelp-tools
dev-util/gdbus-codegen
+   dev-util/itstool
=dev-util/intltool-0.50
sys-devel/gettext
virtual/pkgconfig
@@ -54,7 +56,6 @@ src_configure() {
if [[ ${PV} !=  ]]; then
myconf=${myconf}
VALAC=$(type -P true)
-   ITSTOOL=$(type -P true)
XMLLINT=$(type -P true)

fi



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2015-05-12 Thread Gilles Dartiguelongue
commit: 74e3047a21afe9f34155d8a843b091952795ee4f
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Tue May 12 18:09:18 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Tue May 12 18:24:03 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=74e3047a

x11-terms/gnome-terminal: 3.16.1 → 3.16.2

* Require latest vte release
* Drop gtk-builder-convert dependency, not needed since December 2012.

 ...{gnome-terminal-3.16.1.ebuild = gnome-terminal-3.16.2.ebuild} | 8 +++-
 x11-terms/gnome-terminal/gnome-terminal-.ebuild   | 7 +++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.16.1.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild
similarity index 85%
rename from x11-terms/gnome-terminal/gnome-terminal-3.16.1.ebuild
rename to x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild
index 32033e5..352648b 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.16.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.16.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild,v 
1.1 2015/03/28 09:38:20 pacho Exp $
+# $Header: $
 
 EAPI=5
 GCONF_DEBUG=no
@@ -20,7 +20,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh 
~sparc ~x86 ~x86-fbsd ~
 RDEPEND=
=dev-libs/glib-2.40:2[dbus]
=x11-libs/gtk+-3.10:3[X]
-   =x11-libs/vte-0.40:2.91
+   =x11-libs/vte-0.40.2:2.91
=gnome-base/dconf-0.14
=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/util-linux
@@ -29,11 +29,9 @@ RDEPEND=
gnome-shell? ( gnome-base/gnome-shell )
nautilus? ( =gnome-base/nautilus-3 )
 
-# gtk+:2 needed for gtk-builder-convert, bug 356239
 DEPEND=${RDEPEND}
app-text/yelp-tools
dev-util/gdbus-codegen
-   dev-util/gtk-builder-convert
=dev-util/intltool-0.50
sys-devel/gettext
virtual/pkgconfig
@@ -50,7 +48,7 @@ src_configure() {
$(use_enable debug) \
$(use_enable gnome-shell search-provider) \
$(use_with nautilus nautilus-extension) \
-   VALAC=$(type -P true)
+   VALAC=$(type -P true) \
ITSTOOL=$(type -P true) \
XMLLINT=$(type -P true)
 }

diff --git a/x11-terms/gnome-terminal/gnome-terminal-.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
index 94e9ae0..a14d829 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
@@ -27,7 +27,7 @@ fi
 RDEPEND=
=dev-libs/glib-2.40:2[dbus]
=x11-libs/gtk+-3.10:3[X]
-   =x11-libs/vte-0.40:2.91
+   =x11-libs/vte-0.40.2:2.91
=gnome-base/dconf-0.14
=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/util-linux
@@ -36,11 +36,9 @@ RDEPEND=
gnome-shell? ( gnome-base/gnome-shell )
nautilus? ( =gnome-base/nautilus-3 )
 
-# gtk+:2 needed for gtk-builder-convert, bug 356239
 DEPEND=${RDEPEND}
app-text/yelp-tools
dev-util/gdbus-codegen
-   dev-util/gtk-builder-convert
=dev-util/intltool-0.50
sys-devel/gettext
virtual/pkgconfig
@@ -55,6 +53,7 @@ src_configure() {
 
if [[ ${PV} !=  ]]; then
myconf=${myconf}
+   VALAC=$(type -P true)
ITSTOOL=$(type -P true)
XMLLINT=$(type -P true)

@@ -62,7 +61,7 @@ src_configure() {
 
gnome2_src_configure \
--disable-static \
-   --enable-migration \
+   --disable-migration \
$(use_enable debug) \
$(use_enable gnome-shell search-provider) \
$(use_with nautilus nautilus-extension) \



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2015-04-26 Thread Ole Reifschneider
commit: 270aa2a1c74aebd717d9cd29b4ab5ff60ac7ace9
Author: Ole Reifschneider tranquility AT gentoo DOT org
AuthorDate: Sun Apr 26 13:52:31 2015 +
Commit: Ole Reifschneider tranquility AT gentoo DOT org
CommitDate: Sun Apr 26 13:53:15 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=270aa2a1

Bump gnome-terminal to 3.16.1

Package-Manager: portage-2.2.14
Manifest-Sign-Key: 7E8B4D42

 ...al-.ebuild = gnome-terminal-3.16.1.ebuild} | 42 +++---
 .../gnome-terminal/gnome-terminal-.ebuild  | 16 -
 x11-terms/gnome-terminal/metadata.xml  |  1 +
 3 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.16.1.ebuild
similarity index 63%
copy from x11-terms/gnome-terminal/gnome-terminal-.ebuild
copy to x11-terms/gnome-terminal/gnome-terminal-3.16.1.ebuild
index ba20aaf..32033e5 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.16.1.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: 
/var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild,v 
1.1 2015/03/28 09:38:20 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG=no
 GNOME2_LA_PUNT=yes
 
 inherit gnome2 readme.gentoo
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
 
 DESCRIPTION=The Gnome Terminal
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/;
@@ -17,19 +14,14 @@ HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/;
 LICENSE=GPL-3+
 SLOT=0
 IUSE=debug +gnome-shell +nautilus
-if [[ ${PV} =  ]]; then
-   KEYWORDS=
-else
-   KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
-fi
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd 
~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
 
 # FIXME: automagic dependency on gtk+[X]
 RDEPEND=
-   =dev-libs/glib-2.40:2
+   =dev-libs/glib-2.40:2[dbus]
=x11-libs/gtk+-3.10:3[X]
-   =x11-libs/vte-0.38:2.91
+   =x11-libs/vte-0.40:2.91
=gnome-base/dconf-0.14
-   =gnome-base/gconf-2.31.3
=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/util-linux
x11-libs/libSM
@@ -39,38 +31,28 @@ RDEPEND=
 
 # gtk+:2 needed for gtk-builder-convert, bug 356239
 DEPEND=${RDEPEND}
-   dev-util/appdata-tools
-   || ( dev-util/gtk-builder-convert =x11-libs/gtk+-2.24.10:2 )
+   app-text/yelp-tools
+   dev-util/gdbus-codegen
+   dev-util/gtk-builder-convert
=dev-util/intltool-0.50
sys-devel/gettext
virtual/pkgconfig
 
-if [[ ${PV} ==  ]]; then
-   DEPEND=${DEPEND}
-   app-text/yelp-tools
-fi
 
 DOC_CONTENTS=To get previous working directory inherited in new opened
tab you will need to add the following line to your ~/.bashrc:\n
. /etc/profile.d/vte.sh
 
 src_configure() {
-   local myconf=
-
-   if [[ ${PV} !=  ]]; then
-   myconf=${myconf}
-   ITSTOOL=$(type -P true)
-   XMLLINT=$(type -P true)
-   
-   fi
-
gnome2_src_configure \
--disable-static \
-   --enable-migration \
+   --disable-migration \
$(use_enable debug) \
$(use_enable gnome-shell search-provider) \
$(use_with nautilus nautilus-extension) \
-   ${myconf}
+   VALAC=$(type -P true)
+   ITSTOOL=$(type -P true) \
+   XMLLINT=$(type -P true)
 }
 
 src_install() {

diff --git a/x11-terms/gnome-terminal/gnome-terminal-.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
index ba20aaf..94e9ae0 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -25,11 +25,10 @@ fi
 
 # FIXME: automagic dependency on gtk+[X]
 RDEPEND=
-   =dev-libs/glib-2.40:2
+   =dev-libs/glib-2.40:2[dbus]
=x11-libs/gtk+-3.10:3[X]
-   =x11-libs/vte-0.38:2.91
+   =x11-libs/vte-0.40:2.91
=gnome-base/dconf-0.14
-   =gnome-base/gconf-2.31.3
=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/util-linux
x11-libs/libSM
@@ -39,16 +38,13 @@ RDEPEND=
 
 # gtk+:2 needed for gtk-builder-convert, bug 356239
 DEPEND=${RDEPEND}
-   dev-util/appdata-tools
-   || ( dev-util/gtk-builder-convert =x11-libs/gtk+-2.24.10:2 )
+   app-text/yelp-tools
+   dev-util/gdbus-codegen
+   

[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2014-12-26 Thread Gilles Dartiguelongue
commit: 0ee102ddce30c178304ca3a0c22bb85474888d56
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Fri Dec 26 21:50:51 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Fri Dec 26 21:50:51 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0ee102dd

x11-terms/gnome-terminal: moved to gentoo-x86

---
 .../gnome-terminal/gnome-terminal-3.14.2.ebuild| 69 --
 1 file changed, 69 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild
deleted file mode 100644
index d179a37..000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-
-inherit gnome2 readme.gentoo
-
-DESCRIPTION=The Gnome Terminal
-HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/;
-
-LICENSE=GPL-3+
-SLOT=0
-IUSE=debug +gnome-shell +nautilus
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd 
~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
-
-# FIXME: automagic dependency on gtk+[X]
-RDEPEND=
-   =dev-libs/glib-2.40:2
-   =x11-libs/gtk+-3.10:3[X]
-   =x11-libs/vte-0.38:2.91
-   =gnome-base/dconf-0.14
-   =gnome-base/gconf-2.31.3
-   =gnome-base/gsettings-desktop-schemas-0.1.0
-   sys-apps/util-linux
-   x11-libs/libSM
-   x11-libs/libICE
-   gnome-shell? ( gnome-base/gnome-shell )
-   nautilus? ( =gnome-base/nautilus-3 )
-
-# gtk+:2 needed for gtk-builder-convert, bug 356239
-DEPEND=${RDEPEND}
-   app-text/yelp-tools
-   dev-util/appdata-tools
-   || ( dev-util/gtk-builder-convert =x11-libs/gtk+-2.24.10:2 )
-   =dev-util/intltool-0.50
-   sys-devel/gettext
-   virtual/pkgconfig
-
-
-DOC_CONTENTS=To get previous working directory inherited in new opened
-   tab you will need to add the following line to your ~/.bashrc:\n
-   . /etc/profile.d/vte.sh
-
-src_configure() {
-   gnome2_src_configure \
-   --disable-static \
-   --enable-migration \
-   $(use_enable debug) \
-   $(use_enable gnome-shell search-provider) \
-   $(use_with nautilus nautilus-extension) \
-   VALAC=$(type -P true)
-   # Docs are broken in this release.
-   #ITSTOOL=$(type -P true) \
-   #XMLLINT=$(type -P true)
-}
-
-src_install() {
-   DOCS=AUTHORS ChangeLog HACKING NEWS
-   gnome2_src_install
-   readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-   gnome2_pkg_postinst
-   readme.gentoo_print_elog
-}



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2014-11-23 Thread Gilles Dartiguelongue
commit: f716e9959a427ca094c4fc3fac416159832cc544
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Nov 23 22:38:42 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Nov 23 22:49:05 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f716e995

x11-terms/gnome-terminal: 3.14.1 → 3.14.2

---
 .../{gnome-terminal-3.14.1.ebuild = gnome-terminal-3.14.2.ebuild}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.1.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild
similarity index 100%
rename from x11-terms/gnome-terminal/gnome-terminal-3.14.1.ebuild
rename to x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2014-10-13 Thread Gilles Dartiguelongue
commit: 087571d2c011c19392f78e6337efc207263b5cce
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Mon Oct 13 21:26:38 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Mon Oct 13 21:26:38 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=087571d2

x11-terms/gnome-terminal: 3.14.0 → 3.14.1

---
 .../{gnome-terminal-3.14.0.ebuild = gnome-terminal-3.14.1.ebuild}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.0.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.14.1.ebuild
similarity index 100%
rename from x11-terms/gnome-terminal/gnome-terminal-3.14.0.ebuild
rename to x11-terms/gnome-terminal/gnome-terminal-3.14.1.ebuild



[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/files/, x11-terms/gnome-terminal/

2014-04-24 Thread Gilles Dartiguelongue
commit: a2b962b085fbca81ebc0b7ef5f448b233e165956
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Thu Apr 24 21:34:17 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Thu Apr 24 21:35:43 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a2b962b0

x11-terms/gnome-terminal: fix empty tab title

Following upstream move as explained in
https://bugzilla.gnome.org/show_bug.cgi?id=724110

and relevant commits.

---
 .../gnome-terminal-3.12.0-appmenu-parameter.patch  |  26 +++
 .../gnome-terminal-3.12.0-fallback-title-1.patch   |  29 +++
 .../gnome-terminal-3.12.0-fallback-title-2.patch   |  28 +++
 ...erminal-3.12.0-remove-set-title-feature-0.patch | 131 +
 ...erminal-3.12.0-remove-set-title-feature-1.patch | 214 
 ...erminal-3.12.0-remove-set-title-feature-2.patch | 217 +
 ...erminal-3.12.0-remove-set-title-feature-3.patch | 181 +
 ...12.0.ebuild = gnome-terminal-3.12.0-r1.ebuild} |  14 +-
 .../gnome-terminal/gnome-terminal-.ebuild  |   4 +-
 9 files changed, 841 insertions(+), 3 deletions(-)

diff --git 
a/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-appmenu-parameter.patch 
b/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-appmenu-parameter.patch
new file mode 100644
index 000..46a0b8f
--- /dev/null
+++ 
b/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-appmenu-parameter.patch
@@ -0,0 +1,26 @@
+From d58bc01a2e891e31e11f03eb0d6ae9b5ff260b2b Mon Sep 17 00:00:00 2001
+From: Christian Persch c...@gnome.org
+Date: Mon, 24 Mar 2014 15:16:22 +0100
+Subject: [PATCH 02/61] appmenu: Fix action parameter
+
+https://bugzilla.gnome.org/show_bug.cgi?id=726942
+---
+ src/terminal-appmenu.ui | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/terminal-appmenu.ui b/src/terminal-appmenu.ui
+index 148c640..01ff5a8 100644
+--- a/src/terminal-appmenu.ui
 b/src/terminal-appmenu.ui
+@@ -21,7 +21,7 @@
+   item
+ attribute name=label translatable=yes_New Terminal/attribute
+ attribute name=actionwin.new-terminal/attribute
+-attribute name=target'default'/attribute
++attribute name=target type=(ss)('default','default')/attribute
+   /item
+ /section
+ section
+-- 
+1.9.0
+

diff --git 
a/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-fallback-title-1.patch 
b/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-fallback-title-1.patch
new file mode 100644
index 000..67dd15e
--- /dev/null
+++ 
b/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-fallback-title-1.patch
@@ -0,0 +1,29 @@
+From fe7230e2113510596be5e773f9c1074ed650e858 Mon Sep 17 00:00:00 2001
+From: Christian Persch c...@gnome.org
+Date: Sun, 20 Apr 2014 20:21:04 +0200
+Subject: [PATCH 56/61] window: Use fallback tab title for empty terminal title
+
+https://bugzilla.gnome.org/show_bug.cgi?id=706816
+---
+ src/terminal-tab-label.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c
+index 90bab28..a83d94f 100644
+--- a/src/terminal-tab-label.c
 b/src/terminal-tab-label.c
+@@ -75,8 +75,9 @@ sync_tab_label (TerminalScreen *screen,
+   title = terminal_screen_get_title (screen);
+   hbox = gtk_widget_get_parent (label);
+ 
+-  gtk_label_set_text (GTK_LABEL (label), title);
+-  
++  gtk_label_set_text (GTK_LABEL (label),
++  title  title[0] ? title : _(Terminal));
++
+   gtk_widget_set_tooltip_text (hbox, title);
+ }
+ 
+-- 
+1.9.0
+

diff --git 
a/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-fallback-title-2.patch 
b/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-fallback-title-2.patch
new file mode 100644
index 000..cec5730
--- /dev/null
+++ 
b/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-fallback-title-2.patch
@@ -0,0 +1,28 @@
+From 0d52fef0ca60483debbdedec43bd07a8e9f76bfa Mon Sep 17 00:00:00 2001
+From: Christian Persch c...@gnome.org
+Date: Sun, 20 Apr 2014 20:21:04 +0200
+Subject: [PATCH 57/61] window: Use fallback tab title for empty terminal title
+
+https://bugzilla.gnome.org/show_bug.cgi?id=706816
+---
+ src/terminal-tabs-menu.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/terminal-tabs-menu.c b/src/terminal-tabs-menu.c
+index ed5fc7b..fb2b966 100644
+--- a/src/terminal-tabs-menu.c
 b/src/terminal-tabs-menu.c
+@@ -176,7 +176,9 @@ sync_tab_title (TerminalScreen *screen,
+ 
+   title = terminal_screen_get_title (screen);
+ 
+-  g_object_set (action, label, title, NULL);
++  g_object_set (action,
++label, title  title[0] ? title : _(Terminal),
++NULL);
+ }
+ 
+ static void
+-- 
+1.9.0
+

diff --git 
a/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-remove-set-title-feature-0.patch
 
b/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-remove-set-title-feature-0.patch
new file 

[gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/

2014-04-15 Thread Gilles Dartiguelongue
commit: b3e08a04dafac5ab7721de1f5adf2626891f9ed1
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sat Apr 12 21:02:41 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Tue Apr 15 22:00:26 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b3e08a04

x11-terms/gnome-terminal: 3.10.2 → 3.12.0

Documentation fails to build/install so let it be regenerated.
App data is the new annoyance, just silence it.

---
 ...al-.ebuild = gnome-terminal-3.12.0.ebuild} | 36 +-
 .../gnome-terminal/gnome-terminal-.ebuild  | 27 +++-
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-3.12.0.ebuild
similarity index 73%
copy from x11-terms/gnome-terminal/gnome-terminal-.ebuild
copy to x11-terms/gnome-terminal/gnome-terminal-3.12.0.ebuild
index a499f59..a2b2d2f 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,47 +7,37 @@ GCONF_DEBUG=no
 GNOME2_LA_PUNT=yes
 
 inherit gnome2 readme.gentoo
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
 
 DESCRIPTION=The Gnome Terminal
 HOMEPAGE=https://help.gnome.org/users/gnome-terminal/;
 
 LICENSE=GPL-3+
 SLOT=0
-IUSE=+nautilus
-if [[ ${PV} =  ]]; then
-   KEYWORDS=
-else
-   KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
-fi
+IUSE=+gnome-shell +nautilus
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd 
~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
 
 # FIXME: automagic dependency on gtk+[X]
 RDEPEND=
-   =dev-libs/glib-2.33.2:2
-   =x11-libs/gtk+-3.6:3[X]
-   =x11-libs/vte-0.34.9:2.90
-   =gnome-base/dconf-0.12
+   =dev-libs/glib-2.39.2:2
+   =x11-libs/gtk+-3.9.9:3[X]
+   =x11-libs/vte-0.36:2.90
+   =gnome-base/dconf-0.14
=gnome-base/gconf-2.31.3
=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/util-linux
x11-libs/libSM
x11-libs/libICE
+   gnome-shell? ( gnome-base/gnome-shell )
nautilus? ( =gnome-base/nautilus-3 )
 
 # gtk+:2 needed for gtk-builder-convert, bug 356239
 DEPEND=${RDEPEND}
+   app-text/yelp-tools
|| ( dev-util/gtk-builder-convert =x11-libs/gtk+-2.24.10:2 )
-   =dev-util/intltool-0.40
-   =gnome-base/dconf-0.14.0
+   =dev-util/intltool-0.50
sys-devel/gettext
virtual/pkgconfig
 
-if [[ ${PV} ==  ]]; then
-   DEPEND=${DEPEND}
-   app-text/yelp-tools
-fi
 
 DOC_CONTENTS=To get previous working directory inherited in new opened
tab you will need to add the following line to your ~/.bashrc:\n
@@ -59,8 +49,12 @@ src_configure() {
gnome2_src_configure \
--disable-static \
--enable-migration \
+   $(use_enable gnome-shell search-provider) \
$(use_with nautilus nautilus-extension) \
-   ITSTOOL=$(type -P true)
+   APPDATA_VALIDATE=$(type -P true) \
+   # Docs are broken in this release.
+   #ITSTOOL=$(type -P true) \
+   #XMLLINT=$(type -P true)
 }
 
 src_install() {

diff --git a/x11-terms/gnome-terminal/gnome-terminal-.ebuild 
b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
index a499f59..dcc8ba0 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -25,22 +25,22 @@ fi
 
 # FIXME: automagic dependency on gtk+[X]
 RDEPEND=
-   =dev-libs/glib-2.33.2:2
-   =x11-libs/gtk+-3.6:3[X]
-   =x11-libs/vte-0.34.9:2.90
-   =gnome-base/dconf-0.12
+   =dev-libs/glib-2.39.2:2
+   =x11-libs/gtk+-3.9.9:3[X]
+   =x11-libs/vte-0.36:2.90
+   =gnome-base/dconf-0.14
=gnome-base/gconf-2.31.3
=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/util-linux
x11-libs/libSM
x11-libs/libICE
+   gnome-shell? ( gnome-base/gnome-shell )
nautilus? ( =gnome-base/nautilus-3 )
 
 # gtk+:2 needed for gtk-builder-convert, bug 356239
 DEPEND=${RDEPEND}
|| ( dev-util/gtk-builder-convert =x11-libs/gtk+-2.24.10:2 )
-   =dev-util/intltool-0.40
-   =gnome-base/dconf-0.14.0
+   =dev-util/intltool-0.50
sys-devel/gettext
virtual/pkgconfig
 
@@ -54,13 +54,24 @@ DOC_CONTENTS=To get previous working directory inherited