Clean up old revisions. Version bump to 2.32. Now licensed under GPL3, add search and save feature, lots of bug fixes.

(Portage version: 2.2_rc89/cvs/Linux x86_64)

3 files changed, 20 insertions, 79 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 01053c376021..8a37c4ea65aa 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.228 2010/10/17 15:40:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.229 2010/10/20 20:52:34 eva Exp $
+
+*gnome-terminal-2.32.0 (20 Oct 2010)
+
+  20 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-terminal-2.26.3.1-r2.ebuild, -gnome-terminal-2.28.2.ebuild,
+  +gnome-terminal-2.32.0.ebuild:
+  Clean up old revisions. Version bump to 2.32. Now licensed under GPL3, add
+  search and save feature, lots of bug fixes.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   gnome-terminal-2.30.2.ebuild:
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild
deleted file mode 100644
index 53fc3df1f826..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild,v 1.13 2010/07/20 02:30:17 jer Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-# libgnome needed for some schema, bug #274638
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.14.0
-	>=gnome-base/gconf-2.14
-	>=x11-libs/startup-notification-0.8
-	>=x11-libs/vte-0.20.0
-	>=dev-libs/dbus-glib-0.6
-	x11-libs/libSM
-	gnome-base/libgnome"
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.3.11"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-smclient-backend"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Use login shell by default (#12900)
-	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
-
-	# If we're logged in root on the first tab, don't open a new tab
-	# in user on /, fix bug #269318, import from upstream bug #565328.
-	epatch "${FILESDIR}"/${P}-cwd-on-new-tab.patch
-
-	# Fix bug 268846 -- gnome-terminal errors out if it can't find the gconf
-	# daemon. Patch is from upstream git repository, included in 2.28
-	epatch "${FILESDIR}"/${P}-partial-fix-dbus-error.patch
-
-	# Remove useless Plural-Forms line which breaks build with new
-	# gnome-doc-utils. See bug #304091
-	epatch "${FILESDIR}"/${P}-remove-plural.patch
-
-	# Fix British English documentation translation (bug #289361)
-	epatch "${FILESDIR}"/${PN}-2.26.3.1-en_GB.patch
-
-	# patch gnome terminal to report as GNOME rather than xterm
-	# This needs to resolve a few bugs (#120294,)
-	# Leave out for now; causing too many problems
-	#epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.32.0.ebuild
index f3dbe244cf44..1bd4b710299b 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.32.0.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild,v 1.8 2010/08/18 22:19:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.0.ebuild,v 1.1 2010/10/20 20:52:34 eva Exp $
 
+EAPI="3"
 GCONF_DEBUG="no"
 
 inherit eutils gnome2
@@ -9,22 +10,20 @@ inherit eutils gnome2
 DESCRIPTION="The Gnome Terminal"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 # libgnome needed for some monospace font schema, bug #274638
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.14.0
-	>=gnome-base/gconf-2.14
-	>=x11-libs/startup-notification-0.8
-	>=x11-libs/vte-0.22.0
-	>=dev-libs/dbus-glib-0.6
+RDEPEND=">=dev-libs/glib-2.25.12:2
+	>=x11-libs/gtk+-2.18:2
+	>=gnome-base/gconf-2.31.3
+	>=x11-libs/vte-0.25.91
 	x11-libs/libSM
 	gnome-base/libgnome"
 DEPEND="${RDEPEND}
-	  sys-devel/gettext
+	sys-devel/gettext
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9
 	>=app-text/gnome-doc-utils-0.3.2
@@ -32,15 +31,12 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 
 	# Use login shell by default (#12900)
 	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
 
-	# Fix British English documentation translation (bug #289361)
-	epatch "${FILESDIR}"/${PN}-2.26.3.1-en_GB.patch
-
 	# patch gnome terminal to report as GNOME rather than xterm
 	# This needs to resolve a few bugs (#120294,)
 	# Leave out for now; causing too many problems