From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 53DED138CBB for ; Sun, 26 Apr 2015 13:53:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEE23E0899; Sun, 26 Apr 2015 13:53:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 94FB4E0899 for ; Sun, 26 Apr 2015 13:53:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADD7B340CD9 for ; Sun, 26 Apr 2015 13:53:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C0EB997 for ; Sun, 26 Apr 2015 13:53:35 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1430056395.270aa2a1c74aebd717d9cd29b4ab5ff60ac7ace9.tranquility@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-terms/gnome-terminal/gnome-terminal-3.16.1.ebuild x11-terms/gnome-terminal/gnome-terminal-9999.ebuild x11-terms/gnome-terminal/metadata.xml X-VCS-Directories: x11-terms/gnome-terminal/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: 270aa2a1c74aebd717d9cd29b4ab5ff60ac7ace9 X-VCS-Branch: master Date: Sun, 26 Apr 2015 13:53:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bcc43c9c-6b8a-469d-a3f0-1a8517517481 X-Archives-Hash: 9b24ee7fa0ed48893ca088a47affe7fe commit: 270aa2a1c74aebd717d9cd29b4ab5ff60ac7ace9 Author: Ole Reifschneider gentoo org> AuthorDate: Sun Apr 26 13:52:31 2015 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Sun Apr 26 13:53:15 2015 +0000 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-9999.ebuild => gnome-terminal-3.16.1.ebuild} | 42 +++++++--------------- .../gnome-terminal/gnome-terminal-9999.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-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.16.1.ebuild similarity index 63% copy from x11-terms/gnome-terminal/gnome-terminal-9999.ebuild copy to x11-terms/gnome-terminal/gnome-terminal-3.16.1.ebuild index ba20aaf..32033e5 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-9999.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} = 9999 ]]; 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} = 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 +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} == 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 . /etc/profile.d/vte.sh" src_configure() { - local myconf="" - - if [[ ${PV} != 9999 ]]; 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-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild index ba20aaf..94e9ae0 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-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 + dev-util/gtk-builder-convert >=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 diff --git a/x11-terms/gnome-terminal/metadata.xml b/x11-terms/gnome-terminal/metadata.xml index 8df9fde..926bc07 100644 --- a/x11-terms/gnome-terminal/metadata.xml +++ b/x11-terms/gnome-terminal/metadata.xml @@ -3,6 +3,7 @@ gnome + Integrate with gnome-base/gnome-shell search Build gnome-base/nautilus extension