Drop old, obsoletes bug #464898 by Vicente Olivert Riera <vincent@gentoo.org>

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x895192F9

17 files changed, 27 insertions, 1362 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index a60248b59ad9..2fe33e22994b 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.308 2013/06/01 11:40:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.309 2013/06/30 14:07:11 xarthisius Exp $
+
+  30 Jun 2013; Kacper Kowalik <xarthisius@gentoo.org>
+  -files/1.0.0/gcc-4.3.patch, -files/1.0.0/generate-menu.patch,
+  -files/1.0.0/gentoo_style_location.patch,
+  -files/1.1.0.1/gentoo_style_location.patch, -files/fbsetbg-quiet-1.1.1.patch,
+  -files/fluxbox-1.0.0-interix.patch, -files/fluxbox-1.1.1-multiscreen.patch,
+  -files/fluxbox-1.3.1-gcc46.patch, -files/macrocmd-crash-1.1.1.patch,
+  -files/mousefocus-1.1.1-r2.patch, -files/mousefocus-1.1.1.patch,
+  -files/strictmousefocus-1.1.1.patch, -fluxbox-1.1.1-r3.ebuild,
+  -fluxbox-1.3.1.ebuild, -fluxbox-1.3.3.ebuild:
+  Drop old, obsoletes bug #464898 by Vicente Olivert Riera <vincent@gentoo.org>
 
   01 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #144305
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 08bd1ecb1706..89faf07cbf2d 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,42 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 1.0.0/gcc-4.3.patch 258 SHA256 d4de739b1883377947ac2d67677bac79be0af10ef8272e75bb86f729374125c2 SHA512 49297ecbcd1caf3d56e7da866cb7d204a891d7e7b5434cb4b04addbeb28cf48bd714d541fc6d581e9109efa82a123851ff65740fa4a3099181759f7622f43dc3 WHIRLPOOL ef2195c3174ede9c67751096dac4ff921bd3fc69f8300ed90e1e6dd134c019c409b79ab90abf64b107770017274382c8e7769acf7001556e94b80a38ebd3964c
-AUX 1.0.0/generate-menu.patch 1369 SHA256 93bfb1d51eba8ad06eb7c47896c0d17bb107f9bc04309049a8acf6f522fa08ef SHA512 79594da98bae4be8d61a84bf10f196bc65226d6b7e6eec2ae4657b09450bc34c130a38b371247287e252f39e2da0d5a42987fd636b1b418d6aca0d01815d9f54 WHIRLPOOL ccde946418afeca45a464f62415f8fb7093d3b979031e51cb595429c2b16681db001053260a30561918b61540edd44dfff36921126c20bcc4875071745226687
-AUX 1.0.0/gentoo_style_location.patch 700 SHA256 e692b421558ea1c761eabbcff291ac6378c7b92b585c562ad563e2af796a5d37 SHA512 22bae56cc32d1b2c92d77cbb3edecd28bdddb3d7aeeafe03b5d145fec2eae3d1efc3959d139fb158865ee6ea72ae93f78ab08cd442befe20ff63545d5c20e28d WHIRLPOOL 26db3b945ed368732e6f102683038ecd8fcbb08835992068bbf845ac1e99ed73403e7d53322bd20f543a473558c9c0188e5a25f2b182ff338d8f418d07fb1e39
-AUX 1.1.0.1/gentoo_style_location.patch 735 SHA256 d3031c3ebdd05c23a243e1ec2c0173206bb56a85ef3129ed70c5d7de434f65d9 SHA512 0ee58758e7a9c76b0bba1cf252250406ab3fe3a9d50a84d3a485b9fe8e86c88b52b3cc2ae3cca730644af0ff818305e5f5beddd9003abb5fcd74d6914168e220 WHIRLPOOL ff7410973045285f40c292184f4fbdb8e2012b6be5416e270b2ea61a4491f32a70157457152471be3610a979095ce360c15ef0fb24ed988f2c54ca921d9d0004
-AUX fbsetbg-quiet-1.1.1.patch 2342 SHA256 e9ad48a2281549af472a0cc784e840c06d0032bd4f958a2c8bbabac134f01c0c SHA512 e4e886c5944d159168e5e52f76f6bf98183b642da5dccecdfa1f1797bf4b52c373646678eb26c23af2a61a08033c15611b9d86685194a45a387860ba450d094e WHIRLPOOL bb30439bc7f482a2dcfe860dc67290a8713c09a0c30f90ca9275cebadba7dc69750316ee07a788214745079f254cd5e135b5092d823e9a00a83bd16b3b6cfa44
-AUX fluxbox-1.0.0-interix.patch 963 SHA256 f3f04a2b8ae569eb90fd3b14c9ef0199b8b665dc6c1924d4f06b635d62291416 SHA512 101f10b00cd85e843c1eb041383a08434e3419d92eebf44515b07ed0626a4509ec4a1127f62683fb8932239fa6bc520adaff1a7fd3ca9aedbca5cba6ca388300 WHIRLPOOL 003690913a9e04565bb740d6a0f29d887709b70e830be7f9871abee6cfdcc1cee9ba9e3985bb40f300ddc9ac27e93a52c03d0c942a76474cef0d3a5f1c68a331
-AUX fluxbox-1.1.1-multiscreen.patch 2439 SHA256 0c895fabb908ccdd8fb8cd9e90438f88289851d961398971753aa593b6bd1d09 SHA512 c5848dad78c3f710ed41f9d7adba1923c5d3d3eaaddc8ab5d34b65627d9c42f35ed72c0f9dea92a0b97746c09c478291c9b6cc03aa457a2416c103b5d685bf46 WHIRLPOOL 34bc0bb257ab756ed25cbd57eda7fb488aff43663feefb010b1d80bdb949009630d95e7d9a2725bbf4fb5d8cb2a4f4969f091c6f665ae52e11968422f7662fad
-AUX fluxbox-1.3.1-gcc46.patch 1096 SHA256 31c6ee98837e883c5a1da151131ed2b4e40deb63f778c8e09e03123c7c1ef5ad SHA512 e6a400d28651df435bbef9be22e48525a4ac5354a09b1d897f1f62dc04d35e456f78663d2815ebf00fffa367aeea837fcb351ce94b745721394790ce2357308b WHIRLPOOL 8cc47860d7ab845bd94e0df55ed2f39689272d5453fb1ee663d5b00beeac97092918b7f3f931d6d0dd1fabb55d19f57ebea499d76b2248958c41c6538581a9f9
 AUX fluxbox.desktop 202 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834 SHA512 153a932d089d9f9a39622eef6e1c30ba11df1547b67b041b209fc6c758105b8e4c17aeab8d615a49d2c59ec9b951254f1d6cffa8ffd07b5514fe4f74b938ca88 WHIRLPOOL 148f49c4fec9dabcf1e8bcd7ef3243e042a52652d49bdf74b969134934f5ceed2e0343f14197304f18d836b1cea06d09a7af7b92871c01bcc78311acc44e27c5
 AUX fluxbox.xsession 2004 SHA256 dbff4840a2c32c8ab837e4f34cb002f810dccca107f5e04a28c22d33db2a59bd SHA512 ec50e1472af22fc34d2bd7124a63246b3b3c84fd1d6b334888165c7a3e91581065603d63f5742ea555822bf16505117b4d6b5de3c583c85a9cb37befde341f72 WHIRLPOOL 22d8456c114b770e46feb917b3422e75991b9c14c93507e493c4379b58385c5a06e9fb206ed5656db70a208e91604cdb08f33dbf44d51b767be08f601b020d0b
 AUX gentoo_style_location-1.1.x.patch 735 SHA256 d3031c3ebdd05c23a243e1ec2c0173206bb56a85ef3129ed70c5d7de434f65d9 SHA512 0ee58758e7a9c76b0bba1cf252250406ab3fe3a9d50a84d3a485b9fe8e86c88b52b3cc2ae3cca730644af0ff818305e5f5beddd9003abb5fcd74d6914168e220 WHIRLPOOL ff7410973045285f40c292184f4fbdb8e2012b6be5416e270b2ea61a4491f32a70157457152471be3610a979095ce360c15ef0fb24ed988f2c54ca921d9d0004
-AUX macrocmd-crash-1.1.1.patch 2251 SHA256 4d99d38a56aae213d03aafbf6041d8eadd7197f2212fc94deefaab803dd877a5 SHA512 f3249014ed8c732681107e7de2b5129664aeaee542c88f1fb550cb5190d4f2ff229a957e180c72a502b9d66875a8d639282fa63596a744924211978c024a2127 WHIRLPOOL fe5de8d01524be1847dc309ef75d61e56b6708bdbee0d9fa570d104c669b3189bb5d289a9e85fd07e569bace354696a34f23474646b76d3e61d41ffece62957a
-AUX mousefocus-1.1.1-r2.patch 5552 SHA256 989730762581e9fdbca1c5997811f9f8ebb8d1e0b95884c6d7efee0345b2781f SHA512 805a00b03fb1b5ac0c2729c867d01abafefd0af83385ccde7a2a29ac5303562c1f2088a3bf0980716bd313d0007fc88d5e9d4aa54f420640bb99020f4adc859f WHIRLPOOL 268a3fa6ca8e9fdec4f45322dd2cc6c2c02a18d291df23e065aa2ce87f9aa7b7e72eaf25c9001cc378b0fe5dc8df9d3cdc0a094ca2e26097a7a47a944971b619
-AUX mousefocus-1.1.1.patch 8127 SHA256 a9fb2c249f13abde8a96912db9bade7252d9b312fc0ae11acee0b266773fa8b1 SHA512 995019210482f5ecd4ad40b33c5f4874097feed8b323690dad7680dfe36eba5f819d2191e3894ffe9b984505676af216038576c5d01ba08c535ae42820f68746 WHIRLPOOL 49673fc21cb2b308f7a7a69a18aaa697adc2d337ea305f63c12d0521b42178ffc04a3081dd6f850b0d7089b8b98fcdba53701c28bb5bf75c86ebcde8d9f7c1e0
 AUX osx-has-otool.patch 472 SHA256 e21d837d6e244e61f00f1dc732eeafe0d5eaa59e333449f19d7e4ebfeeee63ec SHA512 50758ff5729bfdd74011106f95eb9cf72c4e1ba3ec5fc462017172b7b4f8f9e7763416e8c9243fdb59f699175c5ca18711e05e4be1a95ad973e76daa3814d17a WHIRLPOOL bcf97d5e8dbac0d75af0cb83f728e8416cc9819bd42062ed3e1c2a4fc076f2b5db389165c5b7bd2643903882cebdd53b4c698c150f0c9122d2134ae6c618e90e
-AUX strictmousefocus-1.1.1.patch 8989 SHA256 4bbcf304c161246acb7d515dc3b185ceab655daedabd2d594925dbb3d90fc11e SHA512 7d3a2966aebb77447dd02e1892ac1a6c05098257da9c299ab574aead9846a5865c73a48f3ea47b15a8b69db9f417dd14d3cc5cdca2fccd06b1fe78925c5c585f WHIRLPOOL 70a6d6f579f778477abf0de047a09c55b14ede37c9f5cffee1e78469b9ef30d47586a1bd5077282ec8dcacbc5359001cfdee690d401c5df38f0e87f35dafefec
 AUX styles-menu-commonbox 127 SHA256 44a56b182b0da9bf26ac41ff7e5ea8da3ddb7c5cbca0f554e3c74f15c72a3d98 SHA512 116876f0edb60b993738b367f5c6a25a401cfd26a9062416e6d4e58dd92e814f79c43357352a1fddf9e52b6274914efa4b41479643557a38295b0d9e5c2c9dee WHIRLPOOL 1191e39ce909dcf6bbd6d7c28d6badacf08e8968d82472abe45e1935b7fb883eb972bf726f2c9cc93a4541409bb8404f3f5787e39d2c09ba79f70e6440bf04bf
 AUX styles-menu-fluxbox 117 SHA256 f5829a442d8653941e2741ab73f49e9d9c95fc8129531e4197730c0bbb2f2989 SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622 WHIRLPOOL 48e609de77393de670fccdc91d6291dbe13559a6fea824822266850155b84b42e86ae0001926ad7d64f1b67ee9328d9993b6904d0ac4df9ae280f7adc7734b02
 AUX styles-menu-user 93 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094 WHIRLPOOL 57fca7ee543c74bf8cc0157c3965cc0b820673168c6fcec66afac9af2b78e54ad9a7c7960c7f66444e68da7ec9f7814e5cdedb1487818aeb08610c2f11c025c4
-DIST fluxbox-1.1.1.tar.bz2 777660 SHA256 903f676a71a301513cd0b3db17e49f88c8d91583793176c4c70358a3012cca34 SHA512 2e3dd1956e130b4cc7e224346b3a1a219f20ac7b720f3166b73563c329d29f4dfe5640cea01a6a28deafb6d3383a2c736881e1fead2865bbc417b43f03443495 WHIRLPOOL fbeda7c3361b6b79fcf3ca412aede2cd543a64f2e1c4e89a0e547a1046d2c8f72d3f0ff303932919fd5ca7093d0d05a92373218d5754d4e663a01990d0c0780b
-DIST fluxbox-1.3.1.tar.bz2 799235 SHA256 c47b2615608151dd19bf9d738badb30ea4179dbe4edeb2243a269a9bb932628c SHA512 b6069a26aaf22abeca4810ad6decc083fb8a20edd9610bbcd8f34426001f268d9d6d061faceb20e332d65d050b6f150bd5243f02e15416f2a108d2c8d76a8d09 WHIRLPOOL 8a4f2120eff1ef40d7b9185ca3d60bbf0fa3007f253cc9ede657e7ae08be150d1b20a0740d9943728cd700102a785cb2664150f9886ced96d9c013c5f8026551
 DIST fluxbox-1.3.2.tar.bz2 787400 SHA256 e8aaf46c043eb6186383c6dde8bf98dbd62305b202ad4d8ebb39508b1b710167 SHA512 2624c337e85b98e39398319170cbf57f8ab031539844e62f2f61aefd5c2e307b8390261b9658073bcf557f7f006c9df95c72a4420f12fa7122742b4623a17d49 WHIRLPOOL 6f6fae12c265f2cf1e700a257fa89f291adea9838714f8bc861c2f37f3d036caa16e269e8b5ff18d687bf6f77a4f1661df864e9ec98f3d2d14e3d3186d2ebdde
-DIST fluxbox-1.3.3.tar.lzma 678937 SHA256 b96310427f0fecc83c01664e18bfe618844c6a148f050249831171246af75ad1 SHA512 69ecfd3726efe18d3a9f99e2b015b22659dc35a0114654651e9ff41d01ab98c071ffb3679db8ac30a458a25e832288b35c4546a0ea49e3b722084e87f2a2844d WHIRLPOOL 27394268d46020d2fc9ebb968e73bdeab5338be159e3bbb0bf7a64570d170579a806f36c1c243a25061a175951752ea185e0a55ce5fcf8ff692a8c8ebd4b37a2
 DIST fluxbox-1.3.5.tar.lzma 694672 SHA256 f4faf1fcb995dbe85d272e511e388de347ff07b69e9f8c5af0248cf330ee2a07 SHA512 55d1689660b9240851be55183f665efff281f8f344474ddd1bee089635cb34e343cca85743900675c21579cf9e58c7bd756932a30c2ff4e6384b500d7c4bdcd8 WHIRLPOOL 6f379f9f224478556c53e2585f76c28f29c20b1fce5ab24ed0d06a813e51ddb1e0eaea7658ec1fa5979b951613542dd47dad4fd7af17bbdf0530653b8583b18d
-EBUILD fluxbox-1.1.1-r3.ebuild 3863 SHA256 d5196b53c400d0b2c7d3241e09f17ae6024896606a5a9012ba0adacc9ea8b5e1 SHA512 2141f8cb8be6b90b849eb04d6a5494119f6a4804e9fc425b5b9aa4b8ee223b55873fd2c60c8d89e5c0ae8d19ac45a29f8e9b0f20f669755e0f4d531d000e6c8e WHIRLPOOL 60afc766418c9c86d3f5d31714a9fe08fe9313b5186b2cdbf69112e44608058f7dc365a978ae78647e7119788ee2a5422cad119efa521740394e0c3b47ca1dae
-EBUILD fluxbox-1.3.1.ebuild 3218 SHA256 521097fea5fa22f16329fc0c651452d132a6016833fc71042b5443d947b8d1c4 SHA512 55c49532a381c0c232ced7853fedd69627f95eee6022a065a53c0b35a7ad78bdda71346185a7131dc44ce2e38597c2ba560476d66806e1a410d18f3264286096 WHIRLPOOL cf99fbd498f3f02e1af8a2e64704c9bf3630ab3ef3de45b53d82bd7133ba09b4393e52079dc3d2c617dd66f83fbace1ffde7222894439bd2ad77fc89445e26b6
 EBUILD fluxbox-1.3.2.ebuild 3074 SHA256 2b40e87e859143f3ee4624b43dceb3aa2a6d7ef91e8ff0f0ed0b2baa761019a6 SHA512 2b7d10575df296824b792b199aeb0b42422b95394bb4dbb1c2074adba351d8ec2870a75e898901d96d469de23ebd3ff6ee1f912e1f874301ec9816f08b9d5bb0 WHIRLPOOL caa40774d95533f3cedd31f41531de367c7166f2a8f2cd804a0361cf8cda62bb35de8ef09eba3e8118b26434bf4437538706e12397391cbca79567f01a1871b7
-EBUILD fluxbox-1.3.3.ebuild 3083 SHA256 c470c3d5c6d7bd3761f26fcc499717f3c515ef80f0202e7d7762e281a9c55850 SHA512 32d61c6e7240f9f8e77c1fc48ec9c0d45089fe6d60e2942c091f1becaae53bae32672e5a683ae33c73278d1f4446e448a5c0368f50c873968b24608df3c4eeb3 WHIRLPOOL 3ce390298f803df81977d830658cba1dd83988ffc8af7c4b6982b2e3550ac57e65b513706fc55adb461dfdb72665acbe4e3349dfb578b272364146144bf5ea4f
 EBUILD fluxbox-1.3.5.ebuild 3083 SHA256 4c12b378f43ee54d4050482ee24a29f9f2d3743aa09c7489783f290883fe4e60 SHA512 ae2cb749ba7d2b01d164cb45c5efe3915e10dfebc34e46137d4e6140460a08a9d5a43d95702cf29cc04e02da642d7e71cb44030bf71e0f79377774b29a001dee WHIRLPOOL f030681745432da81fa9ecbbfe83d47928d79092e24eaa4b8834baa8acc2191793e98b93289d669e2bcafd84743fbcbfc6ec2e9d78c94ff52093eccb29819807
 EBUILD fluxbox-9999.ebuild 2960 SHA256 297cf54004736243350e870ca81bd15e3e26f1a3bd758c17c49d6bdb1364f1fd SHA512 cdc5279caa7919e38c72001f0b6048709874f7b4283f96dbdc7105b3d656bbfa3ca8cad5f4c754a5cb7e22c8bd6e3033af79d0057ed95284a731f19a20676c9d WHIRLPOOL 66e3f7ff9f35c5f89a551a80a48f15846f9c1b966eed2564978b72bff215aa27654bc64286cadcc7da0cf00ca1ade5ee1a70195d1cb3357547a85822eb2e23b7
-MISC ChangeLog 55925 SHA256 0a12f84aab87fee0b7d131e404033f8e437f931e2f4e3c49b4fd2c032b13667b SHA512 c6edd055f7a32a3b5a2a7d7bdae670ca5da72e242a113a10fed0f8d68ac1bff80b16ad4b51dc846d5487fef45e2ea2e4a641c0067355955bc9774b8bde576cbb WHIRLPOOL 93f4c4879d503b66a6fa7b924742dd145b63674d95ade2e618e3f7fa3dd6a4cc05cbd338adf82077d54982413295e4e67f7295296976babc3b12536c4d5eba90
+MISC ChangeLog 56582 SHA256 1f37e9e7bcbd61f062b6ce90cb958c77177913c69bc17bc0949983a650769c9e SHA512 ce557e5a276cbab226ad68812eb379e00db0ce7af2398d9538bb53323e3e26291a853280e7ea1a89d4c9a862971f51c2b0831f07024c52a76ea58c84c4ee54c0 WHIRLPOOL 379fff40f25a916cc39903e7758f2a359411a162877adea5b1662680dd68965a07edae4142a4559eab57e2e0b8f86e19be068e380cc20efa6b275557132afd6e
 MISC metadata.xml 900 SHA256 aed17fe9571ff05de2226a413f2d3c9113dc8659a601df25d3c36ad76b267ba0 SHA512 203e3a0b6f0349f49d6975955cf95823670c4fb1ddfba4d8f9050085b27f612a76553a84c130582fcd7f9055db85b7a3ed027644d94577c2afa3dea715f69c41 WHIRLPOOL 400b67b6eb40976a63a73bdce61c1d06881d318a6083300b5abf7394e8aae40f8d406998b1593b62ef85013092921d14b57bc4d9dfce11797c1729bf3e4c2654
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGp3bIACgkQCaWpQKGI+9TezACeOerpHdwlWbvX+FCi65OJJljR
-m+MAn3p1WswaVP0rO70jVW6YKsiLSGpl
-=RnXc
+iQIcBAEBCAAGBQJR0DuVAAoJEF0huFKJUZL5rZQP/0ZZ2ujTKOBerfuZUYyXGtsV
+kgVFANd36Xr0Q/dTM2tstBHELbHSn+5oRyB2C8hKUM1uH84Ip/uqu8aZsOiE/ykV
+O9A/lTCoX7pDF7CdM9RQ7Z9iqNiy8ePIAQJTLlizAB8WnIQEI50VClhEB1HYeaIq
+7CQ+6/mIB2Vhb0dGd0jC77VTynN+wrqyRgpbNY+6WzXd1EbFubhjcW7Gs7gmPL3H
+buyz4BytN06y+P78i4q7adLDhY/KQicTaTCOrD+Q2jNt8SjdB5O7Umlqne1meSOZ
+gj2eMlDuOu4+8kD/NMNFet/I2Wn+tqKk/vToErHYfX1mMyz3cCA6GLmYKU6VhaQx
+TedK8yUlE3gnEPxF03BxzrracotxyPzy+rKYGgy1/JOySJCWCohO3iUwtRMPS6E/
+ALLmxdwh9SlFspvjRN1Ry0AXc+a7IS80AZLZop84FrvOGVTYtnZVflG4utufSJW1
+uazswi9ej0Fiu7PcrHdQuxR8fzvKBxpnpv2yJ9t0PdzXjNFld+td0rIZo91PzNaO
+Jzz/JwAocvphGIchRIex3RI4MYKaZ93OVAnBP2NsX5h0IEF05We3wcV9Ef4M3P4t
+di9XayHIIjF9/GXgn86BZG1f4bjvWUJmru+siyleQT90hbrZCCB5OOrP19r1zh+D
+KM9FSnmla4sEPYJ4tXT0
+=f6kY
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/files/1.0.0/gcc-4.3.patch b/x11-wm/fluxbox/files/1.0.0/gcc-4.3.patch
deleted file mode 100644
index a4f14de2b250..000000000000
--- a/x11-wm/fluxbox/files/1.0.0/gcc-4.3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- fluxbox-1.0.0/src/main.cc
-+++ fluxbox-1.0.0/src/main.cc
-@@ -45,6 +45,12 @@
-   #include <stdlib.h>
- #endif
- 
-+#ifdef HAVE_CSTRING
-+  #include <cstring>
-+#else
-+  #include <string.h>
-+#endif
-+
- #include <iostream>
- #include <fstream>
- #include <stdexcept>
diff --git a/x11-wm/fluxbox/files/1.0.0/generate-menu.patch b/x11-wm/fluxbox/files/1.0.0/generate-menu.patch
deleted file mode 100644
index 1656fe23f175..000000000000
--- a/x11-wm/fluxbox/files/1.0.0/generate-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- util/fluxbox-generate_menu.in.orig	2007-12-26 13:46:13.000000000 -0500
-+++ util/fluxbox-generate_menu.in	2007-12-26 13:54:59.000000000 -0500
-@@ -1685,6 +1685,7 @@
-        append_submenu "${GRAPHICMENU}"
-                normal_find gimp gimp2 gimp-2.2 inkscape sodipodi xv gqview showimg xpaint kpaint kiconedit \
-                    ee xzgv xscreensaver-demo xlock gphoto tuxpaint krita skencil
-+					find_it display          append "[exec] (ImageMagick Display) {display}"	
-                find_it xnview           append "[exec] (xnview browser) {xnview -browser}"
-                find_it blender          append "[exec] (blender) {blender -w}"
-                find_it gears            append "[exec] (Mesa gears) {gears}"
-@@ -1718,9 +1719,10 @@
-     find_it gcalc           append "[exec] (gcalc) {gcalc}" || \
-         find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}"
-     find_it ical            append "[exec] (Calendar)   {ical}"
-+	 find_it sunbird         append "[exec] (Sunbird)    {sunbird}"
- 
-     # older <=1.1.3 apparently have stuff like swriter, not sowriter
--    for ext in s so oo xoo; do
-+    for ext in oo xoo; do
-         find_it ${ext}ffice2 && (
-             find_it ${ext}ffice2        append "[exec] (Open Office 2)  {${ext}ffice2}"
-             find_it ${ext}base2         append "[exec] (OO Base 2)      {${ext}base2}"
diff --git a/x11-wm/fluxbox/files/1.0.0/gentoo_style_location.patch b/x11-wm/fluxbox/files/1.0.0/gentoo_style_location.patch
deleted file mode 100644
index cc814e4a9cba..000000000000
--- a/x11-wm/fluxbox/files/1.0.0/gentoo_style_location.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- util/fluxbox-generate_menu.in.orig	2007-07-13 13:47:11.000000000 -0600
-+++ util/fluxbox-generate_menu.in	2007-07-13 13:51:03.000000000 -0600
-@@ -1803,12 +1803,8 @@
- append_submenu "${FBSETTINGSMENU}"
-     append "[config] (${CONFIGUREMENU})"
- 
--    append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
--        append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
--    append_menu_end
--
--    append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
--        append "[stylesdir] (~/.@pkgprefix@fluxbox@pkgsuffix@/styles)"
-+    append_submenu "Styles"
-+        append "[include] (@GENTOO_PORTAGE_EPREFIX@/usr/share/fluxbox/menu.d/styles/)"
-     append_menu_end
- 
-     # Backgroundmenu
diff --git a/x11-wm/fluxbox/files/1.1.0.1/gentoo_style_location.patch b/x11-wm/fluxbox/files/1.1.0.1/gentoo_style_location.patch
deleted file mode 100644
index dfa4f2eab48f..000000000000
--- a/x11-wm/fluxbox/files/1.1.0.1/gentoo_style_location.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
-index aca8b08..b229046 100755
---- a/util/fluxbox-generate_menu.in
-+++ b/util/fluxbox-generate_menu.in
-@@ -1794,12 +1794,8 @@ fi
- append_submenu "${FBSETTINGSMENU}"
-     append "[config] (${CONFIGUREMENU})"
- 
--    append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
--        append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
--    append_menu_end
--
--    append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
--        append "[stylesdir] (~/.@pkgprefix@fluxbox@pkgsuffix@/styles)"
-+    append_submenu "Styles"
-+        append "[include] (@GENTOO_PORTAGE_EPREFIX@/usr/share/fluxbox/menu.d/styles/)"
-     append_menu_end
- 
-     # Backgroundmenu
diff --git a/x11-wm/fluxbox/files/fbsetbg-quiet-1.1.1.patch b/x11-wm/fluxbox/files/fbsetbg-quiet-1.1.1.patch
deleted file mode 100644
index a74a4ffb041c..000000000000
--- a/x11-wm/fluxbox/files/fbsetbg-quiet-1.1.1.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 2c60fe4addd9480d78bf6d41c4aa9c179c70df01 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Fri, 24 Apr 2009 11:25:08 -0400
-Subject: [PATCH 1/2] Allow 'background: unset'
-
-When a user sets 'background: none' it really means "Do not let themes touch the
-background I have already set with fbsetbg" -> It does still actually call
-fbsetbeg to re-assert the proper background.
-
-This new value 'unset' is for users who will use an alternate method to set
-their background (root-tail, xscreensaver, or whatever).  It instructs fluxbox
-to *never* run fbsetbg.
----
- src/RootTheme.cc |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/RootTheme.cc b/src/RootTheme.cc
-index 049eb27..34c06e9 100644
---- a/src/RootTheme.cc
-+++ b/src/RootTheme.cc
-@@ -202,6 +202,10 @@ void RootTheme::reconfigTheme() {
-     filename = FbTk::StringUtil::expandFilename(filename);
-     std::string cmd = realProgramName("fbsetbg") + (m_first ? " -z " : " -Z ");
- 
-+    // user explicitly requests NO background be set at all
-+    if (strstr(m_background->options().c_str(), "unset") != 0) {
-+        return;
-+    }
-     // style doesn't wish to change the background
-     if (strstr(m_background->options().c_str(), "none") != 0) {
-         if (!m_first)
--- 
-1.6.2
-
-
-From 23857ca509be6a8ffa306c23c8d39942105a13f9 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Fri, 24 Apr 2009 14:15:58 -0400
-Subject: [PATCH 2/2] Don't complain on '-z' if there's no lastwallpaper
-
-This hides the odd cornercase of users with no lastwallpaper file and no
-background set in their style or overlay.
-
-Adapted from the patch at
-http://sourceforge.net/tracker/?func=detail&aid=2389567&group_id=35398&atid=413962
----
- util/fbsetbg |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/util/fbsetbg b/util/fbsetbg
-index a12d427..47aa33b 100644
---- a/util/fbsetbg
-+++ b/util/fbsetbg
-@@ -308,6 +308,7 @@ while [ $# -gt 0 ]; do
-                 remember=false
-                 break
-             fi
-+            ignore_missing_wallpaper=true
-             style="style"
-             shift ;;
-         -Z)
-@@ -521,6 +522,9 @@ fi
- 
- 
- if [ ! -r "$wallpaper" ]; then
-+	if [ "$ignore_missing_wallpaper" == "true" ]; then
-+		exit 0
-+	fi
-     message "Can't find wallpaper $wallpaper"
-     exit 1
- fi
--- 
-1.6.2
-
diff --git a/x11-wm/fluxbox/files/fluxbox-1.0.0-interix.patch b/x11-wm/fluxbox/files/fluxbox-1.0.0-interix.patch
deleted file mode 100644
index aec829962e9c..000000000000
--- a/x11-wm/fluxbox/files/fluxbox-1.0.0-interix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru fluxbox-1.0.0.orig/src/FbTk/FbString.cc fluxbox-1.0.0/src/FbTk/FbString.cc
---- fluxbox-1.0.0.orig/src/FbTk/FbString.cc	2008-03-11 10:36:10 +0100
-+++ fluxbox-1.0.0/src/FbTk/FbString.cc	2008-03-11 10:39:29 +0100
-@@ -46,7 +46,16 @@
- #ifdef HAVE_ICONV
- #include <iconv.h>
- #endif // HAVE_ICONV
-+
-+#if defined(__INTERIX)
-+extern "C" {
-+// interix has a broken langinfo.h without extern "C"
-+#include <langinfo.h>
-+}
-+#else
- #include <langinfo.h>
-+#endif
-+
- #include <locale.h>
- 
- #include <iostream>
-diff -ru fluxbox-1.0.0.orig/src/FbTk/Font.cc fluxbox-1.0.0/src/FbTk/Font.cc
---- fluxbox-1.0.0.orig/src/FbTk/Font.cc	2008-03-11 10:36:10 +0100
-+++ fluxbox-1.0.0/src/FbTk/Font.cc	2008-03-11 10:39:44 +0100
-@@ -68,7 +68,15 @@
- #include <list>
- #include <map>
- #include <typeinfo>
-+
-+#if defined(__INTERIX)
-+extern "C" {
-+// interix has a broken langinfo.h without extern "C"
-+#include <langinfo.h>
-+}
-+#else
- #include <langinfo.h>
-+#endif
- 
- #include <errno.h>
- 
diff --git a/x11-wm/fluxbox/files/fluxbox-1.1.1-multiscreen.patch b/x11-wm/fluxbox/files/fluxbox-1.1.1-multiscreen.patch
deleted file mode 100644
index 802809934957..000000000000
--- a/x11-wm/fluxbox/files/fluxbox-1.1.1-multiscreen.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 95ee731d9118eec110ecb2de5c9094d561a004bd Mon Sep 17 00:00:00 2001
-From: Mathias Gumz <akira at fluxbox dot org>
-Date: Thu, 6 Jan 2011 08:33:34 +0100
-Subject: [PATCH] Backported bugfix: do not assume ':number.screen' as the result of 'DisplayString()'
-
-a newer xlib recently changed the result of 'DisplayString()' a little bit:
-instead of returning ':0.0' or ':1.0' it yields ':0' or ':1'. our code to
-transform this string into something that includes the currently used
-Screen worked only on something like ':0.0'.
-
-we now find the '.' after the ':' and strip that part away.
-
-Backported from e8ce9ed3a38e1b4a3e5727d408d0fac0e2ff1ada
----
- src/FbCommands.cc |   18 +++++++++++++++---
- 1 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/src/FbCommands.cc b/src/FbCommands.cc
-index fd3f71e..fc9e7a2 100644
---- a/src/FbCommands.cc
-+++ b/src/FbCommands.cc
-@@ -142,9 +142,13 @@ int ExecuteCmd::run() {
-     if (pid)
-         return pid;
- 
-+    // 'display' is given as 'host:number.screen'. we want to give the
-+    // new app a good home, so we remove '.screen' from what is given
-+    // us from the xserver and replace it with the screen_num of the Screen
-+    // the user currently points at with the mouse
-     string displaystring("DISPLAY=");
--    displaystring += DisplayString(FbTk::App::instance()->display());
-     char intbuff[64];
-+    string display = DisplayString(FbTk::App::instance()->display());
-     int screen_num = m_screen_num;
-     if (screen_num < 0) {
-         if (Fluxbox::instance()->mouseScreen() == 0)
-@@ -155,6 +159,15 @@ int ExecuteCmd::run() {
- 
-     sprintf(intbuff, "%d", screen_num);
- 
-+    // strip away the '.screen'
-+    size_t dot = display.rfind(':');
-+    dot = display.find('.', dot);
-+    if (dot != string::npos) { // 'display' has actually a '.screen' part
-+        display.erase(dot);
-+    }
-+    display += '.';
-+    display += intbuff;
-+
-     // get shell path from the environment
-     // this process exits immediately, so we don't have to worry about memleaks
-     const char *shell = getenv("SHELL");
-@@ -162,8 +175,7 @@ int ExecuteCmd::run() {
-         shell = "/bin/sh";
- 
-     // remove last number of display and add screen num
--    displaystring.erase(displaystring.size()-1);
--    displaystring += intbuff;
-+    displaystring += DisplayString(FbTk::App::instance()->display());
- 
-     setsid();
-     putenv(const_cast<char *>(displaystring.c_str()));
--- 
-1.7.4.rc1
-
diff --git a/x11-wm/fluxbox/files/fluxbox-1.3.1-gcc46.patch b/x11-wm/fluxbox/files/fluxbox-1.3.1-gcc46.patch
deleted file mode 100644
index 90d268989dc7..000000000000
--- a/x11-wm/fluxbox/files/fluxbox-1.3.1-gcc46.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From d28e105075e3ec46515c322ee5dca6967a4cc696 Mon Sep 17 00:00:00 2001
-From: Daniel Diaz<dydyam at gmail dot com>
-Date: Mon, 28  Mar  2011  07:06:01  +0000
-Subject: compile fix: added <cstdlib> to provide declaration for 'size_t' (gcc-4.6.x likes it that way)
-
----
-diff --git a/src/FbTk/LayerItem.hh b/src/FbTk/LayerItem.hh
-index a4cdd49..ad33451 100644
---- a/src/FbTk/LayerItem.hh
-+++ b/src/FbTk/LayerItem.hh
-@@ -26,6 +26,7 @@
- #include "Layer.hh"
- #include "NotCopyable.hh"
- #include <vector>
-+#include <cstdlib> // size_t
- 
- namespace FbTk {
- 
-diff --git a/src/FbTk/MacroCommand.hh b/src/FbTk/MacroCommand.hh
-index 932ecaf..bce2ce4 100644
---- a/src/FbTk/MacroCommand.hh
-+++ b/src/FbTk/MacroCommand.hh
-@@ -26,6 +26,7 @@
- #include "RefCount.hh"
- 
- #include <vector>
-+#include <cstdlib> // size_t
- 
- namespace FbTk {
- 
-diff --git a/src/FbTk/MultLayers.hh b/src/FbTk/MultLayers.hh
-index 62c006f..3da25f6 100644
---- a/src/FbTk/MultLayers.hh
-+++ b/src/FbTk/MultLayers.hh
-@@ -24,6 +24,7 @@
- #define FBTK_MULTLAYERS_HH
- 
- #include <vector>
-+#include <cstdlib> // size_t
- 
- namespace FbTk {
- 
---
-cgit 
diff --git a/x11-wm/fluxbox/files/macrocmd-crash-1.1.1.patch b/x11-wm/fluxbox/files/macrocmd-crash-1.1.1.patch
deleted file mode 100644
index 2d5d1bda78dd..000000000000
--- a/x11-wm/fluxbox/files/macrocmd-crash-1.1.1.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 183e6666f6afd7973f60f2253187e8c24b58b6b1 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Mon, 6 Apr 2009 17:25:01 -0400
-Subject: [PATCH 1/2] Exit loop for unterminated { } pair
-
----
- src/FbTk/StringUtil.hh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh
-index 75fa69e..35f23a2 100644
---- a/src/FbTk/StringUtil.hh
-+++ b/src/FbTk/StringUtil.hh
-@@ -84,7 +84,7 @@ static void stringTokensBetween(Container &container, const std::string &in,
-     while (true) {
-         err = getStringBetween(token, in.c_str() + pos, first, last, ok_chars,
-                                allow_nesting);
--        if (err == 0)
-+        if (err <= 0)
-             break;
-         container.push_back(token);
-         pos += err;
--- 
-1.6.2
-
-
-From 55c45305d4f6973f5fbecec1e527e55dd6bd9fa5 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Wed, 8 Apr 2009 10:57:04 -0400
-Subject: [PATCH 2/2] Error on incomplete MacroCmd key command
-
----
- src/FbTk/MacroCommand.cc |   16 +++++++++-------
- 1 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc
-index 511683b..555e5f5 100644
---- a/src/FbTk/MacroCommand.cc
-+++ b/src/FbTk/MacroCommand.cc
-@@ -33,16 +33,18 @@ namespace {
- template <typename M>
- M *addCommands(M *macro, const std::string &args, bool trusted) {
- 
--    std::string blah;
-+    std::string remainder;
-     std::list<std::string> cmds;
--    StringUtil::stringTokensBetween(cmds, args, blah, '{', '}');
-+    StringUtil::stringTokensBetween(cmds, args, remainder, '{', '}');
-     RefCount<Command<void> > cmd(0);
- 
--    std::list<std::string>::iterator it = cmds.begin(), it_end = cmds.end();
--    for (; it != it_end; ++it) {
--        cmd = CommandParser<void>::instance().parse(*it, trusted);
--        if (*cmd)
--            macro->add(cmd);
-+    if (remainder.length() == 0) {
-+        std::list<std::string>::iterator it = cmds.begin(), it_end = cmds.end();
-+        for (; it != it_end; ++it) {
-+            cmd = CommandParser<void>::instance().parse(*it, trusted);
-+            if (*cmd)
-+                macro->add(cmd);
-+        }
-     }
- 
-     if (macro->size() > 0)
--- 
-1.6.2
-
diff --git a/x11-wm/fluxbox/files/mousefocus-1.1.1-r2.patch b/x11-wm/fluxbox/files/mousefocus-1.1.1-r2.patch
deleted file mode 100644
index b492eee11659..000000000000
--- a/x11-wm/fluxbox/files/mousefocus-1.1.1-r2.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 998d9ea7942e3bcb07b52e06d08ef69bbe552944 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Fri, 30 Jan 2009 10:41:27 -0500
-Subject: [PATCH 1/2] Added facility to selectively ignore EnterNotify events
-
-This will be used to avoid some situations where an EnterNotify event should not
-focus the window beneath the mouse cursor.  For example, when a menu (or any
-window for that matter) is unmapped, focus should not pass to whatever window is
-beneath the current location of the mouse cursor, but to the previous window in
-the focus list.
-
-This was first noticed when using the ClientMenu feature with
-focus-follows-mouse on -> The focus would always end up on the window beneath
-the mouse pointer, not the window selected in the menu.
----
- src/FocusControl.cc |   25 ++++++++++++++++++++++++-
- src/FocusControl.hh |   10 ++++++++++
- src/Window.cc       |    8 ++++++--
- 3 files changed, 40 insertions(+), 3 deletions(-)
-
-diff --git a/src/FocusControl.cc b/src/FocusControl.cc
-index cead827..e0a3662 100644
---- a/src/FocusControl.cc
-+++ b/src/FocusControl.cc
-@@ -81,7 +81,8 @@ FocusControl::FocusControl(BScreen &screen):
-     m_focused_win_list(screen), m_creation_order_win_list(screen),
-     m_cycling_list(0),
-     m_was_iconic(false),
--    m_cycling_last(0) {
-+    m_cycling_last(0),
-+    m_ignore_mouse_x(-1), m_ignore_mouse_y(-1) {
- 
-     m_cycling_window = m_focused_list.clientList().end();
-     
-@@ -402,6 +403,28 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) {
- 
- }
- 
-+void FocusControl::ignoreAtPointer()
-+{
-+    int ignore_i;
-+    unsigned int ignore_ui;
-+    Window ignore_w;
-+
-+    XQueryPointer(m_screen.rootWindow().display(),
-+        m_screen.rootWindow().window(), &ignore_w, &ignore_w,
-+        &m_ignore_mouse_x, &m_ignore_mouse_y,
-+        &ignore_i, &ignore_i, &ignore_ui);
-+}
-+
-+void FocusControl::ignoreAt(int x, int y)
-+{
-+    m_ignore_mouse_x = x; m_ignore_mouse_y = y;
-+}
-+
-+bool FocusControl::isIgnored(int x, int y)
-+{
-+    return x == m_ignore_mouse_x && y == m_ignore_mouse_y;
-+}
-+
- void FocusControl::removeClient(WinClient &client) {
-     if (client.screen().isShuttingdown())
-         return;
-diff --git a/src/FocusControl.hh b/src/FocusControl.hh
-index 4de4310..91681ab 100644
---- a/src/FocusControl.hh
-+++ b/src/FocusControl.hh
-@@ -93,6 +93,15 @@ public:
-     bool isMouseFocus() const { return focusModel() == MOUSEFOCUS; }
-     /// @return true if tab focus mode is mouse tab focus
-     bool isMouseTabFocus() const { return tabFocusModel() == MOUSETABFOCUS; }
-+
-+    /// Set the "ignore" pointer location to the current pointer location
-+    void ignoreAtPointer();
-+    /// Set the "ignore" pointer location to the given coordinates
-+    void ignoreAt(int x, int y);
-+    /// @return true if events at the given X/Y coordinate should be ignored
-+    /// (ie, they were previously cached via one of the ignoreAt calls)
-+    bool isIgnored(int x, int y);
-+
-     /// @return true if cycling is in progress
-     bool isCycling() const { return m_cycling_list != 0; }
-     /// Appends a client to the front of the focus list
-@@ -157,6 +166,7 @@ private:
-     const FocusableList *m_cycling_list;
-     Focusable *m_was_iconic;
-     WinClient *m_cycling_last;
-+    int m_ignore_mouse_x, m_ignore_mouse_y;
- 
-     static WinClient *s_focused_window;
-     static FluxboxWindow *s_focused_fbwindow;
-diff --git a/src/Window.cc b/src/Window.cc
-index 5d50fcf..fe32d29 100644
---- a/src/Window.cc
-+++ b/src/Window.cc
-@@ -2676,13 +2676,17 @@ void FluxboxWindow::enterNotifyEvent(XCrossingEvent &ev) {
-             sa.enter = sa.leave = False;
-             XCheckIfEvent(display, &dummy, queueScanner, (char *) &sa);
- 
--            if ((!sa.leave || sa.inferior) && !screen().focusControl().isCycling() ) {
-+            if ((!sa.leave || sa.inferior) &&
-+                !screen().focusControl().isCycling() &&
-+                !screen().focusControl().isIgnored(ev.x_root, ev.y_root) ) {
-                 focus();
-             }
-         }
-     }
- 
--    if (screen().focusControl().isMouseTabFocus() && client && client != m_client) {
-+    if (screen().focusControl().isMouseTabFocus() &&
-+        client && client != m_client &&
-+        !screen().focusControl().isIgnored(ev.x_root, ev.y_root) ) {
-         setCurrentClient(*client, isFocused());
-     }
- 
--- 
-1.7.1
-
-
-From e16a6d1fa71825b5390d9139b771f470aeb03d79 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Sat, 29 May 2010 09:30:48 -0400
-Subject: [PATCH 2/2] Ignore EnterNotify when the ClientMenu closes
-
-This is so that the resulting exposition of a window belowe the ClientMenu will
-not steal focus from the window just focused by the ClientMenu.
----
- src/ClientMenu.cc |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/src/ClientMenu.cc b/src/ClientMenu.cc
-index f5af305..c49791c 100644
---- a/src/ClientMenu.cc
-+++ b/src/ClientMenu.cc
-@@ -25,6 +25,7 @@
- #include "Screen.hh"
- #include "Window.hh"
- #include "WindowCmd.hh"
-+#include "FocusControl.hh"
- #include <X11/keysym.h>
- 
- #include "FbTk/MenuItem.hh"
-@@ -52,8 +53,12 @@ public:
- 
-         m_client.focus();
-         fbwin->raise();
--        if ((mods & ControlMask) == 0)
-+        if ((mods & ControlMask) == 0) {
-+            // Ignore any focus changes due to this menu closing
-+            // (even in StrictMouseFocus mode)
-+            m_client.screen().focusControl().ignoreAtPointer();
-             parent->hide();
-+        }
-     }
- 
-     const std::string &label() const { return m_client.title(); }
--- 
-1.7.1
-
diff --git a/x11-wm/fluxbox/files/mousefocus-1.1.1.patch b/x11-wm/fluxbox/files/mousefocus-1.1.1.patch
deleted file mode 100644
index 12cc1cb78999..000000000000
--- a/x11-wm/fluxbox/files/mousefocus-1.1.1.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-From 5c7784affe78467d7ef4e52e22da83c341622d53 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Fri, 30 Jan 2009 10:41:27 -0500
-Subject: [PATCH 1/5] Added facility to selectively ignore EnterNotify events
-
-This will be used to avoid some situations where an EnterNotify event should not
-focus the window beneath the mouse cursor.  For example, when a menu (or any
-window for that matter) is unmapped, focus should not pass to whatever window is
-beneath the current location of the mouse cursor, but to the previous window in
-the focus list.
-
-This was first noticed when using the ClientMenu feature with
-focus-follows-mouse on -> The focus would always end up on the window beneath
-the mouse pointer, not the window selected in the menu.
----
- src/FocusControl.cc |   25 ++++++++++++++++++++++++-
- src/FocusControl.hh |   10 ++++++++++
- src/Window.cc       |    8 ++++++--
- 3 files changed, 40 insertions(+), 3 deletions(-)
-
-diff --git a/src/FocusControl.cc b/src/FocusControl.cc
-index 78752bb..701373b 100644
---- a/src/FocusControl.cc
-+++ b/src/FocusControl.cc
-@@ -81,7 +81,8 @@ FocusControl::FocusControl(BScreen &screen):
-     m_focused_win_list(screen), m_creation_order_win_list(screen),
-     m_cycling_list(0),
-     m_was_iconic(false),
--    m_cycling_last(0) {
-+    m_cycling_last(0),
-+    m_ignore_mouse_x(-1), m_ignore_mouse_y(-1) {
- 
-     m_cycling_window = m_focused_list.clientList().end();
-     
-@@ -400,6 +401,28 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) {
- 
- }
- 
-+void FocusControl::ignoreAtPointer()
-+{
-+    int ignore_i;
-+    unsigned int ignore_ui;
-+    Window ignore_w;
-+
-+    XQueryPointer(m_screen.rootWindow().display(),
-+        m_screen.rootWindow().window(), &ignore_w, &ignore_w,
-+        &m_ignore_mouse_x, &m_ignore_mouse_y,
-+        &ignore_i, &ignore_i, &ignore_ui);
-+}
-+
-+void FocusControl::ignoreAt(int x, int y)
-+{
-+    m_ignore_mouse_x = x; m_ignore_mouse_y = y;
-+}
-+
-+bool FocusControl::isIgnored(int x, int y)
-+{
-+    return x == m_ignore_mouse_x && y == m_ignore_mouse_y;
-+}
-+
- void FocusControl::removeClient(WinClient &client) {
-     if (client.screen().isShuttingdown())
-         return;
-diff --git a/src/FocusControl.hh b/src/FocusControl.hh
-index 4de4310..91681ab 100644
---- a/src/FocusControl.hh
-+++ b/src/FocusControl.hh
-@@ -93,6 +93,15 @@ public:
-     bool isMouseFocus() const { return focusModel() == MOUSEFOCUS; }
-     /// @return true if tab focus mode is mouse tab focus
-     bool isMouseTabFocus() const { return tabFocusModel() == MOUSETABFOCUS; }
-+
-+    /// Set the "ignore" pointer location to the current pointer location
-+    void ignoreAtPointer();
-+    /// Set the "ignore" pointer location to the given coordinates
-+    void ignoreAt(int x, int y);
-+    /// @return true if events at the given X/Y coordinate should be ignored
-+    /// (ie, they were previously cached via one of the ignoreAt calls)
-+    bool isIgnored(int x, int y);
-+
-     /// @return true if cycling is in progress
-     bool isCycling() const { return m_cycling_list != 0; }
-     /// Appends a client to the front of the focus list
-@@ -157,6 +166,7 @@ private:
-     const FocusableList *m_cycling_list;
-     Focusable *m_was_iconic;
-     WinClient *m_cycling_last;
-+    int m_ignore_mouse_x, m_ignore_mouse_y;
- 
-     static WinClient *s_focused_window;
-     static FluxboxWindow *s_focused_fbwindow;
-diff --git a/src/Window.cc b/src/Window.cc
-index 4b4d1dc..513fbb6 100644
---- a/src/Window.cc
-+++ b/src/Window.cc
-@@ -2680,13 +2680,17 @@ void FluxboxWindow::enterNotifyEvent(XCrossingEvent &ev) {
-             sa.enter = sa.leave = False;
-             XCheckIfEvent(display, &dummy, queueScanner, (char *) &sa);
- 
--            if ((!sa.leave || sa.inferior) && !screen().focusControl().isCycling() ) {
-+            if ((!sa.leave || sa.inferior) &&
-+                !screen().focusControl().isCycling() &&
-+                !screen().focusControl().isIgnored(ev.x_root, ev.y_root) ) {
-                 focus();
-             }
-         }
-     }
- 
--    if (screen().focusControl().isMouseTabFocus() && client && client != m_client) {
-+    if (screen().focusControl().isMouseTabFocus() &&
-+        client && client != m_client &&
-+        !screen().focusControl().isIgnored(ev.x_root, ev.y_root) ) {
-         setCurrentClient(*client, isFocused());
-     }
- 
--- 
-1.6.2
-
-
-From 76ea1d9bbe3f3b7edb15da1a67652982edd5f646 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Fri, 30 Jan 2009 10:47:24 -0500
-Subject: [PATCH 2/5] Ignore EnterNotify on Unmap
-
-This is the basic condition that was first noticed because of the effect of the
-ClientMenu window unmapping and the resulting EnterNotify event stealing focus
-from the window selected in that menu.  But to be complete, any window unmapping
-should cause focus to move to the next in the last-recently-focused window list,
-not the one that happens to be beneath the mouse cursor.
----
- src/fluxbox.cc |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/src/fluxbox.cc b/src/fluxbox.cc
-index 93768da..f44f8aa 100644
---- a/src/fluxbox.cc
-+++ b/src/fluxbox.cc
-@@ -899,6 +899,11 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
- 
-     BScreen *screen = searchScreen(ue.event);
- 
-+    if (screen) {
-+        /* Ignore all EnterNotify events until the pointer actually moves */
-+        screen->focusControl().ignoreAtPointer();
-+    }
-+
-     if (ue.event != ue.window && (!screen || !ue.send_event)) {
-         return;
-     }
--- 
-1.6.2
-
-
-From 8a7879913ba7169224e18db81888a49e732c1819 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Fri, 30 Jan 2009 10:51:10 -0500
-Subject: [PATCH 3/5] Ignore EnterNotify on Lower
-
-Lower is one of the actions which may reveal a window under the current mouse
-pointer which would unexpectedly change focus under focus-folows-mouse.
----
- src/Window.cc |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/Window.cc b/src/Window.cc
-index 513fbb6..35d9b80 100644
---- a/src/Window.cc
-+++ b/src/Window.cc
-@@ -1668,6 +1668,10 @@ void FluxboxWindow::lower() {
- #ifdef DEBUG
-     cerr<<"FluxboxWindow("<<title()<<")::lower()"<<endl;
- #endif // DEBUG
-+
-+    /* Ignore all EnterNotify events until the pointer actually moves */
-+    screen().focusControl().ignoreAtPointer();
-+
-     // get root window
-     WinClient *client = getRootTransientFor(m_client);
- 
--- 
-1.6.2
-
-
-From 54c1ac8704c2ad81a597547912bdbf5cbf7967d9 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Fri, 30 Jan 2009 10:54:04 -0500
-Subject: [PATCH 4/5] Ignore EnterNotify on Move or Resize
-
-Moving and Resizing windows can reveal other windows, which of course can change
-unexpected focus changes in focus-follows-mouse.
----
- src/Window.cc |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/Window.cc b/src/Window.cc
-index 35d9b80..1104e50 100644
---- a/src/Window.cc
-+++ b/src/Window.cc
-@@ -1211,6 +1211,9 @@ void FluxboxWindow::moveResize(int new_x, int new_y,
-     if (!moving) {
-         m_last_resize_x = new_x;
-         m_last_resize_y = new_y;
-+
-+        /* Ignore all EnterNotify events until the pointer actually moves */
-+        screen().focusControl().ignoreAtPointer();
-     }
- 
- }
--- 
-1.6.2
-
-
-From c1dee4a4055f8f0dafadeca508ff5568e2d0ce08 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Mon, 9 Mar 2009 14:05:41 -0400
-Subject: [PATCH 5/5] Ignore EnterNotify on workspace change
-
-Changing workspaces also reveals other windows, which causes unexpected focus
-changes.
----
- src/Screen.cc |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/Screen.cc b/src/Screen.cc
-index 8b605e7..4d9a65f 100644
---- a/src/Screen.cc
-+++ b/src/Screen.cc
-@@ -1098,6 +1098,9 @@ void BScreen::changeWorkspaceID(unsigned int id, bool revert) {
-         id == m_current_workspace->workspaceID())
-         return;
- 
-+    /* Ignore all EnterNotify events until the pointer actually moves */
-+    this->focusControl().ignoreAtPointer();
-+
-     FbTk::App::instance()->sync(false);
- 
-     FluxboxWindow *focused = FocusControl::focusedFbWindow();
--- 
-1.6.2
-
diff --git a/x11-wm/fluxbox/files/strictmousefocus-1.1.1.patch b/x11-wm/fluxbox/files/strictmousefocus-1.1.1.patch
deleted file mode 100644
index ff150fbe4ac9..000000000000
--- a/x11-wm/fluxbox/files/strictmousefocus-1.1.1.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-From a830cf18ce0830451208157ecd0997521e171522 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <jim.ramsay@motorola.com>
-Date: Fri, 28 May 2010 13:22:13 -0400
-Subject: [PATCH 1/2] Add new focus model: StrictMouseFocus
-
-This is not actually implemented yet, but from now on, "MouseFocus" means:
-  Focus follows mouse only when you are moving the mouse, any EnterNotify events
-  caused by non-mouse operations (window closing, keycommands, changing
-  desktops) will *not* shift focus
-
-And once fully-implemented, "StrictMouseFocus" will mean:
-  Focus follows mouse on every EnterNotify event (except when the "ClientMenu"
-  closes or during alt+tab window cycling)
----
- doc/fluxbox.1.in    |    7 +++++--
- nls/fluxbox-nls.hh  |    1 +
- src/FocusControl.cc |    5 +++++
- src/FocusControl.hh |    7 ++++---
- src/Screen.cc       |    7 ++++++-
- 5 files changed, 21 insertions(+), 6 deletions(-)
-
-diff --git a/doc/fluxbox.1.in b/doc/fluxbox.1.in
-index 11f70d9..86802b9 100644
---- a/doc/fluxbox.1.in
-+++ b/doc/fluxbox.1.in
-@@ -910,10 +910,13 @@ session\.screen0\.followModel: <model>
-       be focused\. `Ignore\' does nothing, and `Follow\' uses the setting in
-       session\.screen0\.userFollowModel\. Default: Ignore
- 
--session\.screen0\.focusModel: ClickToFocus|MouseFocus
-+session\.screen0\.focusModel: ClickToFocus|MouseFocus|StrictMouseFocus
-       This controls how windows gain focus via the mouse\. With `ClickToFocus\',
-       the user must click on the window\. With `MouseFocus\', windows gain focus
--      whenever the mouse moves over them\. Default: ClickToFocus
-+	  whenever the mouse moves over them, but only when the mouse is moving.
-+	  With `StrictMouseFocus\', windows gain focus whenever the mouse enters any
-+	  exposed area, even if this is due to layer changes, window movement,
-+	  changing desktops, closing windows, etc\. Default: ClickToFocus
- 
- session\.screen0\.autoRaise: <boolean>
-       When True, this setting automatically raises any window that gains focus\.
-diff --git a/nls/fluxbox-nls.hh b/nls/fluxbox-nls.hh
-index a304995..178c2f2 100644
---- a/nls/fluxbox-nls.hh
-+++ b/nls/fluxbox-nls.hh
-@@ -84,6 +84,7 @@ enum {
-         ConfigmenuMaxIgnoreInc = 27,
-         ConfigmenuMaxDisableMove = 28,
-         ConfigmenuMaxDisableResize = 29,
-+	ConfigmenuStrictMouseFocus = 30,
- 
- 	EwmhSet = 5,
- 	EwmhOutOfMemoryClientList = 1,
-diff --git a/src/FocusControl.cc b/src/FocusControl.cc
-index e0a3662..66a2ed8 100644
---- a/src/FocusControl.cc
-+++ b/src/FocusControl.cc
-@@ -491,6 +491,7 @@ void FocusControl::revertFocus(BScreen &screen) {
-         else {
-             switch (screen.focusControl().focusModel()) {
-             case FocusControl::MOUSEFOCUS:
-+            case FocusControl::STRICTMOUSEFOCUS:
-                 XSetInputFocus(screen.rootWindow().display(),
-                                PointerRoot, None, CurrentTime);
-                 break;
-@@ -596,6 +597,8 @@ std::string FbTk::Resource<FocusControl::FocusModel>::getString() const {
-     switch (m_value) {
-     case FocusControl::MOUSEFOCUS:
-         return string("MouseFocus");
-+    case FocusControl::STRICTMOUSEFOCUS:
-+        return string("StrictMouseFocus");
-     case FocusControl::CLICKFOCUS:
-         return string("ClickFocus");
-     }
-@@ -608,6 +611,8 @@ void FbTk::Resource<FocusControl::FocusModel>::
- setFromString(char const *strval) {
-     if (strcasecmp(strval, "MouseFocus") == 0) 
-         m_value = FocusControl::MOUSEFOCUS;
-+    else if (strcasecmp(strval, "StrictMouseFocus") == 0)
-+        m_value = FocusControl::STRICTMOUSEFOCUS;
-     else if (strcasecmp(strval, "ClickToFocus") == 0) 
-         m_value = FocusControl::CLICKFOCUS;
-     else
-diff --git a/src/FocusControl.hh b/src/FocusControl.hh
-index 91681ab..72eec11 100644
---- a/src/FocusControl.hh
-+++ b/src/FocusControl.hh
-@@ -42,8 +42,9 @@ public:
-     typedef std::list<Focusable *> Focusables;
-     /// main focus model
-     enum FocusModel { 
--        MOUSEFOCUS = 0, ///< focus follows mouse
--        CLICKFOCUS      ///< focus on click
-+        MOUSEFOCUS = 0,  ///< focus follows mouse, but only when the mouse is moving
-+        CLICKFOCUS,      ///< focus on click
-+        STRICTMOUSEFOCUS ///< focus always follows mouse, even when stationary
-     };
-     /// focus model for tabs
-     enum TabFocusModel { 
-@@ -90,7 +91,7 @@ public:
-      */
-     void dirFocus(FluxboxWindow &win, FocusDir dir);
-     /// @return true if focus mode is mouse focus
--    bool isMouseFocus() const { return focusModel() == MOUSEFOCUS; }
-+    bool isMouseFocus() const { return focusModel() != CLICKFOCUS; }
-     /// @return true if tab focus mode is mouse tab focus
-     bool isMouseTabFocus() const { return tabFocusModel() == MOUSETABFOCUS; }
- 
-diff --git a/src/Screen.cc b/src/Screen.cc
-index 649ea2b..0271868 100644
---- a/src/Screen.cc
-+++ b/src/Screen.cc
-@@ -1615,8 +1615,13 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
-                "Click To Focus", "Click to focus",
-                FocusControl::CLICKFOCUS);
-     _FOCUSITEM(Configmenu, MouseFocus,
--               "Mouse Focus", "Mouse Focus",
-+               "Mouse Focus (Keyboard Friendly)",
-+               "Mouse Focus (Keyboard Friendly)",
-                FocusControl::MOUSEFOCUS);
-+    _FOCUSITEM(Configmenu, StrictMouseFocus,
-+               "Mouse Focus (Strict)",
-+               "Mouse Focus (Strict)",
-+               FocusControl::STRICTMOUSEFOCUS);
- #undef _FOCUSITEM
- 
-     focus_menu->insert(new FbTk::MenuSeparator());
--- 
-1.7.1
-
-
-From 9db301c26e27e4d139dff424f8eab2f8def30cb5 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <jim.ramsay@motorola.com>
-Date: Fri, 28 May 2010 15:50:15 -0400
-Subject: [PATCH 2/2] Implement StrictMouseFocus
-
-As noted in the previous commit, StrictMouseFocus now works as advertised:
-  Focus follows mouse on every EnterNotify event (except when the "ClientMenu"
-  closes or during alt+tab window cycling)
----
- src/ClientMenu.cc   |    7 ++++++-
- src/FocusControl.cc |   19 ++++++++++++++-----
- src/FocusControl.hh |   10 ++++++++--
- 3 files changed, 28 insertions(+), 8 deletions(-)
-
-diff --git a/src/ClientMenu.cc b/src/ClientMenu.cc
-index f5af305..46306d9 100644
---- a/src/ClientMenu.cc
-+++ b/src/ClientMenu.cc
-@@ -25,6 +25,7 @@
- #include "Screen.hh"
- #include "Window.hh"
- #include "WindowCmd.hh"
-+#include "FocusControl.hh"
- #include <X11/keysym.h>
- 
- #include "FbTk/MenuItem.hh"
-@@ -52,8 +53,12 @@ public:
- 
-         m_client.focus();
-         fbwin->raise();
--        if ((mods & ControlMask) == 0)
-+        if ((mods & ControlMask) == 0) {
-+            // Ignore any focus changes due to this menu closing
-+            // (even in StrictMouseFocus mode)
-+            m_client.screen().focusControl().ignoreAtPointer(true);
-             parent->hide();
-+        }
-     }
- 
-     const std::string &label() const { return m_client.title(); }
-diff --git a/src/FocusControl.cc b/src/FocusControl.cc
-index 66a2ed8..44cd81b 100644
---- a/src/FocusControl.cc
-+++ b/src/FocusControl.cc
-@@ -403,21 +403,30 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) {
- 
- }
- 
--void FocusControl::ignoreAtPointer()
-+void FocusControl::ignoreAtPointer(bool force)
- {
--    int ignore_i;
-+    int ignore_i, ignore_x, ignore_y;
-     unsigned int ignore_ui;
-     Window ignore_w;
- 
-     XQueryPointer(m_screen.rootWindow().display(),
-         m_screen.rootWindow().window(), &ignore_w, &ignore_w,
--        &m_ignore_mouse_x, &m_ignore_mouse_y,
-+        &ignore_x, &ignore_y,
-         &ignore_i, &ignore_i, &ignore_ui);
-+
-+    this->ignoreAt(ignore_x, ignore_y, force);
-+}
-+
-+void FocusControl::ignoreAt(int x, int y, bool force)
-+{
-+	if (force || this->focusModel() == MOUSEFOCUS) {
-+		m_ignore_mouse_x = x; m_ignore_mouse_y = y;
-+	}
- }
- 
--void FocusControl::ignoreAt(int x, int y)
-+void FocusControl::ignoreCancel()
- {
--    m_ignore_mouse_x = x; m_ignore_mouse_y = y;
-+	m_ignore_mouse_x = m_ignore_mouse_y = -1;
- }
- 
- bool FocusControl::isIgnored(int x, int y)
-diff --git a/src/FocusControl.hh b/src/FocusControl.hh
-index 72eec11..c265253 100644
---- a/src/FocusControl.hh
-+++ b/src/FocusControl.hh
-@@ -96,9 +96,15 @@ public:
-     bool isMouseTabFocus() const { return tabFocusModel() == MOUSETABFOCUS; }
- 
-     /// Set the "ignore" pointer location to the current pointer location
--    void ignoreAtPointer();
-+    /// @param force If true, ignore even in StrictMouseFocus mode
-+    void ignoreAtPointer(bool force = false);
-     /// Set the "ignore" pointer location to the given coordinates
--    void ignoreAt(int x, int y);
-+    /// @param x Current X position of the pointer
-+    /// @param y Current Y position of the pointer
-+    /// @param force If true, ignore even in StrictMouseFocus mode
-+    void ignoreAt(int x, int y, bool force = false);
-+    /// unset the "ignore" pointer location
-+    void ignoreCancel();
-     /// @return true if events at the given X/Y coordinate should be ignored
-     /// (ie, they were previously cached via one of the ignoreAt calls)
-     bool isIgnored(int x, int y);
--- 
-1.7.1
-
diff --git a/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild
deleted file mode 100644
index d3d1a2283a54..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild,v 1.8 2011/04/16 18:22:51 ulm Exp $
-
-EAPI="3"
-inherit eutils prefix
-
-IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax -newmousefocus"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="gnome" simply adds support for some gnome protocols, and
-# does not depend on external libraries.  However, it does make the binary a
-# fair bit bigger, so we don't want to turn it on unless the user actually wants
-# it.
-
-RDEPEND="x11-libs/libXpm
-	x11-libs/libXrandr
-	xinerama? ( x11-libs/libXinerama )
-	x11-apps/xmessage
-	x11-libs/libXft
-	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0[X] )
-	vim-syntax? ( app-vim/fluxbox-syntax )
-	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	!!<=x11-misc/fluxconf-0.9.9
-	!!<=x11-misc/fbdesk-1.2.1"
-DEPEND="nls? ( sys-devel/gettext )
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	${RDEPEND}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-
-src_prepare() {
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
-	eprefixify util/fluxbox-generate_menu.in
-
-	epatch "${FILESDIR}"/osx-has-otool.patch
-
-	# Patch to handle a broken key file gracefully, #263379
-	epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"
-
-	# Patch to quiet fbsetbg on upgrade
-	epatch "${FILESDIR}/fbsetbg-quiet-1.1.1.patch"
-
-	# Patch to fix window focus bug when you have "focus-follows-mouse"
-	if use newmousefocus; then
-		# These change 'MouseFocus' behaviour to what will be in fluxbox-1.1.2
-		# and add the new 'StrictMouseFocus' mode.
-		epatch "${FILESDIR}/mousefocus-1.1.1.patch"
-		epatch "${FILESDIR}/strictmousefocus-1.1.1.patch"
-	else
-		epatch "${FILESDIR}/mousefocus-1.1.1-r2.patch"
-	fi
-
-	# Patch to fix multiple screens with libX11-1.4.0, #348819
-	epatch "${FILESDIR}/fluxbox-1.1.1-multiscreen.patch"
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable gnome) \
-		$(use_enable imlib imlib2) \
-		$(use_enable slit ) \
-		$(use_enable toolbar ) \
-		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
-		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
-		${myconf}
-}
-
-src_compile() {
-	default
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	emake DESTDIR="${D}" STRIP="" install || die "install failed"
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}/${PN}.xsession" fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
-
-	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox" || die
-	doins "${FILESDIR}/styles-menu-commonbox" || die
-	doins "${FILESDIR}/styles-menu-user" || die
-}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.1.ebuild
deleted file mode 100644
index aa196504bda3..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.1.ebuild,v 1.9 2011/08/20 16:03:39 jer Exp $
-
-EAPI=4
-inherit eutils prefix
-
-IUSE="nls xinerama bidi +truetype gnome +imlib +slit +toolbar vim-syntax"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="gnome" simply adds support for some gnome protocols, and
-# does not depend on external libraries.  However, it does make the binary a
-# fair bit bigger, so we don't want to turn it on unless the user actually wants
-# it.
-
-RDEPEND="x11-libs/libXpm
-	x11-libs/libXrandr
-	xinerama? ( x11-libs/libXinerama )
-	x11-apps/xmessage
-	x11-libs/libXft
-	truetype? ( media-libs/freetype )
-	bidi? ( dev-libs/fribidi )
-	imlib? ( >=media-libs/imlib2-1.2.0[X] )
-	vim-syntax? ( app-vim/fluxbox-syntax )
-	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	!!<=x11-misc/fluxconf-0.9.9
-	!!<=x11-misc/fbdesk-1.2.1"
-DEPEND="nls? ( sys-devel/gettext )
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	${RDEPEND}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-
-src_prepare() {
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
-	eprefixify util/fluxbox-generate_menu.in
-
-	epatch "${FILESDIR}"/osx-has-otool.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable gnome) \
-		$(use_enable imlib imlib2) \
-		$(use_enable bidi fribidi ) \
-		$(use_enable slit ) \
-		$(use_enable toolbar ) \
-		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
-		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
-		${myconf}
-}
-
-src_compile() {
-	default
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	emake DESTDIR="${D}" STRIP="" install
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}/${PN}.xsession" fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
-
-	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox"
-	doins "${FILESDIR}/styles-menu-commonbox"
-	doins "${FILESDIR}/styles-menu-user"
-}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.3.ebuild b/x11-wm/fluxbox/fluxbox-1.3.3.ebuild
deleted file mode 100644
index a1577a399a54..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.3.ebuild,v 1.1 2013/01/08 21:32:50 lack Exp $
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs prefix
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.lzma"
-HOMEPAGE="http://www.fluxbox.org"
-
-RDEPEND="x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	|| ( x11-misc/gxmessage x11-apps/xmessage )
-	xinerama? ( x11-libs/libXinerama )
-	truetype? ( media-libs/freetype )
-	bidi? ( >=dev-libs/fribidi-0.19.2 )
-	imlib? ( >=media-libs/imlib2-1.2.0[X] )
-	vim-syntax? ( app-vim/fluxbox-syntax )
-	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	!!<=x11-misc/fluxconf-0.9.9
-	!!<=x11-misc/fbdesk-1.2.1"
-DEPEND="bidi? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	x11-proto/xextproto
-	${RDEPEND}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-
-src_prepare() {
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
-	eprefixify util/fluxbox-generate_menu.in
-
-	epatch "${FILESDIR}"/osx-has-otool.patch
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-}
-
-src_configure() {
-	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable imlib imlib2) \
-		$(use_enable bidi fribidi ) \
-		$(use_enable slit ) \
-		$(use_enable toolbar ) \
-		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
-		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
-		${myconf}
-}
-
-src_compile() {
-	default
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	emake DESTDIR="${D}" STRIP="" install
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}/${PN}.xsession" fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
-
-	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox"
-	doins "${FILESDIR}/styles-menu-commonbox"
-	doins "${FILESDIR}/styles-menu-user"
-}