re-enable patch to report as "gnome" and not "xterm". see #91055 and #122566. archs, this revision is not to be stabled with 2.14.2.

(Portage version: 2.1.1_pre3)
 (Unsigned Manifest commit)

7 files changed, 11 insertions, 194 deletions

diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 491caa499375..756dcbb2585a 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-terminal-2-default_shell.patch 490 RMD160 22b0e40dc8a6cae17d391e2e21dc0dda60201d23 SHA1 cb9a4b23285cc70eb36a17919463bd3796d7974f SHA256 89248a85b8c921274d336467ba355032d6621fb09efd1a6ab86c64ee90d69c5b
 MD5 1c5aaf13eb2a8bd0b2b03c529d5c8740 files/gnome-terminal-2-default_shell.patch 490
 RMD160 22b0e40dc8a6cae17d391e2e21dc0dda60201d23 files/gnome-terminal-2-default_shell.patch 490
@@ -9,58 +6,34 @@ AUX gnome-terminal-2-dnd_url_add_space.patch 1000 RMD160 e83cf094681389b3a82b5f9
 MD5 206e36d5520f43272f029d6411af6332 files/gnome-terminal-2-dnd_url_add_space.patch 1000
 RMD160 e83cf094681389b3a82b5f9c5cd40431ccaef810 files/gnome-terminal-2-dnd_url_add_space.patch 1000
 SHA256 d807989dc7aec88f1d01e9449a5d44232e5d01fb64bea91fb2a181bf3080116c files/gnome-terminal-2-dnd_url_add_space.patch 1000
-DIST gnome-terminal-2.10.0.tar.bz2 2334171
 DIST gnome-terminal-2.12.0.tar.bz2 1684178 RMD160 97343108571febee95991e76b0e60d4cf2ea60c8 SHA1 5a81e76968962d9e8acd077db8b4d14284f996e2 SHA256 e515509f2d07ab1360723b70345ac18b44c5525abc31cce48f135b43fbb444cc
-DIST gnome-terminal-2.14.0.tar.bz2 1732708 RMD160 41074d730584036df15786251c0bb2107d0b46c9 SHA1 5be15e2b7ace3d6b5103fa28ba0780cf88708be2 SHA256 238c28f937fd1a1b8f9c6ca9a7aed242287cc199ffa98c3c4342caeea0239286
-DIST gnome-terminal-2.14.1.tar.bz2 1783063 RMD160 4754269a493fcd5daca40a02b3a4b6901b9e0d3c SHA1 0f88f3c51b80a9e1995b185fc151e6db333caf80 SHA256 c1e7674bb75343db89ad6769bc2d7ecfb115d9eda02035d374d8c4d952091647
 DIST gnome-terminal-2.14.2.tar.bz2 1791473 RMD160 cb91ce96bceca12abda7ec50e16b48759c7f38a1 SHA1 a04bd803ced2de80415827318303308531cf6636 SHA256 bd7d500b16ecf1d6189f12ea5d936c218a3e1927ee5ce39119d3aeb8015cca91
-EBUILD gnome-terminal-2.10.0.ebuild 1161 RMD160 99ce5aac2ed8e80cf082c56e177332f2ef914c20 SHA1 5b7c38525afde0cc7a27e1825bcb37709838345b SHA256 cda235366ed0864865b8851cf3a305f2d8dd7af8622b9ef2e9e34f8f0018f24b
-MD5 f44e7916277f346bd86a5b21cd8f1851 gnome-terminal-2.10.0.ebuild 1161
-RMD160 99ce5aac2ed8e80cf082c56e177332f2ef914c20 gnome-terminal-2.10.0.ebuild 1161
-SHA256 cda235366ed0864865b8851cf3a305f2d8dd7af8622b9ef2e9e34f8f0018f24b gnome-terminal-2.10.0.ebuild 1161
 EBUILD gnome-terminal-2.12.0.ebuild 1215 RMD160 19d07f7d0217ab6b04424376a7a3814493787424 SHA1 0ca22ff7de452375751358ac7fcaf5565382e261 SHA256 e256043c33b799bb41a4bc5877fe0d12d2d9c3ce7875a3d50cda341ddf6b1d0e
 MD5 e44c17b0dfc422e07e2b616112faa043 gnome-terminal-2.12.0.ebuild 1215
 RMD160 19d07f7d0217ab6b04424376a7a3814493787424 gnome-terminal-2.12.0.ebuild 1215
 SHA256 e256043c33b799bb41a4bc5877fe0d12d2d9c3ce7875a3d50cda341ddf6b1d0e gnome-terminal-2.12.0.ebuild 1215
-EBUILD gnome-terminal-2.14.0.ebuild 1386 RMD160 9e049986c32c50cd189717ab30e506e4e1052ae3 SHA1 f646f9c98ccaf89f233b46adab3f2a20465f9d38 SHA256 be9f0cedf8b83bc2e916e463aa2bfcf49a5bb46ca4d477441118a0394d30f2a7
-MD5 2f66d061d67450f811e97f77ac0f1464 gnome-terminal-2.14.0.ebuild 1386
-RMD160 9e049986c32c50cd189717ab30e506e4e1052ae3 gnome-terminal-2.14.0.ebuild 1386
-SHA256 be9f0cedf8b83bc2e916e463aa2bfcf49a5bb46ca4d477441118a0394d30f2a7 gnome-terminal-2.14.0.ebuild 1386
-EBUILD gnome-terminal-2.14.1.ebuild 1381 RMD160 6b02d3ebd617454de8ae3fb13be08f2286fdee3a SHA1 4ecb7d30d4ee51162d2bc32e7387e5e5a858985a SHA256 aa1e1c490eeed350c5da33fe971070a09583e9d1b74984dcff25ca8ce046e724
-MD5 faabe33aba2c30ed15fc74643eb3f3c2 gnome-terminal-2.14.1.ebuild 1381
-RMD160 6b02d3ebd617454de8ae3fb13be08f2286fdee3a gnome-terminal-2.14.1.ebuild 1381
-SHA256 aa1e1c490eeed350c5da33fe971070a09583e9d1b74984dcff25ca8ce046e724 gnome-terminal-2.14.1.ebuild 1381
+EBUILD gnome-terminal-2.14.2-r1.ebuild 1509 RMD160 32c4b801c2370e54f0ece41fb8d8d5a0f3e2191b SHA1 46b9ab7f6d9b26669e9780ae81a53f53927046b0 SHA256 558077b263de48cfce5f84406c2166056f5f08897d1e2d037b267b2c49e43fa7
+MD5 ba43e6f37f4dc3e959b4985891c879a0 gnome-terminal-2.14.2-r1.ebuild 1509
+RMD160 32c4b801c2370e54f0ece41fb8d8d5a0f3e2191b gnome-terminal-2.14.2-r1.ebuild 1509
+SHA256 558077b263de48cfce5f84406c2166056f5f08897d1e2d037b267b2c49e43fa7 gnome-terminal-2.14.2-r1.ebuild 1509
 EBUILD gnome-terminal-2.14.2.ebuild 1317 RMD160 d38bc3cb5ba76d7e9256b8b6578b2f805e43268d SHA1 8512782eaf3fe7c3ac3cdcd45f6eaf457b3ab6ce SHA256 928eb26ffe8e5ddf47d5dbcf1f422e4d376977982d461921031a7902564942ef
 MD5 441f68d8116ed0ea9896b4390cb098df gnome-terminal-2.14.2.ebuild 1317
 RMD160 d38bc3cb5ba76d7e9256b8b6578b2f805e43268d gnome-terminal-2.14.2.ebuild 1317
 SHA256 928eb26ffe8e5ddf47d5dbcf1f422e4d376977982d461921031a7902564942ef gnome-terminal-2.14.2.ebuild 1317
-MISC ChangeLog 14432 RMD160 ea569df632f3fd16f09f651b7fa29dc7a8f4418a SHA1 23c05e303a38c328100b1680cdfa62dbadc289d7 SHA256 ced3a7e4154c43172fb4851e135dafd28df3ad05d44c34eb3ce26ef598957329
-MD5 b6b30727741054093d37d1565009e27f ChangeLog 14432
-RMD160 ea569df632f3fd16f09f651b7fa29dc7a8f4418a ChangeLog 14432
-SHA256 ced3a7e4154c43172fb4851e135dafd28df3ad05d44c34eb3ce26ef598957329 ChangeLog 14432
+MISC ChangeLog 14803 RMD160 9d779ccf832a2a9908e77a8acc54512347cda39c SHA1 ecd08cd93627ac169a7df29858fb8c0766d1df7f SHA256 3c480eedd210da891ea49f3f1061e2af3117548fbeebc5058d6c05d0fe68e0e2
+MD5 8d71506238f9ec9bfe01567dfb4dc8a7 ChangeLog 14803
+RMD160 9d779ccf832a2a9908e77a8acc54512347cda39c ChangeLog 14803
+SHA256 3c480eedd210da891ea49f3f1061e2af3117548fbeebc5058d6c05d0fe68e0e2 ChangeLog 14803
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 c6d9c33f98e008a1bb1ca3caa6028f8d files/digest-gnome-terminal-2.10.0 75
-RMD160 b38e9a8ef78de4c02a1523ff24e802f143030625 files/digest-gnome-terminal-2.10.0 75
-SHA256 1183e744dcf8788220b89c5f255e934317256c5552153875f15864ba3b079726 files/digest-gnome-terminal-2.10.0 75
 MD5 21b4f85823438c302c6b898668f4fa41 files/digest-gnome-terminal-2.12.0 271
 RMD160 59dd165df506942e4ce8e758d3385584cbefbc9a files/digest-gnome-terminal-2.12.0 271
 SHA256 a28d024491611da72e115bf1b65c0053e4824ca1687615176c7c7134ce2b6069 files/digest-gnome-terminal-2.12.0 271
-MD5 bbb4c2c708c0218fdd962f3149ba98fa files/digest-gnome-terminal-2.14.0 271
-RMD160 e58b4e2a98cb490d37e33b69d6d25d6e3309e7b4 files/digest-gnome-terminal-2.14.0 271
-SHA256 ca48e28b18161e78f01689c1e1c59f8f812b5072698d044d924dbd23a6f3dea7 files/digest-gnome-terminal-2.14.0 271
-MD5 4ec7d7e9d02a6399c3cdd389e21f0d33 files/digest-gnome-terminal-2.14.1 271
-RMD160 cdec291fa6ae99b4bcf936911c05d5194a4d70f6 files/digest-gnome-terminal-2.14.1 271
-SHA256 587249b8f6fdfe2960e53fbec50af5c6d5a97f6ac7a27e28cd05b0566bc03ed4 files/digest-gnome-terminal-2.14.1 271
 MD5 4560424497aec70c5bb6c4168ea77b5f files/digest-gnome-terminal-2.14.2 271
 RMD160 4df02c63f0744530bc2361b721a6a3e3995e5c26 files/digest-gnome-terminal-2.14.2 271
 SHA256 0cb7b5b28219d9c55ed688764f709cd6239050019046caf109a1e329c2ca6150 files/digest-gnome-terminal-2.14.2 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEu6BVomPajV0RnrERAqheAJ4sYYu7dI20uv1KsceWICHxx71kDwCfXr2p
-EwKdrrI58KS8qXPsufB5ftc=
-=YLM4
------END PGP SIGNATURE-----
+MD5 4560424497aec70c5bb6c4168ea77b5f files/digest-gnome-terminal-2.14.2-r1 271
+RMD160 4df02c63f0744530bc2361b721a6a3e3995e5c26 files/digest-gnome-terminal-2.14.2-r1 271
+SHA256 0cb7b5b28219d9c55ed688764f709cd6239050019046caf109a1e329c2ca6150 files/digest-gnome-terminal-2.14.2-r1 271
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.10.0 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.10.0
deleted file mode 100644
index 9c4fcbcf2c8a..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 062744daca0c7f708b8c52f47b5db0d1 gnome-terminal-2.10.0.tar.bz2 2334171
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.14.0 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.14.0
deleted file mode 100644
index 3837f5c9a4d5..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.14.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a05bac2c9d7b3860f137193c98d3d9a8 gnome-terminal-2.14.0.tar.bz2 1732708
-RMD160 41074d730584036df15786251c0bb2107d0b46c9 gnome-terminal-2.14.0.tar.bz2 1732708
-SHA256 238c28f937fd1a1b8f9c6ca9a7aed242287cc199ffa98c3c4342caeea0239286 gnome-terminal-2.14.0.tar.bz2 1732708
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.14.1 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.14.1
deleted file mode 100644
index 0efa1e92077d..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.14.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7abe60db5359c88392d2b4f0d5587ef5 gnome-terminal-2.14.1.tar.bz2 1783063
-RMD160 4754269a493fcd5daca40a02b3a4b6901b9e0d3c gnome-terminal-2.14.1.tar.bz2 1783063
-SHA256 c1e7674bb75343db89ad6769bc2d7ecfb115d9eda02035d374d8c4d952091647 gnome-terminal-2.14.1.tar.bz2 1783063
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.10.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.10.0.ebuild
deleted file mode 100644
index 49393a7c8729..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.10.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 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.10.0.ebuild,v 1.11 2005/08/23 21:49:22 agriffis Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/xft
-	>=x11-libs/gtk+-2.5.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.8
-	>=x11-libs/vte-0.11.10"
-
-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
-
-DOCS="AUTHORS ChangeLog README NEWS TODO"
-
-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
-
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.14.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.14.0.ebuild
deleted file mode 100644
index ccb18685a710..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.14.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 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.14.0.ebuild,v 1.2 2006/03/27 00:53:25 allanonjl Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static"
-
-RDEPEND="virtual/xft
-	>=x11-libs/gtk+-2.5.4
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.8
-	>=x11-libs/vte-0.11.10
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2
-	sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28
-	!gnome-base/gnome-core"
-# gnome-core overwrite /usr/bin/gnome-terminal
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-
-pkg_setup() {
-	G2CONF="$(use_enable static)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# 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
-
-	# patch gnome terminal to report as GNOME rather than xterm
-	# This needs to resolve a few bugs (#120294,)
-	# epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.14.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.14.1.ebuild
deleted file mode 100644
index bbbb079a9e47..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.14.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 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.14.1.ebuild,v 1.1 2006/05/02 03:15:46 dang Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static"
-
-RDEPEND="virtual/xft
-	>=x11-libs/gtk+-2.5.4
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.8
-	>=x11-libs/vte-0.11.10
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2
-	sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28
-	!gnome-base/gnome-core"
-# gnome-core overwrite /usr/bin/gnome-terminal
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-
-pkg_setup() {
-	G2CONF="$(use_enable static)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# 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
-
-	# patch gnome terminal to report as GNOME rather than xterm
-	# This needs to resolve a few bugs (#120294,)
-	# epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch
-}