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

[Nirbheek Chauhan]

commit:     b81310f6dd27152c9e0cf11ea3eb6b700b162892
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 22:11:52 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 22:11:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b81310f6

x11-terms/gnome-terminal: 2.33.5 -> 2.33.90

---
 ...2.33.5.ebuild => gnome-terminal-2.33.90.ebuild} |   10 ++--------
 .../gnome-terminal/gnome-terminal-9999.ebuild      |   17 ++++++-----------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.33.90.ebuild
similarity index 79%
rename from x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild
rename to x11-terms/gnome-terminal/gnome-terminal-2.33.90.ebuild
index 8608dd7..56f8a97 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.33.90.ebuild
@@ -5,7 +5,7 @@
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit autotools eutils gnome2
+inherit eutils gnome2
 
 DESCRIPTION="The Gnome Terminal"
 HOMEPAGE="http://www.gnome.org/"
@@ -20,9 +20,8 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 fi
 
-# libgnome needed for some monospace font schema, bug #274638
 RDEPEND=">=dev-libs/glib-2.26.0:2
-	>=x11-libs/gtk+-2.99.3:3
+	>=x11-libs/gtk+-3.0:3
 	>=x11-libs/vte-0.27.3:2.90
 	>=gnome-base/gconf-2.31.3
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
@@ -45,10 +44,5 @@ src_prepare() {
 	# Use login shell by default (#12900)
 	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
 
-	# Remove libgnome dep, taken from upstream, not needed for next release
-	epatch "${FILESDIR}"/${P}-remove-libgnome-dep.patch
-
-	[[ ${PV} != 9999 ]] && eautoreconf
-
 	gnome2_src_prepare
 }

diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
index a14ed06..56f8a97 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit autotools eutils gnome2
+inherit eutils gnome2
 
 DESCRIPTION="The Gnome Terminal"
 HOMEPAGE="http://www.gnome.org/"
@@ -20,14 +20,13 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 fi
 
-# libgnome needed for some monospace font schema, bug #274638
-RDEPEND=">=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.91.6:3
-	>=gnome-base/gconf-2.31.3
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	>=x11-libs/gtk+-3.0:3
 	>=x11-libs/vte-0.27.3:2.90
+	>=gnome-base/gconf-2.31.3
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	x11-libs/libSM
-	x11-libs/libX11
-	gnome-base/libgnome"
+	x11-libs/libICE"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9
@@ -45,9 +44,5 @@ src_prepare() {
 	# Use login shell by default (#12900)
 	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
 
-	epatch "${FILESDIR}"/${PN}-2.33.4-fix-gdk-targets.patch
-
-	[[ ${PV} != 9999 ]] && eautoreconf
-
 	gnome2_src_prepare
 }