new version 'n cleanup

11 files changed, 47 insertions, 133 deletions

diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 07a637f7ca18..b1fd96cfcecc 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,19 +1,11 @@
-MD5 df3147f96470653948b26b0747d79a9b gnome-terminal-2.0.2.ebuild 796
 MD5 61f1ed4c5adec0486113818e1f1e5954 gnome-terminal-2.2.0.ebuild 861
-MD5 b41cd3978577f5add4f465b4793bc231 gnome-terminal-2.0.1.ebuild 853
-MD5 4a4dbee6788ed31f3a129714dc1b0628 gnome-terminal-2.0.0-r1.ebuild 841
-MD5 f87403854cbf56959336869b12782b9e gnome-terminal-2.2.2.ebuild 1165
+MD5 2045da128449e17ca9dfd0e4b5b9a41b gnome-terminal-2.2.2.ebuild 1163
 MD5 f87403854cbf56959336869b12782b9e gnome-terminal-2.2.1-r1.ebuild 1165
-MD5 1ec37ef0d6f20849665313a5c4cf6f4c gnome-terminal-2.0.0.ebuild 931
-MD5 17628ade1fde10d147136343be07d44e ChangeLog 3814
+MD5 3f57a0e37c8ff592c79d5c0f7affe806 ChangeLog 3934
 MD5 4eb0749069a48c28005bc8e5700be5a6 gnome-terminal-2.2.1.ebuild 1004
-MD5 3da275b4e646e068ac84ca1c0154e4c4 files/digest-gnome-terminal-2.0.0 73
-MD5 1f325123403bfb134b903108a998cdee files/digest-gnome-terminal-2.0.1 73
-MD5 11eb49490d94e008b6b005ce5cce12b0 files/digest-gnome-terminal-2.0.2 73
 MD5 f29df8dd0bbc7d89b4eeada7ab337e5c files/digest-gnome-terminal-2.2.0 73
 MD5 4513cc772232b6e41dc1d057fa07d3a7 files/digest-gnome-terminal-2.2.1 73
 MD5 1a505906f62f50ab4495b966126639cf files/digest-gnome-terminal-2.2.2 74
 MD5 1c5aaf13eb2a8bd0b2b03c529d5c8740 files/gnome-terminal-2-default_shell.patch 490
-MD5 3da275b4e646e068ac84ca1c0154e4c4 files/digest-gnome-terminal-2.0.0-r1 73
 MD5 4513cc772232b6e41dc1d057fa07d3a7 files/digest-gnome-terminal-2.2.1-r1 73
 MD5 206e36d5520f43272f029d6411af6332 files/gnome-terminal-2-dnd_url_add_space.patch 1000
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.0 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.0
deleted file mode 100644
index e58798502991..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8486e569451db6747184fbcbd4734bdf gnome-terminal-2.0.0.tar.bz2 533570
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.0-r1 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.0-r1
deleted file mode 100644
index e58798502991..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8486e569451db6747184fbcbd4734bdf gnome-terminal-2.0.0.tar.bz2 533570
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.1 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.1
deleted file mode 100644
index bf7aa6cb5512..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b98bfb8e7deb733ee2ff126c503ed139 gnome-terminal-2.0.1.tar.bz2 616470
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.2 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.2
deleted file mode 100644
index 3357323bb2f8..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a4a7e523e05296ede8d2a23029a8d50 gnome-terminal-2.0.2.tar.bz2 684517
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
new file mode 100644
index 000000000000..84660884ae3d
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.2.2
@@ -0,0 +1 @@
+MD5 30140540966ba84597e257054a232e99 gnome-terminal-2.2.2.tar.bz2 1317607
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.0.0-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.0.0-r1.ebuild
deleted file mode 100644
index b6feebf08810..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,30 +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.0.0-r1.ebuild,v 1.6 2003/02/13 17:34:37 vapier Exp $
-
-inherit gnome2
-S=${WORKDIR}/${P}
-DESCRIPTION="The Gnome Terminal"
-
-SRC_URI="mirror://gnome/2.0.0/sources/${PN}/${P}.tar.bz2"
-
-HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="x86 ppc"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND=">=x11-libs/pango-1.0.3
-	>=x11-libs/gtk+-2.0.5
-	>=x11-libs/libzvt-2.0.0
-	>=gnome-base/libglade-2.0.0
-	>=gnome-base/gconf-1.2.0
-	>=gnome-base/libgnomeui-2.0.1
-	>=app-text/scrollkeeper-0.3.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	!gnome-base/gnome-core"
-# gnome-core overwrite /usr/bin/gnome-terminal
-
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS TODO"
-
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.0.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.0.0.ebuild
deleted file mode 100644
index 6fd86cf2f5ae..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +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.0.0.ebuild,v 1.5 2003/02/13 17:34:41 vapier Exp $
-
-inherit gnome2
-S=${WORKDIR}/${P}
-DESCRIPTION="The Gnome Terminal"
-
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${PN}/${P}.tar.bz2
-	 ftp://archive.progeny.com/GNOME/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-
-HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND=">=x11-libs/pango-1.0.0
-	>=x11-libs/gtk+-2.0.0
-	>=x11-libs/libzvt-1.99999.0
-	>=gnome-base/libglade-2.0.0
-	>=gnome-base/gconf-1.1.11
-	>=gnome-base/libgnomeui-2.0.1
-	>=app-text/scrollkeeper-0.3.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	!gnome-base/gnome-core"
-# gnome-core overwrite /usr/bin/gnome-terminal
-
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS TODO"
-
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.0.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.0.1.ebuild
deleted file mode 100644
index 934ac6de7486..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.0.1.ebuild
+++ /dev/null
@@ -1,30 +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.0.1.ebuild,v 1.8 2003/02/13 17:34:47 vapier Exp $
-
-inherit gnome2
-S=${WORKDIR}/${P}
-DESCRIPTION="The Gnome Terminal"
-
-SRC_URI="mirror://gnome/2.0.0/sources/${PN}/${P}.tar.bz2"
-
-HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="x86 ppc sparc alpha"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND=">=x11-libs/pango-1.0.4
-	>=x11-libs/gtk+-2.0.6
-	>=x11-libs/libzvt-2.0.0
-	>=gnome-base/libglade-2.0.0-r1
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/libgnomeui-2.0.1
-	>=app-text/scrollkeeper-0.3.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	!gnome-base/gnome-core"
-# gnome-core overwrite /usr/bin/gnome-terminal
-
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS TODO"
-
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.0.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.0.2.ebuild
deleted file mode 100644
index c8e4e707a632..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.0.2.ebuild
+++ /dev/null
@@ -1,28 +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.0.2.ebuild,v 1.6 2003/02/13 17:34:53 vapier Exp $
-
-inherit gnome2
-S=${WORKDIR}/${P}
-DESCRIPTION="The Gnome Terminal"
-
-HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="x86 ~ppc ~sparc alpha"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND=">=x11-libs/pango-1.0.4
-	>=x11-libs/gtk+-2.0.6
-	>=x11-libs/libzvt-2.0.0
-	>=gnome-base/libglade-2.0.0-r1
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/libgnomeui-2.0.1
-	>=app-text/scrollkeeper-0.3.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	!gnome-base/gnome-core"
-# gnome-core overwrite /usr/bin/gnome-terminal
-
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS TODO"
-
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.2.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.2.2.ebuild
new file mode 100644
index 000000000000..305f8d43d18f
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.2.2.ebuild
@@ -0,0 +1,44 @@
+# 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.1 2003/06/03 10:52:32 foser Exp $
+
+inherit gnome2 eutils
+
+S=${WORKDIR}/${P}
+DESCRIPTION="The Gnome Terminal"
+
+HOMEPAGE="http://www.gnome.org/"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+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"