summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-11-13 12:42:17 +0000
committerPacho Ramos <pacho@gentoo.org>2014-11-13 12:42:17 +0000
commite7466dea29e04e8932375991cd1571132a39a5f7 (patch)
treeaee7867c31738eed1a4a1f19cd0e60a455c6863f /x11-terms
parentDrop old (#508854) (diff)
downloadhistorical-e7466dea29e04e8932375991cd1571132a39a5f7.tar.gz
historical-e7466dea29e04e8932375991cd1571132a39a5f7.tar.bz2
historical-e7466dea29e04e8932375991cd1571132a39a5f7.zip
Drop old (#508854)
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/gnome-terminal/ChangeLog11
-rw-r--r--x11-terms/gnome-terminal/Manifest28
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch24
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-appmenu-parameter.patch26
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch36
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-window-resize.patch30
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild50
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild79
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-3.12.2.ebuild80
9 files changed, 14 insertions, 350 deletions
diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 64cfba129da2..20d1114cb784 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for x11-terms/gnome-terminal
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.291 2014/07/23 15:38:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.292 2014/11/13 12:42:16 pacho Exp $
+
+ 13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+ -files/gnome-terminal-3.10.2-sys-wait.h.patch,
+ -files/gnome-terminal-3.12.0-appmenu-parameter.patch,
+ -files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch,
+ -files/gnome-terminal-3.6.1-window-resize.patch,
+ -gnome-terminal-2.32.1-r1.ebuild, -gnome-terminal-3.10.2.ebuild,
+ -gnome-terminal-3.12.2.ebuild:
+ Drop old (#508854)
23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gnome-terminal-3.12.3.ebuild:
Stable for x86, wrt bug #512012
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 70313799bc6d..a8a045b3a9b9 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,40 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX gnome-terminal-3.10.2-sys-wait.h.patch 594 SHA256 e04e5f28540405d0a0527d641eafb5cef7e59bd61a493f1dee8832da41505bb9 SHA512 ccdb38bc1b7c987ac7dc6472e0cb79ed1bb791f3ba3f63d79bbf39e27a08d489351f703d3d7fe1c8fb6d4d188fc74c3e83967ef47d11e407e718d3e626770849 WHIRLPOOL 2593cc31c9e23d2ef6d005f199f2f98b5068d1a94a1e28723930b5b136ff1334dcaaebe21b1029666857541d16d13fb864c92f06c162dc08e5b0b77bd01eeadc
-AUX gnome-terminal-3.12.0-appmenu-parameter.patch 856 SHA256 5aec428761d647d0b546da42b21b7ab2bd3918864f6d6a46bd94cb150af40e3d SHA512 4fc69e1240376f6a860fd69edae14ff2fe07a45072a78d7936744e36d8882fea51120e16a016bd624328d08c9b63455d38382e4140f88f43cc0dfd3260629041 WHIRLPOOL e9dae2c04cbe2d69f553fd7b6a2a1f636852be0dcccf017e4c4086c95ee57b1f51ea2796bf44738de8d1e3192bf54da2bc87543aa00cb59bc201c189603bdc45
AUX gnome-terminal-3.12.0-fallback-title-1.patch 901 SHA256 afd9449ba6fd07ca20abb17b7ac775cb1bd82b1fb9a79e4192afe2ee9f8dea6c SHA512 672970741dff96112f9ea0919db59f19462fb3bfcfd5a67ad8233b006149442ae0ff479e96adee8f20cb6e7ab27d43f101a8e1a50a8345b4654fbb001d587be9 WHIRLPOOL b96c0af51f084302565013377a10ef2b0ff30bae28c393effd8d55be105a9bfbf5e66c019a72ff4fb2e7e44b59964e382cd307635a01747313e08ce59fe53044
AUX gnome-terminal-3.12.0-fallback-title-2.patch 811 SHA256 f14effa2bbc4dbb01a0d43541035ba3d98afcf8ff07e337eff515fcab301be65 SHA512 5f3a1c32289f37062e6ca42576717af412a06702280f56f06d1193b071a6020e666f00764abe21fbcb10d167d0edbd900f8f3536ff0c79e5523cf22983ab6a42 WHIRLPOOL 9218f75ecaee483733b999961e8a52fee1c1a8c1899a59c48e88818adb6427aec12773cca2d76aa589b6c8c73c77e3ed51aa690553783cbd115bf16670b7aec2
AUX gnome-terminal-3.12.0-remove-set-title-feature-0.patch 5613 SHA256 9288c88b00368126f1d83406f0726544dc4ed61885ceeec644796ff077df7667 SHA512 b29a6de0aeca14977efea8c7ba7e6dd4d8bafbfdacd390e9ddd96e8e3731a4bb5009e14c6f222c1d224bca92e2d83f6cf32a9e93450b14c31de64dc58c5d05fd WHIRLPOOL 0c9ba3e7b9aa619b87d1b63978f6182e88c614846e38620704f4f6d6696c82cf9504eb76bd68764e1775ceefab01100f2ceb21d1410eb39c375dbbef228f3ac9
AUX gnome-terminal-3.12.0-remove-set-title-feature-1.patch 8886 SHA256 75b99525a8bd7cba13c25069dd549ac9492a6423a15b99ed2713a9a9a217c2bb SHA512 4e32e85b6b4601fca23e723f999376437eaf82e4bfdd98ac79bd3a590b0d6cadfe29755e1cfb434f15fb68abe240dd3e5ea55f8724c00ac8bc229556e69e3305 WHIRLPOOL eafe812c320a19655b3f5c7ffc7e147c9daa64cc87b00e09f791d2a056ed41c988f1a5a6e45d547466881d3270c6a505c4b7a8f03e00b300b8de17740620ddbf
AUX gnome-terminal-3.12.0-remove-set-title-feature-2.patch 10871 SHA256 6871c5372b0f9af73cce4e816dd75e077f717b1030c4be0416b912ffb4e965d3 SHA512 97dedb17d542f18ab6280cbfe16bbeeb77b8f9b1761898f50e471d091ec445229c83d9f07960a34011c3d32d316c898e1d3846c8d6c847b92ea95aac7d00d248 WHIRLPOOL b611cc240664068d5f772658a28ef2f330dd4e5ae8ec8ef865c551f60da9e74fe7b317842bd56551ad7cd1e69b0698943cb2b7be67bfe0928bc3267efe39f682
AUX gnome-terminal-3.12.0-remove-set-title-feature-3.patch 5952 SHA256 ef6d829de0e87ccc1784ce437cc98ded1322ee6dcd6fd23deebe170ef6eade26 SHA512 a80dd10f5f0c2b0da4bfde579e38197958dd8de746fa19d634f2e10fc54e7f60e56c47eb2448ee166758d7c7b196af21c4f4859d5fd27cfef856bc1b50670da3 WHIRLPOOL 2aa15816a19c3f663c908a8aba0652292a5c19be5f29d9aa25696bc2368c578ac7f44fca0f8ec4139e89f6f2caa4def38ab769e38616e0ac5034549500e4d183
-AUX gnome-terminal-3.6.1-no-gnome-doc-utils.patch 818 SHA256 e6163f5e2794d238bd0bfe7c1997e423774a4579dcdb7e0d5108bc2247108634 SHA512 9c26ee63497f886b5cb3b779a7b7e08beeac8276349db0141c0544f94193305c640aecc6accb1cd9ce8cc8e0a66250a3bc46f735fededd5c0ceb16710d112ff2 WHIRLPOOL aa8c41d02febc9025d64b7140d93620899e6f4d3cbc55aeac51b15055fd3deebffb670f1e9814287d7e4e8608ab908f10a2a7b0c223d0d53c22b07561ec21a2f
-AUX gnome-terminal-3.6.1-window-resize.patch 986 SHA256 1ce91e6d4bf7ab8220ddadf1875a0ca065a2ff5a76653c5e7883bb45152522f2 SHA512 3df4ff654bdfbd12527bfc7c86da09bdcd064f4abd5eb53c1293e409c88fa279541857b06183581ec4b3bcee1a73af0d59f86218bad84be280bdd8ae6ca335ee WHIRLPOOL 50efc479dc2f8bc229c307d5717a11b8cd07d5d058f13d807d50fab359803b7201a698bcca79019ddf718197d15f0bf353bc8dfe121fe15281f8e9749c01bd22
-DIST gnome-terminal-2.32.1.tar.bz2 2319315 SHA256 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb SHA512 791591ecd219f605ae815c7ef6d464889f628124e077052805a6890508c570d635c8677d2a83262aa2029bdf9db3e6fb3294cb57bd988ac47534dc7023858f66 WHIRLPOOL 11c27188d5e0a8dd29c13130f84695dd30548c0cca263dcc723b4a63a6fd13b0503c439a0e5c9502cf5d335dd60b04f2caec2fb967fc8b13e96dd17b904aef72
-DIST gnome-terminal-3.10.2.tar.xz 1698184 SHA256 e02827c29de45c09973483d821ab29ea60ab3fbba34b62a81d67b8304a9ad913 SHA512 82a7667ccfdfc5e7d71827cea180c5381d8323d64c89de9916c104d3ef3d35d77b02e7a4af99f32437eeefa03e550ffd7cd7b1ac1b39a8a166e2e4db2239a169 WHIRLPOOL b0999d86230efa3eae390ed2b80c67bc3c1463b0552e574692f72246c7b4062176cf589624b1d88b5cd3a3346d3427c99df9113c8560623fcd1f5a1cd976f076
-DIST gnome-terminal-3.12.2.tar.xz 1706508 SHA256 ea19ce610af2873d26e1e75491415e17af6a5080366db966f9220fdeea5ebecd SHA512 0640167d2e41026944d7a6ccbf9bce41361a8398eb203e61660d9cf4b2ae0659cccc2720803a23fd43fd15522a79fd4f8d38fbc212db495072acb207b4a25c7e WHIRLPOOL 8a19cbed70e75847af191991d83210b74f32212cb9ce8b86143bb82632f2e476267b9ac8da0a7292785eae4767c13a33d0c113c9a9ee4bd64d551adaeb9bd91e
DIST gnome-terminal-3.12.3.tar.xz 1720988 SHA256 8450da259fb485289d61fdbe5b59037be068e0dbdd5c7dd8216b60cd49d55528 SHA512 b155600483129c0e592d0a9604fd7826f2f41633bebf9df5ed459b12c154d3f1e505b10a93e129c22b24215b7cdaa97acac9c4897a85256553fda1394e76ac48 WHIRLPOOL 6fbd2cd546e45a95a37493443c7e34c73dd17b39884882ff4cc4a46b4c5d189d7601f35b2f0ad39535c9693f55b84a9d46bc1d3a8404537dc0d5c26b415e5e0f
-EBUILD gnome-terminal-2.32.1-r1.ebuild 1514 SHA256 963b028cfc0f7182474b18b28c36d02783244033d47449900677f1390fc8868a SHA512 f684fe3bee16e4cf59a35789da204649a1c50f8b8dea034229d2c47888758542bbd5a95e1c85bd06b79f4a38517586753434ea208b05ff6c540b6da422b862d3 WHIRLPOOL 28244e12fd519bf00bcf73a2e98caa7265d7e0f4469adc8770d3d4cf060001bb2fba22ee2831b7643694ec7a94c840714e60f4536567e50bb3afe6df419689b5
-EBUILD gnome-terminal-3.10.2.ebuild 2280 SHA256 2fa30fff04418720142c46d4e7937089898e862c78d51b9e3552db6d2bab19ca SHA512 3c78cc5470e7b11a7852be4420080414d54d1803051acbaf4095c6b5fd81cca1904a6400559861146f2a4787271cae338b7887217bb0cad2b3fb974c4c60f350 WHIRLPOOL 0831e6d250874211218c86e71116777a3b7cc265c96fbae1c4b8d0ed297d8a711edc187afe982ee5dd6bbc7ef83b266c78967c31275b908ac938daf17474e797
-EBUILD gnome-terminal-3.12.2.ebuild 2346 SHA256 1c57c1d2ba7324aa628d6a4485bd858fd4ce1992265207978938d6bbd4552e8b SHA512 29b321c252732f3b36be5dc72ca6fba529e282742a3f25ad4fe13de124496a236d316cf925500c814a77472b7887e88e31d112622dc3b5df5f64fb54f68f8b11 WHIRLPOOL 475d08ecd7bdd49ccfedd1065acb19315c3af0a553f485e29a2da05e33866fa9b2fe4dfb42d1fc27532e88793fd054b08a1a199c5db1de22e92eccc93daf4c56
EBUILD gnome-terminal-3.12.3.ebuild 2342 SHA256 703a02a87f974b44e7a28f4b30c280cc0512f195259f6764e7029a8cd315e529 SHA512 e3356625d0a24444c02fda9664af13bdcb2f1e815c31272dcf1e09ac56d07a363e0804cbd703f828a4a15dea760b8e33205a4a2e4eb17ea67d04b6c2c0bd489f WHIRLPOOL 37d13812b9c64f0eca03fd37c704f89f2c9b5e4563ec2dd0ff4a8f19b4d072f3eea80e48889076fe59bdfe4030f3254073ee28a0aef40773b6b1ce1d4233fc4c
-MISC ChangeLog 42848 SHA256 678913950b6892723fbd8c5a8ab9b4e72c82c340fe94aae23a1ca61c2c098857 SHA512 8caf84631c7dcd4d18e2ec4568fa55c93e676a8da25c9333f2519ae66417e6244c9788591bdc91f84e275976ca5cbb977e6393f10d0ea21ec668fd48665e012d WHIRLPOOL 0a93cfc24e0470f477c8ae0d4b92f43ea942d81cd3c9f4c2bc71fe8b19583056c8d0097896a30f54133e71b86cfd0765540de78e8e7ed4e6b33b0e44ea15ec73
+MISC ChangeLog 43230 SHA256 712d910605a320b95ae3aa1b78b49f6177a82f68b5a539353da1a6a928d491b8 SHA512 9b6e8a19c437a2e8e2ba52952779cc2f1b5bcd3d5b5ce2f79069888456314d091a8effdaf05cb3c49677f13b051ba98259025087d8ad3b9afd8faef95f3c3e9c WHIRLPOOL ac7090a49ce4ee020b464459e6ccab6270dd6ce110702f74e21e71ac4bc4970d16370e23027749cb626d44e425c83f2b016b46b87cd79fba25b15121923bfaa3
MISC metadata.xml 326 SHA256 181cdd492d55b5179008e3a36c4b3bc0cdd8ab896e0e54bbbf9e98d7a3362da3 SHA512 f66ce7d9b1e6282bb6922c92c6f09ee343961ad5ce9d52db46c587f5b2c66088797529264b13ff5d6a5fdc7f30e9989ac37101e6b881fef085f571c9b249fc0b WHIRLPOOL b0324d62b86672f0f785279e02f10207fd254b17b71b927a6c86ef1b31ecf9c0fb4144dc45c541dc5e70600164674c52b14bcd09536bb7294cd7b896382081e5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJTz9cPAAoJELp701BxlEWfs1EQAL3X5ZdxN/hctsaTDMCVXXs/
-NPtP9PBBDHS2DcMTg5lzTxEOGizbZ6JMWupt1j/YWh/XJHujn4Uc7eKxiT+a26hK
-PbUpfN5sUgCzhZLHldvGKzfQE2koEFvSkaBkLwyhzRWJsTsyQnDAqJAMfDK+2eaA
-dXqg0cOI/5lcH7ld/TiWtkgNspoZAlLZUMb1QBxZ5GK0BDZypc4aMij6yvidmIud
-0qAWdVEFW5HBjqGWDbxngP/GEg86ScFMqS3O8NLIk3LdB+S72j2YVP03RhFmZhua
-jxsGmYcSCttfNpMSUloGczw4eK7NYD22IcbdjFRQt4xOoWKSOeizyNSS4HYRdgGA
-2NJ55sGxTDhAOcc4JrWsBpIYIrakLzE+mqNXaJHNgATzxvHdJcSjSSA5FFQvX8rW
-gsy+Y51gaAfLIU6+9evGDJ53s/MhFw0pl9VXSbj7Rszhx8PvBjWEwRDDcgZ8ijXM
-aoQIEAPmT6GARzwpPISNr5EcvAe04I7dYq92nO5WHixDHfuyVXajBuRs8IjlYbYm
-qzlPffwSVlVxNSgMATy6EcgrUjNRNxrsOnjiYtCrpBi+elFz9RAQMH8eNWNZ5Dju
-WnhSR0TdgfgOKBEWLf6elazuGsf5FnWindEWdFJxDElbJByMLvLKIRG9OtCFzSFc
-dkL4WhKFr7+eI2VTJlVl
-=g9Cw
+iEYEAREIAAYFAlRkpykACgkQCaWpQKGI+9RG5QCcChjhOGKeSGm7Q5igUgLtFLFU
+jwkAn0PmsCIDi+tKmDt9Kk55vTjW+ieD
+=V354
-----END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch
deleted file mode 100644
index b51d03c0c55f..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4c82fe8c37718ce2d6040a48d4e643ae6d862be6 Mon Sep 17 00:00:00 2001
-From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
-Date: Mon, 1 Apr 2013 11:23:36 +0200
-Subject: [PATCH] Pull in sys/wait.h for WIFEXITED/WEXITSTATUS
-
----
- src/terminal-app.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/terminal-app.c b/src/terminal-app.c
-index 448e1ae..a92826c 100644
---- a/src/terminal-app.c
-+++ b/src/terminal-app.c
-@@ -41,6 +41,7 @@
- #include "terminal-defines.h"
- #include "terminal-prefs.h"
-
-+#include <sys/wait.h>
- #include <errno.h>
- #include <string.h>
- #include <stdlib.h>
---
-1.9.1
-
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-appmenu-parameter.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-appmenu-parameter.patch
deleted file mode 100644
index 46a0b8ffa0c3..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-appmenu-parameter.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d58bc01a2e891e31e11f03eb0d6ae9b5ff260b2b Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Mon, 24 Mar 2014 15:16:22 +0100
-Subject: [PATCH 02/61] appmenu: Fix action parameter
-
-https://bugzilla.gnome.org/show_bug.cgi?id=726942
----
- src/terminal-appmenu.ui | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/terminal-appmenu.ui b/src/terminal-appmenu.ui
-index 148c640..01ff5a8 100644
---- a/src/terminal-appmenu.ui
-+++ b/src/terminal-appmenu.ui
-@@ -21,7 +21,7 @@
- <item>
- <attribute name="label" translatable="yes">_New Terminal</attribute>
- <attribute name="action">win.new-terminal</attribute>
-- <attribute name="target">'default'</attribute>
-+ <attribute name="target" type="(ss)">('default','default')</attribute>
- </item>
- </section>
- <section>
---
-1.9.0
-
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch
deleted file mode 100644
index 369bc9e61064..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ce8ba57e66b1e7dca878a446ce13977a33827feb Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 21 Jan 2013 15:11:54 -0500
-Subject: [PATCH] Don't check for gnome-doc-utils, we are no longer using them.
-
-Restore GNOME_COMMON_INIT to match gnome-terminal 3.7.x.
----
- configure.ac | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index bfa1c8a..e056d16 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,8 +32,7 @@ AC_HEADER_STDC
- AM_PROG_LIBTOOL
- IT_PROG_INTLTOOL([0.40.0])
-
--# User documentation
--YELP_HELP_INIT
-+GNOME_COMMON_INIT
-
- GNOME_DEBUG_CHECK
-
-@@ -154,7 +153,7 @@ AC_SUBST([GTK_BUILDER_CONVERT_FLAGS])
- # Documentation
- # *************
-
--GNOME_DOC_INIT
-+YELP_HELP_INIT
-
- # ****************************
-
---
-1.8.1.1
-
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-window-resize.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-window-resize.patch
deleted file mode 100644
index efe60b991e51..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-window-resize.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 611e93f2f8c0c18ed8d365ecb850258e8d5c9c12 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Wed, 16 Jan 2013 22:52:03 +0100
-Subject: [PATCH] window: Use the geometry of the active screen
-
-When we get the restyle on focus-out, the screens call terminal_window_set_size()
-directly. This was causing the window to revert to a previous size, see bug
-https://bugzilla.gnome.org/show_bug.cgi?id=688959 .
----
- src/terminal-window.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index ed509ba..1740247 100644
---- a/src/terminal-window.c
-+++ b/src/terminal-window.c
-@@ -2330,6 +2330,10 @@ terminal_window_set_size_force_grid (TerminalWindow *window,
- int grid_width;
- int grid_height;
-
-+ /* Only update the geometry from the active screen. */
-+ if (window->priv->active_screen != screen)
-+ return;
-+
- /* be sure our geometry is up-to-date */
- terminal_window_update_geometry (window);
-
---
-1.8.1.1
-
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild
deleted file mode 100644
index 1595771f00ab..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 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.32.1-r1.ebuild,v 1.12 2014/01/02 23:58:54 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-# libgnome needed for some monospace font schema, bug #274638
-RDEPEND=">=dev-libs/glib-2.25.12:2
- >=x11-libs/gtk+-2.18:2
- >=gnome-base/gconf-2.31.3
- >=x11-libs/vte-0.26.0:0
- x11-libs/libICE
- x11-libs/libSM
- gnome-base/libgnome"
-DEPEND="${RDEPEND}
- || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
- sys-devel/gettext
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- >=app-text/gnome-doc-utils-0.3.2
- >=app-text/scrollkeeper-0.3.11"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_prepare() {
- # fix underlinking, bug #496804; avoid eautoreconf
- sed -e 's/SMCLIENT_PKGS="sm"/SMCLIENT_PKGS="sm ice"/' -i configure.ac configure || die
- gnome2_src_prepare
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if [[ ${REPLACING_VERSIONS} < 2.32.1-r1 ]]; then
- elog "Gnome Terminal no longer uses login shell by default, switching"
- elog "to upstream default. Because of this, if you have some command you"
- elog "want to be run, be sure to have it placed in your ~/.bashrc file."
- fi
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild
deleted file mode 100644
index f3dfc30fa19d..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild,v 1.6 2014/03/25 04:08:58 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 readme.gentoo
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://help.gnome.org/users/gnome-terminal/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+nautilus"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X]
-RDEPEND="
- >=dev-libs/glib-2.33.2:2
- >=x11-libs/gtk+-3.6:3[X]
- >=x11-libs/vte-0.34.9:2.90
- >=gnome-base/dconf-0.12
- >=gnome-base/gconf-2.31.3
- >=gnome-base/gsettings-desktop-schemas-0.1.0
- sys-apps/util-linux
- x11-libs/libSM
- x11-libs/libICE
- nautilus? ( >=gnome-base/nautilus-3 )
-"
-# gtk+:2 needed for gtk-builder-convert, bug 356239
-DEPEND="${RDEPEND}
- || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
- >=dev-util/intltool-0.40
- >=gnome-base/dconf-0.14.0
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened
- tab you will need to add the following line to your ~/.bashrc:\n
- . /etc/profile.d/vte.sh"
-
-src_prepare() {
- # patch from 3.12, fixes buld on non-glibc systems
- epatch "${FILESDIR}/${PN}-3.10.2-sys-wait.h.patch"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # FIXME: leave smclient configure unset until it accepts values from the
- # switch and not from GDK_TARGET, bug #363033
- gnome2_src_configure \
- --disable-static \
- --enable-migration \
- $(use_with nautilus nautilus-extension) \
- ITSTOOL=$(type -P true)
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog HACKING NEWS"
- gnome2_src_install
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if [[ ${REPLACING_VERSIONS} < 3.6.1-r1 && ${REPLACING_VERSIONS} != 2.32.1-r1 &&
- ${REPLACING_VERSIONS} != 3.4.1.1-r1 ]]; then
- elog
- elog "Gnome Terminal no longer uses login shell by default, switching"
- elog "to upstream default. Because of this, if you have some command you"
- elog "want to be run, be sure to have it placed in your ~/.bashrc file."
- elog
- fi
- readme.gentoo_print_elog
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.12.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.12.2.ebuild
deleted file mode 100644
index 6c5317d4412f..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.12.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.12.2.ebuild,v 1.1 2014/05/31 09:27:18 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+gnome-shell +nautilus"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X]
-RDEPEND="
- >=dev-libs/glib-2.39.2:2
- >=x11-libs/gtk+-3.9.9:3[X]
- >=x11-libs/vte-0.36.1:2.90
- >=gnome-base/dconf-0.14
- >=gnome-base/gconf-2.31.3
- >=gnome-base/gsettings-desktop-schemas-0.1.0
- sys-apps/util-linux
- x11-libs/libSM
- x11-libs/libICE
- gnome-shell? ( gnome-base/gnome-shell )
- nautilus? ( >=gnome-base/nautilus-3 )
-"
-# gtk+:2 needed for gtk-builder-convert, bug 356239
-DEPEND="${RDEPEND}
- app-text/yelp-tools
- dev-util/appdata-tools
- || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
- >=dev-util/intltool-0.50
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened
- tab you will need to add the following line to your ~/.bashrc:\n
- . /etc/profile.d/vte.sh"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-3.12.0-remove-set-title-feature-0.patch \
- "${FILESDIR}"/${PN}-3.12.0-remove-set-title-feature-1.patch \
- "${FILESDIR}"/${PN}-3.12.0-remove-set-title-feature-2.patch \
- "${FILESDIR}"/${PN}-3.12.0-remove-set-title-feature-3.patch \
- "${FILESDIR}"/${PN}-3.12.0-fallback-title-1.patch \
- "${FILESDIR}"/${PN}-3.12.0-fallback-title-2.patch
-
- gnome2_src_prepare
-}
-src_configure() {
- # FIXME: leave smclient configure unset until it accepts values from the
- # switch and not from GDK_TARGET, bug #363033
- gnome2_src_configure \
- --disable-static \
- --enable-migration \
- $(use_enable gnome-shell search-provider) \
- $(use_with nautilus nautilus-extension) \
- # Docs are broken in this release.
- #ITSTOOL=$(type -P true) \
- #XMLLINT=$(type -P true)
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog HACKING NEWS"
- gnome2_src_install
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-}