Version bump (bug #525212). Removed old (bug #525022)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

15 files changed, 141 insertions, 637 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 612103d306b5..3ec10ea080fa 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.166 2014/10/29 09:38:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.167 2014/11/02 19:13:45 polynomial-c Exp $
+
+*icewm-1.3.9 (02 Nov 2014)
+
+  02 Nov 2014; Lars Wendler <polynomial-c@gentoo.org> -icewm-1.2.37.ebuild,
+  -icewm-1.3.7-r1.ebuild, +icewm-1.3.9.ebuild,
+  -files/icewm-1.2.37-gnome2.patch,
+  -files/icewm-1.2.37-libX11-1.5.0-deprecated.patch,
+  -files/icewm-1.3.7-build-fixes.patch,
+  -files/icewm-1.3.7-configurenotify.patch,
+  -files/icewm-1.3.7-deprecated.patch, -files/icewm-1.3.7-gcc47.patch,
+  -files/icewm-1.3.7-uclibc.patch, +files/icewm-1.3.9-fribidi.patch,
+  -files/icewm-menu.patch, -files/icewm-uclibc.patch,
+  -files/icewm-wmclient.patch:
+  Version bump (bug #525212). Removed old (bug #525022).
 
   29 Oct 2014; Agostino Sarubbo <ago@gentoo.org> icewm-1.3.8.ebuild:
   Stable for sparc, wrt bug #506828
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 497dc4028783..59966336795c 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -3,51 +3,40 @@ Hash: SHA256
 
 AUX IceWM.desktop 200 SHA256 7564e6a573365eae529b849c7f5723eaef39258d785fd83de42e122cdf8e0eb1 SHA512 dd4072ca1c0e3e2205222ef0428094b0e159ff5ec4092145c61cd7cdf935fdaac78f89fb23974f0f75120819254314cd049b2fcb89b106aea51e22a930fa5bba WHIRLPOOL 10868795b119feb8f1d32df258a0ca721a27c281aa53f0f9fc71b662c1bd64a91576fa2f96b6719f83a183a477ca2fc013430f6ce729cf5412142c9034942dc6
 AUX icewm 33 SHA256 9c227d5676372166707902073337c0610ea0e1e0bb1c5d8881bd4e3b44919df1 SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0 WHIRLPOOL 7248377faae7454d1695d0c094829c47edad23b6bec84197bfeeda6500eb418dc9b627f3d4fe811ebffce2f91c508af66478d7177bfaa0013371f1cc0a4f391b
-AUX icewm-1.2.37-gnome2.patch 1194 SHA256 c1f64007fe60a898b3f816b08b8ef03a8ed9607a4367aead176220ad0b56c3c9 SHA512 f680359751a29de347de9c993d5cdda31291616897492b64acc8153333e4dc7eddd026e985765ccc75bfa42872c0c3322cbfe308c040de3db38712415a7a42ce WHIRLPOOL c046bad4bb2704863082a0d6b390c46792e600c6e82f4a9a395595dfecf4baa178a77fc7f03eb8dcdb65a5e839f7c2e1a7a8774ba26924be97bc42bb0c21e77a
-AUX icewm-1.2.37-libX11-1.5.0-deprecated.patch 711 SHA256 1b8ad309391c46d79f90feea0d47927a105ee413d82f2533f61530ecf22154cd SHA512 a73c2b3e6de1caa2ba9855ef49870ba37ac0d726e0ef18b600767128b62467e5f1281c20087cc3180510e7c56c6d9a73cd12b6964a5c7fcb0773a184a1e782e2 WHIRLPOOL f34a5fb98b335579ed581407468065e30b40e0a1d0c91f251459994256b93b82cd7124c6e0dd094daa1884a9e232f0936ebb65c1216c532a96ab4a9e92331bf9
-AUX icewm-1.3.7-build-fixes.patch 7116 SHA256 7e206b8e4d3fd88d4c64be1158cc7781772e00a2520669966db3f1ce87181d4b SHA512 e7118206876b7b3b04e17c594946e7f13a8f2b7aaa9f4a3d33bc4ecb7ebe8ff2feb1209c42cdd640770a06a1fe10c95ed2f2047646bb934a03ae93783dd0dbdc WHIRLPOOL 10f6d2de01687bba03eb76f0d3a4ff5f7b288d0e7d10b690efe3403d9294554bd834fe87a746dfc681ec32900518f8b415ecbef8c1ac221d6ebbb8f042f44def
-AUX icewm-1.3.7-configurenotify.patch 444 SHA256 d86d8e670211916b426e82088ce68af8cad271c0a957b18fa95a79eae513c5b2 SHA512 f5bd4637287f15f497482ae3f566c119a907a6fc7078f177bb16c9304d47f69de3b000b539f10597ad5c9910191b5ffbd443f3416d2de65c1192470e24f2c61b WHIRLPOOL 29f6396d6b533c0654b7fee859cab573f0d9a7ced6b60805ee7f1357e5bb4f482aff9ed28797cbd5968241b77d948c5ac231dfad285055be7e97c2d0d208c0b8
-AUX icewm-1.3.7-deprecated.patch 443 SHA256 a05efa3620f6e0c6bd92f53da7a0c920f95760c8350c91ab52ed7ca72adedbe4 SHA512 69c39fab4208ae3f3408d63713c210833460a03c181fde223fa5acba56dc6e1b2b1072e135143cf7ff9867b0a765074b62eb1218c49857553fb867a7590cf976 WHIRLPOOL 5f616811ff8b1320f7b200e74d5fc72c46fc14efde9db19af57be67a15bbed1e2e79b66fbbfc7701bcf866f6195b80855de887d961431da1fbf92fd66aa44fa4
 AUX icewm-1.3.7-dso.patch 376 SHA256 4c8108800ad05a88011a7e4dbe9ed009a3ff314a434afa0d832ab74785887223 SHA512 e2ca26ef3bf1f1e1ffb452cebdf3cc5cdb8b84c47b5409e68923c0ad6cac8ea399274fd4d0bf71f6a6929445b0f8a1d35edbc2233b90594f05acd6a03e6a8f8a WHIRLPOOL 3eef2a86500b03cba9c08b3159ff21bfe8ffdd6bdfc2747f4a2a2fc62ab0b021a48158ac7f6bf3648d922ab4b9f52f877c3b7894a76cc7c02a213a153c65e9cf
 AUX icewm-1.3.7-gcc44.patch 434 SHA256 60e421ae6de444cacd4e854991b43029422cf1ed1f03a37c17271fb971d0ba76 SHA512 12acc47b5938234bfa76e38f2c6f7ff0e2528aa4feac8bd19eec6743d994f7b5465373ff708232fc3ddcc5fe3cb8c21fda34d1ea6e0e860bb86c58503b2f8d65 WHIRLPOOL 9bd83695f7d13cb8e446a460526f1fff51bc51caef32b56e9fb269259e42de1a5c059785906c4f5bd70617c6ef505aaed2e71af6989e0f7520e33cc1566d72eb
-AUX icewm-1.3.7-gcc47.patch 475 SHA256 e380d2ece544c9f851f6888c75e219d907cd8f5eef7b8335fd542383d50a2eb4 SHA512 dd0744cfe647aee30ec833a6b93da80a07624e26ff60df1e76af326512951c4695104dafbe326b2ff2b4c6c937be32d78a3672aa3ca666876d053d8d589eb948 WHIRLPOOL e7c0b96e7aae9a4741de1c39babb110fa8d759e244d9408aefde9438804998a8f8e3580472f17909bc3d6e04cb13cb5d37f822d2478e85cf3dcfd2f384240cca
 AUX icewm-1.3.7-menuiconsize.patch 2435 SHA256 ba77282c9b952d0e9f780244edbc708e63bd7bb39e8c583ad3490f025050cebc SHA512 ee56ff65a74d9a4cf4a03bc7e1324c6f0ea180fadc2232ba46a5f467d2b4f6f9e57ca73a658d5f7ed0acce4f399e1c7491ef54a29516da2fef081e7671dd1e3d WHIRLPOOL e3274f791b7081721e77a9cd3207b67b4fd6cb74b741e979ddae7b32c524e4a6c32d1bfa997385ba1faa65bb6001d579a80a4a9a805d9117348a327bb2ebe443
 AUX icewm-1.3.7-thermal.patch 1335 SHA256 fe69b7994764e1c3fbf90ec3547e85e8dc92a305570291201c456b7cc4efcd9e SHA512 3d6cfce4980a19cc16a1c56737300157f73261e0f8e512063f3ac43ac177acbe635d9e9456cdfd2e177899091e620caf0cfad1f651e533cfa5c1712e71b90650 WHIRLPOOL ab2e0279bbb792a2df31221e32b8874a4646894e28cde28615fbfc8c4974f7bd151b5fe15263ed365869bd755eb50f205f3209d1c008bf021b15e13a0ebb410c
-AUX icewm-1.3.7-uclibc.patch 1830 SHA256 7ee3a62e956d1c8c1b2563a1a85356405cc11b06d8f67e65b63d364355acab52 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e WHIRLPOOL 5e5b89cdb7b76f06541001b9f72b7da0cde8235528b57fc2fb7d6d7c816aefea82a314b34959e3987145228ae98c0e9dfa2c9575cefedc3aa95acfb7731e21cd
 AUX icewm-1.3.8-build-fixes.patch 3821 SHA256 243db61d3c5b27a70061fb806387e18c1418d7b6b526cc37c7c3e7027089edbf SHA512 7fce22f361dbff6635acbcb91b91235221b1d85f9639a38f12c081305a3b1eb1de7e8825048d39a84495bb6b443e78eff5b9af315a9beb2b20d4205646e47362 WHIRLPOOL e0971a26dde9b74cdd3b259fab32fd5569f838ec8c17fd1674cf08264385a1b5109411716ff375a574647f1cd964645622cb334f1153eb98bbbb8e8f49b03d60
 AUX icewm-1.3.8-deprecated.patch 317 SHA256 05c464c0abbf65a1ea01f81a514c3022939ec0f0a3152583969f6c022dd38451 SHA512 7f0649853c78ea553a20d07bb3d88c3481a033d0fc143585f3bc2e39e9b66572b068f2ffd1660fcbf7d805c7d2f064d6d8900ddf01b61244a84aa13466061aaa WHIRLPOOL 5653fbabd227438b754371daf4a8d483d5d84a2e34be831b400591bf32630616cf9cdafacf15351a54f3953c33ca53cccb29b34a5b617d9e7833f04685effc2c
 AUX icewm-1.3.8-menu.patch 928 SHA256 22d1929f34f377eeb776e993d3052bed06987922b8f6fffb9183c8c986b5ea8e SHA512 837720dc620a02d225f5df82f8fc8b8bb8512e846f6360b058c02fb1e2483186bdccbeaf997bb690c6d8482555f710494a0d534a4add1009ecc3060e180f8baa WHIRLPOOL 50c07457c67802c67b789a42f489c4dace8cf2f912cecf7abe2d1551a951ef25c4d0c66970adb277b37a0041b630c77250c13ac741884ed198e1b51618c7c3b1
+AUX icewm-1.3.9-fribidi.patch 2039 SHA256 7eba54205ab6c74db1fb7c13c8a3f9b08cfbaa7a8226af0a58237fd01c28c7d0 SHA512 0057bcc8570f17a2de4427dcc72685a2dcc866d553559c7cf31bfda04f42782f793a04768d80cedafdca7771f57d8e5c3f86e32c46580e49d7c7dcc4b6cd3492 WHIRLPOOL 87aa0b5b6e7cf0869b28d3f217b3875d6b59ea3f1363854a7dfd424bcde0848c0baeadef907f8c3dab894a895aff4fb3068dac68faf4d2158dd76dbab7daebb8
 AUX icewm-defaults.patch 694 SHA256 ce43d1a20428cecf2198422e87f5092c6378d97e3987925b2c494ea87323bf8c SHA512 41832e4d23af4790991703a502e3c5f5b0189bceac34b3e2e133ed60efd164f0521a90c39aab6fbac81ffb00a07313e1607cd7fb961bda9c5062bd1623a37919 WHIRLPOOL d243a0434ec9217ba8ccd29d9160d8028ce2db8b727e1619021b96304edac10f0969fa581749d387e6ebf7a1ef595a2ff3bb9a49109d3fb416487059140ad0ab
 AUX icewm-fribidi.patch 2168 SHA256 15865e8642ccc9fc5da221cc803176db2acc4a7afc500d199bc33c893a703649 SHA512 85f1f6f12a68f0e64d847ade924755e7f5eac3e443a8c8efeb44400e6403c10d5739b178f540d4337687c0c55159e81ebaaf6c53ae5c14d73a1e4352bd5d1fb5 WHIRLPOOL 9801fde474805e825e0f88a32560192fd45444d194c76e32dc5e82f7d0045022c695713b5d93babbc3a14ee8944c53ea0ef2efc4d618ea6d4c9d6bd12f9824c6
 AUX icewm-keys.patch 1870 SHA256 8e64cf50489fc27b0ddd44faa1e04651981e2d13c8a48bb6270636e7c7d3d7c7 SHA512 c5206e2c4e98d89e71ccd46c3838941101e009036abd6026cf445b2e01315d9d70d6835b45def978d101d575e0c4dc48514883406c0bef67f11f24e4404daf43 WHIRLPOOL 517e63604d1730a3f9895e6d20d3c8b6d9d2b9c79b565e486190682417cff82245292211f09ff6b2659cdd830dde06f6eee8535887da11696370bffd7991823d
-AUX icewm-menu.patch 1077 SHA256 c062379022be3e1c344aedd6c1ec7160cf111644f8b5166f9d1ee0909fa1e996 SHA512 09b48d8b97d76b044fb6a2b1584517c5c12911ba1cde854650f814cf2d08a0911e877d7ab43bccc27d22b42cfae4e4b0db179e93ae6dae853a9dc1d6b76723e5 WHIRLPOOL 8c9908013b95ce9fbb24832a39470ccc2dce226ef9fa66a1f5897fc87488707511b68428f7f60e393985ba0d03385d929c5f0411aa9169a48c7cba7ddde662a8
 AUX icewm-startup 177 SHA256 2da3eb74acb1ad4fbfdbb7ced872c0ced4248b56d098ef8506ca9aaf625a6145 SHA512 512edf9e94a8bb240e932fa3be7fd4bc78635a0fe0e41ed96de520be188f23d2e03115868f4b3610d190eff50f011531e61ca8eaccbbf194a232e991713580d9 WHIRLPOOL abf6f33d23277b6fa5659a10c539397816817a798f549b50e54e3b5313fb1ad6d7e74fe4503170d7b141d1965b0554409b6b4ef797fb6f85932fcaf58200bf15
 AUX icewm-toolbar.patch 476 SHA256 b855be8a37177cbd4604b92b8f0f55f086c81c6529f7220b3c52d6cd00bce0ad SHA512 66c434c385454e139e495bc9f475f403e0c2f2b241ee2dc4903ab1975198152211b21f836c39338d5a796b2ac8a40f6ce4cb09a6878467bab50177fc105eb9fe WHIRLPOOL 8cf5b8c714ddc96894ec69b4cc274b17b0192a0558416f0aa103ad6a8881a33983af59ef23e406005a988b967bd460622add14249a7b6a359685cc190ce2d406
-AUX icewm-uclibc.patch 708 SHA256 3357b8d27e4979a59fc45298ded733c623832143b1c155da72cfb24aee6d3e95 SHA512 a35d2013c6673eb46c98a5249737b0c8a447879f76c75760471087987a74fd282b1f09b272af28e3efbaa737b26ae066a76b4aafc599b5b50c893fcaa267c1c9 WHIRLPOOL 52b971fc5a760899afe5eb4c8b5be2e53350b7772bc4a22923705b7817d4ca88e1fd526ac00481f5741011738bdcd7cbf11520e8a3b29a04fe8ec341a544e4ee
-AUX icewm-wmclient.patch 1253 SHA256 a147022909e083571bb7a17784966c7bbdeba54960e0cd11f501e90ac88384a5 SHA512 cd82e055eed6a10005f36092de25642d1f5c524e6bd4bc5e49da52c7a6fb7aabecce33c28389daa78118323ac45cb0029d31f0bdbf4111704e288bd2ce145bef WHIRLPOOL 6773f18a3b6f6a42f35ddcc79de62b6cbe558c13d453c9fbea103498548727a1794405754ece1e50edb462a07af8d6b270723231c85f9f657ce8d76defb7b9d7
 AUX icewm-xdg-menu 4380 SHA256 115f081152fe8d376b884402bd8af24f678e68bbf4d6717690678df92eba2c22 SHA512 edbb196bae0c6aff3d5cfa31c50486e0ac9ffc5d287a11221e0a16ab27e176c9c6e724bc00725c5e3eba71df9afa12e5a8132eb0f154c4bc38c3150242f5d9c3 WHIRLPOOL e7380eeab8965d297ef7e16c5deb6d5dccb25e1077197ef0e2c6123d8559e36bd156b9fe2eeef630ff12951c78749ac2051a2d548a69aaf578687ead5db7e213
-DIST icewm-1.2.37.tar.gz 841879 SHA256 bfb60165cddafb458cbfd4b4b9203aa351e37cb75e0ad0c64e818b6fd2140595 SHA512 e7605470ab6480ac93ae482d68cab361b640a9355db0826c7d1a4b48f1a29c690fa908d649929db203ddb340e61a9fcbbf19732e237bbefd5116f33bdd85e34f WHIRLPOOL 8d55e97a5584c26151d4bbe64bd1be9a07ef9f8a10b767fd1d015f94fc95b66988ad3ce675bbbf446437b3ee199664934e7c432b4c42474e691aafcd9ccb2868
-DIST icewm-1.3.7.tar.gz 898197 SHA256 ca1a78046ae340c324c441ce24a9675c24a8bafd3eb6ed8205345785da08887b SHA512 b0c09b19d1a6df3acf03eda364716b5a8516011c760806087fd6315ccf2a5c926471db56079b46d8fab01db87ea42a809a66fe3088b6ad8575e41a000914e895 WHIRLPOOL 8ea9ade64b2d6eadedb35ec146096fd6c3986142ff14d718c789315aaf3bfb1ef9afcb5206ee2286bc01f3775373428d5b969e3e632e87eb2bf1e49a3d03b9ef
 DIST icewm-1.3.8.tar.gz 905680 SHA256 17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18 SHA512 ce9bf3e736a2f3fad4bbf731647b4e4ad0168cd2c4af66b1c43beef9ceeee39d14909714d2fc73ab13f6c285a74dfe31fffc9677ae8bd2d1077716cd6d6afb72 WHIRLPOOL 5bb0f6fa830ea10978bb8fd31805596c849a370d619626736e1218e844de72e142ed1aaa87b2f2aeb40603fcf2cfaa88ffae242c726ae1151045c6a792d5cf6c
-EBUILD icewm-1.2.37.ebuild 2982 SHA256 da8b5d7b54234d08b1f2c1cb66ba00a90f13f2291c662f3e3cf8f1d586f4f110 SHA512 b817ffc6f2ef6280e769ed7ab7713a2294dfe42775204ab80840b93fd68e629b30c6ed501feda2c850a5854773ae047835247bfff32a3f00215012afc410de35 WHIRLPOOL a75427d1169a089008d98a9b4d6ec60db0cc3fc8f7f8743f0a531a106080fa4e5f9e655cc9e3464f488d2c801c114af8acdfad6db65684d473a99affd3523f0e
-EBUILD icewm-1.3.7-r1.ebuild 3563 SHA256 4aaa569a55e44eb66981b56733b6b2787496eea142b09d985746cc2ccf9dfc6e SHA512 3c8bd47e511d8e1cfa8a29a90b8ac6ccf3671c2e3a6402baace60b8cf47fc63f477709c425d7fd0184bdd083aed80606a6c0a1d461b0b331c675225d77f3a78b WHIRLPOOL 40a86b85599499a1ef419d56245c3833e5855cde471143713ee0f7b96b733482042ee471618ea7d3d54292d814f81970378a7bffc2c2570e71a27e1ea6cea7ce
+DIST icewm-1.3.9.tar.gz 890170 SHA256 2d47f8cda48a91ac14fb20890c2df0f304cf8278adf50c3e4070ef68b61a687d SHA512 9c28b004d3a13470e61a3ecbea489d67134b5d1651d84677e8ab0fb732b630d30b7be047553833c818a0ae05841ec808d37d7d50e21e5a562d407cdc74b4943e WHIRLPOOL 8ecba1325da50655524b414280bf4c87f7bcf4c5d0e7edb0df8c6b341680443f961eddf7fd653ac75229aea88100ba8c06b8268196b48f63f6683231f972eb97
 EBUILD icewm-1.3.8.ebuild 3430 SHA256 8c2b5777eb0d2e882355afa78fe8bf2d68750f65587ffda448a7cbbc9582ecd4 SHA512 25b4e2f37def4a32b0c18bef5bf8f85059056186174c2b4c6711732a77076293747254b4e4f18c5ac026318dd489cb9e6f0e81cef8aa25218e400c59459d5526 WHIRLPOOL 1a129945ad6e93e9c21d190f415bdfeeab9b8293fbed39c12a0e883ea6408894ff45c155cb4e01373900b0a7b5277af3bff13fd139f6e7dcce759e16627fa1ff
-MISC ChangeLog 25669 SHA256 dab13dc0f7db7fae4739814e88bfdb68b454424d0cf428290ef6a7ae1752c4f1 SHA512 dd8f73994e52c686f81274154e0df5d741d0739789b256d8774e6c9dd29bf1f7f35df568d27f6d62938a38af33852715bfbd3a49c272851d79a62ede039eadcb WHIRLPOOL 898ed25a435aa6f66c594e2948e994f9d02ee64080a1fdfa3bac82189a7672df14c20fb671193b30a8592c5924933a56e6be9cc77e175df9803458362f6a41ce
+EBUILD icewm-1.3.9.ebuild 3321 SHA256 633c4e08f9836d4c09ddcf1b9f6c283097ddef5eedb8d84125013db23501059e SHA512 18f2376669b7e79079682b5dc6bc92b5199652d77512124de4f60e0896f757eb45ebcbebc66a1d8a292eb006ebf653f5f347d5fcc418f6e60367231111aa6bd7 WHIRLPOOL aed80e48f9d3a730a0527c65c33ee8caf90c63bd70eace18a981482089fa333ff15cf304652543b23e76418429895ee17e92e71711b4b34ed0f9a8a09e7e94da
+MISC ChangeLog 26285 SHA256 56d80f1af829ff76b39d765c0797995bf3f71ba8c061b489817c03c991cda2aa SHA512 a9256f27b05c2e8b5853c29179f40a9501fe9e2a62f80a2630cae659ee2ac380530e0a79f67a1b8cfc1dcc3e678aacf996568344beb616ded4b79c7b17af7135 WHIRLPOOL 034d25a2df3a32838d6353243d1fa48045fe75ab287cc6cf01b5ebf54334d507a31611c5253ba6cd6d17ecc31f5de73eb1340c55dd710b7d6ba9ea48b7b162ee
 MISC metadata.xml 475 SHA256 ab567633101459c7952b19014cc0cca71f5cf90e5ff7bc322ef8e39755e24826 SHA512 fab94ce62073fb76d3e8413444e3f43b243b5f484f5afab7c4ef2e47d020f5f013fd610109c248b247b0c78af978779da237c822bf103d2ffff7cb43dba276ad WHIRLPOOL d817f0e0c27ed472d7ebef46fd2d11c4e71e5b092ee46ccb6a60caf3a11d54051d20e03074b7167d585e225bf27302cbf27b48bc0ddb5f036ada359fde03f2a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUULWSAAoJELp701BxlEWfOzoP/iPuEdo3e9U6mjNP9lglgaId
-/yD/j22ZLtKNtJhOzBfpHFkYAviHcH0hkqVX2KtJHJt9A6+GBQjdUL/U5BokV+WZ
-1c3aMd4kIU6nknlIfXCnjUnBMeKwRY1PqExhTaBTVqwT2UtSQ7bANbGi4dJAkD7g
-ZkOsjUKDoZJVfTiw25CkWfpqY987RvZ8h4HbSW+3gX7VUR2Ff5NAEy02VjYCjL15
-7arhP0C5t3yj2EwgPJ4LbBCitA75VID0JR881nuHaDDnCN5QLHIOJE6+Mv3PM6GD
-+Lqhq4uhjAU8PV5SbP210CozMluSBFtB4KpzkjMIPEpg41j+ZDLX07C2avnOgpLU
-DdqiV1BOJsw7UulYK41SxF7TlBSSx8N4Meb/fid7JqTu9uurSjlqMtr6Cmy9DZp7
-ZdN5T9xZ2y7v9NP9CCU1e/jc5wz3fU8t+w5MFGwsjjUZasrjNo881k9/F4NUJOTm
-5+DGPiBaA+udTLrXOO7R8Eq824MIYTRcq2ZSDn5cJcCTyPvJ6j070i963kYUSRKx
-Z3BCBO+kLX0GsA3Im9K680KOJi2EEqqvAA8EGwrSn79dzos7p1oM7GaRmrKUq1W/
-pktxmSwLVXo5gl6SuP5+JWHolMWLSMjAy++UQsn9zOMV0ye6oJvg5a0MhEeT20Qx
-gXd1l2KyHg5PEXB9YyBM
-=YRfr
+iQIcBAEBCAAGBQJUVoJqAAoJEPiazRVxLXTFyHwP/2q/DLhqKjooqr1FscO1Cwz/
+iQpC28bJLTigcnMh3kamE65HA0i8MCEFFW71zHBLJyiQ+/W9cYOt0q2cpi714pka
+qDiDmtu0A3mkAgdf/2F7H5vCWq7c2oN3ImxkjLelS+QxiQsdq4mTFc+xemAumH0x
+0NaXEbsbTd1vMYFV6GMPw4pPya1VXMmbdafYVJd7JAHSp2zBjE/wOg2YUDwtqY/v
+vBdFzsSM1TJWO7NLA7TpUc2LEmkbSOv/vwU+fYSVxkEcg+TxxjyNooPaZ1aWjMct
+ZVzwcCrt9GQqEBY4+FcO4OuHg1qq+7wbxzxX/H9lKD8WJAS5DBN7hwsCfEVqBLwK
+PNrDJs8yoAp1qfZ+TqjJaoj50rlRHVZ3RQI3rWSVx93lYp0roFifHFiw3oywvGd8
+tsbWUiqKslLw/SoxrPqUxp3Hv/sbV1w551A4COBrV6DNOZyTdk+cmPEeXcZ8iq//
+Vd/h5BM0aVrBhj6EOQGCSKd5x1BekOisXK60ZV5USZrLq063wYPfHPIcJeyLdqKw
+jhw961sJ5h8gCM48pz7VUjAo8IbDogosJIuz37U2W++gu/Ge5g9/2gpW/G5MxCKO
+s4NPf+W+fZWD3N5C2Ddx22xuqzX3UozXUmKC71/Q/qkPC0vupMX7t9wvfQWmiEt8
+p2wL1ALITwDySjPc/C3l
+=AlZE
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/files/icewm-1.2.37-gnome2.patch b/x11-wm/icewm/files/icewm-1.2.37-gnome2.patch
deleted file mode 100644
index 5da3fbd84882..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.37-gnome2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -NrU5 icewm-1.2.37.original/configure.in icewm-1.2.37/configure.in
---- icewm-1.2.37.original/configure.in	2009-11-16 15:16:24.000000000 -0600
-+++ icewm-1.2.37/configure.in	2009-11-16 16:15:13.000000000 -0600
-@@ -818,19 +818,19 @@
-   [ if test "${enable_menus_gnome2}" = "yes"; then
-       AC_PATH_PROG(PKG_CONFIG, pkg-config)
-     
-       if test "${PKG_CONFIG}" != ""; then
- 	GNOME_VER=2
--	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
--	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
-+	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
-+	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
- 
- 	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
- 
- 	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
- 	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
- 	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
--	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"
-+	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/"
-       fi
- 
-       if test "${GNOME2_CFLAGS}" = ""; then
- 	AC_MSG_ERROR([gnome 2 can not be found via pkg-config.
- *** Install the GNOME´s development packages.])
diff --git a/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch b/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch
deleted file mode 100644
index 3533d31e34ac..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Don't use "deprecated" as identifier, will FTBFS if another
- library defines functions as deprecated.
-Author: Andreas Moog <amoog@ubuntu.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179
-Forwarded: Yes
-
---- icewm-1.3.7.orig/src/base.h
-+++ icewm-1.3.7/src/base.h
-@@ -2,9 +2,9 @@
- #define __BASE_H
- 
- #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
--#define deprecated __attribute__((deprecated))
-+#define ICEWM_deprecated __attribute__((deprecated))
- #else
--#define deprecated
-+#define ICEWM_deprecated
- #endif
- 
- /*** Atomar Data Types ********************************************************/
diff --git a/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch b/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch
deleted file mode 100755
index 0dd4b6dc0e76..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-Index: icewm-1.3.7/po/Makefile.in
-===================================================================
---- icewm-1.3.7.orig/po/Makefile.in	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/po/Makefile.in	2013-06-28 18:46:58.940864492 +0200
-@@ -20,6 +20,7 @@
- XGETTEXT =	@XGETTEXT@
- MSGMERGE =	@MSGMERGE@
- MSGFMT =	@MSGFMT@
-+VPATH = .:po:@srcdir@
- 
- .SUFFIXES:
- .SUFFIXES: .po .mo
-Index: icewm-1.3.7/src/WinMgr.h
-===================================================================
---- icewm-1.3.7.orig/src/WinMgr.h	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/src/WinMgr.h	2013-06-28 18:46:58.940864492 +0200
-@@ -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"
-Index: icewm-1.3.7/src/yfont.cc
-===================================================================
---- icewm-1.3.7.orig/src/yfont.cc	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/src/yfont.cc	2013-06-28 18:46:58.940864492 +0200
-@@ -12,7 +12,7 @@
- 
- extern ref<YFont> getXftFont(ustring name, bool antialias);
- extern ref<YFont> getXftFontXlfd(ustring name, bool antialias);
--extern ref<YFont> getCoreFont(ustring name);
-+extern ref<YFont> getCoreFont(const char*);
- 
- #ifdef CONFIG_XFREETYPE
- ref<YFont> YFont::getFont(ustring name, ustring xftFont, bool antialias) {
-@@ -46,7 +46,9 @@
- #endif
- 
- #ifdef CONFIG_COREFONTS
--    return getCoreFont(name);
-+    char tmp[4096]; // XXX: such things should go into getCoreFont directly
-+    name.copy(tmp, sizeof(tmp));
-+    return getCoreFont(tmp);
- #else
-     return null;
- #endif
-Index: icewm-1.3.7/src/yapp.cc
-===================================================================
---- icewm-1.3.7.orig/src/yapp.cc	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/src/yapp.cc	2013-06-28 18:46:58.944864245 +0200
-@@ -269,7 +269,7 @@
-         }
- #endif
- 
--        {
-+        if(measure_latency) {
-             struct timeval difftime;
-             struct timeval curtime;
-             gettimeofday(&curtime, 0);
-Index: icewm-1.3.7/src/Makefile.in
-===================================================================
---- icewm-1.3.7.orig/src/Makefile.in	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/src/Makefile.in	2013-06-28 18:46:58.944864245 +0200
-@@ -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@ # `fc-config --cflags`
-+	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ -I. # `fc-config --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@ # `fc-config --libs`
- IMAGE_LIBS =    @IMAGE_LIBS@
-@@ -192,6 +192,8 @@
- TESTCASES = @TESTCASES@
- OBJECTS = @BASEOBJS@ @TESTOBJS@
- BINARIES = @BASEBINS@ @TESTBINS@
-+BASEOBJS = @BASEOBJS@
-+VPATH = .:@srcdir@
- 
- ################################################################################
- 
-@@ -209,7 +211,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)
- 
-@@ -245,6 +248,8 @@
- 
- genpref$(EXEEXT): $(genpref_OBJS)
- 
-+build-dep: $(DEPLIST)
-+
- ################################################################################
- 
- check:	all tests
-Index: icewm-1.3.7/Makefile.in
-===================================================================
---- icewm-1.3.7.orig/Makefile.in	2013-06-28 18:46:58.952863752 +0200
-+++ icewm-1.3.7/Makefile.in	2013-06-28 18:46:58.944864245 +0200
-@@ -4,6 +4,8 @@
- # Please run 'configure' first (generate it with autogen.sh)
- ################################################################################
- 
-+SHELL=/bin/bash
-+
- srcdir     = @srcdir@
- top_srcdir = @top_srcdir@
- 
-@@ -33,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
-@@ -46,21 +48,22 @@
- install:	@TARGETS_INSTALL@
- 
- base icesound icehelp:
--	@cd src; $(MAKE) $@
-+	@cd src && $(MAKE) $@
- 
- docs:
--	@cd doc; $(MAKE) all
-+	@cd doc && $(MAKE) all
- 
- nls:
--	@cd po; $(MAKE) all
-+	@cd po && $(MAKE) all
- 
- srcclean:
--	@cd src; $(MAKE) clean
-+	@cd src && $(MAKE) clean
- 
- clean:  srcclean
--	@cd doc; $(MAKE) clean
-+	@cd doc && $(MAKE) clean
- 
--distclean: clean
-+distclean:
-+	@-$(MAKE) clean
- 	rm -f *~ config.cache config.log config.status install.inc \
- 	sysdep.inc src/config.h \
- 	lib/preferences \
-@@ -68,10 +71,10 @@
- 
- maintainer-clean: distclean
- 	rm -f icewm.spec icewm.lsm Makefile configure src/config.h.in
--	@cd doc; $(MAKE) maintainer-clean
-+	@cd doc && $(MAKE) maintainer-clean
- 
- check:
--	@cd src ; $(MAKE) check >/dev/null
-+	@cd src && $(MAKE) check >/dev/null
- 
- dist:	distclean docs configure
- 
-@@ -80,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; \
-@@ -126,7 +131,7 @@
- 
- install-nls: nls
- 	@echo ------------------------------------------
--	@cd po; $(MAKE) install
-+	@cd po && $(MAKE) install
- 	@echo ------------------------------------------
- 
- install-man:
diff --git a/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch b/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch
deleted file mode 100644
index 07e7e1344ed3..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- icewm-1.3.7/src/decorate.cc.old	2012-06-10 10:59:22.496484163 +0300
-+++ icewm-1.3.7/src/decorate.cc	2012-06-10 11:00:05.453078780 +0300
-@@ -320,6 +320,7 @@
-     YWindow::configure(r);
- 
-     performLayout();
-+	sendConfigure();
- }
- 
- void YFrameWindow::performLayout()
-@@ -331,8 +332,6 @@
-     layoutShape();
-     if (affectsWorkArea())
-         manager->updateWorkArea();
--
--    sendConfigure();
- }
- 
- void YFrameWindow::layoutTitleBar() {
diff --git a/x11-wm/icewm/files/icewm-1.3.7-deprecated.patch b/x11-wm/icewm/files/icewm-1.3.7-deprecated.patch
deleted file mode 100644
index a6be36009957..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-deprecated.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- icewm-1.3.7/src/base.h.old	2010-10-31 16:09:36.000000000 +0200
-+++ icewm-1.3.7/src/base.h	2012-06-10 11:08:34.643875363 +0300
-@@ -2,7 +2,11 @@
- #define __BASE_H
- 
- #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
-+#if ( __GNUC__ == 4 && __GNUC_MINOR__ > 7 ) || __GNUC__ > 3
-+#define __icewm_deprecated __attribute__((deprecated))
-+#else
- #define deprecated __attribute__((deprecated))
-+#endif
- #else
- #define deprecated
- #endif
diff --git a/x11-wm/icewm/files/icewm-1.3.7-gcc47.patch b/x11-wm/icewm/files/icewm-1.3.7-gcc47.patch
deleted file mode 100644
index c33adda1e982..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-gcc47.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=424888
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672089#24
-
---- a/src/yarray.h
-+++ b/src/yarray.h
-@@ -152,7 +152,7 @@ public:
-     }
- 
-     virtual void remove(const typename YArray<DataType *>::SizeType index) {
--        if (index < YArray<DataType *>::getCount()) delete getItem(index);
-+        if (index < YArray<DataType *>::getCount()) delete this->getItem(index);
-         YArray<DataType *>::remove(index);
-     }
-     
diff --git a/x11-wm/icewm/files/icewm-1.3.7-uclibc.patch b/x11-wm/icewm/files/icewm-1.3.7-uclibc.patch
deleted file mode 100644
index e790842faed8..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-uclibc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur icewm-1.3.7.orig/configure.in icewm-1.3.7/configure.in
---- icewm-1.3.7.orig/configure.in	2010-10-31 10:09:37.000000000 -0400
-+++ icewm-1.3.7/configure.in	2013-10-19 06:20:22.947520430 -0400
-@@ -113,6 +113,7 @@
- AC_CHECK_HEADERS(libgen.h)	dnl --  basename() for FreeBSD
- AC_CHECK_HEADERS(machine/apmvar.h)
- AC_CHECK_HEADERS(machine/apm_bios.h)
-+AC_CHECK_HEADERS(execinfo.h)
- 
- AC_CHECK_HEADERS(kstat.h,
-   [ CORE_LIBS="${CORE_LIBS} -lkstat"
-diff -Naur icewm-1.3.7.orig/src/acpustatus.cc icewm-1.3.7/src/acpustatus.cc
---- icewm-1.3.7.orig/src/acpustatus.cc	2010-10-31 10:09:36.000000000 -0400
-+++ icewm-1.3.7/src/acpustatus.cc	2013-10-19 06:20:18.355519888 -0400
-@@ -25,17 +25,12 @@
- #include "sysdep.h"
- #include "default.h"
- 
--#if defined(linux)
--//#include <linux/kernel.h>
--#include <sys/sysinfo.h>
--#endif
- #if defined(sun) && defined(SVR4)
- #include <sys/loadavg.h>
- #endif
- #ifdef HAVE_KSTAT_H
- #include <sys/resource.h>
- #include <kstat.h>
--#include <sys/sysinfo.h>
- #endif
- 
- #ifdef HAVE_SYS_PARAM_H
-@@ -56,6 +51,10 @@
- #include <dirent.h>
- #include "intl.h"
- 
-+#if defined(linux) || defined(HAVE_KSTAT_H)
-+#include <sys/sysinfo.h>
-+#endif
-+
- #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME)
- 
- extern ref<YPixmap> taskbackPixmap;
-diff -Naur icewm-1.3.7.orig/src/misc.cc icewm-1.3.7/src/misc.cc
---- icewm-1.3.7.orig/src/misc.cc	2010-10-31 10:09:36.000000000 -0400
-+++ icewm-1.3.7/src/misc.cc	2013-10-19 06:20:22.947520430 -0400
-@@ -15,7 +15,7 @@
- #include <libgen.h>
- #endif
- 
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
- #include <execinfo.h>
- #endif
- 
-@@ -503,7 +503,7 @@
- }
- 
- void show_backtrace() {
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
-     const char head[] = "\nbacktrace:\n";
-     const char tail[] = "end\n";
-     void *array[20];
diff --git a/x11-wm/icewm/files/icewm-1.3.9-fribidi.patch b/x11-wm/icewm/files/icewm-1.3.9-fribidi.patch
new file mode 100644
index 000000000000..20fd29f96046
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.9-fribidi.patch
@@ -0,0 +1,80 @@
+--- icewm-1.3.9/configure.ac
++++ icewm-1.3.9/configure.ac
+@@ -53,6 +53,17 @@
+     features="$features i18n"
+ fi
+ 
++AC_ARG_ENABLE([fribidi],
++    AC_HELP_STRING([--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
++
+ AC_ARG_WITH([unicode-set],
+     AC_HELP_STRING([--with-unicode-set=CODESET],[Your iconv unicode set in
+ 	machine endian encoding (e.g. WCHAR_T, UCS-4-INTERNAL, UCS-4LE,
+--- icewm-1.3.9/src/yfontxft.cc
++++ icewm-1.3.9/src/yfontxft.cc
+@@ -6,6 +6,11 @@
+ #include "ypaint.h"
+ #include "yxapp.h"
+ #include "intl.h"
++#include <stdio.h>
++
++#ifdef CONFIG_FRIBIDI
++    #include <fribidi/fribidi.h>
++#endif
+ 
+ /******************************************************************************/
+ 
+@@ -69,10 +74,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,
diff --git a/x11-wm/icewm/files/icewm-menu.patch b/x11-wm/icewm/files/icewm-menu.patch
deleted file mode 100644
index d706c635d143..000000000000
--- a/x11-wm/icewm/files/icewm-menu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- icewm-1.3.7/lib/menu.in.old	2012-06-10 08:59:34.000000000 +0300
-+++ icewm-1.3.7/lib/menu.in	2012-06-10 09:00:16.000000000 +0300
-@@ -4,16 +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-gnome1 --list @CONFIG_GNOME1_MENU_DIR@
--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-uclibc.patch b/x11-wm/icewm/files/icewm-uclibc.patch
deleted file mode 100644
index e7b273a6c397..000000000000
--- a/x11-wm/icewm/files/icewm-uclibc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- orig/icewm-1.2.21/src/acpustatus.cc	2005-05-31 14:23:48 -0500
-+++ work/icewm-1.2.21/src/acpustatus.cc	2005-08-03 18:29:29 -0500
-@@ -25,17 +25,12 @@
- #include "sysdep.h"
- #include "default.h"
- 
--#if defined(linux)
--//#include <linux/kernel.h>
--#include <sys/sysinfo.h>
--#endif
- #if defined(sun) && defined(SVR4)
- #include <sys/loadavg.h>
- #endif
- #ifdef HAVE_KSTAT_H
- #include <sys/resource.h>
- #include <kstat.h>
--#include <sys/sysinfo.h>
- #endif
- 
- #ifdef HAVE_SYS_PARAM_H
-@@ -54,6 +49,10 @@
- #include <sched.h>
- #endif
- 
-+#if defined(linux) || defined(HAVE_KSTAT_H)
-+#include <sys/sysinfo.h>
-+#endif
-+
- #include "intl.h"
- 
- #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME)
diff --git a/x11-wm/icewm/files/icewm-wmclient.patch b/x11-wm/icewm/files/icewm-wmclient.patch
deleted file mode 100644
index fbc9649689fe..000000000000
--- a/x11-wm/icewm/files/icewm-wmclient.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/wmclient.cc.orig	2011-11-15 13:49:31.557650930 +0100
-+++ src/wmclient.cc	2011-11-15 13:50:11.167899273 +0100
-@@ -1044,20 +1044,11 @@
-         while (XGetWindowProperty(display, handle,
-                                propAtom, (itemCount * itemSize) / 32, 1024*32, False, AnyPropertyType,
-                                &r_type, &r_format, &nitems, &bytes_remain,
--                               &prop) == Success && prop && bytes_remain == 0)
-+                               &prop) == Success && prop)
-         {
-             if (r_format == itemSize1 && nitems > 0) {
-                 data = realloc(data, (itemCount + nitems) * itemSize / 8);
- 
--                // access to memory beyound 256MiB causes crashes! But anyhow, size
--                // >>2MiB looks suspicious. Detect this case ASAP. However, if
--                // the usable icon is somewhere in the beginning, it's okay to
--                // return truncated data.
--                if (itemCount * itemSize / 8 >= 2097152) {
--                     XFree(prop);
--                     break;
--                }
--
-                 memcpy((char *)data + itemCount * itemSize / 8, prop, nitems * itemSize / 8);
-                 itemCount += nitems;
-                 XFree(prop);
diff --git a/x11-wm/icewm/icewm-1.2.37.ebuild b/x11-wm/icewm/icewm-1.2.37.ebuild
deleted file mode 100644
index 81b0b1de00b1..000000000000
--- a/x11-wm/icewm/icewm-1.2.37.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.37.ebuild,v 1.11 2012/06/16 13:26:14 chithanh Exp $
-
-EAPI=1
-
-inherit eutils autotools
-
-DESCRIPTION="Ice Window Manager with Themes"
-
-HOMEPAGE="http://www.icewm.org/"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
-
-IUSE="gnome imlib nls truetype xinerama minimal debug uclibc"
-
-RDEPEND="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 )
-	gnome? ( gnome-base/gnome-desktop:2
-		gnome-base/libgnomeui )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	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_unpack() {
-	unpack ${A}
-	cd "${S}/src"
-
-	use uclibc && epatch "${FILESDIR}/icewm-uclibc.patch"
-
-	echo "#!/bin/sh" > "$T/icewm"
-	echo "/usr/bin/icewm-session" >> "$T/icewm"
-
-	cd "${S}"
-	#Fixing gnome2 support
-	epatch "${FILESDIR}/${P}-gnome2.patch"
-	# build fix for libX11-1.5.0, bug 420773
-	epatch "${FILESDIR}"/${PN}-1.2.37-libX11-1.5.0-deprecated.patch
-
-	eautoreconf
-}
-
-src_compile() {
-
-	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
-		--without-esd-config
-		$(use_enable gnome menus-gnome2)
-		$(use_enable nls)
-		$(use_enable nls i18n)
-		$(use_with imlib)
-		$(use_enable x86 x86-asm)
-		$(use_enable xinerama)
-		$(use_enable debug)"
-
-	CXXFLAGS="${CXXFLAGS}" econf ${myconf} || die "configure failed"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-
-	emake || die "emake failed"
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
-
-	exeinto /etc/X11/Sessions
-	doexe "$T/icewm"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/IceWM.desktop"
-}
-
-pkg_postinst() {
-	if use gnome; then
-		elog "You have enabled gnome USE flag which provides icewm-menu-gnome2 ."
-		elog "It is used internally and generates IceWM program menus from"
-		elog "FreeDesktop .desktop files"
-	fi
-}
diff --git a/x11-wm/icewm/icewm-1.3.7-r1.ebuild b/x11-wm/icewm/icewm-1.3.9.ebuild
index a453546eac3f..107e2ee226c3 100644
--- a/x11-wm/icewm/icewm-1.3.7-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.3.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7-r1.ebuild,v 1.9 2013/12/13 08:04:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.9.ebuild,v 1.1 2014/11/02 19:13:45 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -8,13 +8,13 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 inherit autotools eutils python-single-r1
 
 DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="http://www.icewm.org/"
+HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
 LICENSE="GPL-2"
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
+SRC_URI="http://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
-IUSE="bidi debug gnome minimal nls truetype uclibc xinerama"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bidi debug doc gnome minimal nls truetype uclibc xinerama"
 REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
@@ -46,6 +46,7 @@ RDEPEND="
 	media-libs/giflib
 "
 DEPEND="${RDEPEND}
+	doc? ( app-text/linuxdoc-tools )
 	x11-proto/xproto
 	x11-proto/xextproto
 	xinerama? ( x11-proto/xineramaproto )
@@ -60,30 +61,26 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
+PATCHES=(
 	# Fedora patches
-	epatch "${FILESDIR}"/${PN}-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}-wmclient.patch
-	epatch "${FILESDIR}"/${PN}-1.3.7-menuiconsize.patch
-	epatch "${FILESDIR}"/${PN}-1.3.7-configurenotify.patch
-	epatch "${FILESDIR}"/${PN}-1.3.7-deprecated.patch
-
-	epatch "${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-
-	# Get thermal info from proper locations, bug #452730
-	epatch "${FILESDIR}"/${PN}-1.3.7-thermal.patch
+	"${FILESDIR}"/${PN}-1.3.8-menu.patch
+	"${FILESDIR}"/${PN}-1.3.9-fribidi.patch
+	#"${FILESDIR}"/${PN}-1.3.7-dso.patch
+	"${FILESDIR}"/${PN}-1.3.8-deprecated.patch
 
 	# Debian patch fixing multiple build issues, like bug #470148
-	epatch "${FILESDIR}"/${PN}-1.3.7-build-fixes.patch
+	#"${FILESDIR}"/${PN}-1.3.8-build-fixes.patch
+)
+
+src_prepare() {
+	epatch ${PATCHES[@]}
 
 	# Fix bug #486710
-	use uclibc && epatch "${FILESDIR}/${P}-uclibc.patch"
+	use uclibc && epatch "${FILESDIR}/${PN}-1.3.8-uclibc.patch"
+
+	if ! use doc ; then
+		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
+	fi
 
 	eautoreconf
 }
@@ -106,9 +103,7 @@ src_configure() {
 		$(use_enable gnome menus-gnome2)
 		$(use_enable nls i18n)
 		$(use_enable nls)
-		$(use_enable x86 x86-asm)
-		$(use_enable xinerama)
-		--without-esd-config"
+		$(use_enable xinerama)"
 
 	CXXFLAGS="${CXXFLAGS}" econf ${myconf}
 
@@ -126,7 +121,12 @@ src_install(){
 	fi
 
 	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
+
+	if ! use doc ; then
+		dohtml -a html,sgml doc/*
+		cp doc/${PN}.man "${T}"/${PN}.1
+		doman "${T}"/${PN}.1
+	fi
 
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}/icewm"