From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q8z1Y-0000ay-Qb for garchives@archives.gentoo.org; Sun, 10 Apr 2011 18:06:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 099851C0C2; Sun, 10 Apr 2011 18:04:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BA80F1C0C2 for ; Sun, 10 Apr 2011 18:04:50 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6511E1B4097 for ; Sun, 10 Apr 2011 18:04:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C641B80019 for ; Sun, 10 Apr 2011 18:04:49 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <7cc742ccfd38af1b093634631e831e34eae6c959.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.0.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: 7cc742ccfd38af1b093634631e831e34eae6c959 Date: Sun, 10 Apr 2011 18:04:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 0ba6b35033bbadbd2a9fe15ff7f79b96 commit: 7cc742ccfd38af1b093634631e831e34eae6c959 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Apr 9 16:15:44 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Apr 10 18:03:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D7cc742cc x11-terms/gnome-terminal: QAed * Split phases * fix typo with smclient (Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --forc= e, signed Manifest commit with key C6085806) --- .../gnome-terminal/gnome-terminal-3.0.0.ebuild | 11 ++++++----- .../gnome-terminal/gnome-terminal-9999.ebuild | 13 ++++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.0.0.ebuild b/x11-t= erms/gnome-terminal/gnome-terminal-3.0.0.ebuild index c2c7656..5e72086 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-3.0.0.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-3.0.0.ebuild @@ -15,12 +15,12 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-3" SLOT=3D"0" -IUSE=3D"" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux" fi +IUSE=3D"" =20 RDEPEND=3D">=3Ddev-libs/glib-2.26.0:2 >=3Dx11-libs/gtk+-3.0:3 @@ -38,13 +38,14 @@ DEPEND=3D"${RDEPEND} >=3Dapp-text/scrollkeeper-0.3.11 sys-devel/gettext" =20 -DOCS=3D"AUTHORS ChangeLog HACKING NEWS README" - -src_prepare() { +pkg_setup() { + DOCS=3D"AUTHORS ChangeLog HACKING NEWS README" G2CONF=3D"${G2CONF} - --with-smclient-backend=3Dxsmp + --with-smclient=3Dxsmp --with-gtk=3D3.0" +} =20 +src_prepare() { # Use login shell by default (#12900) epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch =20 diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-te= rms/gnome-terminal/gnome-terminal-9999.ebuild index 5b292cf..5e72086 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild @@ -15,12 +15,12 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-3" SLOT=3D"0" -IUSE=3D"" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux" fi +IUSE=3D"" =20 RDEPEND=3D">=3Ddev-libs/glib-2.26.0:2 >=3Dx11-libs/gtk+-3.0:3 @@ -29,20 +29,23 @@ RDEPEND=3D">=3Ddev-libs/glib-2.26.0:2 >=3Dgnome-base/gsettings-desktop-schemas-0.1.0 x11-libs/libSM x11-libs/libICE" +# gtk+:2 needed for gtk-builder-convert, bug 356239 DEPEND=3D"${RDEPEND} + x11-libs/gtk+:2 >=3Ddev-util/intltool-0.40 >=3Ddev-util/pkgconfig-0.9 >=3Dapp-text/gnome-doc-utils-0.3.2 >=3Dapp-text/scrollkeeper-0.3.11 sys-devel/gettext" =20 -DOCS=3D"AUTHORS ChangeLog HACKING NEWS README" - -src_prepare() { +pkg_setup() { + DOCS=3D"AUTHORS ChangeLog HACKING NEWS README" G2CONF=3D"${G2CONF} - --with-smclient-backend=3Dxsmp + --with-smclient=3Dxsmp --with-gtk=3D3.0" +} =20 +src_prepare() { # Use login shell by default (#12900) epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch =20