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

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     7cc742ccfd38af1b093634631e831e34eae6c959
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 16:15:44 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 18:03:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7cc742cc

x11-terms/gnome-terminal: QAed

	* Split phases
	* fix typo with smclient

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, 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-terms/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="http://www.gnome.org/"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 fi
+IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.26.0:2
 	>=x11-libs/gtk+-3.0:3
@@ -38,13 +38,14 @@ DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.3.11
 	sys-devel/gettext"
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_prepare() {
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	G2CONF="${G2CONF}
-		--with-smclient-backend=xsmp
+		--with-smclient=xsmp
 		--with-gtk=3.0"
+}
 
+src_prepare() {
 	# Use login shell by default (#12900)
 	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
 

diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/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="http://www.gnome.org/"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 fi
+IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.26.0:2
 	>=x11-libs/gtk+-3.0:3
@@ -29,20 +29,23 @@ RDEPEND=">=dev-libs/glib-2.26.0:2
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	x11-libs/libSM
 	x11-libs/libICE"
+# gtk+:2 needed for gtk-builder-convert, bug 356239
 DEPEND="${RDEPEND}
+	x11-libs/gtk+:2
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9
 	>=app-text/gnome-doc-utils-0.3.2
 	>=app-text/scrollkeeper-0.3.11
 	sys-devel/gettext"
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_prepare() {
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	G2CONF="${G2CONF}
-		--with-smclient-backend=xsmp
+		--with-smclient=xsmp
 		--with-gtk=3.0"
+}
 
+src_prepare() {
 	# Use login shell by default (#12900)
 	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch