Stable on x86 as part of GNOME-2.4.1

7 files changed, 9 insertions, 96 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 221b6decfaef..ea675a992db8 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.47 2004/01/06 18:51:21 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.48 2004/01/14 13:56:38 obz Exp $
+
+  14 Jan 2004; Mike Gardiner <obz@gentoo.org> gnome-terminal-2.2.1-r1.ebuild,
+  gnome-terminal-2.2.1.ebuild, gnome-terminal-2.4.2.ebuild:
+  Stable on x86 as part of GNOME-2.4.1
 
   06 Jan 2004; <gustavoz@gentoo.org> gnome-terminal-2.4.1.ebuild:
   marked stable on sparc
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 45e0d1eda875..45a7531639ae 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,16 +1,12 @@
 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 507f219d22c5b4a807f5885ebd7d27b5 gnome-terminal-2.2.1-r1.ebuild 1172
-MD5 1c8ee1520bc3b526ebe751df56862eba ChangeLog 5951
-MD5 e2d30038422f89012ed1c785436ff16f gnome-terminal-2.2.1.ebuild 1014
+MD5 62dc5bd4579917de0f3c642c58ba89ab ChangeLog 6124
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 bdc7ab49ea930498bac97bcb08417beb gnome-terminal-2.4.2.ebuild 1074
-MD5 4513cc772232b6e41dc1d057fa07d3a7 files/digest-gnome-terminal-2.2.1 73
+MD5 6695b8572fe02fc72f53fc615ac981a9 gnome-terminal-2.4.2.ebuild 1069
 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 4513cc772232b6e41dc1d057fa07d3a7 files/digest-gnome-terminal-2.2.1-r1 73
 MD5 206e36d5520f43272f029d6411af6332 files/gnome-terminal-2-dnd_url_add_space.patch 1000
 MD5 3c82681825a313b5d5342acb6f82cd8f files/digest-gnome-terminal-2.4.0.1 76
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.2.1 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.2.1
deleted file mode 100644
index a878d0f8829b..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 05603de355b2d4095cbd6f6ac0c438aa gnome-terminal-2.2.1.tar.bz2 874553
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.2.1-r1 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.2.1-r1
deleted file mode 100644
index a878d0f8829b..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 05603de355b2d4095cbd6f6ac0c438aa gnome-terminal-2.2.1.tar.bz2 874553
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.2.1-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.2.1-r1.ebuild
deleted file mode 100644
index f79b7e731f77..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.2.1-r1.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.1-r1.ebuild,v 1.4 2003/07/19 23:40:40 tester Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The Gnome Terminal"
-
-HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="~x86 ~ppc ~alpha sparc ~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 overwrite /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.2.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.2.1.ebuild
deleted file mode 100644
index 468188f6d346..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.2.1.ebuild
+++ /dev/null
@@ -1,41 +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.1.ebuild,v 1.12 2003/07/19 23:40:40 tester 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 overwrite /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
-}
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild
index b7b137573f41..0f4716aec91a 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild
@@ -1,13 +1,13 @@
 # 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.4.2.ebuild,v 1.1 2003/11/09 12:41:24 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild,v 1.2 2004/01/14 13:56:38 obz 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"
 SLOT="0"
 LICENSE="GPL-2"