New version, removed old versions

7 files changed, 22 insertions, 71 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 8bc0d32947b9..e2e65ddcbc3c 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.73 2004/11/12 03:35:58 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.74 2004/11/25 05:59:12 obz Exp $
+
+*gnome-terminal-2.6.1-r1 (25 Nov 2004)
+
+  25 Nov 2004; Mike Gardiner <obz@gentoo.org> -gnome-terminal-2.6.0.ebuild,
+  -gnome-terminal-2.6.1-r1.ebuild, +gnome-terminal-2.8.0.ebuild:
+  New version, removed old versions
 
   12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   gnome-terminal-2.7.3.ebuild:
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 9c0eccc55e86..389a4aa74dd9 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,17 +1,15 @@
-MD5 46dfc6d1e7c00a639c90f125ba4fd522 ChangeLog 8995
-MD5 2793c4049916cbc600a5625f1bbb1c4c gnome-terminal-2.4.2.ebuild 1185
-MD5 a98e78f25185fd007d7c1dc34dc216e4 gnome-terminal-2.6.0.ebuild 1232
+MD5 8603c16a7760885286f4f69a4e66c9d9 gnome-terminal-2.7.3.ebuild 1171
+MD5 002af2278387561c1737b8f6d937d47f gnome-terminal-2.8.0.ebuild 1154
+MD5 5158e87658a6bef923baefb4075a387c ChangeLog 9208
 MD5 be88af273f2aaa445d9b25fb58aba95c gnome-terminal-2.6.1.ebuild 1225
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 360cadae40b6adb1e629216761637df7 gnome-terminal-2.6.1-r1.ebuild 1319
-MD5 8603c16a7760885286f4f69a4e66c9d9 gnome-terminal-2.7.3.ebuild 1171
+MD5 2793c4049916cbc600a5625f1bbb1c4c gnome-terminal-2.4.2.ebuild 1185
 MD5 0992c11acfb7df9271bd526a65b6f1bb files/digest-gnome-terminal-2.4.2 74
-MD5 b3a6b960b39b9070746d366be76739f9 files/digest-gnome-terminal-2.6.0 74
 MD5 552d1014c29f7ae4902e4c25041d6c5d files/digest-gnome-terminal-2.6.1 74
+MD5 3885e2b37720a9a46954dc7e82c9fd7a files/digest-gnome-terminal-2.7.3 74
+MD5 110ffc42888f4ff8e943eb6a2f23d73e files/digest-gnome-terminal-2.8.0 74
 MD5 1c5aaf13eb2a8bd0b2b03c529d5c8740 files/gnome-terminal-2-default_shell.patch 490
-MD5 206e36d5520f43272f029d6411af6332 files/gnome-terminal-2-dnd_url_add_space.patch 1000
 MD5 307641ad0c36aecafbe97053c944098f files/gnome-terminal-2.4.2-shortcuts_fix.patch 1037
-MD5 235667e1b2901cfe549fc106471ecc38 files/gnome-terminal-2.6.1-gcc34_eggcell.patch 850
-MD5 552d1014c29f7ae4902e4c25041d6c5d files/digest-gnome-terminal-2.6.1-r1 74
+MD5 206e36d5520f43272f029d6411af6332 files/gnome-terminal-2-dnd_url_add_space.patch 1000
 MD5 e0fc64188ba086229362c19960003ffc files/gnome-terminal-2.6.1-select.patch 2071
-MD5 3885e2b37720a9a46954dc7e82c9fd7a files/digest-gnome-terminal-2.7.3 74
+MD5 235667e1b2901cfe549fc106471ecc38 files/gnome-terminal-2.6.1-gcc34_eggcell.patch 850
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.0 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.0
deleted file mode 100644
index edc97228f50c..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bbb9d4d6bddaec8611d4c002842ec5b8 gnome-terminal-2.6.0.tar.bz2 1911916
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.1-r1 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.1-r1
deleted file mode 100644
index c2538ac851c3..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 43e04260410e66e767a4b247d0af8b46 gnome-terminal-2.6.1.tar.bz2 1999378
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.8.0 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.8.0
new file mode 100644
index 000000000000..755456184420
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.8.0
@@ -0,0 +1 @@
+MD5 93e59f24b35bd867653664565adb4672 gnome-terminal-2.8.0.tar.bz2 2195403
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.6.1-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.6.1-r1.ebuild
deleted file mode 100644
index fea0d7791f5d..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 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.6.1-r1.ebuild,v 1.1 2004/08/18 06:57:04 obz Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The Gnome Terminal"
-IUSE=""
-HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="virtual/xft
-	>=x11-libs/gtk+-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2.4
-	>=x11-libs/startup-notification-0.4
-	>=x11-libs/vte-0.11"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29
-	!gnome-base/gnome-core"
-# gnome-core overwrite /usr/bin/gnome-terminal
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# Use login shell by default (#12900) 
-	epatch ${FILESDIR}/${PN}-2-default_shell.patch
-	# terminal enhancement, inserts a space after a DND URL
-	# patch by Zach Bagnall <yem@y3m.net> in #13801
-	epatch ${FILESDIR}/${PN}-2-dnd_url_add_space.patch
-
-	# gcc 3.4 fix
-	epatch ${FILESDIR}/${P}-gcc34_eggcell.patch
-
-	# patch for text-selection performance, (#52952)
-	epatch ${FILESDIR}/${P}-select.patch
-
-}
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.6.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.8.0.ebuild
index 444793a77dda..d349f38b0349 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.6.0.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.8.0.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2004 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.6.0.ebuild,v 1.10 2004/07/04 19:00:19 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.8.0.ebuild,v 1.1 2004/11/25 05:59:12 obz Exp $
 
 inherit gnome2 eutils
 
 DESCRIPTION="The Gnome Terminal"
 IUSE=""
 HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="x86 ppc alpha ~sparc hppa amd64 ~ia64 mips"
+
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
 SLOT="0"
 LICENSE="GPL-2"
 
 RDEPEND="virtual/xft
-	>=x11-libs/gtk+-2.2
+	>=x11-libs/gtk+-2.4
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-1.2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/gnome-vfs-2.4
 	>=x11-libs/startup-notification-0.4
-	>=x11-libs/vte-0.11"
+	>=x11-libs/vte-0.11.10"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
@@ -39,9 +40,6 @@ src_unpack() {
 	# patch by Zach Bagnall <yem@y3m.net> in #13801
 	epatch ${FILESDIR}/${PN}-2-dnd_url_add_space.patch
 
-	# gcc 3.4 fix
-	epatch ${FILESDIR}/${PN}-2.6.1-gcc34_eggcell.patch
-
 }
 
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
+DOCS="AUTHORS ChangeLog README NEWS TODO"