update patch with final form from upstream, add missed addition from bug 537356 to -1.3.5-r1, full update to live ebuild from patch from same bug, remove broken 1.3.6 ebuild, fixes Bugs 537356, 536370 by maintainers

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

6 files changed, 71 insertions, 168 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 419875c58b5a..33e5814e7248 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.323 2015/01/26 10:18:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.324 2015/01/26 12:31:03 idella4 Exp $
+
+  26 Jan 2015; Ian Delaney <idella4@gentoo.org> -fluxbox-1.3.6.ebuild,
+  files/1.3.5-generate_menu-printf-fix.patch, fluxbox-1.3.5-r1.ebuild,
+  fluxbox-9999.ebuild:
+  update patch with final form from upstream, add missed addition from bug
+  537356 to -1.3.5-r1, full update to live ebuild from patch from same bug,
+  remove broken 1.3.6 ebuild, fixes Bugs 537356, 536370 by maintainers
 
   26 Jan 2015; Agostino Sarubbo <ago@gentoo.org> fluxbox-1.3.5.ebuild:
   Stable for x86, wrt bug #536086
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index cb337791f1a0..6cd53f279e33 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 1.3.5-generate_menu-printf-fix.patch 668 SHA256 460722cb6aad667a8d7e7109b01c0d56a94a524e6de9c73f1501446f7ab620c2 SHA512 99719010a93195b3ab5dc9de925709231ff16c4ad4a548ed97909dd462b9703a097565cfd57564585ddd33f6d12f0a3574eab166d5c263daab56e6b46c46352a WHIRLPOOL 41639b89187fa6ddca2b95ddb6facee67a92e3f5b841bfb1b1bb3630f11c7c7d7f0407907d3f5cf4b3ce574f2efa83f9259a4905817e82be7645246c8824d225
+AUX 1.3.5-generate_menu-printf-fix.patch 1188 SHA256 5eabe84b84a5476595d5b1bdb02d375753e2aa7b3fe20d7c8034e9f0cd14db99 SHA512 78949c35a153d21f98e640e67abc73b124346fcbd31dbc200b6892bfc0af7bab22a5383759482864721644c5cff3cf423914861212390ab96dbebb09c5ba7e38 WHIRLPOOL 30ca248bee5e96f1701425bc5d0d93ed1a0bf9f147abdf76f66afa7620f81ae9b02baa0e3e421ecd19acfd8dec8014c3490e8267d8e1e2efaa46b6feb58ec8d8
 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
@@ -13,27 +13,16 @@ DIST fluxbox-1.3.2.tar.bz2 787400 SHA256 e8aaf46c043eb6186383c6dde8bf98dbd62305b
 DIST fluxbox-1.3.5.tar.lzma 694672 SHA256 f4faf1fcb995dbe85d272e511e388de347ff07b69e9f8c5af0248cf330ee2a07 SHA512 55d1689660b9240851be55183f665efff281f8f344474ddd1bee089635cb34e343cca85743900675c21579cf9e58c7bd756932a30c2ff4e6384b500d7c4bdcd8 WHIRLPOOL 6f379f9f224478556c53e2585f76c28f29c20b1fce5ab24ed0d06a813e51ddb1e0eaea7658ec1fa5979b951613542dd47dad4fd7af17bbdf0530653b8583b18d
 DIST fluxbox-1.3.6.tar.xz 793144 SHA256 fa09ad8d30841021a1e5147efa944eb509201fa3619da5b6608d94cbbf55bf33 SHA512 66257f00b3f92cb3b87990610e0b5d6c7191c75997bbcba6744d581ccec36da2d1724767575dcde81be4fdbf39e2e25c8530013ee52a28d4775230fdf04b2f9a WHIRLPOOL 198a3972a81287a1fa6346a708bf461cd9b5262adb7cb17504077e9d154c582947b05f7508d151363f36f78d822fa9fbf9797ee4cc6f7f76a8cc5b7a69db4c52
 EBUILD fluxbox-1.3.2.ebuild 3074 SHA256 2b40e87e859143f3ee4624b43dceb3aa2a6d7ef91e8ff0f0ed0b2baa761019a6 SHA512 2b7d10575df296824b792b199aeb0b42422b95394bb4dbb1c2074adba351d8ec2870a75e898901d96d469de23ebd3ff6ee1f912e1f874301ec9816f08b9d5bb0 WHIRLPOOL caa40774d95533f3cedd31f41531de367c7166f2a8f2cd804a0361cf8cda62bb35de8ef09eba3e8118b26434bf4437538706e12397391cbca79567f01a1871b7
-EBUILD fluxbox-1.3.5-r1.ebuild 3250 SHA256 78e12a014b162324ada36f32783142577e456d1c21400126e6246c363e417b50 SHA512 a1e4159757b16d6bb7e09368c6461a57a0f5742042011a27125e293558fe1a0457d2c2b408aaff8044358736fe0a08dc11a1d6d9ae59cc5f7e1fd440c568f906 WHIRLPOOL 032c7d791ab7d0a281b4e0f1be46bf072b15df430df221699cdd7899b1305bb9ff6e3d8a0f321a14e6c87d908458453757c888d459792d3fc07c9c66346afc93
+EBUILD fluxbox-1.3.5-r1.ebuild 3258 SHA256 ade6d0944117fb8fceac3b2ad4b5f5bf4ff0ad192aec49b13dacabd4ff7ba9c1 SHA512 b3301791bed4bed4c1ca38ca33ef2a8e1f0e5f99e710ada09c75801096a2c0bf69a94645a53918614017d95d4465aba7f3b568f1ff987de208abe9038eaa9670 WHIRLPOOL 794d6bddea74edb8e042a6306f7a234db228715a5e061342a99ba261b755c4792d0b6281a84886dcb30e2fefd747ca74def6fecc2a64bbb16f52988cee7c55e7
 EBUILD fluxbox-1.3.5.ebuild 3079 SHA256 baea9548a0c6d527a7f1df7687b310fbd04feb97e3a35225486279895ce3e236 SHA512 cff7fa21595b2a78874623190bc0a1c4f4b3a7978eb78fea11bbe07022b029529858217725aa0e844b071056b42e089e22238835c545e0019a698c8df4845cfe WHIRLPOOL 970ae42ffeb495a2a757494c63b3f932678fb85a7c016f6315269d5486502438e50bc1828fda0bab3136e3bccd595cae2695b3f2e9946bf79731faf639565f40
 EBUILD fluxbox-1.3.6-r1.ebuild 3256 SHA256 5f6d477065ce4ae9718c440d60e9e735b87a1a948eb55fa645f671482bc650bb SHA512 3c60e914ff74b4d73f715c6b9ee109d9cd0f1c1b41a9dba2038496a440a7f1628bed766ca9727eaa4914d1d01c2c9a03f2336ea9919d058e36fc0cf55afd1a45 WHIRLPOOL dfe02715106f5e6c2abb8c56499fb3917f9dfd8defcbc9f3fba22cb7ccea72a69abd24391dfb8d52ee4a7a3117fb6777172501e47265b9d498f6ae0dee0d4200
-EBUILD fluxbox-1.3.6.ebuild 3135 SHA256 8ec46cdda647a68cba31740b90c343b37a686cde471bfbb7ed28a88a37ae3a1c SHA512 d00e39f80d894529c67d0f14e2c1a5e4afb82c7e0a74ac96a7c89a1c35cf7567c51dfd2022894766947e0c4203a851995a54b84f0b86285e295d5b7443c3b475 WHIRLPOOL 5751d45f12377e2f0306b9a11ccf701c74f8679e79bda66e18ae62340dd76b27a66118b7d8dd195a858052cb544461cd758fd21015754e2df254f58860aa7d79
-EBUILD fluxbox-9999.ebuild 2960 SHA256 297cf54004736243350e870ca81bd15e3e26f1a3bd758c17c49d6bdb1364f1fd SHA512 cdc5279caa7919e38c72001f0b6048709874f7b4283f96dbdc7105b3d656bbfa3ca8cad5f4c754a5cb7e22c8bd6e3033af79d0057ed95284a731f19a20676c9d WHIRLPOOL 66e3f7ff9f35c5f89a551a80a48f15846f9c1b966eed2564978b72bff215aa27654bc64286cadcc7da0cf00ca1ade5ee1a70195d1cb3357547a85822eb2e23b7
-MISC ChangeLog 58419 SHA256 3777c08b8122292121fda83dd6ef2d216ba25e329a254e3bfb7bc4be09548b40 SHA512 45973b8f1677f8ae836ee6ae89d6611baa0b07da29e151a61ad886241388294d6f33d20726c752ded10816261a134d284cf15238501a3bac98d32efb4b3ab0a1 WHIRLPOOL ef49c6aa3936550e4ea47156e353adc9b1578923c46db15c218ff1a4221cd3a1ec4212a554998eb6af9e241a6a40f4b6f5c9f8a2ee4dad4da364519add35741b
+EBUILD fluxbox-9999.ebuild 3089 SHA256 d21eb8f4d0b5ac2b1c9e9355906b7295b36a2e1c4fd748df1c94f9fcf8d1599d SHA512 d7434517dab3cb173cce62ab0df6aac8854052680bf1c08a5d49ea0eab6d0993306ddb95a5fcf07d6dfd323e1110c75cf801d0f09fe053c7a6fbdf896620c4d7 WHIRLPOOL 2eba3fd26c2cb2f78e455ad84c70787f93884347e04d897b475532e52d91f5241610b9eed322ed2630cda1b870395d1d9bebddc1f48a13defbb6c0a51d8e4339
+MISC ChangeLog 58811 SHA256 50f3783a60690827019618c6a406cd1eb4f01cba1f68fdd65c3e4e6c3abbd7a9 SHA512 ac4895d542a7cc8ccf0c8ad982a9dae45153bd1cf08a5d3e2d4c731edf035fc175c1eea46ec06485a10c34b7807c9b94b2b5eb4c0b36faf712720d244ca41630 WHIRLPOOL ffd3bed95c4c041fef91b626d92a9f2e1b8a4d2b53eade575e9273cdc9c866113ccd10063253b0498c383ac6fe7dd8ac942538675ead40657e41a85ed654be2c
 MISC metadata.xml 967 SHA256 2ffac0979f0372a134fd4d867258de0771847fe5114e58aedc0bc6d51cc43955 SHA512 f5b54fcf45f9dde3370ef781d8ae52aa696d260ef113555f34e6b17beca7d96a3992cf0713aed33d5daf215990d3d35244253b99b93b2fecb332ae630d486234 WHIRLPOOL 7262d71d2ddb256766535935fe9403aa1ac81b37b03f78b513e6a5700250ca10e9cac65a110498186736eca17e6703bd5555770383daef426fea445ca285409c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUxhRcAAoJELp701BxlEWf4poQAJRV6D5aJNc76/+wDAVb+2yX
-DrkRAEmSBDBQcizLSuGaEpQbUC+mKiWt9bw8blqYprbRO8bPiNk5o3QZFoKBcaDv
-YsbOHLaYbzDlUccIMOSxYSjAG76CrrSJZzQthzc4SewN8xmHAFKLfMpfML/ar8QP
-GQAKAjZRCAwKEm+rBZh+AGvBFBI9KGUOI2QhGm5SmVAQzvZ8o7t/5XhZMx1BPcIz
-eyt5GGCxFHrwyzgkY7SGybRTutXtM8kjx3qfa0QGw9QBoTdx8GX34IQ/zuVVlBFH
-/OCWUUfEUIfoRYgLTQ6AzLghVdD0FyEGJxU1PQAq4Ctse/x551pjf4ISOlYkmpiU
-ARp7tEA6az2WZOi9hWd3GBIJADq9q9O1REGESa6hBSY94DQ5W+Ta0J/oMTKHV8Zb
-dErPF/iYO/G2W4+IY9k3vTr+5PnotcgJOt+O8dgP/3vj4HCZOlFmIr8tP4UdT7IL
-DFD2OCTY0ir9LkKjgKVCBJD54Ypv9U5q49WohqIUIXkIi4dWxYsbMOpb1LY7qrUo
-mGMjI46kFYNI4B0XLPJ8rqV2/T4enbCCaoUNYCgAZUQbqb+xMT0CUkUVZb0fbWmS
-qdL4Os9kwK1YlDtG0u6xiQjapBi3IV7HS+jn6ozgO+W0AEp1cMlmZze6oIczwb9V
-aWqDwo9PNA5Jhc5+jqBY
-=NzDi
+iEYEAREIAAYFAlTGM5cACgkQso7CE7gHKw0tYACeJUv8jTXXu725cYa84u8ApCrg
+M2AAoKnckiho92BmMzI4YFo/S866I21I
+=/nsk
 -----END PGP SIGNATURE-----
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
index 6804b29102ee..f9246f159076 100644
--- 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
@@ -1,12 +1,22 @@
---- fluxbox-1.3.6/util/fluxbox-generate_menu.in	2015-01-15 13:35:50.223367998 -0800
-+++ fluxbox-1.3.6-copy/util/fluxbox-generate_menu.in	2015-01-15 13:38:21.789755711 -0800
-@@ -331,7 +331,7 @@
+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
+-        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 ${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/fluxbox-1.3.5-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild
index 629e74583de3..70f98a0a7d68 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild,v 1.1 2015/01/26 02:37:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild,v 1.2 2015/01/26 12:31:03 idella4 Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs prefix
@@ -69,7 +69,7 @@ src_configure() {
 		$(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} \
diff --git a/x11-wm/fluxbox/fluxbox-1.3.6.ebuild b/x11-wm/fluxbox/fluxbox-1.3.6.ebuild
deleted file mode 100644
index 9034a8f492e5..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.6.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.6.ebuild,v 1.1 2015/01/11 17:18:40 titanofold Exp $
-
-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 ~x86-interix ~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
-
-	# 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 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
index e249d2a60c9c..50dd49a48e02 100644
--- a/x11-wm/fluxbox/fluxbox-9999.ebuild
+++ b/x11-wm/fluxbox/fluxbox-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.13 2013/01/08 21:32:50 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.14 2015/01/26 12:31:03 idella4 Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils flag-o-matic toolchain-funcs git-2 prefix
 
 IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
@@ -12,29 +12,32 @@ 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-libs/libXpm
-	x11-libs/libXrandr
+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
-	|| ( 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 )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	x11-proto/xextproto
-	${RDEPEND}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS=""
+"
 
 src_prepare() {
 	./autogen.sh
@@ -45,6 +48,8 @@ src_prepare() {
 	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"
@@ -59,17 +64,17 @@ src_prepare() {
 src_configure() {
 	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
 
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
+	econf ${myconf} \
+		$(use_enable bidi fribidi ) \
 		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
 		$(use_enable slit ) \
 		$(use_enable toolbar ) \
-		$(use_enable bidi fribidi ) \
+		$(use_enable toolbar systray ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
 		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
-		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
-		${myconf}
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
 }
 
 src_compile() {
@@ -77,29 +82,30 @@ src_compile() {
 
 	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" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
+		bash "${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
+	# 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
 
-	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