Fluxbox-1.3.1 is released. Plus cleanup of a prefix patch for osx (Bug #355177)

Package-Manager: portage-2.1.9.34/cvs/Linux i686

9 files changed, 141 insertions, 37 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 35dfdf00d623..fa6acce7e567 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.285 2011/02/22 13:31:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.286 2011/02/28 00:32:30 lack Exp $
+
+*fluxbox-1.3.1 (28 Feb 2011)
+
+  28 Feb 2011; Jim Ramsay <lack@gentoo.org> fluxbox-1.1.1-r1.ebuild,
+  fluxbox-1.1.1-r2.ebuild, fluxbox-1.1.1-r3.ebuild,
+  -files/fluxbox-1.1.1-osx-has-otool.patch, fluxbox-1.3.0.ebuild,
+  -files/fluxbox-1.3.0-osx-has-otool.patch, +fluxbox-1.3.1.ebuild,
+  +files/osx-has-otool.patch:
+  Fluxbox-1.3.1 is released. Plus cleanup of a prefix patch for osx (Bug
+  #355177)
 
   22 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> fluxbox-1.3.0.ebuild:
   Remove needless ||die statements with eapi4.
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index b7f8dee9f118..51b13e45d1df 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -5,14 +5,13 @@ AUX 1.1.0.1/gentoo_style_location.patch 735 RMD160 fb14a4d9d91b4a23992ec90c65e1a
 AUX fbsetbg-quiet-1.1.1.patch 2342 RMD160 211d9a868d608d87804ca79062a982838c12aa78 SHA1 366d1b452e7b8066a75f9f0f26d0ae7ac2ac3739 SHA256 e9ad48a2281549af472a0cc784e840c06d0032bd4f958a2c8bbabac134f01c0c
 AUX fluxbox-1.0.0-interix.patch 963 RMD160 dafd89f3691a283ddf7e922a0c7499d734a9d2e4 SHA1 ad2e0fdb5c3a7ba793efa3e854d389a46e8f4626 SHA256 f3f04a2b8ae569eb90fd3b14c9ef0199b8b665dc6c1924d4f06b635d62291416
 AUX fluxbox-1.1.1-multiscreen.patch 2439 RMD160 139e49b60b491472dc2d5dff97f5a7ddfa70324a SHA1 12cd1348f6b80b3a917dcfd116df7bf0e6ccf5c8 SHA256 0c895fabb908ccdd8fb8cd9e90438f88289851d961398971753aa593b6bd1d09
-AUX fluxbox-1.1.1-osx-has-otool.patch 581 RMD160 89d2a183a3782538fff98ea174d3999176b8fa31 SHA1 a149be1522c4d1d1c54ca3b3c90774e1ca7bfcf3 SHA256 6edfdc7196e33abba32f5035ad4c68271e680dbcf730a6bfd99d16c8c9a1a362
-AUX fluxbox-1.3.0-osx-has-otool.patch 581 RMD160 89d2a183a3782538fff98ea174d3999176b8fa31 SHA1 a149be1522c4d1d1c54ca3b3c90774e1ca7bfcf3 SHA256 6edfdc7196e33abba32f5035ad4c68271e680dbcf730a6bfd99d16c8c9a1a362
 AUX fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57b4d0fad653660cc6cf0a2cd808b7a34d72b95 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834
 AUX fluxbox.xsession 2004 RMD160 9a5f192628d6d888734f24b9ff4f6f1b7e8f178b SHA1 ec59f4611868866b8bc6d7fc9762bbc9bca640c3 SHA256 dbff4840a2c32c8ab837e4f34cb002f810dccca107f5e04a28c22d33db2a59bd
 AUX gentoo_style_location-1.1.x.patch 735 RMD160 fb14a4d9d91b4a23992ec90c65e1a8def40cb75c SHA1 899131f61bb5e1cd46e76dbad719ff03c3511475 SHA256 d3031c3ebdd05c23a243e1ec2c0173206bb56a85ef3129ed70c5d7de434f65d9
 AUX macrocmd-crash-1.1.1.patch 2251 RMD160 716f3da654365730a964d693dac789a17258e164 SHA1 aa55faaaa3637b02b221c64c7a195ad1fbe434c6 SHA256 4d99d38a56aae213d03aafbf6041d8eadd7197f2212fc94deefaab803dd877a5
 AUX mousefocus-1.1.1-r2.patch 5552 RMD160 a1893631fa5167026936715ed4f21b7b977f4a45 SHA1 ab3274917c75dac46387ef15e86a1bd1a3ecdcdc SHA256 989730762581e9fdbca1c5997811f9f8ebb8d1e0b95884c6d7efee0345b2781f
 AUX mousefocus-1.1.1.patch 8127 RMD160 7cd8b23c7db46256f45f931fcd44b3c18d627e3d SHA1 e83c7994439b8a7f6c10ccaac6509df2fa223a90 SHA256 a9fb2c249f13abde8a96912db9bade7252d9b312fc0ae11acee0b266773fa8b1
+AUX osx-has-otool.patch 472 RMD160 a911037f1d3bdf06262ccbb01862959e9619435b SHA1 716fef9466780579e2c73ba8e0f538082f4ca8d9 SHA256 e21d837d6e244e61f00f1dc732eeafe0d5eaa59e333449f19d7e4ebfeeee63ec
 AUX strictmousefocus-1.1.1.patch 8989 RMD160 adcd297418bfaffec12edd6fbf49cd502dc9cf1f SHA1 5ba0603fb03f559b945f62918190a056db564c72 SHA256 4bbcf304c161246acb7d515dc3b185ceab655daedabd2d594925dbb3d90fc11e
 AUX styles-menu-commonbox 127 RMD160 e5668235e10ffa8fa73683d23d4483c85bf4296e SHA1 59c6aed23a105536de1b1264f94ee75008d74557 SHA256 44a56b182b0da9bf26ac41ff7e5ea8da3ddb7c5cbca0f554e3c74f15c72a3d98
 AUX styles-menu-fluxbox 117 RMD160 a2f3ced8acd6bd9057aea30b6ca374cff7d3db3e SHA1 99692536559b07878054852e17171d4ef5f79a76 SHA256 f5829a442d8653941e2741ab73f49e9d9c95fc8129531e4197730c0bbb2f2989
@@ -21,13 +20,15 @@ DIST fluxbox-1.0.0.tar.bz2 767586 RMD160 320b11a1cf96a757da079886cd6496b9d84ab20
 DIST fluxbox-1.1.0.1.tar.bz2 778639 RMD160 319158d5c618302a3505db8e58de60bef82ee251 SHA1 70d41a0192b77d2da491221185ce1a7ec4ebda3c SHA256 5876363c6cb13a68be86c193027634ced4333027b4edc23b511346166884f1fc
 DIST fluxbox-1.1.1.tar.bz2 777660 RMD160 aabfdd10c835d0ef903885646a7f34f7df75af17 SHA1 6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f SHA256 903f676a71a301513cd0b3db17e49f88c8d91583793176c4c70358a3012cca34
 DIST fluxbox-1.3.0.tar.bz2 794865 RMD160 f580071660e12bedb8c046879a59f5d260837b2d SHA1 b4b1732f1c3ad9499cd9ec0aa03fbaee59c69d49 SHA256 3afa696c4616a4ad80c1e0852fc9dbbf568530a23227a436f4aad86cd92c964c
+DIST fluxbox-1.3.1.tar.bz2 799235 RMD160 529d2f23d9446b3e76f3974e14c8b9459d788ecb SHA1 1c4755b8ac1042c98f700848240ac99ef18dca01 SHA256 c47b2615608151dd19bf9d738badb30ea4179dbe4edeb2243a269a9bb932628c
 EBUILD fluxbox-1.0.0-r2.ebuild 3439 RMD160 e5d968d8710c64a914b2aed021162aabbf96b34d SHA1 30148718699329b392835151396cb831966b6c21 SHA256 a2372168a67631636b30de040fdc64ed7d2a2cb1b5a1192af5fd3149fb0e0077
 EBUILD fluxbox-1.0.0.ebuild 3158 RMD160 1b67abd77417874b09aa57ace7c3ae274db3fead SHA1 57a4efc087fa7e1f8023bdc3ee92db9364764744 SHA256 1ce9adaaede435628e0be2e5fdbf4c0253f6e6b49ee511b69e432ceae90a8f81
 EBUILD fluxbox-1.1.0.1.ebuild 3255 RMD160 b3fe06bb8f90c09e3b16ac8f773e491c49972c48 SHA1 8f224d0d5ce4bc7482285464b6a0f0312d1b63f9 SHA256 28548be030bbfa55afde8635e0e21845322edcf832c8cb0bd8a1a6d2bec6c8d6
-EBUILD fluxbox-1.1.1-r1.ebuild 3508 RMD160 5c4ddbdaa6b8944ac711d0f91f600ce92f125e25 SHA1 3fedc9963522c71c0c01f35d3e2077c78fb2e699 SHA256 6be9a4d8b39ce02e0457a6e8ba4accffd69a228f76612e53f20ae10bf589cc98
-EBUILD fluxbox-1.1.1-r2.ebuild 3790 RMD160 ed3ac3a00bc4df0cdb531994a5ebb3cf2731008f SHA1 b01a42b157aae05376892409164f26579d11b1ed SHA256 7421a16f7e358e1a2b0b3f10ba4e477c0ed0270030a5f614f5b1a878250a5599
-EBUILD fluxbox-1.1.1-r3.ebuild 3898 RMD160 627cdb1ffa06f5ffe8008e03432eb54e5c27ce72 SHA1 f068f2367a81fc2af08bae0cb6bfa8fa4cb5a6d9 SHA256 b5d0040fac53d1bfb2bd51d908ae7a6f41b04fa642b5988ef28a253381d49bb0
-EBUILD fluxbox-1.3.0.ebuild 3230 RMD160 36e6a01af0c55e8da538d0e8b2e72f2546824d0b SHA1 628112b02fd04ba2339da458fe292dea8e4eb24b SHA256 51cc67cb10315a33ef717573fcd44a9dd707d5c81e92a1dc7fbc4ccbb830e515
+EBUILD fluxbox-1.1.1-r1.ebuild 3503 RMD160 ce11a219ceb7af71bf1223014cf99c075be1e028 SHA1 6676f2ac37a49529e9a1fca45e8ef56072583797 SHA256 65f6d855697b768de6777c26cc5eecd0a987b6a6f2ec66088655e2bbf2e79505
+EBUILD fluxbox-1.1.1-r2.ebuild 3785 RMD160 94576a60d8caecacb5d160c5c2066d56f09a2a24 SHA1 33a967a4da12661153e883eb447073d7ab4bc61b SHA256 3c2b7e5348bdca52c9ec4f6c01902aa3e8ed7cea5db17e78c267207e94280ab2
+EBUILD fluxbox-1.1.1-r3.ebuild 3891 RMD160 19eb023a15a26e35f32b2e321819f5969c03cecb SHA1 6fbf11d2c286f513954f641b0bba90ddf417bff2 SHA256 31d2f07e75d1a33d1966e2b4973894ea5a04bcc718028f6340d017328b798b3d
+EBUILD fluxbox-1.3.0.ebuild 3220 RMD160 3e3018bfff7e4c5f6058ddf0a18a7b4bb08638ce SHA1 51ae28b558450619e88529a94447768438edb498 SHA256 1d4622a0f8bbdf8472284096a75906ce1a481969aa91c3fb2acfa90c86aa0216
+EBUILD fluxbox-1.3.1.ebuild 3220 RMD160 9c2c646b968a7f57bd815b698100ae68836f7323 SHA1 8c4f53d3085471e93d22eecebc9302d43cde056b SHA256 b62606f5920054956b59c8d611f67b336bdc1c02d839ea7592a11444a926381a
 EBUILD fluxbox-9999.ebuild 3228 RMD160 c16a9467ea088e049571678a397e91b3bf17c86c SHA1 57cc19b4c5db43b9f3369c454225fa35616a3865 SHA256 05826d9a2df2ed823a6a678d2d3607df6c6c6c2d4231d68a01e6944a4769fd99
-MISC ChangeLog 52283 RMD160 547e3856591c6519f7f07a89f9ce2231ede60045 SHA1 b480b941db39a51b2945d608a98ff9d0faa2e047 SHA256 765c57cb2bd641c7094a0cdec55390adc515af697e9ddec5a11c68b83dc60e97
+MISC ChangeLog 52677 RMD160 463fc2958a3b76d21da39788b71bcb860b532e69 SHA1 bdda6cb5cb29b0f53737aa2025c9c7e5ec0e5eab SHA256 76c8bd34927a75a03f70f31f67addeea0c8bb7e648b7a210c6f009e623ceae30
 MISC metadata.xml 1124 RMD160 ade07b2ec508cf3be2e6d439c5e6b3d7e94fe792 SHA1 ce24cca05659fcfa1fcdd5697082d87e8d9c501d SHA256 4a4c6e8e71d6d258fd9af8843f5eaa0c3d90f004f21121123e58abedba060e95
diff --git a/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch b/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch
deleted file mode 100644
index 637d2a824669..000000000000
--- a/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- util/fbsetbg
-+++ util/fbsetbg
-@@ -356,7 +356,10 @@
-             if [ ! "$wpsetter" = Esetroot ]; then
-                 WPSETTER=$wpsetter
-                 break
--            elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
-+            elif ( [[ `type -t otool` == file ]] \
-+                && otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null ) \
-+              || ( [[ `type -t ldd` == file ]] \
-+                && ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null ); then
-                 WPSETTER=$wpsetter
-                 break
-             else
diff --git a/x11-wm/fluxbox/files/fluxbox-1.1.1-osx-has-otool.patch b/x11-wm/fluxbox/files/osx-has-otool.patch
index 637d2a824669..7671dd83647c 100644
--- a/x11-wm/fluxbox/files/fluxbox-1.1.1-osx-has-otool.patch
+++ b/x11-wm/fluxbox/files/osx-has-otool.patch
@@ -1,14 +1,12 @@
 --- util/fbsetbg
 +++ util/fbsetbg
-@@ -356,7 +356,10 @@
+@@ -356,7 +356,8 @@
              if [ ! "$wpsetter" = Esetroot ]; then
                  WPSETTER=$wpsetter
                  break
 -            elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
-+            elif ( [[ `type -t otool` == file ]] \
-+                && otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null ) \
-+              || ( [[ `type -t ldd` == file ]] \
-+                && 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/fluxbox-1.1.1-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild
index 401a16369afc..533f646dcda9 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-r1.ebuild,v 1.8 2010/08/16 19:43:13 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild,v 1.9 2011/02/28 00:32:30 lack Exp $
 
 EAPI="3"
 inherit eutils prefix
@@ -45,7 +45,7 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
 	eprefixify util/fluxbox-generate_menu.in
 
-	epatch "${FILESDIR}"/${P}-osx-has-otool.patch
+	epatch "${FILESDIR}"/osx-has-otool.patch
 
 	# Patch to handle a broken key file gracefully, #263379
 	epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"
diff --git a/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild
index ae0677aa66b1..7fd822f16708 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-r2.ebuild,v 1.2 2010/08/16 19:43:13 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild,v 1.3 2011/02/28 00:32:30 lack Exp $
 
 EAPI="3"
 inherit eutils prefix
@@ -45,7 +45,7 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
 	eprefixify util/fluxbox-generate_menu.in
 
-	epatch "${FILESDIR}"/${P}-osx-has-otool.patch
+	epatch "${FILESDIR}"/osx-has-otool.patch
 
 	# Patch to handle a broken key file gracefully, #263379
 	epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"
diff --git a/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild
index 9610f1691da0..a8e8665f0239 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2011/02/20 23:50:34 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild,v 1.7 2011/02/28 00:32:30 lack Exp $
 
 EAPI="3"
 inherit eutils prefix
@@ -45,7 +45,7 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
 	eprefixify util/fluxbox-generate_menu.in
 
-	epatch "${FILESDIR}"/${P}-osx-has-otool.patch
+	epatch "${FILESDIR}"/osx-has-otool.patch
 
 	# Patch to handle a broken key file gracefully, #263379
 	epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"
diff --git a/x11-wm/fluxbox/fluxbox-1.3.0.ebuild b/x11-wm/fluxbox/fluxbox-1.3.0.ebuild
index 00e59f0e05cf..4d81d27db391 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.0.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.2 2011/02/22 13:31:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.0.ebuild,v 1.3 2011/02/28 00:32:30 lack Exp $
 
 EAPI=4
 inherit eutils prefix
@@ -46,7 +46,7 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
 	eprefixify util/fluxbox-generate_menu.in
 
-	epatch "${FILESDIR}"/${P}-osx-has-otool.patch
+	epatch "${FILESDIR}"/osx-has-otool.patch
 
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
diff --git a/x11-wm/fluxbox/fluxbox-1.3.1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.1.ebuild
new file mode 100644
index 000000000000..e5be2bab322d
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.1.ebuild
@@ -0,0 +1,109 @@
+# 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.1 2011/02/28 00:32:30 lack 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}"
+PROVIDE="virtual/blackbox"
+
+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() {
+	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"
+}