gnom2 2.6 commit

7 files changed, 17 insertions, 55 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index aa13c65bc30b..46e61fb85e0c 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.52 2004/03/17 00:56:40 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.53 2004/03/20 23:24:10 foser Exp $
+
+*gnome-terminal-2.5.90 (20 Mar 2004)
+
+  20 Mar 2004; foser <foser@gentoo.org> gnome-terminal-2.5.90.ebuild :
+  Gnome 2.6 commit
 
   16 Mar 2004; Stephen P. Becker <geoman@gentoo.org>
   gnome-terminal-2.4.2.ebuild:
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index f05d2ba28b42..7f3af68b22a9 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,12 +1,10 @@
 MD5 736c438924556e2238ac9e7dbd0c2e9e gnome-terminal-2.4.0.1.ebuild 1077
-MD5 3af121ab75424dfc5a12635c73449daf gnome-terminal-2.4.1.ebuild 1071
-MD5 4a6e6949913e3381857354b7b8eb78e0 gnome-terminal-2.2.2.ebuild 1180
-MD5 a1aadda583b24eece1bff45c9a818d8b ChangeLog 6544
+MD5 48d4f9829da0c87cf2d3cf2f84d07524 ChangeLog 6672
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 4ad4d6a37b6ef18bdef7e971e097ff3d gnome-terminal-2.5.90.ebuild 1171
 MD5 d4f0999daf7e195c2a30841e470172d9 gnome-terminal-2.4.2.ebuild 1079
-MD5 1a505906f62f50ab4495b966126639cf files/digest-gnome-terminal-2.2.2 74
-MD5 6bba8fd42ae09e28e3c0da03d46460eb files/digest-gnome-terminal-2.4.1 74
 MD5 0992c11acfb7df9271bd526a65b6f1bb files/digest-gnome-terminal-2.4.2 74
 MD5 1c5aaf13eb2a8bd0b2b03c529d5c8740 files/gnome-terminal-2-default_shell.patch 490
 MD5 206e36d5520f43272f029d6411af6332 files/gnome-terminal-2-dnd_url_add_space.patch 1000
 MD5 3c82681825a313b5d5342acb6f82cd8f files/digest-gnome-terminal-2.4.0.1 76
+MD5 e58437bb53f2698b191f543d1e82ae85 files/digest-gnome-terminal-2.5.90 75
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.2.2 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.2.2
deleted file mode 100644
index 84660884ae3d..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30140540966ba84597e257054a232e99 gnome-terminal-2.2.2.tar.bz2 1317607
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.4.1 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.4.1
deleted file mode 100644
index 34d568866dd4..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 387509327d4a0a3e9d0cee4830d42b26 gnome-terminal-2.4.1.tar.bz2 1672158
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.5.90 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.5.90
new file mode 100644
index 000000000000..66ffb79a8dd4
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.5.90
@@ -0,0 +1 @@
+MD5 97f5310b15cae23289f7df06c4aa654b gnome-terminal-2.5.90.tar.bz2 1857818
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.2.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.2.2.ebuild
deleted file mode 100644
index 780462c1d9c3..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.2.2.ebuild,v 1.5 2003/09/23 16:13:37 darkspecter Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The Gnome Terminal"
-
-HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="x86 ppc ~alpha ~sparc ~hppa ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/libgnomeui-2
-	>=x11-libs/startup-notification-0.4
-	>=x11-libs/vte-0.10.4"
-
-# 2.1.x+ needs cvs version
-#	x11-libs/libzvt"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	!gnome-base/gnome-core"
-# gnome-core overwrites /usr/bin/gnome-terminal
-
-G2CONF="${G2CONF} --with-widget=vte"
-
-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
-}
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.4.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.5.90.ebuild
index 1d24d29b657d..b355963d7f20 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.4.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.5.90.ebuild
@@ -1,26 +1,30 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.4.1.ebuild,v 1.5 2004/01/06 18:51:21 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.5.90.ebuild,v 1.1 2004/03/20 23:24:10 foser Exp $
 
 inherit gnome2 eutils
 
 DESCRIPTION="The Gnome Terminal"
 
 HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="x86 ~ppc alpha sparc hppa ~amd64"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
 SLOT="0"
 LICENSE="GPL-2"
 
-RDEPEND=">=x11-libs/gtk+-2.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