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

Package-Manager: portage-2.2_rc89/cvs/Linux x86_64

4 files changed, 33 insertions, 84 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/Manifest b/x11-terms/gnome-terminal/Manifest
index 00994dc8a077..a0d5c9df5c3a 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-terminal-2.13.90-TERM-gnome.patch 413 RMD160 d2dd09acd8ac4b185316a09727cc5e3ebee100c3 SHA1 b83a85153e2c29fd287f97e873d1a851e57aac9a SHA256 812ffb7e6966b6ba813223af276c95d3a6efddceddc24b5637b085d4695dcd62
 AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
 AUX gnome-terminal-2.24.2-restore-switch-to-tab.patch 15041 RMD160 5860f46b1379dd40cd8ca9c9e23b30be5ef3e7cb SHA1 3ab937c566c401ad1ee82313cc6989338209fc47 SHA256 7edf095b8e037bcb2d41807eb3d26a6d4c9413088e1c9b58e4ef5eebf4c3a36e
@@ -5,11 +8,16 @@ AUX gnome-terminal-2.26.3.1-cwd-on-new-tab.patch 7074 RMD160 36deb7b2808fe5db59f
 AUX gnome-terminal-2.26.3.1-en_GB.patch 697 RMD160 c51011605f1af753ffde6e146071cc81c2f87124 SHA1 d1a69db6616aa39c6921fa30fcb85e7fac2d0688 SHA256 a795069430962a1d53d111bc345297289c06d44fc391e3408d0bb2c67c5d3e62
 AUX gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch 2667 RMD160 b1f3ce54c8a90a54d1c2e5f1f87195c8d3c7f8fa SHA1 6c0b4d0a35c04b88b7219cd09f246fd489ec4808 SHA256 6b3fd92d3dced996fe09718873b007335fac14171fb667e7c04c9dc883d121a7
 AUX gnome-terminal-2.26.3.1-remove-plural.patch 624 RMD160 5b260d0407b8824aed762af5d387ac3532431355 SHA1 2f2386bb930b3cc61a7a99990996c12a2c1a2ab8 SHA256 3adfefbe62233b37c373fd49e5ab0c58055d25ff4b937f386f994240b2d7894c
-DIST gnome-terminal-2.26.3.1.tar.bz2 2176049 RMD160 db6b5ba601c3c74e3424e88119501b9414e1f37d SHA1 68dc9739b4d35c0647596b1773c5da76782f1164 SHA256 40d97f983363002d6da574b35f3e4d44d4e8db38b776b226626f1e83d6fde1dc
-DIST gnome-terminal-2.28.2.tar.bz2 2194820 RMD160 10b3cea1f57d7775c1209103cdf88e738ea4ac28 SHA1 d5437aa0cb8e30315f18a4f8b694fa21387cfe3a SHA256 ccf2547c579755ec9b6f727add6bb327bbda95ac621aa6e0738fbd37ab6c9c78
 DIST gnome-terminal-2.30.2.tar.bz2 2250070 RMD160 cabf51649dafa6ccf0bbf2903fa081315d7e2933 SHA1 ab97acd3d70bdcc468975a49b23ebb05f6e9bc49 SHA256 2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1e8a6a10069e07a
-EBUILD gnome-terminal-2.26.3.1-r2.ebuild 1931 RMD160 489126dd915927a149e5c5aeb98670956a53afe0 SHA1 e94416a464a32a9015fa552df8f6c3c89ae562dc SHA256 37ce1683e8ed3c5bdd3257f49bc0c268423fe2b9493b517280558eb1d6ebfefd
-EBUILD gnome-terminal-2.28.2.ebuild 1421 RMD160 314dc7ac1df5e055a6833227a84cfbd88933b96e SHA1 2a08ad00a12af5e61bf018a7fab273a19c05a606 SHA256 3fb2841bb3ed674aa3c05e98499196f392e1cf702a80f49339415485c640f04d
+DIST gnome-terminal-2.32.0.tar.bz2 2322564 RMD160 f361d956f39b16250eab10039b57f4c9587a5056 SHA1 7eb7679930fd34fd33391eb96b95a1daaa64f6dd SHA256 3e9f922bea4af7f016b66f3204266c8993582c51a12f6cfdce47607202400725
 EBUILD gnome-terminal-2.30.2.ebuild 1268 RMD160 6cfbc70d2f1e7430da9c5dbb91656428ef324535 SHA1 d904c5d9ec3cc4f1654f3acebf47d759051d3708 SHA256 73ea10e0a42eb2fb4c1584f4f56f302de0dc06dc4d1da0c51f49c555b834eea2
-MISC ChangeLog 31899 RMD160 40746b1c553a6d01ce0f2ce62f525992ac9fa0a8 SHA1 52b13b90350531fbe72ee51f83e02e96cd502fc3 SHA256 10d5a8439ccdeea6c2a0f13dc881eccace8dd090bb83083220dea2e6b0191391
+EBUILD gnome-terminal-2.32.0.ebuild 1264 RMD160 3ffe1b50ae8996869ef29a476102b2b63905b399 SHA1 d6c6fdf0a1a542a2b03da5990e5d0101b4d4c32e SHA256 4d3bf82c1926786e5b09261d2a3f09780c07ada1ff36f025b9edf83e3f6c92f1
+MISC ChangeLog 32213 RMD160 a61b029efb1e2b306a5cb378de85670d39231cdc SHA1 da4b4cd754134a919a3df5bff745ea303f308abb SHA256 7b268228546a82a88ee09f1b55d95b46cf3c3233f2880a0793a063dd98ed4687
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAky/VpsACgkQ1fmVwcYIWAagSACeM5IzF/0ZxdgUVvo/s1lzvPx2
+NnUAnipNFq2P0uNo0G9FTc5qRfUoO7eG
+=ArDH
+-----END PGP SIGNATURE-----
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