reinit the tree, so we can have metadata

16 files changed, 877 insertions, 0 deletions

diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
new file mode 100644
index 000000000000..d385a4a8834c
--- /dev/null
+++ b/x11-wm/fluxbox/Manifest
@@ -0,0 +1,19 @@
+AUX 1.3.5-generate_menu-printf-fix.patch 1188 SHA256 5eabe84b84a5476595d5b1bdb02d375753e2aa7b3fe20d7c8034e9f0cd14db99 SHA512 78949c35a153d21f98e640e67abc73b124346fcbd31dbc200b6892bfc0af7bab22a5383759482864721644c5cff3cf423914861212390ab96dbebb09c5ba7e38 WHIRLPOOL 30ca248bee5e96f1701425bc5d0d93ed1a0bf9f147abdf76f66afa7620f81ae9b02baa0e3e421ecd19acfd8dec8014c3490e8267d8e1e2efaa46b6feb58ec8d8
+AUX fix-hidden-toolbar.patch 5403 SHA256 81bfb72f60c76be5c4d803ddd141dcef49cd156686c949528682d393b2defcfe SHA512 69705c1c24bb7696c59a82dc20ef5319562cfd67b4e9b6903cd5de02744c48bfce132949ed7eae4879bf89a08bebeb592d35d0ce77b24c17ad172740a15215b1 WHIRLPOOL 61c14d04ac6ae2a5070545648adc0b2de50725a86961ce69225460d2faf985805265c8f18a92b6013e43613fe87475e45e208430e0e719e72ff8459c1103cfd2
+AUX fluxbox.desktop 187 SHA256 d0709698a96bef34f0984c203d26f976ed401448821285fa5f74907070244948 SHA512 217baf54698bb553dabfdc5565827eb10e897728a2ff2595f0eb03aaf049784a094c48b7e698b34ce374dd9f81036bebc77cf7136ec7aa9651eeaf8a0b751dd0 WHIRLPOOL 6aa0cb435bb75e3aa5f94da156662f95398f3b15924972ddf0ce0493fcf3f695f5669756a43eb47228aece8f6c24f801a1d5e4f907ec5eaee3ec6b17098ea6b5
+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 osx-has-otool.patch 472 SHA256 e21d837d6e244e61f00f1dc732eeafe0d5eaa59e333449f19d7e4ebfeeee63ec SHA512 50758ff5729bfdd74011106f95eb9cf72c4e1ba3ec5fc462017172b7b4f8f9e7763416e8c9243fdb59f699175c5ca18711e05e4be1a95ad973e76daa3814d17a WHIRLPOOL bcf97d5e8dbac0d75af0cb83f728e8416cc9819bd42062ed3e1c2a4fc076f2b5db389165c5b7bd2643903882cebdd53b4c698c150f0c9122d2134ae6c618e90e
+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.3.6.tar.xz 793144 SHA256 fa09ad8d30841021a1e5147efa944eb509201fa3619da5b6608d94cbbf55bf33 SHA512 66257f00b3f92cb3b87990610e0b5d6c7191c75997bbcba6744d581ccec36da2d1724767575dcde81be4fdbf39e2e25c8530013ee52a28d4775230fdf04b2f9a WHIRLPOOL 198a3972a81287a1fa6346a708bf461cd9b5262adb7cb17504077e9d154c582947b05f7508d151363f36f78d822fa9fbf9797ee4cc6f7f76a8cc5b7a69db4c52
+DIST fluxbox-1.3.7.tar.xz 786492 SHA256 fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01 WHIRLPOOL ebf8352dfd6a92ba589c0224a7b50a7a6b1692ca760b551959885e2bcaf59a82657598288ac14ed947763891d939f9c227a8a6fde3a6bd0684b7d9478026a727
+EBUILD fluxbox-1.3.6-r1.ebuild 3147 SHA256 59418c642b22a0786be13a3eb0e8518d5d956bf6e1204e2562c2f006c4dcc7d5 SHA512 cda36abf7e37c650ab8248cc3817b437820360a81db9932d21b744bed482bdbc29ca359bdb43e9cfca6142f553e7c687cfd68494f925b5f081c2f99f491f21d2 WHIRLPOOL 7c67dce16f7e4ecf95f2e7ce9bef7f107e789558dfa07779aab39bc4b5d0dff59f8e8e815e99288acd013514661102d2e7973f954fe7f2d2349617184894efb0
+EBUILD fluxbox-1.3.7-r2.ebuild 3173 SHA256 af756e557d923aff6f00c50d220907bb7aa2378a7b19fa93e254f99c757d20fe SHA512 28e6a6c5146c417c9e7ac8ca4eb60aee7fbd0b2c952c433f5a974d05f8f31dea44039932888088b79484b08e33da229dab58e2542eb9be1666df0b8a15cc3252 WHIRLPOOL 46686ea8fd412a819aa112fdfc12abb2d40a6859c25479027ed08391b4557c29db4c637e52d68605aae3b9e526121c993cbf9219d221aa302bf416e0ad656ea2
+EBUILD fluxbox-1.3.7-r3.ebuild 3175 SHA256 bc921db389a0e49d840f769755aaeaf8fd4e59fdb35e8bc108fdba190dfdd42b SHA512 0419913064ad2d4edfe00c429b74936fc4284cd208f6db1004fce7cf8eb3fe2cd18ff8422c9232f49ef52e24a8c48c3ee4d92cc1d9e10cc8795f0adf3bb93bc0 WHIRLPOOL 2e1f812a15f53222a1f605f002faad0e9c7bd5b1fd5ea88648fd03f4e6abd07d320f5ada29bb0ccba73d7771034a5097e679dd1c23b63dd913985539058fdbaf
+EBUILD fluxbox-1.3.7-r4.ebuild 3217 SHA256 73f38696a9a8823a2458cab175f09dd83149ef1bf9a14674c92c73188d1664f7 SHA512 16ca60b87181b516bb6d76e6cea2c7507e4a0a435f567c8758fb660a521f4168d92d8ec9a41ed9d6d44878278856bb53b1d9700d52f0767cd45c3788a3096207 WHIRLPOOL 01a2a3b0e0a9b79c00de90b651fff51e931cc09ed8d32a6461a9f42f28dc84568fa39aa5ecd16bca1c625f730710c9e86ee6eb0105aa48ae3ea6063b35e5dab6
+EBUILD fluxbox-9999.ebuild 3003 SHA256 448798e660730d7ba002de6a8963188ee41f5dd757a6e9d90309db6d4121071a SHA512 d9cff50cad586aafb16b9de11f581a81405f35c85523965f89a079e9fcdfab6484addc06d2280ea6f923e2f3597960605eb154b67ccb811823fe2516c7e32026 WHIRLPOOL d65ec559558b49c25a3858313c123eaecc5a6af0ab263e4e34a90296c65b7727e39a10d672900aa05275f093467d23a50a2a8a04e341a409d990e37be2710de8
+MISC ChangeLog 4681 SHA256 e2ae7d9e371cf242d82ddc09ade8f370c49ef64e967725668e909d863d7293bd SHA512 37225a26418d2b1b309c937f1d05584f4096d98c92ee13f8b51591f37f352faf582e4a92452534e1546ddb5abf9bf38451e959fcefec1c6a6fd06bece6a864d5 WHIRLPOOL 907f0a4de2fe5636f4fdc8b841925670e4da3e099553280ab0c5507b6202eeba9fadb64f239932559d5d697ab81166509203ca6f5492f78018bb4835280c4d93
+MISC ChangeLog-2015 62229 SHA256 77ace1985e0eee1dde1cab0db729134840afc842637341d071c4f1a72b3f7514 SHA512 ce04b4872632b65a3c94f25f6a359e1937cd19c0bb4ff80b3586691fd50df7ff287a058a9dae1171a55737934363bf9a94048820b02bad1ab0156b69653f0831 WHIRLPOOL f16df1cc901db3bdc2c093f1d0a0494fbb97f5c8c05baa8eb582955d26194945a12ff0a3c9f222a4ed16096b234599c3c45a7a802c6c3eab97d7f838262448b6
+MISC metadata.xml 1177 SHA256 7bde8cb7441f307433df423c692614945a9f810becdc9f3761df79d5299b2bbd SHA512 7b3ba2c7db2d7fcfb6bc1170842928aceaa8b6868c8f242164742864741453a940c72298d1f1d3d7db7768c95c0910e80de5cb822f137496916114dc784b9ec8 WHIRLPOOL 2073389deac2f03e724a2a57b8ade4503f5989f7ff153acced579f8d7b28262f9f36bb069e99a28aaf174c906cd2f69ceff75c736140cb2dd696537e7bf44e44
diff --git a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
new file mode 100644
index 000000000000..f9246f159076
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
@@ -0,0 +1,22 @@
+https://github.com/fluxbox/fluxbox/commit/fc245408d6975d0813cd4440e7089d987b54d42e
+diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
+index 525315c..33b0153 100755
+--- a/util/fluxbox-generate_menu.in
++++ b/util/fluxbox-generate_menu.in
+@@ -330,13 +330,13 @@ searchForIcon(){
+     # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
+     if [ -f "$entry_icon" ]; then
+     # if icon exists and entry does not already exists, add it
+-        if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
+-            printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING
++        if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
++            printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
+         else 
+-            : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
++            : echo "#    mapping already exists for ${execname}" >> $ICONMAPPING
+         fi
+     else
+-        echo "# No icon file found for $entry_exec" >> $ICONMAPPING
++        echo "# No icon file found for $execname" >> $ICONMAPPING
+     fi
+ }
diff --git a/x11-wm/fluxbox/files/fix-hidden-toolbar.patch b/x11-wm/fluxbox/files/fix-hidden-toolbar.patch
new file mode 100644
index 000000000000..e5e5a552c392
--- /dev/null
+++ b/x11-wm/fluxbox/files/fix-hidden-toolbar.patch
@@ -0,0 +1,92 @@
+--- a/src/Toolbar.cc
++++ b/src/Toolbar.cc
+@@ -80,18 +80,18 @@ const struct {
+     unsigned int shape;
+ } _values[] = {
+     { /* unused */ },
+-    { Toolbar::TOPLEFT,      "TopLeft",      FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::TOPCENTER,    "TopCenter",    FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::TOPRIGHT,     "TopRight",     FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::BOTTOMLEFT,   "BottomLeft",   FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::BOTTOMRIGHT,  "BottomRight",  FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::LEFTBOTTOM,   "LeftBottom",   FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+-    { Toolbar::LEFTCENTER,   "LeftCenter",   FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+-    { Toolbar::LEFTTOP,      "LeftTop",      FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+-    { Toolbar::RIGHTBOTTOM,  "RightBottom",  FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::RIGHTCENTER,  "RightCenter",  FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::RIGHTTOP,     "RightTop",     FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
++    { Toolbar::TOPLEFT,      "TopLeft",      FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT                            },
++    { Toolbar::TOPCENTER,    "TopCenter",    FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT  },
++    { Toolbar::TOPRIGHT,     "TopRight",     FbTk::ROT0,   FbTk::Shape::BOTTOMLEFT                             },
++    { Toolbar::BOTTOMLEFT,   "BottomLeft",   FbTk::ROT0,   FbTk::Shape::TOPRIGHT                               },
++    { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0,   FbTk::Shape::TOPRIGHT    | FbTk::Shape::TOPLEFT     },
++    { Toolbar::BOTTOMRIGHT,  "BottomRight",  FbTk::ROT0,   FbTk::Shape::TOPLEFT                                },
++    { Toolbar::LEFTBOTTOM,   "LeftBottom",   FbTk::ROT270, FbTk::Shape::TOPRIGHT                               },
++    { Toolbar::LEFTCENTER,   "LeftCenter",   FbTk::ROT270, FbTk::Shape::TOPRIGHT    | FbTk::Shape::BOTTOMRIGHT },
++    { Toolbar::LEFTTOP,      "LeftTop",      FbTk::ROT270, FbTk::Shape::BOTTOMRIGHT                            },
++    { Toolbar::RIGHTBOTTOM,  "RightBottom",  FbTk::ROT90,  FbTk::Shape::TOPLEFT                                },
++    { Toolbar::RIGHTCENTER,  "RightCenter",  FbTk::ROT90,  FbTk::Shape::TOPLEFT     | FbTk::Shape::BOTTOMLEFT  },
++    { Toolbar::RIGHTTOP,     "RightTop",     FbTk::ROT90,  FbTk::Shape::BOTTOMLEFT                             },
+ };
+ 
+ }
+@@ -648,24 +648,29 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
+         break;
+     case TOPCENTER:
+         frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
+         break;
+     case TOPRIGHT:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
+         break;
+     case BOTTOMRIGHT:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += head_h - bw - pixel;
+         break;
+     case BOTTOMCENTER: // default is BOTTOMCENTER
+         frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
+         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += head_h - bw - pixel;
+         break;
+     case LEFTCENTER:
+         frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
++        frame.y_hidden = frame.y;
+         frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
+         break;
+     case LEFTTOP:
+@@ -673,21 +678,24 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
+         break;
+     case LEFTBOTTOM:
+         frame.y = head_h - static_cast<int>(frame.height) - bw*2;
++        frame.y_hidden = frame.y;
+         frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
+         break;
+     case RIGHTCENTER:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+-        frame.y += (head_h - static_cast<int>(frame.height))/2 * bw;
+-        frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;
++        frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
++        frame.x_hidden += head_w - bw - pixel;
++        frame.y_hidden = frame.y;
+         break;
+     case RIGHTTOP:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+-        frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;
++        frame.x_hidden += head_w - bw - pixel;
+         break;
+     case RIGHTBOTTOM:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
+-        frame.x_hidden +=   static_cast<int>(frame.width) + bw - pixel;
++        frame.x_hidden += head_w - bw - pixel;
++        frame.y_hidden = frame.y;
+         break;
+     }
+ 
diff --git a/x11-wm/fluxbox/files/fluxbox.desktop b/x11-wm/fluxbox/files/fluxbox.desktop
new file mode 100644
index 000000000000..975d121c877a
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Fluxbox
+Comment=This session logs you into Fluxbox
+Exec=startfluxbox
+TryExec=startfluxbox
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/x11-wm/fluxbox/files/fluxbox.xsession b/x11-wm/fluxbox/files/fluxbox.xsession
new file mode 100644
index 000000000000..0fb9dcd6c77c
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox.xsession
@@ -0,0 +1,90 @@
+#!/bin/sh
+# Fluxbox Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.fluxbox-errors" "${TMPDIR-/tmp}/fluxbox-$USER" "/tmp/fluxbox-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec /usr/bin/startfluxbox
diff --git a/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch b/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch
new file mode 100644
index 000000000000..dfa4f2eab48f
--- /dev/null
+++ b/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch
@@ -0,0 +1,19 @@
+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/osx-has-otool.patch b/x11-wm/fluxbox/files/osx-has-otool.patch
new file mode 100644
index 000000000000..7671dd83647c
--- /dev/null
+++ b/x11-wm/fluxbox/files/osx-has-otool.patch
@@ -0,0 +1,12 @@
+--- util/fbsetbg
++++ util/fbsetbg
+@@ -356,7 +356,8 @@
+             if [ ! "$wpsetter" = Esetroot ]; then
+                 WPSETTER=$wpsetter
+                 break
+-            elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
++            elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null || \
++                otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
+                 WPSETTER=$wpsetter
+                 break
+             else
diff --git a/x11-wm/fluxbox/files/styles-menu-commonbox b/x11-wm/fluxbox/files/styles-menu-commonbox
new file mode 100644
index 000000000000..742e587e4f48
--- /dev/null
+++ b/x11-wm/fluxbox/files/styles-menu-commonbox
@@ -0,0 +1,5 @@
+[begin] (Legacy Commonbox Styles)
+[submenu] (Legacy Commonbox Styles)
+   [stylesdir] (/usr/share/commonbox/styles)
+[end]
+[end]
diff --git a/x11-wm/fluxbox/files/styles-menu-fluxbox b/x11-wm/fluxbox/files/styles-menu-fluxbox
new file mode 100644
index 000000000000..d2e0d580339f
--- /dev/null
+++ b/x11-wm/fluxbox/files/styles-menu-fluxbox
@@ -0,0 +1,5 @@
+[begin] (Fluxbox Core Styles)
+[submenu] (Fluxbox Core Styles)
+   [stylesdir] (/usr/share/fluxbox/styles)
+[end]
+[end]
diff --git a/x11-wm/fluxbox/files/styles-menu-user b/x11-wm/fluxbox/files/styles-menu-user
new file mode 100644
index 000000000000..3d011d27ed23
--- /dev/null
+++ b/x11-wm/fluxbox/files/styles-menu-user
@@ -0,0 +1,5 @@
+[begin] (User Styles)
+[submenu] (User Styles)
+   [stylesdir] (~/.fluxbox/styles)
+[end]
+[end]
diff --git a/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..0368c77fcfbd
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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.xz"
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+"
+
+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
+	# Fix the semantic issue of icon paths, bug #536370
+	epatch "${FILESDIR}"/1.3.5-generate_menu-printf-fix.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 ${myconf} \
+		$(use_enable bidi fribidi ) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable slit ) \
+		$(use_enable toolbar ) \
+		$(use_enable toolbar systray ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="" install
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+	# Styles menu framework
+	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.7-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
new file mode 100644
index 000000000000..0af7d5b91c24
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs prefix
+
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+"
+
+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
+
+	# Fix bug #551522; 1.3.8 will render this obsolete
+	epatch "${FILESDIR}"/fix-hidden-toolbar.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 bidi fribidi ) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable slit ) \
+		$(use_enable systray ) \
+		$(use_enable toolbar ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="" install
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+	# Styles menu framework
+	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.7-r3.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
new file mode 100644
index 000000000000..c4f2aee10842
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs prefix xdg
+
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+"
+
+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
+
+	# Fix bug #551522; 1.3.8 will render this obsolete
+	epatch "${FILESDIR}"/fix-hidden-toolbar.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 bidi fribidi ) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable slit ) \
+		$(use_enable systray ) \
+		$(use_enable toolbar ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="" install
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+	# Styles menu framework
+	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.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
new file mode 100644
index 000000000000..2edfed184eaf
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs prefix xdg xdg-utils
+
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+"
+
+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
+
+	# Fix bug #551522; 1.3.8 will render this obsolete
+	epatch "${FILESDIR}"/fix-hidden-toolbar.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() {
+	xdg_environment_reset
+	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
+
+	econf $(use_enable bidi fribidi ) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable slit ) \
+		$(use_enable systray ) \
+		$(use_enable toolbar ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="" install
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+	# Styles menu framework
+	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-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
new file mode 100644
index 000000000000..7d8e0f9002ab
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-9999.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs git-2 prefix
+
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+EGIT_REPO_URI="git://git.fluxbox.org/fluxbox.git"
+SRC_URI=""
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS=""
+
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+"
+
+src_prepare() {
+	./autogen.sh
+
+	# 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 bidi fribidi ) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable slit ) \
+		$(use_enable systray) \
+		$(use_enable toolbar ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="" install
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+	# Styles menu framework
+	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/metadata.xml b/x11-wm/fluxbox/metadata.xml
new file mode 100644
index 000000000000..2bb00c096216
--- /dev/null
+++ b/x11-wm/fluxbox/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zlg@gentoo.org</email>
+		<name>Daniel Campbell</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>pchrist@gentoo.org</email>
+		<name>Panagiotis Christopoulos</name>
+	</maintainer>
+	<longdescription>
+		Fluxbox is yet another windowmanager for X. Originally based upon the
+		Blackbox 0.61.1 code, Fluxbox has been extended to include a new tabbed
+		window handling mechanism, an improved configurable window title bar,
+		better KDE and GNOME integration, an integrated key grabber and
+		countless additional features.
+	</longdescription>
+	<use>
+		<flag name="bidi">
+			Enable bidirectional language support with
+			<pkg>dev-libs/fribidi</pkg>
+		</flag>
+		<flag name="slit">Enables the Fluxbox slit (or dock)</flag>
+		<flag name="systray">Enables the system tray in the Fluxbox toolbar</flag>
+		<flag name="toolbar">Enables the Fluxbox toolbar</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">fluxbox</remote-id>
+	</upstream>
+</pkgmetadata>