Use Fedora patches to fix a lot if bugs, also menu handling. Fix thermal information handling (#452730 by Dag Bakke).

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

17 files changed, 655 insertions, 18 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 645505cdc289..8bf396597e2b 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-wm/icewm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.150 2012/10/07 10:25:13 xarthisius Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.151 2013/09/06 21:17:59 pacho Exp $
+
+*icewm-1.3.7-r1 (06 Sep 2013)
+
+  06 Sep 2013; Pacho Ramos <pacho@gentoo.org> +files/icewm,
+  +files/icewm-1.3.7-configurenotify.patch, +files/icewm-1.3.7-deprecated.patch,
+  +files/icewm-1.3.7-dso.patch, +files/icewm-1.3.7-menuiconsize.patch,
+  +files/icewm-1.3.7-thermal.patch, +files/icewm-defaults.patch,
+  +files/icewm-fribidi.patch, +files/icewm-keys.patch, +files/icewm-menu.patch,
+  +files/icewm-startup, +files/icewm-toolbar.patch, +files/icewm-wmclient.patch,
+  +files/icewm-xdg-menu, +icewm-1.3.7-r1.ebuild:
+  Use Fedora patches to fix a lot if bugs, also menu handling. Fix thermal
+  information handling (#452730 by Dag Bakke).
 
   07 Oct 2012; Kacper Kowalik <xarthisius@gentoo.org>
   +files/icewm-1.3.7-gcc47.patch, icewm-1.3.7.ebuild:
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 9da2a2319474..822e1ebca0a0 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -2,31 +2,36 @@
 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-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-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
-DIST icewm-1.2.37.tar.gz 841879 SHA256 bfb60165cddafb458cbfd4b4b9203aa351e37cb75e0ad0c64e818b6fd2140595
+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
 EBUILD icewm-1.2.37.ebuild 2982 SHA256 da8b5d7b54234d08b1f2c1cb66ba00a90f13f2291c662f3e3cf8f1d586f4f110 SHA512 b817ffc6f2ef6280e769ed7ab7713a2294dfe42775204ab80840b93fd68e629b30c6ed501feda2c850a5854773ae047835247bfff32a3f00215012afc410de35 WHIRLPOOL a75427d1169a089008d98a9b4d6ec60db0cc3fc8f7f8743f0a531a106080fa4e5f9e655cc9e3464f488d2c801c114af8acdfad6db65684d473a99affd3523f0e
+EBUILD icewm-1.3.7-r1.ebuild 3370 SHA256 1fefa1988a89bd60ac12cac7b8cb51e75b52b567e0f7b4000286ddf8844b931a SHA512 8554b972d6887c9da72fac0279094e5599579e5ec775d66104d02a3f8d7251bc9c7cfaaf76ffc8d016f6e767ae391e0f132270d2830aaa5372336323140f0bf2 WHIRLPOOL ba87d0e51ca7f91999f3a1c2d4a2c4d74536ce59f1eb2fc211766292ef76f22008438d534b8f65efa9934b597cb607df0dd68df8c79856fada0975e5232aec80
 EBUILD icewm-1.3.7.ebuild 2748 SHA256 b6ec683f6fa49fa9da122b2933fa58470427122ea0ad88a554f795363b1eefb8 SHA512 a4ffb9a713f06fa27244340e836319bf83569f58ac05d559edf9e5a1df61ee6a9b2de659a1ce1dabd3b472f704d2b396526045589acac0cff26bc20b07c1fa7f WHIRLPOOL c8f4bd8b14074915cc19d6faf7d3074f7119fdf233f6c6a23ddeee55f1cefbc55cb4232fc517029493e0d60dccdbd539df737683799c943a1b7f0a27ad66c2af
-MISC ChangeLog 23120 SHA256 c323ee7f62a470f9571a28e5ac9af3fe9930585f9ed7513972190c309d58feaf SHA512 9a3773997b3fc055dc86a6fa1ee4772ed83448c414f4e6859b7dc268d35ebf1be089f8ac3700796cdaf14bdc845bd70c44280a29622f811cc95e53ef28ecbc3e WHIRLPOOL 3174193e485252457316c4eb35d0fc0d2d140fd72e678ee1903f1f7349d6abd08e8fa9eaf9009ada28d2b5ab4df5b9b693c7e8e939ad9b637d2659b59592edcf
+MISC ChangeLog 23756 SHA256 84494f04b3b8e8511dfaafe599b2c3c3a36f1681be9907edc4d2d72d03def189 SHA512 c45fef0cd0b15aaa46022465a46bc633dc63f478db149ba8babc63fe7a26eede09073fe4c1dab79b3bf4e12db3f9a3a1b95965e9e256d0fe4e42f7fbed746377 WHIRLPOOL 9113060a9347f32d2117a994fd0f81d9c06b7f94c1a7be1030ee7a860739c80fe7ce14dd0ff86c7ecba7a16b8c35ee68fc3c5c1e12d2092e9ec5bbfb82afb188
 MISC metadata.xml 402 SHA256 d46d24046043ffdcab650808421c66fe7bb9cd8bd3fcc0823244b92fab57bfde SHA512 d2e1bdce89dda0c21ba433d43f4edfdf6b8e3f2fd394d5f9b52741ba9034b94f612d5e2f183ea67f345d5fc1480faf1632525a32f52babe6e027085fff216a65 WHIRLPOOL b2f6eab04cad767e6607d14f57a6d83d223663f006e21bf81ae53ce9173decf45afcfcf1361866e54469fbf7bcb0dc7593f75eef8bbfd3e403e7b0214b77bcc8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQcViNAAoJEF0huFKJUZL54E4QAK48wzQ14OSkLhkJQhz9Pigt
-Hl8pj/3TjKglWmdN0yPeZZ0mXzLFzWUTk+agtvc2GrjqNY48k+CMfUcou7VxRI/m
-J1/WAvxX0tqHMUzW5C6CcXbEK6O26lx+rkpjeEyfBiLoDWaTJjWwINqkVAHR3VHm
-EQa7SvcuMCt2e1mUzVE3CRo4pB3WpuS3E2jl5n4dkySTUxksthUcBlQGsmOOITm6
-23a2oj0BXJnTfhPgnv80nyXy6wNUfufFT+2vnNH+Uge1M06J5l/CrXNlJd62Xvp1
-JUjZG1wy7KvX+O/54SiMY1JHuvRMwIHiRn/79xhygLhAJHEDXNxjLI/BjVVvideU
-4z6RYe0dWGxthoMyqmgnAE5qLZjb+/clvTME/WEZmg19u+/UwFpsMiohuqvVuMND
-GjGUVmbPw3nPS8r3nx0I356glf4LBd4HCWyNa7doSLpZr1CPmyb6zZLtvXFZWjNo
-KcmAkyyh7wFmxT8n2fcy3LsKtpSeW8sirRx4Ekykac3BOzhIBN9Rz9qZ9cluMaIU
-iMT+maw6Xjy27KuDe8gbX+JF59rCu78wPKmyd1oWeVdffwCJ7mBrz76eUQEs1MZP
-04Qeo0+dlRC6fgBkPq46xcrZZ3OaC1+lpUcUCr4lfVX0Sc5XqvjvVZ++o23aQItm
-LkOVbjJ8efZ476UMIYwx
-=DJfC
+iEYEAREIAAYFAlIqRogACgkQCaWpQKGI+9TkdgCdF7r55MAU08Tnc/b4fdaeK3MV
+dmYAnjhBcJYvcgUDdw0a3AHCUiSLJzvB
+=bCZw
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/files/icewm b/x11-wm/icewm/files/icewm
new file mode 100755
index 000000000000..90905960d1a2
--- /dev/null
+++ b/x11-wm/icewm/files/icewm
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/icewm-session
diff --git a/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch b/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch
new file mode 100644
index 000000000000..07e7e1344ed3
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-configurenotify.patch
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000000..a6be36009957
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-deprecated.patch
@@ -0,0 +1,14 @@
+--- 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-dso.patch b/x11-wm/icewm/files/icewm-1.3.7-dso.patch
new file mode 100644
index 000000000000..55100d5f62a6
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-dso.patch
@@ -0,0 +1,10 @@
+--- 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-menuiconsize.patch b/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
new file mode 100644
index 000000000000..d051d5bc5f19
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
@@ -0,0 +1,73 @@
+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
new file mode 100644
index 000000000000..f6b2cf71f0f5
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-thermal.patch
@@ -0,0 +1,41 @@
+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-defaults.patch b/x11-wm/icewm/files/icewm-defaults.patch
new file mode 100644
index 000000000000..72e5410db4fe
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-defaults.patch
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 000000000000..66691d78a3ff
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-fribidi.patch
@@ -0,0 +1,83 @@
+--- 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
new file mode 100644
index 000000000000..7e136bb93288
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-keys.patch
@@ -0,0 +1,43 @@
+--- 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-menu.patch b/x11-wm/icewm/files/icewm-menu.patch
new file mode 100644
index 000000000000..d706c635d143
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-menu.patch
@@ -0,0 +1,24 @@
+--- 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-startup b/x11-wm/icewm/files/icewm-startup
new file mode 100644
index 000000000000..048ab5938486
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-startup
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 000000000000..a6f0f15f52d3
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-toolbar.patch
@@ -0,0 +1,12 @@
+--- 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-wmclient.patch b/x11-wm/icewm/files/icewm-wmclient.patch
new file mode 100644
index 000000000000..fbc9649689fe
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-wmclient.patch
@@ -0,0 +1,24 @@
+--- 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/files/icewm-xdg-menu b/x11-wm/icewm/files/icewm-xdg-menu
new file mode 100644
index 000000000000..529f9e2ab3b4
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-xdg-menu
@@ -0,0 +1,128 @@
+#!/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.7-r1.ebuild b/x11-wm/icewm/icewm-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..adcd40ab212d
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.3.7-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2013 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.1 2013/09/06 21:17:59 pacho Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_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="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/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? (
+		${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}-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
+
+	cd "${S}/src"
+	use uclibc && epatch "${FILESDIR}/${PN}-uclibc.patch"
+
+	cd "${S}"/ && 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 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"
+}