revbump; Add patch prepared by proxy maintainer, D. Campbell, from bug #536370 addressing format issue in icon paths, fixes said Bug

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

4 files changed, 138 insertions, 5 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index cbeafe3b3455..00fb25f1f7d1 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.319 2015/01/22 18:24:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.320 2015/01/24 03:11:20 idella4 Exp $
+
+*fluxbox-1.3.6-r1 (24 Jan 2015)
+
+  24 Jan 2015; Ian Delaney <idella4@gentoo.org>
+  +files/1.3.5-generate_menu-printf-fix.patch, +fluxbox-1.3.6-r1.ebuild:
+  revbump; Add patch prepared by proxy maintainer, D. Campbell, from bug #536370
+  addressing format issue in icon paths, fixes said Bug
 
   22 Jan 2015; Markus Meier <maekke@gentoo.org> fluxbox-1.3.5.ebuild:
   arm stable, bug #536086
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 48b184f58f2f..6910e89971d4 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,6 +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 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,14 +14,15 @@ DIST fluxbox-1.3.5.tar.lzma 694672 SHA256 f4faf1fcb995dbe85d272e511e388de347ff07
 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.ebuild 3083 SHA256 0fcf83c3de3c0e88934b2068763ef2a8ec8a83f5cefbdc045a7c56d152ed2d10 SHA512 ed401b50a513a875abc91f8cdba965adaaa14d93df683a2f69e193694f597008a0c335c8bdab0c174da5faf4ae90457cc363da17cc7cb8496cb5b417405ed4b0 WHIRLPOOL 82473cdee231835194da5654e1bd02723f5538f5b3ea00d3fd6d5edbc670a69de0a76cbe128c540199404d48e2c488b9e8121ecbd83da41556b62800e4684aab
+EBUILD fluxbox-1.3.6-r1.ebuild 3248 SHA256 970fc07935a1b03a3aba0373095a92bf9f0125ec005372be2362ec7364a882f8 SHA512 c5e527585c5f31d9e24bf265bd80d6033810425d2387ef91edc191991f79b67488d46991444eea7a3e90e6fd8d1996a4d3a8f77af0abbced5b3bc2a8f0c32622 WHIRLPOOL 05d30163072cc88800653e70f746ff046b417fac8837e3ee5e73725cffd7b04d51bae2a156e64b1e9475be3e67847ce6f332a86a8186407e2ae8eefa18d1d2c9
 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 57667 SHA256 131cb9b05a407302a13b0674831deb1dbf36eff1955ada5aa9c994132c0609fb SHA512 9c0eb648f3be8aa769b0eb14f958ef2b921fa3dff1554bae624fabced40a80e3e1fd3ebfd1ee54e79287104eaefb053b993808a2710faae5985d9632c22873b3 WHIRLPOOL c3e0fb5bceb0cfcff12b0fa54aa7fdb3858b0f95abb9683a305f5cfbe05b399e7ce7dfd1488d38fab7ce8592c5fb389b573cfb64c35fdc0323158eec4119a3d7
+MISC ChangeLog 57960 SHA256 04816d40faf9da515e5ec4d2d3f16d35a04ab3ee3303a81d79ae34725e571baa SHA512 33ed636581208c3f1920bae70f42a91d30fab2c94bb04c51b2bad36684fb199389ce73f9304108dd30d446a9c32d5f95148ba71a6e6e9e034ddddfb833000b06 WHIRLPOOL a5fc90eddfd5c7bddb10b3991b2d5b8cfa17a330bb3e74342faea4c93f4b2935eb20d73f52386436dd69ba9a4020221137dcfb650216eb6d3081ce09808fba4a
 MISC metadata.xml 967 SHA256 2ffac0979f0372a134fd4d867258de0771847fe5114e58aedc0bc6d51cc43955 SHA512 f5b54fcf45f9dde3370ef781d8ae52aa696d260ef113555f34e6b17beca7d96a3992cf0713aed33d5daf215990d3d35244253b99b93b2fecb332ae630d486234 WHIRLPOOL 7262d71d2ddb256766535935fe9403aa1ac81b37b03f78b513e6a5700250ca10e9cac65a110498186736eca17e6703bd5555770383daef426fea445ca285409c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTBQGUACgkQkKaRLQcq0GLLNACeOwO8pAAXL81zEFicCdtKhpwK
-ZC8An39Z80vnHxNRmj5ywXORqIodz0wh
-=FT3K
+iEYEAREIAAYFAlTDDWcACgkQso7CE7gHKw0rhACgoc+Tsl0XVA/AtMcfb5YGOvAA
+7TMAoNh7PwSk7jFZsasCwcoM2b8Z7G2X
+=RkFr
 -----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
new file mode 100644
index 000000000000..6804b29102ee
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
@@ -0,0 +1,12 @@
+--- 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 @@
+     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
++            printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
+         else 
+             : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
+         fi
+
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..bf0712817f21
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild
@@ -0,0 +1,112 @@
+# 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-r1.ebuild,v 1.1 2015/01/24 03:11:20 idella4 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
+	# 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 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
+}