gentoo resync : 29.08.2018

7 files changed, 5 insertions, 50 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index c70b1b087399..12e79c90527b 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index e029b6606416..a39f89eb53b8 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,5 +1,6 @@
 AUX ctwm-4.0.1-m4.patch 600 BLAKE2B 119ca96ba88e694d5a8269c67869e3185d15701dd9c3af921243db12793c4e90b2832aab9eba1ac432619472f1b2103474866853ccfe89aefda0679bbb6bab35 SHA512 d90b490d5a39dd1caf8c59b6753a65e0aa2e38a911ceef9e5b84d0c4b246b44072499d1853c7137e28f858d1856d33fd510b57b0ebef75097f98ebb6455fac77
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7 SHA512 8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
+DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40 SHA512 445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f
 EBUILD ctwm-4.0.1-r1.ebuild 984 BLAKE2B cba23544d81b5cc2eed545e11147302ec6cdc34d3da21e7ae1ba1795757eef3e213e5345a4bcd07a7cf725fb0401129e8eec968b63cf2dc9a2428ab6c80f2f98 SHA512 b5b2d3782bec877df729a6c516bd2c1c3bb852633d38796f14978e0321468cd691254408c9339ed712ed85f61b2622b5863064286c05bd45b6b2ea2ec2a956af
-EBUILD ctwm-4.0.1.ebuild 881 BLAKE2B d476155cb7a13721f3c7c31932a3172d3753bf9c6bb87d8c9e7399bbbf87fc517c2a2b9e4fa24b92352cb6cd5a879cc26e83de604edb16e5e505dc135b5b4700 SHA512 819b7e3d0fff0ae88b1d6f6a4e86fde3c0ddaf51919fa28dd49ca95966fcaf72c7a0d04b5b926a66e18dcdf69761f2ec3d26f1e724b9f322ba588472687a0400
+EBUILD ctwm-4.0.2.ebuild 884 BLAKE2B e30e63758298128dc9abe7ceddf7bce548bf3cb5a797b3db017ed2863ca25df1986945b011925000f711a3a7ada2f4c545754eb96a02f52e7b1639fccf5c01fc SHA512 9948e749e0714e05d3b808a6d79031cd36697b62bc45d6f7fb51c625c1333c1b26338950d5c76c7253d0ebdf6145680e33a48ad176fcccdf8c81767eaa7af239
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
index c509b28861a7..d4278854c5be 100644
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	x11-libs/libICE
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 11e42fb31281..512a78aaf691 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,7 +1,3 @@
 DIST twm-1.0.10.tar.bz2 287094 BLAKE2B c84d26119c2a9ed1b6482dc35a421e3d745af506d2faf6dff1027aa84752accc32ff6fffba0e9e8468bfd583bee17c774a88960fc4c5268e82b69c4dc6ae8e81 SHA512 1280683fce7ebbf5670239cb1f3cee2b40612bd9850d98827e793cf8bf298bdb58e48387cab943ea6befc6f7b34da2567353c22b8eaeb8bcf1b9e303cd7e6a9e
-DIST twm-1.0.8.tar.bz2 275201 BLAKE2B 3f7c70e9004d5d2e873f9496aff68a5318576425e659cc090d431c989b0876e24f8ac662cd7579e9df7ade28e6f9ab7c731daee742b21eac2e4672b08b3a1d13 SHA512 669c6453574d3f12ce27ab365303b1fdf5bbe2d0219bff5decf7058cd08eb942202f4006a35352554b6220c618a1e5405515fbec8e0df1387420e08bc871d663
-DIST twm-1.0.9.tar.bz2 284160 BLAKE2B e3bc90e33ec43898ecfbb478be9919f7f7a99c1abe091b2e69371e3df9e19b4cf508dd6992ef9560779334e25b76ed2761a843948a85e016efc582ee5e13fe69 SHA512 7b967560d19d1d928729688b7fab8cb7ff1221cef8054b8ad8e62ff0abc451466b49f0ff55a06d7ca89304eda4125e3285751d983705d8d27bb34677a0bf0fbf
-EBUILD twm-1.0.10.ebuild 465 BLAKE2B b78aff87a35b266cb22ba099ac216f182c5e4540a76dbbe8a84a2db52cd83e0c0a013f976f367e8770977e876b5694adb416f8f2e1e7a5fbcac5fd83bff6d45c SHA512 538a94607acb918076fcb09268279bcdca7cd968a73dc102d28ff20e554f6a69aafaa8e2a7289cfe5d346ddc0f71c040bbadaa8b8d178403267d9a8963b54101
-EBUILD twm-1.0.8.ebuild 459 BLAKE2B 77b78e144721c77aa99e7625a0a06e17d5b4faa80d235b593f3dd43a57bc48d48b7ff15053202bcefdc961330deba350e9c3e69d76f3c7bf9f3a3ce7cdb32bc5 SHA512 aab8440b3c7a2f922be96b649cae812e8bd7fbfe7dbd3640ee597f7ea35397361c2ab8e1424e9bfb0fafb4740655bdd589904a301424c6586c2da7b9ec581511
-EBUILD twm-1.0.9.ebuild 466 BLAKE2B e31e1b575b1a8a0eec85ee2ab0a660c4f34d56f170a56dcd768432b429657766928356affb6dce9f435be75d5dfaca1f50d56615355a2134aaba168a16c3d7b4 SHA512 943a66ce65c350acfedf32649ee7e6aaaed586a4d385dc2c914b42df16d408bfefa142ac4b3809041efb051bfae3253176a72b3ae1f6fb57e5b3ae7985259035
+EBUILD twm-1.0.10.ebuild 468 BLAKE2B 4bda337f3af82dae7c68142d76d4e3c2844db927b807a6da0a4cb66d3b73af659e09bb6324c2861257641c4f6e7a6608f2ae71d8f87c85d19705f69dacc95953 SHA512 33df1c3b7504f527e532502eb12fe35a62ed517a6e26163f6fc05f9e0bcb9d9a5fd7dbef4bdc1f5c911c3d06d3e37f9f4b31781dbbd28a5dff332092412d171b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-wm/twm/twm-1.0.10.ebuild b/x11-wm/twm/twm-1.0.10.ebuild
index cb7da1b9ebdb..b3fd6e3919b8 100644
--- a/x11-wm/twm/twm-1.0.10.ebuild
+++ b/x11-wm/twm/twm-1.0.10.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 XORG_STATIC=no
 inherit xorg-2
 
-DESCRIPTION="X.Org twm application"
+DESCRIPTION="X.Org Tab Window Manager"
 
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/x11-wm/twm/twm-1.0.8.ebuild b/x11-wm/twm/twm-1.0.8.ebuild
deleted file mode 100644
index 2f783b92b001..000000000000
--- a/x11-wm/twm/twm-1.0.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-DESCRIPTION="X.Org twm application"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libICE
-	x11-libs/libSM"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
diff --git a/x11-wm/twm/twm-1.0.9.ebuild b/x11-wm/twm/twm-1.0.9.ebuild
deleted file mode 100644
index 49a0c07af1cb..000000000000
--- a/x11-wm/twm/twm-1.0.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-DESCRIPTION="X.Org twm application"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libICE
-	x11-libs/libSM"
-DEPEND="${RDEPEND}
-	sys-devel/bison"