commit: b3e08a04dafac5ab7721de1f5adf2626891f9ed1
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 21:02:41 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 22:00:26 2014 +0000
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-9999.ebuild => gnome-terminal-3.12.0.ebuild} | 36 +++++++++-------------
.../gnome-terminal/gnome-terminal-9999.ebuild | 27 +++++++++++-----
2 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
b/x11-terms/gnome-terminal/gnome-terminal-3.12.0.ebuild
similarity index 73%
copy from x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
copy to x11-terms/gnome-terminal/gnome-terminal-3.12.0.ebuild
index a499f59..a2b2d2f 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-9999.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} = 9999 ]]; 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} = 9999 ]]; 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} == 9999 ]]; 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-9999.ebuild
b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
index a499f59..dcc8ba0 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-9999.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
in new opened
. /etc/profile.d/vte.sh"
src_configure() {
+ local myconf=""
+
+ if [[ ${PV} = 9999 ]]; then
+ myconf="${myconf}
+ ITSTOOL=$(type -P true)
+ XMLLINT=$(type -P true)
+ "
+ fi
+
# FIXME: leave smclient configure unset until it accepts values from the
# switch and not from GDK_TARGET, bug #363033
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) \
+ ${myconf}
}
src_install() {
