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

3 files changed, 11 insertions, 22 deletions

diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 83ec73c5..16cdf9c5 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
 AUX gnome-terminal-2.33.5-remove-libgnome-dep.patch 6681 RMD160 89c30690d4dd8820c51b3bbd5403792daf5d895a SHA1 9d5c340c4a341d02033d16e9a8a78e63ce154135 SHA256 5785a90b92653bef79bb8fbfeb6339adf83730f8eb73ce5c731b72793dda66ae
-DIST gnome-terminal-2.33.5.tar.bz2 2317829 RMD160 37e97619d453f11a38ca6de35f8aadd89529f5e9 SHA1 b1074c032c5eef49d7c2d18b6eaadde8ba880af1 SHA256 3d69b5430ba1d54a20f93763fcf4b218c4ec97fee634b5947685dc9fb31e9612
-EBUILD gnome-terminal-2.33.5.ebuild 1418 RMD160 5dd7316e226fa309d9c6a76451d6d8c2c9655803 SHA1 73fe9c862549921d22e68b48b5710718ed62ae3a SHA256 6cee211e407b57cb30b1e902048113d2a49d120a0dacad9bc1c2d01cd4ffcf76
-EBUILD gnome-terminal-9999.ebuild 1325 RMD160 f75f5bef8d2aec046234c6defbbb423af2e60f72 SHA1 2206c16276450a75f8f99d5edbf0ea1212156219 SHA256 d08599f80a1a54405de2c093545884c05f10e9a1501f091a49699ae95a278718
+DIST gnome-terminal-2.33.90.tar.bz2 2319318 RMD160 e5ba465c3c8518b72d5cb91be2af52fac91853d1 SHA1 14eb64a355eb8a04a4c93d1af2d43a9c05bbc82d SHA256 d0c16be584a150f98788e1380df07280864c4351109dfa421a03a718e0052acb
+EBUILD gnome-terminal-2.33.90.ebuild 1179 RMD160 d65ac6169df58cef3c440100b6107e3bac72f6d9 SHA1 3bfc446db65836d3496e50b5cb4155a8621ea5f7 SHA256 5d84b539a71b74b6d50b32ac81a6584ae870320ba4772bd0b17074bb23a3e686
+EBUILD gnome-terminal-9999.ebuild 1179 RMD160 d65ac6169df58cef3c440100b6107e3bac72f6d9 SHA1 3bfc446db65836d3496e50b5cb4155a8621ea5f7 SHA256 5d84b539a71b74b6d50b32ac81a6584ae870320ba4772bd0b17074bb23a3e686
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.33.90.ebuild
index 8608dd7e..56f8a974 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 a14ed06e..56f8a974 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
 }