gentoo resync : 15.02.2018

21 files changed, 2 insertions, 968 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 11f465a14a39..de8926196544 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index e9ecd86fb57b..c0d9fe046faa 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -4,7 +4,7 @@ DIST i3-4.13.tar.bz2 1121298 BLAKE2B 94f3940406d43083c8dc577b4216a32a08ad4c4b58e
 DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba SHA512 ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 EBUILD i3-4.13-r1.ebuild 1898 BLAKE2B ee0a771f9735272a28285c38b30d9693d6eea70c4238142a271c2a31f3a54f874fb88b22acde07895577aeccf98f0ab124ae14cbc81249316c4a2f00cc88c1a1 SHA512 fa0fc10c2989175051e86ff329a560ad07ba0aac2c16e19f9e7426d7a74b96be4dda9146a899f4498858fdc9558ba27b3281c7df9ad936988310a441002aee0d
-EBUILD i3-4.14.1.ebuild 2288 BLAKE2B 8b61896ae179c7130cfe4e220347af27d68401a18703017036032c7100976541a240f65e10465bdb359cca6c1dc86717dab041b80507825f84e89ee6bfc84c0e SHA512 3a66ade6582d9c4a5c45b76eb0dc4d1c1278c51f4e55ddda5d80da65ae1154b13b7e02fecc663ae2605191366eb82affd10a885bf33240a9598f5e27effe915c
+EBUILD i3-4.14.1.ebuild 2281 BLAKE2B 3caa4d75153e68ad87137c223af7c349a5e52b9a05bd4e76c94607083571c6c05102c6b7596e4ac1b7815a798657fa816de03c172e613289cf8f1b6bed7e364b SHA512 eadf625bb151263d864476a15665acea1d98b0e1d8dcda54f60ebd25d58c42cc4a476c59730ea6f6fbdcff773625ae758f9bd06c5070a4dafb5a725963816333
 EBUILD i3-4.14.ebuild 2018 BLAKE2B 1623ddaf5351872074ec15137bbe61ee855d65ea31915c8090346164e574af4b9d9180f0f8665d931a0cf6464c9ee40b2702f38919559a0851a5f560d1c94fac SHA512 1f6e635f080952aa55416e367f9bbbca4929a73cde2080e121fd76dd1396f01d43199871d09fed71f5b6680f0d94cef5d07c2b8f86675d63763464b6e3d95c2d
 EBUILD i3-9999.ebuild 1716 BLAKE2B 46975a8704867cb17347dc1a2abc133e1d12a1ad2db0f6e27d2e6cbd68fbcf1e52b6c7dc9da4a5da1f99958fedbe1eb6fe5329bf46778b868b656fe9f19a8558 SHA512 da9b92fdc17543284b129956fbb517f49d670121f2e3d0cd5fcec2239612810030a4d45f6d2178c22d6c939d3528bc97ca38c35c2073d45f8b208b56c6dcd505
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index df485534f2f4..3c204ad407fc 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index c6a59ed10a77..ad6895ef1b91 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,26 +1,6 @@
-AUX IceWM.desktop 185 BLAKE2B 1bf06de1f57b2afb1b4972187315b1fa2ffd203483ac64a8724f0d57296ff134c139db9ed8063e188476e8bef5d73e7d2c152829d7d68e7e3dc4ba05491a5c4b SHA512 9e44391fa20f02f8aa0495c0d77ec10799e7b7097fff495dbabed457a88c17e00fd53a295b0e0293e8aae275b424928f83cac4e2313afa1cb2b8a1e7ac24c711
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 AUX icewm-1.3.10-menu.patch 821 BLAKE2B 2274136f91b891c971a84f80c3ace49f4c3e5245ae0de83408219575a25dc1cb42523459a923634ab25565fdafe1b5320b955adbb1de4b3fda3c7613ba93d7ad SHA512 15ad0cd80fa358ef823ad747b873afab7ce07114590cba90710b91daa6421a8b8030c7ce7bd8af245c85983d75583c2701de85809de3059fe3e838e2f88f016e
-AUX icewm-1.3.7-dso.patch 376 BLAKE2B bd75e019ddbf6bc8ee8d870ddc44a0c13468c71d0dd3ad3426c5f2030692ff7ee8f78e88ddafb9abfe47aa4999b39da9ed36c6be814d94fb5ec81deb9fa45243 SHA512 e2ca26ef3bf1f1e1ffb452cebdf3cc5cdb8b84c47b5409e68923c0ad6cac8ea399274fd4d0bf71f6a6929445b0f8a1d35edbc2233b90594f05acd6a03e6a8f8a
-AUX icewm-1.3.7-gcc44.patch 434 BLAKE2B 126524e70a73cdc7f0ace652e1c42a404a3bcd7df9b4d7fce8e56cc4a2a7101eebf97d5e0ed7942d22c87dbed0c6ed50b4af00aa0685a94f3acb02a0be937731 SHA512 12acc47b5938234bfa76e38f2c6f7ff0e2528aa4feac8bd19eec6743d994f7b5465373ff708232fc3ddcc5fe3cb8c21fda34d1ea6e0e860bb86c58503b2f8d65
-AUX icewm-1.3.7-menuiconsize.patch 2435 BLAKE2B 69fce71d787e51ff3da91c04d4d984de4f4d6d8060b3bc1b65ab850fe4e85fcd33901d8d6199859d390b80c8d93bfff2530a53b6a4722a5bc89e2a47bdb9ddd9 SHA512 ee56ff65a74d9a4cf4a03bc7e1324c6f0ea180fadc2232ba46a5f467d2b4f6f9e57ca73a658d5f7ed0acce4f399e1c7491ef54a29516da2fef081e7671dd1e3d
-AUX icewm-1.3.7-thermal.patch 1335 BLAKE2B 1b42bc48030aed401bc2d47988c0ace5f00ad4d412e5745f1b6c56bc42d8a37b94503714833953cb3329bd04b11cc3ea988a46db6baab3f2faca64afdcfb68d8 SHA512 3d6cfce4980a19cc16a1c56737300157f73261e0f8e512063f3ac43ac177acbe635d9e9456cdfd2e177899091e620caf0cfad1f651e533cfa5c1712e71b90650
-AUX icewm-1.3.8-build-fixes.patch 3821 BLAKE2B d47bf052ad1b800626ddd98b7715ad3af5a4011e0d38d29e419dfe71fdc86533b23ddbeadbf4c1d4e002d6821fcbad63d7e2d7abcc54ff3d8e2238e6adb9ffd6 SHA512 7fce22f361dbff6635acbcb91b91235221b1d85f9639a38f12c081305a3b1eb1de7e8825048d39a84495bb6b443e78eff5b9af315a9beb2b20d4205646e47362
-AUX icewm-1.3.8-deprecated.patch 317 BLAKE2B 94949f8d48b8036355df4d488c43f9c935969502d37f39ab66896683c84d5a6d22cb03d8995680c275a24f39de47285f55f9da3076350d10a85c2c73a827094a SHA512 7f0649853c78ea553a20d07bb3d88c3481a033d0fc143585f3bc2e39e9b66572b068f2ffd1660fcbf7d805c7d2f064d6d8900ddf01b61244a84aa13466061aaa
-AUX icewm-1.3.8-menu.patch 928 BLAKE2B 33a2a72afdb1999ccb1fb4d5a8d9432220d726e85cdf632a96c21eec85f216ac88de1c4279bc4efc224621426254d19204bb7a597d1428db5a715742927b2fff SHA512 837720dc620a02d225f5df82f8fc8b8bb8512e846f6360b058c02fb1e2483186bdccbeaf997bb690c6d8482555f710494a0d534a4add1009ecc3060e180f8baa
 AUX icewm-1.3.8-uclibc.patch 1830 BLAKE2B 36037fcdadb7d70d1cc4125170c05e9800a2acca930148eeb091d084a4aca7f4813f452e3565aece03aca7d441755e958cd75a83c875f684beec335355ee7a16 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e
-AUX icewm-defaults.patch 694 BLAKE2B 191396b555efb2324dd7c3e6ce60c5e497e652039e233acfbb6981d2c4d0c4616638e0d3074bec600f4f33ff725d4a3ef97dcae7953f09805cc24998b478487e SHA512 41832e4d23af4790991703a502e3c5f5b0189bceac34b3e2e133ed60efd164f0521a90c39aab6fbac81ffb00a07313e1607cd7fb961bda9c5062bd1623a37919
-AUX icewm-fribidi.patch 2168 BLAKE2B 345e8f7064ca31b5ec767559de124d5e376762015fd0135e6880cb8dbdc8dd59da4e91dbb25ab604532ad8b57d2fe66731bbd24d6b3074d28c6d00d7bf5a5eb3 SHA512 85f1f6f12a68f0e64d847ade924755e7f5eac3e443a8c8efeb44400e6403c10d5739b178f540d4337687c0c55159e81ebaaf6c53ae5c14d73a1e4352bd5d1fb5
-AUX icewm-keys.patch 1870 BLAKE2B 28646b6bf5f697a3d241943ab1beefd9b686de9ca548ca66fb9bfc2198e931346ad77004e6943ce31d5784d8867510081bd878077c6d32eeb93fe3da21c73350 SHA512 c5206e2c4e98d89e71ccd46c3838941101e009036abd6026cf445b2e01315d9d70d6835b45def978d101d575e0c4dc48514883406c0bef67f11f24e4404daf43
-AUX icewm-startup 177 BLAKE2B 4c6cd3214c8906153a9875d84e525997102ef3af0a67475a98cda04336f5c19a2ae04cf5645627dcbe846902a375ab34b8b06f6ed737c4373584d305925f9e3c SHA512 512edf9e94a8bb240e932fa3be7fd4bc78635a0fe0e41ed96de520be188f23d2e03115868f4b3610d190eff50f011531e61ca8eaccbbf194a232e991713580d9
-AUX icewm-toolbar.patch 476 BLAKE2B f0c302422815ede382b0e495baa6039b2c6836e5b8e0a8223bc82331e7347a30fc358e6a9cb688ecc9b83f2d819b46ce639216195b8dd559f0efeab1f97572f0 SHA512 66c434c385454e139e495bc9f475f403e0c2f2b241ee2dc4903ab1975198152211b21f836c39338d5a796b2ac8a40f6ce4cb09a6878467bab50177fc105eb9fe
-AUX icewm-xdg-menu 4380 BLAKE2B cbe57d6029727500292f2f618923357a20aaecfdf8acb4c82bf7679ce219d25b88a0273d4c87103a9e3385486cd03fa1c0734523b999c93b48c615d7eb84a783 SHA512 edbb196bae0c6aff3d5cfa31c50486e0ac9ffc5d287a11221e0a16ab27e176c9c6e724bc00725c5e3eba71df9afa12e5a8132eb0f154c4bc38c3150242f5d9c3
-DIST icewm-1.3.12.tar.gz 944617 BLAKE2B b95ab2bc77c3370f4da4f6a1f4b2c38a772f0e53d7613ad28244e37c460421f681c58f16e9e94533365d386a4be83de69303d9a0bd16caef18c4a655d2060514 SHA512 b2704ab69a1910cab6711ca11b79fa32f66747fe04468eff86813812fa855423ed43144ab0290e245221520a919755c0e153b60ff238ace60f9546af595063ee
-DIST icewm-1.3.8.tar.gz 905680 BLAKE2B dcb794ab6bd0a4b31240bb5506b2504d04a82ca267223d41c6b31f0447fa5e1541d58068776fba97aa33016567c66268937a6c3afafc7151bac4c1081ddc3db3 SHA512 ce9bf3e736a2f3fad4bbf731647b4e4ad0168cd2c4af66b1c43beef9ceeee39d14909714d2fc73ab13f6c285a74dfe31fffc9677ae8bd2d1077716cd6d6afb72
-DIST icewm-1.4.0.tar.gz 1732329 BLAKE2B 2fec09fbea04b96fcd3ec5d26a4bac5ece153b6bab774804287bfb4b8757e92e04aecc7a8b6f9f3c11b1abc5106d39fd02b54e8e60c8146edab1d8b03e2d223a SHA512 ee0a80912bce5c94121f8c9b4e2f914e6a47dc810fe83528544f8644d9e5c4c61573c5a604d22af737be653fcfa1c64c10e0be0e663ce02cf982ba19dae7396e
 DIST icewm-1.4.2.tar.gz 1709850 BLAKE2B 1a9dde495345f1601b3ae901b3e98554b60a9b9a8e94b7079f3c766971eb31bde5a3cd3972f5c96d86b5e02e413811df2a0689efc15a461bca39a70842f3df69 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872
-EBUILD icewm-1.3.12-r1.ebuild 2557 BLAKE2B 2ce9cc71babd67a3bcdf439cf43409c187bd98537f42cdbf07bb048db596c7cf336d63b605da40339439b80576856cecefa9438e556b6bf1c9a449f8a1652b61 SHA512 3f80f6085819384fd0cc9d35a61213491f47a07462a39e027ea97ef6fd49a624e4bc4ff6eb62f76b1839ddec75cdb53f65421b19f7be7523c6ee45994f7e87f9
-EBUILD icewm-1.3.8.ebuild 3324 BLAKE2B 760ffe0227a4e83059f774604a50ce8a576573ba7c80b924fc7257abe61e18f11e346a5a38c0b642f171eda20712ed5fe76e9a4c73aea5fb3c568b2fbb897694 SHA512 ae33e9f3d4ddab0b46eba920e851c0a1efcfe5b77606aad380d1a2d734a47e373b208e5e2401d9c457dcee3ca2aa792eec2cf4856322e034af3e26eed2bb7786
-EBUILD icewm-1.4.0.ebuild 2515 BLAKE2B ff695c11454adbfb0b8e0ffec3ee3f493057da36b7e740f8ff8a036d4d222fe69ab99f6f74c9becde873e08aa874387c299ce6ca61aa502d605ad2075c4d7711 SHA512 ed1eb8975e258ae8de64d1110f22b9b4510dd533cd3de5a15aea2093b9a0021b92450aaa05437bb32819990b5b29475ad67fcf0cafe309a40a05e51b8fc6cdc1
 EBUILD icewm-1.4.2.ebuild 2518 BLAKE2B 95975eef4219b5bbbccdce658a7c17d0d686cd2880574ee6b721b5b269183ae9e67dbbca775b90763ccff75bd48ee4b25e69181b6619360fa45137aae4d9ddde SHA512 a2e5c37b98fa5ab43b202434b9a53bcd04e5915d94e7a2eb55283fdbb8667b78105ff5497120c4531debb2c538be8bd82fc5705d2bf031c8d62f09e68b47dd6b
 MISC metadata.xml 619 BLAKE2B f25a8bc7e435eee00d8ba0cfd21a750ae84d3643b25aaad271cf297918b0c5d702ec60e9ffe919c0b7b07e36f5ff10ba82d5c81d561d22072cec94772de4d8bd SHA512 5beee59a4a9d6785a338f2a18b0f4906681dbcff463ddb3bb273634416c297ad646e0a4247d94f367352b4a063d1858953827d775a01e100f1a769941d2d9cb2
diff --git a/x11-wm/icewm/files/IceWM.desktop b/x11-wm/icewm/files/IceWM.desktop
deleted file mode 100644
index 087384ee1308..000000000000
--- a/x11-wm/icewm/files/IceWM.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=IceWM
-Comment=This session logs you into IceWM
-Exec=icewm-session
-TryExec=icewm-session
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/x11-wm/icewm/files/icewm-1.3.7-dso.patch b/x11-wm/icewm/files/icewm-1.3.7-dso.patch
deleted file mode 100644
index 55100d5f62a6..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-dso.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.old	2011-11-23 15:44:52.121654867 +0200
-+++ configure.in	2011-11-23 15:47:09.514411391 +0200
-@@ -494,6 +494,7 @@
-     AC_DEFINE(CONFIG_COREFONTS, 1, [Define to enable X11 core conts.])
-     features="${features} corefonts"
-   fi
-+  CORE_LIBS="${CORE_LIBS} -lfontconfig"
- 
- dnl ============================================================= GUI Events ===
- dnl
diff --git a/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch b/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch
deleted file mode 100644
index d500f64004bc..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=376451
-
---- a/src/wmapp.cc
-+++ b/src/wmapp.cc
-@@ -337,7 +337,7 @@
-             char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
- 
-             char ** newFontPath = new char *[ndirs + 1];
--            newFontPath[ndirs] = fontsdir;
-+            newFontPath[ndirs] = (char *)fontsdir;
- 
-             if (fontPath)
-                 memcpy(newFontPath, fontPath, ndirs * sizeof (char *));
diff --git a/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch b/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
deleted file mode 100644
index d051d5bc5f19..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur icewm-1.3.7.bak/src/yicon.cc icewm-1.3.7/src/yicon.cc
---- icewm-1.3.7.bak/src/yicon.cc	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/yicon.cc	2011-11-07 19:41:52.841910531 +0100
-@@ -270,6 +270,10 @@
-         iconCache.getItem(0)->removeFromCache();
- }
- 
-+int YIcon::menuSize() {
-+    return menuIconSize;
-+}
-+
- int YIcon::smallSize() {
-     return smallIconSize;
- }
-diff -Naur icewm-1.3.7.bak/src/yicon.h icewm-1.3.7/src/yicon.h
---- icewm-1.3.7.bak/src/yicon.h	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/yicon.h	2011-11-07 19:41:28.555296033 +0100
-@@ -25,6 +25,7 @@
-     bool isCached() { return fCached; }
-     void setCached(bool cached) { fCached = cached; }
- 
-+    static int menuSize();
-     static int smallSize();
-     static int largeSize();
-     static int hugeSize();
-diff -Naur icewm-1.3.7.bak/src/ymenu.cc icewm-1.3.7/src/ymenu.cc
---- icewm-1.3.7.bak/src/ymenu.cc	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/ymenu.cc	2011-11-07 19:42:40.498474049 +0100
-@@ -153,8 +153,8 @@
- 
- #ifndef LITE
-         if (getItem(selItem)->getIcon() != null &&
--            YIcon::smallSize() > h)
--            h = YIcon::smallSize();
-+            YIcon::menuSize() > h)
-+            h = YIcon::menuSize();
- #endif
- 
-         if (x <= int(width() - h - 4))
-@@ -1023,8 +1023,8 @@
-                     mitem->getIcon()->draw(g,
-                                l + 1 + delta, t + delta + top + pad +
-                                (eh - top - pad * 2 - bottom -
--                                YIcon::smallSize()) / 2,
--                                YIcon::smallSize());
-+                                YIcon::menuSize()) / 2,
-+                                YIcon::menuSize());
- #endif
-                 }
- 
-diff -Naur icewm-1.3.7.bak/src/ymenuitem.cc icewm-1.3.7/src/ymenuitem.cc
---- icewm-1.3.7.bak/src/ymenuitem.cc	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/ymenuitem.cc	2011-11-07 19:50:04.458316916 +0100
-@@ -86,8 +86,8 @@
-         int ih = fontHeight;
- 
- #ifndef LITE
--        if (YIcon::smallSize() > ih)
--            ih = YIcon::smallSize();
-+        if (YIcon::menuSize() > ih)
-+            ih = YIcon::menuSize();
- #endif
- 
-         if (wmLook == lookWarp4 || wmLook == lookWin95) {
-@@ -123,7 +123,7 @@
-     return 0;
- #else
-     ref<YIcon> icon = getIcon();
--    return icon != null ? YIcon::smallSize(): 0;
-+    return icon != null ? YIcon::menuSize(): 0;
- #endif
- }
- 
diff --git a/x11-wm/icewm/files/icewm-1.3.7-thermal.patch b/x11-wm/icewm/files/icewm-1.3.7-thermal.patch
deleted file mode 100644
index f6b2cf71f0f5..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-thermal.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -uprN a/src/acpustatus.cc b/src/acpustatus.cc
---- a/src/acpustatus.cc	2010-10-31 15:09:36.000000000 +0100
-+++ b/src/acpustatus.cc	2013-01-17 21:12:19.085715083 +0100
-@@ -315,6 +315,37 @@ int CPUStatus::getAcpiTemp(char *tempbuf
-         }
-         closedir(dir);
-     } 
-+    else if ((dir = opendir("/sys/class/thermal")) != NULL) {
-+        struct dirent *de;
-+
-+        while ((de = readdir(dir)) != NULL) {
-+
-+            int fd, seglen;
-+
-+            if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
-+                continue;
-+
-+            sprintf(namebuf, "/sys/class/thermal/%s/temp", de->d_name);
-+            fd = open(namebuf, O_RDONLY);
-+            if (fd != -1) {
-+                int len = read(fd, buf, sizeof(buf) - 1);
-+                buf[len - 4] = '\0';
-+                seglen = strlen(buf) + 4;
-+                if (retbuflen + seglen >= buflen) {
-+                    retbuflen = -retbuflen;
-+                    close(fd);
-+                    closedir(dir);
-+                    break;
-+                }
-+                retbuflen += seglen;
-+                strcat(tempbuf, "  ");
-+                strncat(tempbuf, buf, seglen);
-+                strcat(tempbuf, " C");
-+                close(fd);
-+            }
-+        }
-+        closedir(dir);
-+    }
-     return retbuflen;
- }
- 
diff --git a/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch b/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch
deleted file mode 100644
index cec27a79ad0a..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- icewm-1.3.8/Makefile.in
-+++ icewm-1.3.8/Makefile.in
-@@ -35,7 +35,7 @@
- 
- ################################################################################
- 
--BINFILES    = @BINFILES@ icewm-set-gnomewm
-+BINFILES    = @BINFILES@ "$(srcdir)/icewm-set-gnomewm"
- LIBFILES    = lib/preferences lib/winoptions lib/keys \
-               lib/menu lib/toolbar # lib/programs
- DOCFILES    = README BUGS CHANGES COPYING AUTHORS INSTALL VERSION icewm.lsm
-@@ -83,21 +83,23 @@
- 	@echo ------------------------------------------
- 	@echo "Installing binaries in $(DESTDIR)$(BINDIR)"
- 	@$(INSTALLDIR) "$(DESTDIR)$(BINDIR)"
-+#generated files, relative to the build directory
- 	@for bin in $(BINFILES); do \
-              $(INSTALLBIN) "$${bin}" "$(DESTDIR)$(BINDIR)"; \
-          done
- 	
- 	@echo "Installing presets and icons in $(DESTDIR)$(LIBDIR)"
- 	@$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)"
-+# data files from the source directory
- 	#-@$(INSTALLDIR) "$(DESTDIR)$(CFGDIR)"
- 	@for lib in $(LIBFILES); do \
--             $(INSTALLLIB) "$${lib}" "$(DESTDIR)$(LIBDIR)"; \
-+             $(INSTALLLIB) "$(top_srcdir)/$${lib}" "$(DESTDIR)$(LIBDIR)"; \
-          done
- 
- 	@for xpmdir in $(XPMDIRS); do \
--	     if test -d "lib/$${xpmdir}"; then \
-+	     if test -d "$(top_srcdir)/lib/$${xpmdir}"; then \
- 		$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
--		for pixmap in "lib/$${xpmdir}/"*.xpm; do \
-+		for pixmap in "$(top_srcdir)/lib/$${xpmdir}/"*.xpm; do \
- 		    $(INSTALLLIB) "$${pixmap}" "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
- 		done; \
- 	    fi; \
---- icewm-1.3.8/po/Makefile.in
-+++ icewm-1.3.8/po/Makefile.in
-@@ -20,6 +20,7 @@
- XGETTEXT =	@XGETTEXT@
- MSGMERGE =	@MSGMERGE@
- MSGFMT =	@MSGFMT@
-+VPATH = .:po:@srcdir@
- 
- .SUFFIXES:
- .SUFFIXES: .po .mo
---- icewm-1.3.8/src/Makefile.in
-+++ icewm-1.3.8/src/Makefile.in
-@@ -11,7 +11,7 @@
- 
- CXX =           @CXX@
- HOSTCXX =       @HOSTCXX@
--LD =            @CXX_LINK@
-+LD =            gcc
- HOSTLD =        @HOSTCXX_LINK@
- EXEEXT =        @EXEEXT@
- 
-@@ -32,12 +32,12 @@
-                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
-                 -DICESMEXE='"icewm-session$(EXEEXT)"' \
-                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
--                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+                -DICEHELPIDX='"$(DOCDIR)/icewm-common/icewm.html"'
- 
- CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
- 	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ `pkg-config fontconfig --cflags`
- LFLAGS =	@LDFLAGS@ 
--LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` 
-+LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig -lm -lsupc++
- 
- CORE_LIBS =     @CORE_LIBS@ `pkg-config fontconfig --libs`
- IMAGE_LIBS =    @IMAGE_LIBS@
-@@ -188,6 +188,8 @@
- TESTCASES = @TESTCASES@
- OBJECTS = @BASEOBJS@ @TESTOBJS@
- BINARIES = @BASEBINS@ @TESTBINS@
-+BASEOBJS = @BASEOBJS@
-+VPATH = .:@srcdir@
- 
- ################################################################################
- 
-@@ -205,7 +207,8 @@
- 	@echo "  CXX     " $@
- 	@$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
- 
--$(BINARIES):
-+$(BINARIES): $(BASEOBJS)
-+#	@$(MAKE) --no-print-directory build-dep DEPLIST="$($(@:$(EXEEXT)=)_OBJS)"
- 	@echo "  LD      " $@
- 	@$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
- 
-@@ -217,6 +220,8 @@
- 	@echo "  HOSTLD  " $@
- 	@$(HOSTLD) -o $@ $(genpref_OBJS)
- 
-+build-dep: $(DEPLIST)
-+
- ################################################################################
- 
- gnome2.o: gnome2.cc
---- icewm-1.3.8/src/WinMgr.h
-+++ icewm-1.3.8/src/WinMgr.h
-@@ -128,7 +128,7 @@
-  * this where WIN_WORKSPACE_COUNT comes into play.
-  */
- 
--#define WinWorkspaceInvalid    (-1L)
-+#define WinWorkspaceInvalid    ((unsigned long)-1)
- 
- /* workspaces */
- #define XA_WIN_WORKSPACES "_WIN_WORKSPACES"
diff --git a/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch b/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch
deleted file mode 100644
index b956180627bc..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- icewm-1.3.8/src/base.h
-+++ icewm-1.3.8/src/base.h
-@@ -2,7 +2,9 @@
- #define __BASE_H
- 
- #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
-+#if ( __GNUC__ == 4 && __GNUC_MINOR__ > 7 ) || __GNUC__ > 3
- #define _icewm_deprecated __attribute__((deprecated))
-+#endif
- #else
- #define _icewm_deprecated
- #endif
diff --git a/x11-wm/icewm/files/icewm-1.3.8-menu.patch b/x11-wm/icewm/files/icewm-1.3.8-menu.patch
deleted file mode 100644
index e4bab5c5ffc3..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.8-menu.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- icewm-1.3.8/lib/menu.in
-+++ icewm-1.3.8/lib/menu.in
-@@ -4,15 +4,9 @@
- # since modifications to this file will be discarded when you
- # (re)install icewm.
- #
--prog xterm xterm xterm
--prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
--prog fte fte fte
--prog NEdit nedit nedit
--prog Mozilla mozilla mozilla
--prog XChat xchat xchat
--prog Gimp gimp gimp
-+prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
-+prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
- separator
--menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@
--menuprog KDE folder icewm-menu-gnome@GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@
--menufile Programs folder programs
--menufile Tool_bar folder toolbar
-+prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup
-+separator
-+menufile Programs folder programs.autogen
diff --git a/x11-wm/icewm/files/icewm-defaults.patch b/x11-wm/icewm/files/icewm-defaults.patch
deleted file mode 100644
index 72e5410db4fe..000000000000
--- a/x11-wm/icewm/files/icewm-defaults.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/default.h.old	2011-11-23 18:04:22.429626938 +0200
-+++ src/default.h	2011-11-23 18:04:38.416824083 +0200
-@@ -161,8 +161,8 @@
- #endif
- 
- XSV(const char *, mailBoxPath,                  0)
--XSV(const char *, mailCommand,                  "xterm -name pine -title PINE -e pine")
--XSV(const char *, mailClassHint,                "pine.XTerm")
-+XSV(const char *, mailCommand,                  "xterm -name alpine -title ALPINE -e alpine")
-+XSV(const char *, mailClassHint,                "alpine.XTerm")
- XSV(const char *, newMailCommand,               0)
- XSV(const char *, lockCommand,                  0)
- XSV(const char *, clockCommand,                 "xclock -name icewm -title Clock")
diff --git a/x11-wm/icewm/files/icewm-fribidi.patch b/x11-wm/icewm/files/icewm-fribidi.patch
deleted file mode 100644
index 66691d78a3ff..000000000000
--- a/x11-wm/icewm/files/icewm-fribidi.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- src/yfontxft.cc.old	2009-09-25 00:07:51.000000000 +0300
-+++ src/yfontxft.cc	2009-09-25 00:18:09.000000000 +0300
-@@ -6,6 +6,11 @@
- #include "ypaint.h"
- #include "yxapp.h"
- #include "intl.h"
-+#include <stdio.h>
-+
-+#ifdef CONFIG_FRIBIDI
-+    #include <fribidi/fribidi.h>
-+#endif
- 
- /******************************************************************************/
- 
-@@ -68,10 +73,45 @@
-                            char_t * str, size_t len)
-     {
-         XftColor *c = *g.color();
-+
-+#ifdef CONFIG_FRIBIDI
-+
-+#define STATIS_STRING_SIZE	256
-+
-+		// Based around upstream (1.3.2) patch with some optimization
-+		//   on my end. (reduce unnecessary memory allocation)
-+		// - Gilboa
-+
-+		char_t static_str[STATIS_STRING_SIZE];
-+		char_t *vis_str = static_str;
-+
-+		if (len >= STATIS_STRING_SIZE)
-+		{
-+			vis_str = new char_t[len+1];
-+			if (!vis_str)
-+				return;
-+		}
-+
-+		FriBidiCharType pbase_dir = FRIBIDI_TYPE_N;
-+		fribidi_log2vis(str, len, &pbase_dir, //input
-+						vis_str, // output
-+						NULL, NULL, NULL // "statistics" that we don't need
-+						);
-+		str = vis_str;
-+#endif
-+
-         XftDrawString(g.handleXft(), c, font,
-                       x - g.xorigin(),
-                       y - g.yorigin(),
-                       str, len);
-+
-+#ifdef CONFIG_FRIBIDI
-+
-+		if (vis_str != static_str)
-+			delete[] str;
-+
-+#endif
-+
-     }
- 
-     static void textExtents(XftFont * font, char_t * str, size_t len,
---- configure.in.old	2009-09-25 00:05:08.000000000 +0300
-+++ configure.in	2009-09-25 00:07:14.000000000 +0300
-@@ -307,6 +307,20 @@
-       features="${features} i18n"
- fi
- 
-+dnl =================================================== Right to left support ===
-+dnl
-+AC_ARG_ENABLE(fribidi,
-+  [  --disable-fribidi       Disable right to left support])
-+      
-+if test "$enable_fribidi" != "no" && test "$enable_i18n" != "no"; then
-+  PKG_CHECK_MODULES(FRIBIDI, fribidi)
-+
-+  AC_DEFINE(CONFIG_FRIBIDI,1, [Define to enable fribidi support])
-+        
-+  CORE_CFLAGS="${CORE_CFLAGS} ${FRIBIDI_CFLAGS}"
-+  CORE_LIBS="${CORE_LIBS} ${FRIBIDI_LIBS}"
-+fi
-+
- dnl ============================================================ NLS Support ===
- dnl
- AC_ARG_ENABLE(nls,
diff --git a/x11-wm/icewm/files/icewm-keys.patch b/x11-wm/icewm/files/icewm-keys.patch
deleted file mode 100644
index 7e136bb93288..000000000000
--- a/x11-wm/icewm/files/icewm-keys.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- icewm-1.2.30/lib/keys.in.old	2007-01-18 13:55:20.000000000 +0200
-+++ icewm-1.2.30/lib/keys.in	2007-01-18 16:07:07.000000000 +0200
-@@ -9,28 +9,21 @@
- # You'll have to omit XK_ prefixs and to replace XF86XK_ prefixes by
- # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper.
- #
--key "Alt+Ctrl+t"		xterm
--key "Alt+Ctrl+f"		fte
--key "Alt+Ctrl+e"		nedit
--key "Alt+Ctrl+g"		gimp
--key "Alt+Ctrl+n"		netscape -noraise -remote openBrowser
--key "Alt+Ctrl+b"		netscape -noraise -remote openBookmarks
--key "Alt+Ctrl+m"		netscape -noraise -remote openURL(mailto:,new-window) 
-+key "Alt+Ctrl+t"			xterm
-+key "Alt+Ctrl+b"			xdg-open about:blank
-+key "Alt+Ctrl+s"			xdg-open http://www.google.com
- 
--key "Alt+Ctrl+KP_Divide"	aumix -v -5		# lower volume
--key "Alt+Ctrl+KP_Multiply"	aumix -v +5		# raise volume
-+key "Super+KP_Subtract"		amixer sset PCM 5%-
-+key "Super+KP_Add"			amixer sset PCM 5%+
- 
- # "Multimedia key" bindings for XFree86. Gather the keycodes of your
- # advanced function keys by watching the output of the xev command whilest
- # pressing those keys and map those symbols by using xmodmap.
- 
--key "XF86Standby"		killall -QUIT icewm
--key "XF86AudioLowerVolume"	aumix -v -5
--key "XF86AudioRaiseVolume"	aumix -v +5
--key "XF86AudioMute"		aumix -v 0
--key "XF86AudioPlay"		cdplay play 1
--key "XF86AudioStop"		cdplay stop
--key "XF86HomePage"		netscape -noraise -remote openHomepage
--key "XF86Mail"			netscape -noraise -remote openURL(mailto:,new-window) 
--key "XF86Search"		netscape -noraise -remote openURL(http://www.google.com/)
--key "XF86Eject"			eject
-+key "XF86Standby"			killall -QUIT icewm
-+key "XF86AudioLowerVolume"	amixer sset PCM 5%-
-+key "XF86AudioRaiseVolume"	amixer sset PCM 5%+
-+key "XF86AudioMute"			amixer sset PCM 0%
-+key "XF86HomePage"			xdg-open about:blank
-+key "XF86Search"			xdg-open http://www.google.com
-+key "XF86Eject"				eject
diff --git a/x11-wm/icewm/files/icewm-startup b/x11-wm/icewm/files/icewm-startup
deleted file mode 100644
index 048ab5938486..000000000000
--- a/x11-wm/icewm/files/icewm-startup
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ ! -d ~/.icewm ] && mkdir ~/.icewm
-XDG_MENU_PREFIX="gnome-" icewm-xdg-menu --entire-menu --with-theme-paths --icon-size 16 --theme gnome > ~/.icewm/programs.autogen
-
diff --git a/x11-wm/icewm/files/icewm-toolbar.patch b/x11-wm/icewm/files/icewm-toolbar.patch
deleted file mode 100644
index a6f0f15f52d3..000000000000
--- a/x11-wm/icewm/files/icewm-toolbar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- icewm-1.2.30/lib/toolbar.in.old	2007-01-18 18:51:55.000000000 +0200
-+++ icewm-1.3.7/lib/toolbar.in	2012-06-10 09:36:00.000000000 +0200
-@@ -4,6 +4,6 @@
- # since modifications to this file will be discarded when you
- # (re)install icewm.
- #
--prog XTerm xterm xterm
--prog FTE fte fte
--prog Netscape netscape netscape
-+prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
-+prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
-+
diff --git a/x11-wm/icewm/files/icewm-xdg-menu b/x11-wm/icewm/files/icewm-xdg-menu
deleted file mode 100644
index 529f9e2ab3b4..000000000000
--- a/x11-wm/icewm/files/icewm-xdg-menu
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/python2
-"""
-This script generates FreeDesktop application menu for IceWM window manager.
-
-Written by Konstantin Korikov <lostclus@ua.fm>, put in the public domain
-
-Requires pyxdg http://cvs.freedesktop.org/cgi-bin/viewcvs.cgi/pyxdg/
-
-USAGE EXAMPLE
-
-Add to $HOME/.icewm/menu this line:
-
-	menuprog Applications - icewm-xdg-menu
-
-and restart IceWM.
-"""
-
-import sys
-import locale
-import getopt
-import re
-import xdg.Menu
-import xdg.DesktopEntry
-import xdg.IconTheme
-import xdg.Config
-
-version = "0.3"
-
-def print_usage(exit_code = 1):
-  print """Usage: %s [options]
-Options:
-  --locale=locale               set output languege and encoding
-  --root-folder folder          folder to generate (for example: /Games)
-  --terminal command            set terminal emulator command (default: xterm -e %%s)
-  --default-folder-icon icon    icon for folders that not provide Icon option
-  --default-entry-icon icon     icon for entries that not provide Icon option
-  --with-theme-paths            convert icon base names to icon absolute paths
-                                using icon theme
-  --entire-menu                 print entire menu
-  --icon-size                   set default icon size
-  --theme theme                 set icon theme
-  --help                        print this help and exit
-  --version                     print version and exit
-""" % sys.argv[0]
-  sys.exit(exit_code)
-  
-def print_version():
-  print "%s version %s" % (
-    os.path.basename(sys.argv[0]), version)
-  sys.exit(0)
-
-root_folder = ""
-terminal = "xterm -e %s"
-default_folder_icon = "folder"
-default_entry_icon = "-"
-entire_menu = False
-with_theme_paths = False
-icon_size = 16
-
-exec_clean1_re = re.compile(r'%[a-zA-Z]')
-exec_clean2_re = re.compile(r'%%')
-encoding = None
-locale_str = None
-
-def find_icon(entry):
-  icon = entry.getIcon()
-  if icon and with_theme_paths:
-    icon = xdg.IconTheme.getIconPath(icon, icon_size) or icon
-  return icon
-
-def process_menu(menu):
-  for entry in menu.getEntries():
-    if isinstance(entry, xdg.Menu.Menu):
-      name = entry.getName() or entry.DesktopFileID
-      icon = find_icon(entry) or default_folder_icon
-
-      if entire_menu:
-        print ("menu \"%s\" \"%s\" {" % (name, icon)).encode(encoding)
-        process_menu(entry)
-        print "}".encode(encoding)
-      else:
-        print (("menuprog \"%s\" \"%s\" %s" % (name, icon, sys.argv[0])) +
-            (" --root-folder \"%s\"" % entry.getPath(org=True)) +
-            (" --terminal \"%s\"" % terminal) +
-            (" --default-folder-icon \"%s\"" % default_folder_icon) +
-            (" --default-entry-icon \"%s\"" % default_entry_icon) +
-            (" --theme \"%s\"" % xdg.Config.icon_theme) +
-            (" --icon-size \"%d\"" % icon_size) +
-            (with_theme_paths and " --with-theme-paths" or "")).encode(encoding),
-        if locale_str:
-          print (" --locale \"%s\"" % locale_str).encode(encoding),
-        print
-    elif isinstance(entry, xdg.Menu.MenuEntry):
-      de = entry.DesktopEntry
-      name = de.getName() or entry.DesktopFileID
-      icon = find_icon(de) or default_entry_icon
-      execute = exec_clean2_re.sub('%', exec_clean1_re.sub('', de.getExec()))
-      if de.getTerminal(): execute = terminal % execute      
-      print ("prog \"%s\" \"%s\" %s" % (name, icon, execute)).encode(encoding)
-
-try: opts, args = getopt.getopt(sys.argv[1:], "", 
-  ("help", "version", "locale=",
-   "root-folder=", "terminal=", "default-folder-icon=", 
-   "default-entry-icon=", "entire-menu", "theme=", "with-theme-paths",
-   "icon-size="))
-except getopt.GetoptError: print_usage()
-
-locale.setlocale(locale.LC_ALL, "")
-
-for o, v in opts:
-  if o == "--locale":
-    locale_str = v
-    locale.setlocale(locale.LC_ALL, locale_str)
-  if o == "--root-folder": root_folder = v
-  elif o == "--terminal": terminal = v
-  elif o == "--default-folder-icon": default_folder_icon = v
-  elif o == "--default-entry-icon": default_entry_icon = v
-  elif o == "--entire-menu" : entire_menu = True
-  elif o == "--with-theme-paths" : with_theme_paths = True
-  elif o == "--icon-size": icon_size = int(v)
-  elif o == "--theme" : xdg.Config.setIconTheme(v)
-  elif o in ("-h", "-?", "--help"): print_usage(0)
-  elif o in ("-v", "--version"): print_version()
-
-encoding = locale.getlocale()[1] or 'UTF-8'
-menu = xdg.Menu.parse()
-if root_folder: menu = menu.getMenu(root_folder)
-process_menu(menu)
diff --git a/x11-wm/icewm/icewm-1.3.12-r1.ebuild b/x11-wm/icewm/icewm-1.3.12-r1.ebuild
deleted file mode 100644
index 37e3971bb7e2..000000000000
--- a/x11-wm/icewm/icewm-1.3.12-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-apps/sed-4
-	x11-proto/xextproto
-	x11-proto/xproto
-	doc? ( app-text/linuxdoc-tools )
-	nls? ( >=sys-devel/gettext-0.19.6 )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-pkg_setup() {
-	if use truetype && use minimal ; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.10-menu.patch
-)
-
-src_prepare() {
-	# Fix bug #486710
-	use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
-
-	default
-
-	if ! use doc ; then
-		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	if use truetype ; then
-		myconf=(
-			--enable-gradients
-			--enable-shape
-			--enable-shaped-decorations
-		)
-	else
-		myconf=(
-			--disable-xfreetype
-			--enable-corefonts
-			$(use_enable minimal lite)
-		)
-	fi
-
-	myconf+=(
-		--disable-menus-gnome2
-		--with-libdir=/usr/share/icewm
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-
-	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-}
-
-src_install(){
-	local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
-
-	default
-
-	if ! use doc ; then
-		docinto html
-		dodoc doc/*.sgml
-		cp doc/${PN}.man "${T}"/${PN}.1 || die
-		doman "${T}"/${PN}.1
-	fi
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/icewm/icewm-1.3.8.ebuild b/x11-wm/icewm/icewm-1.3.8.ebuild
deleted file mode 100644
index 4d76d35485f6..000000000000
--- a/x11-wm/icewm/icewm-1.3.8.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="http://www.icewm.org/"
-LICENSE="GPL-2"
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
-IUSE="bidi debug gnome minimal nls truetype uclibc xinerama"
-REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-RDEPEND="
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libSM
-	x11-libs/libICE
-	xinerama? ( x11-libs/libXinerama )
-	bidi? ( dev-libs/fribidi )
-	gnome? (
-		${PYTHON_DEPS}
-		dev-python/pyxdg
-		gnome-base/gnome-desktop:2
-		gnome-base/gnome-menus
-		gnome-base/libgnomeui )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-libs/giflib
-"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	>=sys-apps/sed-4
-"
-
-pkg_setup() {
-	if use truetype && use minimal; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-src_prepare() {
-	# Fedora patches
-	epatch "${FILESDIR}"/${PN}-1.3.8-menu.patch
-	epatch "${FILESDIR}"/${PN}-toolbar.patch
-	epatch "${FILESDIR}"/${PN}-keys.patch
-	epatch "${FILESDIR}"/${PN}-fribidi.patch
-	epatch "${FILESDIR}"/${PN}-1.3.7-dso.patch
-	epatch "${FILESDIR}"/${PN}-defaults.patch
-	epatch "${FILESDIR}"/${PN}-1.3.7-menuiconsize.patch
-	epatch "${FILESDIR}"/${PN}-1.3.8-deprecated.patch
-
-	epatch "${FILESDIR}"/${PN}-1.3.7-gcc44.patch
-
-	# Get thermal info from proper locations, bug #452730
-	epatch "${FILESDIR}"/${PN}-1.3.7-thermal.patch
-
-	# Debian patch fixing multiple build issues, like bug #470148
-	epatch "${FILESDIR}"/${PN}-1.3.8-build-fixes.patch
-
-	# Fix bug #486710
-	use uclibc && epatch "${FILESDIR}/${P}-uclibc.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	if use truetype
-	then
-		myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations"
-	else
-		myconf="${myconf} --disable-xfreetype --enable-corefonts
-			$(use_enable minimal lite)"
-	fi
-
-	myconf="${myconf}
-		--with-libdir=/usr/share/icewm
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable gnome menus-gnome2)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable x86 x86-asm)
-		$(use_enable xinerama)
-		--without-esd-config"
-
-	CXXFLAGS="${CXXFLAGS}" econf ${myconf}
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-}
-
-src_install(){
-	default
-
-	if use gnome; then
-		dobin "${FILESDIR}"/icewm-xdg-menu
-		exeinto /usr/share/icewm/
-		newexe "${FILESDIR}"/icewm-startup startup
-	fi
-
-	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/IceWM.desktop"
-}
diff --git a/x11-wm/icewm/icewm-1.4.0.ebuild b/x11-wm/icewm/icewm-1.4.0.ebuild
deleted file mode 100644
index 6ccb181652d1..000000000000
--- a/x11-wm/icewm/icewm-1.4.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-apps/sed-4
-	x11-proto/xextproto
-	x11-proto/xproto
-	doc? ( app-text/linuxdoc-tools )
-	nls? ( >=sys-devel/gettext-0.19.6 )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-pkg_setup() {
-	if use truetype && use minimal ; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.10-menu.patch
-)
-
-src_prepare() {
-	# Fix bug #486710
-	use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
-
-	default
-
-	if ! use doc ; then
-		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-menus-gnome2
-		--with-libdir=/usr/share/icewm
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-gradients
-			--enable-shape
-			--enable-shaped-decorations
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-			$(use_enable minimal lite)
-		)
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-}
-
-src_install(){
-	local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
-
-	default
-
-	if ! use doc ; then
-		cp doc/${PN}.man "${T}"/${PN}.1 || die
-		doman "${T}"/${PN}.1
-	fi
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}