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 2E8171381F3 for ; Mon, 14 Oct 2013 07:22:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A52A2E0A9F; Mon, 14 Oct 2013 07:22:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D770E0A9D for ; Mon, 14 Oct 2013 07:22:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D195433DEE1 for ; Mon, 14 Oct 2013 07:22:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 859DFE5308 for ; Mon, 14 Oct 2013 07:22:27 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1381735327.8727243ba0a52070256481054b162855e17ef1b1.eva@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.10.0.ebuild x11-terms/gnome-terminal/gnome-terminal-9999.ebuild X-VCS-Directories: x11-terms/gnome-terminal/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 8727243ba0a52070256481054b162855e17ef1b1 X-VCS-Branch: master Date: Mon, 14 Oct 2013 07:22:27 +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: 46939b76-d6e4-44a0-a0b7-c41ff2595a0b X-Archives-Hash: b6520cbbf5d2c6caf42afeff59a6e16e commit: 8727243ba0a52070256481054b162855e17ef1b1 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Oct 14 06:48:04 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Mon Oct 14 07:22:07 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8727243b x11-terms/gnome-terminal: 3.8.4 → 3.10.0 --- .../gnome-terminal/gnome-terminal-3.10.0.ebuild | 72 ++++++++++++++++++++++ .../gnome-terminal/gnome-terminal-9999.ebuild | 57 +++++++++++------ 2 files changed, 111 insertions(+), 18 deletions(-) diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.10.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.10.0.ebuild new file mode 100644 index 0000000..18f8236 --- /dev/null +++ b/x11-terms/gnome-terminal/gnome-terminal-3.10.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2013 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://help.gnome.org/users/gnome-terminal/" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="+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.8:2.90 + >=gnome-base/dconf-0.12 + >=gnome-base/gconf-2.31.3 + >=gnome-base/gsettings-desktop-schemas-0.1.0 + sys-apps/util-linux + x11-libs/libSM + x11-libs/libICE + 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 + 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() { + # 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_with nautilus nautilus-extension) \ + ITSTOOL=$(type -P true) +} + +src_install() { + DOCS="AUTHORS ChangeLog HACKING NEWS" + gnome2_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + if [[ ${REPLACING_VERSIONS} < 3.6.1-r1 && ${REPLACING_VERSIONS} != 2.32.1-r1 && + ${REPLACING_VERSIONS} != 3.4.1.1-r1 ]]; then + elog + elog "Gnome Terminal no longer uses login shell by default, switching" + elog "to upstream default. Because of this, if you have some command you" + elog "want to be run, be sure to have it placed in your ~/.bashrc file." + elog + fi + readme.gentoo_print_elog +} diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild index 4c8e8f6..d0beae2 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild @@ -1,63 +1,84 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 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 +inherit gnome2 readme.gentoo if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi DESCRIPTION="The Gnome Terminal" -HOMEPAGE="http://www.gnome.org/" +HOMEPAGE="https://help.gnome.org/users/gnome-terminal/" LICENSE="GPL-3+" SLOT="0" -IUSE="nautilus" +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 ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" fi # FIXME: automagic dependency on gtk+[X] RDEPEND=" >=dev-libs/glib-2.33.2:2 - >=x11-libs/gtk+-3.5.3:3[X] - >=x11-libs/vte-0.33.0:2.90 - >=gnome-base/dconf-0.13.4 - >=gnome-base/gconf-2.31.3:2 + >=x11-libs/gtk+-3.6:3[X] + >=x11-libs/vte-0.34.8:2.90 + >=gnome-base/dconf-0.12 + >=gnome-base/gconf-2.31.3 >=gnome-base/gsettings-desktop-schemas-0.1.0 - sys-apps/dbus + sys-apps/util-linux + x11-libs/libSM + x11-libs/libICE 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 ) - app-text/yelp-tools - dev-libs/libxml2 - dev-util/gdbus-codegen >=dev-util/intltool-0.40 + >=gnome-base/dconf-0.14.0 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() { - DOCS="AUTHORS ChangeLog HACKING NEWS README" - G2CONF="${G2CONF} - $(use_with nautilus nautilus-extension)" + # 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_with nautilus nautilus-extension) \ + ITSTOOL=$(type -P true) +} - gnome2_src_configure +src_install() { + DOCS="AUTHORS ChangeLog HACKING NEWS" + gnome2_src_install + readme.gentoo_create_doc } pkg_postinst() { gnome2_pkg_postinst if [[ ${REPLACING_VERSIONS} < 3.6.1-r1 && ${REPLACING_VERSIONS} != 2.32.1-r1 && - ${REPLACING_VERSIONS} != 3.4.1.1-r1 ]]; then + ${REPLACING_VERSIONS} != 3.4.1.1-r1 ]]; then + elog elog "Gnome Terminal no longer uses login shell by default, switching" elog "to upstream default. Because of this, if you have some command you" elog "want to be run, be sure to have it placed in your ~/.bashrc file." + elog fi + readme.gentoo_print_elog }