Version bump fixes bug 539348. Thanks Daniel Campbell.

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

3 files changed, 122 insertions, 19 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 071fc7086b46..2c70a8c84d1b 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,10 @@
 # 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.331 2015/03/20 09:01:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.332 2015/03/22 12:06:22 titanofold Exp $
+*fluxbox-1.3.7 (22 Mar 2015)
+
+  22 Mar 2015; Aaron W. Swenson <titanofold@gentoo.org> +fluxbox-1.3.7.ebuild:
+  Version bump fixes bug 539348. Thanks Daniel Campbell.
 
   20 Mar 2015; Justin Lecher <jlec@gentoo.org> files/fluxbox.desktop:
   Fix desktop file
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 4fe1a4368c2e..bddc00022497 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 1.3.5-generate_menu-printf-fix.patch 1188 SHA256 5eabe84b84a5476595d5b1bdb02d375753e2aa7b3fe20d7c8034e9f0cd14db99 SHA512 78949c35a153d21f98e640e67abc73b124346fcbd31dbc200b6892bfc0af7bab22a5383759482864721644c5cff3cf423914861212390ab96dbebb09c5ba7e38 WHIRLPOOL 30ca248bee5e96f1701425bc5d0d93ed1a0bf9f147abdf76f66afa7620f81ae9b02baa0e3e421ecd19acfd8dec8014c3490e8267d8e1e2efaa46b6feb58ec8d8
 AUX fluxbox.desktop 187 SHA256 d0709698a96bef34f0984c203d26f976ed401448821285fa5f74907070244948 SHA512 217baf54698bb553dabfdc5565827eb10e897728a2ff2595f0eb03aaf049784a094c48b7e698b34ce374dd9f81036bebc77cf7136ec7aa9651eeaf8a0b751dd0 WHIRLPOOL 6aa0cb435bb75e3aa5f94da156662f95398f3b15924972ddf0ce0493fcf3f695f5669756a43eb47228aece8f6c24f801a1d5e4f907ec5eaee3ec6b17098ea6b5
@@ -12,29 +12,19 @@ AUX styles-menu-user 93 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c
 DIST fluxbox-1.3.2.tar.bz2 787400 SHA256 e8aaf46c043eb6186383c6dde8bf98dbd62305b202ad4d8ebb39508b1b710167 SHA512 2624c337e85b98e39398319170cbf57f8ab031539844e62f2f61aefd5c2e307b8390261b9658073bcf557f7f006c9df95c72a4420f12fa7122742b4623a17d49 WHIRLPOOL 6f6fae12c265f2cf1e700a257fa89f291adea9838714f8bc861c2f37f3d036caa16e269e8b5ff18d687bf6f77a4f1661df864e9ec98f3d2d14e3d3186d2ebdde
 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
+DIST fluxbox-1.3.7.tar.xz 786492 SHA256 fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01 WHIRLPOOL ebf8352dfd6a92ba589c0224a7b50a7a6b1692ca760b551959885e2bcaf59a82657598288ac14ed947763891d939f9c227a8a6fde3a6bd0684b7d9478026a727
 EBUILD fluxbox-1.3.2.ebuild 3074 SHA256 2b40e87e859143f3ee4624b43dceb3aa2a6d7ef91e8ff0f0ed0b2baa761019a6 SHA512 2b7d10575df296824b792b199aeb0b42422b95394bb4dbb1c2074adba351d8ec2870a75e898901d96d469de23ebd3ff6ee1f912e1f874301ec9816f08b9d5bb0 WHIRLPOOL caa40774d95533f3cedd31f41531de367c7166f2a8f2cd804a0361cf8cda62bb35de8ef09eba3e8118b26434bf4437538706e12397391cbca79567f01a1871b7
 EBUILD fluxbox-1.3.5-r1.ebuild 3285 SHA256 49ed36a34815ffe1fd1c72a82244f815ac0235fb1d830ecae54b296c97591f3f SHA512 ddef282d83461bf7c7bdb0b14adf06ed2395986e735e73a03338e71fe39e228aac1b7a2f928cb62fb8eedc76189e306f0ea71e7ec5cd2de0d09af4b93efda4e5 WHIRLPOOL 280f2a7c7926939dbb820a8e18c3904af1381959cd068c5799d90830439f1dd3413518f0af59dbdafa6891bfa1d1140b585d7a3fe27107842bbdabb2d07a9b23
 EBUILD fluxbox-1.3.5.ebuild 3075 SHA256 1bca49230ae8f60ecc51ff604b5e956a2d28024c42553b3d21795ed1809434fb SHA512 89a9b77b15b6716527baf0e05aa6c32d9b2be0b389718e4bc31fb3c9bbb12c0465a79748f2bbc1410a561ca8272bdbfd7a3dfe35b3f961353a281ba086b3276b WHIRLPOOL 168783ce9d96d0c079d76b5324629039e620429b9ee37a8c9667074efa82db9159f6818933a604609477d54586655c53218d5a3ccf315ddbd442021ceef49214
 EBUILD fluxbox-1.3.6-r1.ebuild 3283 SHA256 90f0b49690745de1d3231974f0759c3bb20ddee86374b64c00cac2df8b8e6dfd SHA512 caf4749a2c30d28c6a1776bdc7757be77e7262f4b659cce077911692ce373449174dca8dcddf2331ab993309627447fead0955cc673663611cad7cfdacc32145 WHIRLPOOL f8ad6901200dc540877b34a04e426316e7e23fb10da8696e5ba546355c5057ca5d44cb2bb2282230adc8420e6aa73b8d4023d9c597131ce5cc9deeaeb3393a1b
+EBUILD fluxbox-1.3.7.ebuild 3135 SHA256 838dcc5532f343cabc0ff57fa26efb410856f518cd728472f1c543c8a5e4c9f0 SHA512 f75ffc1a4f3274be805fb51530aa250f6419a4dd0130233e893625baee89276465ed87e426b3f9e9bee652d8b00cb667466f0d8229b7af88893877e5500ca3f2 WHIRLPOOL 061615df89ed40f1b3d53ed778f9f1787e66405d735b4919ed07e4cd0b353cc2e59dc30672839c48f91340a6d0d6c2b1f954b486d9f575b0c5a62a806d1f1903
 EBUILD fluxbox-9999.ebuild 3089 SHA256 d21eb8f4d0b5ac2b1c9e9355906b7295b36a2e1c4fd748df1c94f9fcf8d1599d SHA512 d7434517dab3cb173cce62ab0df6aac8854052680bf1c08a5d49ea0eab6d0993306ddb95a5fcf07d6dfd323e1110c75cf801d0f09fe053c7a6fbdf896620c4d7 WHIRLPOOL 2eba3fd26c2cb2f78e455ad84c70787f93884347e04d897b475532e52d91f5241610b9eed322ed2630cda1b870395d1d9bebddc1f48a13defbb6c0a51d8e4339
-MISC ChangeLog 59569 SHA256 c0a3fe9cca4a658f87cf79e77f6d558b362be0ac16f2f30093f52b5543a67590 SHA512 46e9304e6ba933fcdff104f84cc14f6a9a34eba9dfc1c4a5ac110dc1a9dc53ae77f5227f25771705511740966a5092bbb5980972c51f381b3c08fdbd35c09f75 WHIRLPOOL 0624223aa71968bf1ab8f12a4739ba9658c008d8594358654bb3daa62fe5e7cfa05075f255c9aaa5be482d0573c4fbdc8c4b98f1f2fd2fd3b24933fe895bab51
+MISC ChangeLog 59741 SHA256 7a0ad7c45788ce4e351041ba44b2b9e2bd77a8f246285b32c230faebf39aef7c SHA512 103720eb8e8b802b1110c978f919997a348f5b07179049a62ac02bdee81bcfc61019e865e4767d307716782ced8bab6b5401bbfb6028f20c946c0ea6b1fb6315 WHIRLPOOL a943ac552cd83d41548f03bdc02761b83bfafa585180052bc57b95095ea153771f9b57794b4c6c7e905a83c72aebdbe66a38118470e8cb9d53ecececcaf94c7b
 MISC metadata.xml 967 SHA256 2ffac0979f0372a134fd4d867258de0771847fe5114e58aedc0bc6d51cc43955 SHA512 f5b54fcf45f9dde3370ef781d8ae52aa696d260ef113555f34e6b17beca7d96a3992cf0713aed33d5daf215990d3d35244253b99b93b2fecb332ae630d486234 WHIRLPOOL 7262d71d2ddb256766535935fe9403aa1ac81b37b03f78b513e6a5700250ca10e9cac65a110498186736eca17e6703bd5555770383daef426fea445ca285409c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVC+HUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirZokQAKJyUNzvxiFCHZroPmfQbCHq
-kcjYdlssOBZg0l5eYuM/bPnv2BEk6c2CLdK3xQ44NnUCO4st1qK0opgNaPDlrEiQ
-Py4lMA8t9iQeOM9sFcK+MD0+bb5A795SMErYkJ/vawPmcEZZps7q3BFIIcoHxkyh
-10N+jCyzUJy1eo8IAfqTXDsMBpoIqSjIwI/bFELCxldsEwF+y/+8c1xDRt41hAs/
-ON8nuFnvXTEaX2hh1XMnGPgd0dhSPrwhPg9MyoiTS0L8ws9xWqv11CJUeiKuuAN/
-f/lB8Mz3NiwMxgtaJlyAZUdambRXUtowHEC2txvrMCGRFU9KQI1VApEMw13125V3
-IKvAuiAs7la/tA7BLax8yTx9il9bapp/bJvb1eJ+rcSJOcbxYo4UpHgcPuwRid5n
-kmbvm9WVI2r8WZHNM59ss36AQuT8cinqsxEcUMYLIq6ceDTo5LXTmYK3YytP3LWy
-OpDy6FB59rOI0QCsjdPkuHBy3tny1ViVbQ5VKcC5MCbaIBtMGuvFB0el+umGFAAb
-wV+fbZ3myERLmBD/8DkMaTHa8Pc45IR4iPLG6lcJvb4ZMH4xAl2qIJPOxzp9WIvb
-Zv6TCL2rDA0mK9ZKpTP4iPkDszigYK88bmCWZRbqXQ1LUxCIbSzrWE/PyVEs+PPs
-1WKFupf8MXmg9yxrrbsM
-=b6VE
+iF4EAREIAAYFAlUOsD8ACgkQVxOqA9G7/aDQdgD/dZWaObNrVd/UWy7t7apfIhgi
+F3PC7yf7yZHcWbQNoOsA/RfgAm412wcbq9Y47ZHPBXcmpuuYWWqX4Qh7LTe/hYdp
+=sKSi
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7.ebuild
new file mode 100644
index 000000000000..7d41ed11a18c
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.7.ebuild
@@ -0,0 +1,109 @@
+# 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.7.ebuild,v 1.1 2015/03/22 12:06:22 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
+}