Transfer prefix support from overlay: add prefix keywords, switch to EAPI-3, edit patches to use @GENTOO_PORTAGE_PREFIX@ and run eprefixify, add extra patches for Mac OS X and Interix

Package-Manager: portage-v2.2_rc67-475-g06c7c90/cvs/Linux i686

13 files changed, 149 insertions, 50 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 47814435cf61..32be81d56186 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.275 2010/05/29 15:01:29 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.276 2010/08/16 19:43:13 abcd Exp $
+
+  16 Aug 2010; Jonathan Callen <abcd@gentoo.org> fluxbox-1.0.0.ebuild,
+  +files/fluxbox-1.0.0-interix.patch,
+  files/1.1.0.1/gentoo_style_location.patch, fluxbox-1.0.0-r2.ebuild,
+  fluxbox-1.1.0.1.ebuild, fluxbox-1.1.1-r1.ebuild, fluxbox-1.1.1-r2.ebuild,
+  +files/fluxbox-1.1.1-osx-has-otool.patch,
+  files/gentoo_style_location-1.1.x.patch, fluxbox-9999.ebuild,
+  files/1.0.0/gentoo_style_location.patch:
+  Transfer prefix support from overlay: add prefix keywords, switch to
+  EAPI-3, edit patches to use @GENTOO_PORTAGE_PREFIX@ and run eprefixify,
+  add extra patches for Mac OS X and Interix
 
 *fluxbox-1.1.1-r2 (29 May 2010)
 
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 1f250a3eb7a2..1e3e17d2cc0d 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,11 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.0.0/gcc-4.3.patch 258 RMD160 c2a45bbb135f43ed008bb76c8e545d113169dcb8 SHA1 9ff072a88470c277f9e4ab641587f0a35aa81548 SHA256 d4de739b1883377947ac2d67677bac79be0af10ef8272e75bb86f729374125c2
 AUX 1.0.0/generate-menu.patch 1369 RMD160 58c1e756f7a2eb2d25d87dda9b6aaa7efb31288a SHA1 975b782c35d43a7ddbf408ba5e7a743f7872f969 SHA256 93bfb1d51eba8ad06eb7c47896c0d17bb107f9bc04309049a8acf6f522fa08ef
-AUX 1.0.0/gentoo_style_location.patch 676 RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f SHA1 83d725fd320b8f9af329176bc8941b843e4ab559 SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f
-AUX 1.1.0.1/gentoo_style_location.patch 711 RMD160 d6d358759ba664bcfcf098f47d37f206387de007 SHA1 1ac6b515ab6004757cd5217cb74c892feb5ea5ee SHA256 84aba82bc9ab3a9dcdeb3857eb7ee0236a8ec96ae77e29cd0455813bac473915
+AUX 1.0.0/gentoo_style_location.patch 700 RMD160 1c8feeaf840c7ef51515a7f59921a9c38a08ffbd SHA1 c76b59783e290a33dac9a832a9d958d109b87fce SHA256 e692b421558ea1c761eabbcff291ac6378c7b92b585c562ad563e2af796a5d37
+AUX 1.1.0.1/gentoo_style_location.patch 735 RMD160 fb14a4d9d91b4a23992ec90c65e1a8def40cb75c SHA1 899131f61bb5e1cd46e76dbad719ff03c3511475 SHA256 d3031c3ebdd05c23a243e1ec2c0173206bb56a85ef3129ed70c5d7de434f65d9
 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-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 711 RMD160 d6d358759ba664bcfcf098f47d37f206387de007 SHA1 1ac6b515ab6004757cd5217cb74c892feb5ea5ee SHA256 84aba82bc9ab3a9dcdeb3857eb7ee0236a8ec96ae77e29cd0455813bac473915
+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
@@ -16,11 +21,28 @@ AUX styles-menu-user 93 RMD160 2a6831b45ce1d655586b699d16c0547de201d187 SHA1 84a
 DIST fluxbox-1.0.0.tar.bz2 767586 RMD160 320b11a1cf96a757da079886cd6496b9d84ab202 SHA1 7985e35fbb170fda24b9e04610690cd04c7a8748 SHA256 3c27672fdd4709d7f5c7968b4197ef704fce82766f51a5bebf411953516794c5
 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
-EBUILD fluxbox-1.0.0-r2.ebuild 3250 RMD160 2886be9d84068d3c2689a06a18f895a63e533b1e SHA1 cf0a9c3d7cc67d46a7065187ce419ac5f381629f SHA256 fa12e4020043b2c82091a3a86bc97afd80e55936bfb135d2654a7f6ef1bcc462
-EBUILD fluxbox-1.0.0.ebuild 3114 RMD160 1d5322cad44277827affc4dce9a29cc6de0a9d50 SHA1 b4c8e79b0345039427e5c91b094d2ca7524e822b SHA256 b678d8273bf09bc4d9ac19f311cd7bd202bc6c0cba94f489c6535e6bb02d5918
-EBUILD fluxbox-1.1.0.1.ebuild 3150 RMD160 90f2c25eed0e9cd727008b766962b576a3949141 SHA1 fe1237e45d4d4e93036b9807086983baa31cedc5 SHA256 f803103487153c08fb6f79ec01e1747886baf54d76cad51f5aa2a52007242437
-EBUILD fluxbox-1.1.1-r1.ebuild 3352 RMD160 669656e72a0f816494601d9ff3b71a9435315a8d SHA1 eaf77d56d6fa69ed7b9633476615b082cf317c73 SHA256 da0c379998762f49b482fcad6c245fc3d9df1571f6e1201ba7fe21ee8d7b5142
-EBUILD fluxbox-1.1.1-r2.ebuild 3632 RMD160 aea5784bbe1310ab027df82b421d252738982c3d SHA1 722be4540f77f7dc141741d1fcdc451efeeb54bb SHA256 dd44da802ede69cb6694077878309f6b93910a671c4e2d58fe52c3dae5a96d73
-EBUILD fluxbox-9999.ebuild 3095 RMD160 4756748e96ef6f0a704571f36ff5ccd2b47b0b72 SHA1 fa25b86b5ec9c0955419587249792e774aca2a8e SHA256 a97680f8fac32564017816a9740a6772a2a9040c14524a92bdd46866b0399392
-MISC ChangeLog 50452 RMD160 c6455807d100f684edf23237c8a5e836727351f2 SHA1 09c34636d8d83a2b07a1792eae56d210422cd232 SHA256 c821d4628e9d0687a45fbae885cd7e306aa7bb01b5975860498eb2830a9f7b85
+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-9999.ebuild 3163 RMD160 7f2c145f1a29d455fb3341479e21794024808d8f SHA1 75bf84a72baeec31c660326581e8b4ae04e0e7ba SHA256 811d9576d7c75c5087c433abb7308c9cb7b3e27ccaaf1e58f61c69aec7c6f50d
+MISC ChangeLog 51049 RMD160 9a86b9d1b6c58f5bcb73f942f7d691001f8dc0ff SHA1 9198ec56a949b3af4dfb5bac943e310ea0b06c49 SHA256 441ee7b0289004f80a515d6d6a444fd437ab081e6a8d58fe1305135297f8afb0
 MISC metadata.xml 1023 RMD160 0000d4186c712fd878a8bbb47ac5363ae5fa1ce9 SHA1 2b461f96e1220092bc3ca3a609bde70cebdcf04c SHA256 e797cbae3aa30ae91842d2969514b8437b19075226942821cf7557683738de00
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBCAAGBQJMaZTbAAoJELHSF2kinlg4ks0P/0ugqioHAFtmXIuD7EbU/OoE
+H79aHYncESI9WoK0szdq1s9NxNdt5FdcqytGy3EY2oMOpXKgjl0Gm95nhWFN8hJM
+o/UTFR9GtAMbEIlPlIZAhCiV5mUSg22cJ5XqvMaqNdcc7KKt//yOLI2AkoEKM9pG
+LN5El2zir3DfzR2Tbu+p/rJ8suHHidWRklBIzb12gR+FSXDots5mLPnHiXfWv+eF
+J6mimUmmsTA1PUDv13n7azfVGKcxTMF8G6BDDhfjOk44clIP9svSkPr7CcPe8lG4
+iiXBGDvcRf+7UfUW1N5PGMp4kCG2AJdhdNMRHBwSbOBsjWbReNzOt3WLIVTqFsAo
+mrVv/X7Z0do3+Qw58u4YsAIezsbAbMEzNPAd6m35uYBBjCyrLuLS1sLTQexsAL/f
+zvAdGQs9Ayzrb2s+kNrkStDWM0bYMdKOI/93s5toPvVpiE8XLeuxPYTeMz2NY8Om
+zTUGo95RQv0jpmuu+nxuKC1HAU2g8f+/h9yr8Bf8jO1WMT6H2jcJo8B7R9NSd8uW
+GWmIp4pA9hJsX7pFKXzsEATZTBHQoYnNjfx9NWzXgln7HmeeF5LsxySjtFVNb46B
+5Zk6hO3lPx9EIkGkyrd9YT8I9Ru8EJ2GvdJr+nlMp0TQDEu4esGBVU2GaysS2FaJ
+OvPqrZp0NjQfPOFJP3pW
+=HgBR
+-----END PGP SIGNATURE-----
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
index 3bf59802ab1f..cc814e4a9cba 100644
--- a/x11-wm/fluxbox/files/1.0.0/gentoo_style_location.patch
+++ b/x11-wm/fluxbox/files/1.0.0/gentoo_style_location.patch
@@ -11,7 +11,7 @@
 -    append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
 -        append "[stylesdir] (~/.@pkgprefix@fluxbox@pkgsuffix@/styles)"
 +    append_submenu "Styles"
-+        append "[include] (/usr/share/fluxbox/menu.d/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
index 71183e2754b1..dfa4f2eab48f 100644
--- 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
@@ -13,7 +13,7 @@ index aca8b08..b229046 100755
 -    append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
 -        append "[stylesdir] (~/.@pkgprefix@fluxbox@pkgsuffix@/styles)"
 +    append_submenu "Styles"
-+        append "[include] (/usr/share/fluxbox/menu.d/styles/)"
++        append "[include] (@GENTOO_PORTAGE_EPREFIX@/usr/share/fluxbox/menu.d/styles/)"
      append_menu_end
  
      # Backgroundmenu
diff --git a/x11-wm/fluxbox/files/fluxbox-1.0.0-interix.patch b/x11-wm/fluxbox/files/fluxbox-1.0.0-interix.patch
new file mode 100644
index 000000000000..aec829962e9c
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox-1.0.0-interix.patch
@@ -0,0 +1,39 @@
+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-osx-has-otool.patch b/x11-wm/fluxbox/files/fluxbox-1.1.1-osx-has-otool.patch
new file mode 100644
index 000000000000..637d2a824669
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox-1.1.1-osx-has-otool.patch
@@ -0,0 +1,14 @@
+--- 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/gentoo_style_location-1.1.x.patch b/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch
index 71183e2754b1..dfa4f2eab48f 100644
--- a/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch
+++ b/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch
@@ -13,7 +13,7 @@ index aca8b08..b229046 100755
 -    append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
 -        append "[stylesdir] (~/.@pkgprefix@fluxbox@pkgsuffix@/styles)"
 +    append_submenu "Styles"
-+        append "[include] (/usr/share/fluxbox/menu.d/styles/)"
++        append "[include] (@GENTOO_PORTAGE_EPREFIX@/usr/share/fluxbox/menu.d/styles/)"
      append_menu_end
  
      # Backgroundmenu
diff --git a/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
index 5924920a0c3e..fdcf299c220c 100644
--- a/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.11 2009/08/03 10:24:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.12 2010/08/16 19:43:13 abcd Exp $
 
-EAPI="2"
-inherit eutils
+EAPI="3"
+inherit eutils prefix
 
 IUSE="nls xinerama truetype kde gnome +imlib +slit +toolbar vim-syntax"
 
@@ -36,13 +36,14 @@ PROVIDE="virtual/blackbox"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 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}/${PV}/gentoo_style_location.patch"
+	eprefixify util/fluxbox-generate_menu.in
 
 	# A couple menu generation fixes, #199437 and #199439
 	epatch "${FILESDIR}/${PV}/generate-menu.patch"
@@ -50,6 +51,9 @@ src_prepare() {
 	# Patch for gcc-4.3, #211675
 	epatch "${FILESDIR}/${PV}/gcc-4.3.patch"
 
+	# patch for interix (damaged langinfo.h)
+	epatch "${FILESDIR}"/${P}-interix.patch
+
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
 		suffix="gentoo"
@@ -71,8 +75,8 @@ src_configure() {
 		$(use_enable imlib imlib2) \
 		$(use_enable slit ) \
 		$(use_enable toolbar ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
 		${myconf}
 }
 
diff --git a/x11-wm/fluxbox/fluxbox-1.0.0.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0.ebuild
index 1f66bb233c39..7e29df993dff 100644
--- a/x11-wm/fluxbox/fluxbox-1.0.0.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild,v 1.11 2009/08/03 10:24:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0.ebuild,v 1.12 2010/08/16 19:43:13 abcd Exp $
 
 EAPI="2"
-inherit eutils
+inherit eutils prefix
 
 IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
 
@@ -42,6 +42,7 @@ src_prepare() {
 	# files in menu [include] items. This patch will allow us to do clever
 	# things with style ebuilds.
 	epatch "${FILESDIR}/${PV}/gentoo_style_location.patch"
+	eprefixify util/fluxbox-generate_menu.in
 
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
diff --git a/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild b/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild
index 228b06d43456..e110e5f16e63 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.5 2009/08/03 10:24:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.0.1.ebuild,v 1.6 2010/08/16 19:43:13 abcd Exp $
 
-EAPI="2"
-inherit eutils
+EAPI="3"
+inherit eutils prefix
 
 IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax"
 
@@ -36,13 +36,14 @@ PROVIDE="virtual/blackbox"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~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}/${PV}/gentoo_style_location.patch"
+	eprefixify util/fluxbox-generate_menu.in
 
 	# Patch to handle a broken key file gracefully, #263379
 	epatch "${FILESDIR}/keyparse_hang.patch"
@@ -67,8 +68,8 @@ src_configure() {
 		$(use_enable imlib imlib2) \
 		$(use_enable slit ) \
 		$(use_enable toolbar ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
 		${myconf}
 }
 
diff --git a/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild
index a23c9efed896..401a16369afc 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.7 2009/07/19 14:46:55 nixnut Exp $
+# $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 $
 
-EAPI="2"
-inherit eutils
+EAPI="3"
+inherit eutils prefix
 
 IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax"
 
@@ -36,13 +36,16 @@ PROVIDE="virtual/blackbox"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+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}"/${P}-osx-has-otool.patch
 
 	# Patch to handle a broken key file gracefully, #263379
 	epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"
@@ -73,8 +76,8 @@ src_configure() {
 		$(use_enable imlib imlib2) \
 		$(use_enable slit ) \
 		$(use_enable toolbar ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
 		${myconf}
 }
 
diff --git a/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild
index ec1eda4a369f..ae0677aa66b1 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 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.1 2010/05/29 15:01:29 lack Exp $
+# $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 $
 
-EAPI="2"
-inherit eutils
+EAPI="3"
+inherit eutils prefix
 
 IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax -newmousefocus"
 
@@ -36,13 +36,16 @@ PROVIDE="virtual/blackbox"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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}"/${P}-osx-has-otool.patch
 
 	# Patch to handle a broken key file gracefully, #263379
 	epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"
@@ -80,8 +83,8 @@ src_configure() {
 		$(use_enable imlib imlib2) \
 		$(use_enable slit ) \
 		$(use_enable toolbar ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
 		${myconf}
 }
 
diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
index dea398ce65b1..8e4d32be2f30 100644
--- a/x11-wm/fluxbox/fluxbox-9999.ebuild
+++ b/x11-wm/fluxbox/fluxbox-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.5 2009/11/14 16:09:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.6 2010/08/16 19:43:13 abcd Exp $
 
-EAPI=2
-inherit eutils git
+EAPI=3
+inherit eutils git prefix
 
 IUSE="nls xinerama +truetype gnome +imlib +slit +toolbar vim-syntax"
 
@@ -52,6 +52,7 @@ src_prepare() {
 	# 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
 
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
@@ -73,8 +74,8 @@ src_configure() {
 		$(use_enable imlib imlib2) \
 		$(use_enable slit ) \
 		$(use_enable toolbar ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
 		${myconf}
 }