Version bump fixes bug 535864. Thanks Daniel Campbell.

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

3 files changed, 121 insertions, 5 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 2c93cece2b9a..0e4c76224973 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,11 @@
 # 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.315 2015/01/07 07:34:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.316 2015/01/11 17:18:40 titanofold Exp $
+
+*fluxbox-1.3.6 (11 Jan 2015)
+
+  11 Jan 2015; Aaron W. Swenson <titanofold@gentoo.org> +fluxbox-1.3.6.ebuild:
+  Version bump fixes bug 535864. Thanks Daniel Campbell.
 
   07 Jan 2015; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Update e-mail address.
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 3503e416e96a..3abb5fb1a419 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -10,15 +10,17 @@ AUX styles-menu-fluxbox 117 SHA256 f5829a442d8653941e2741ab73f49e9d9c95fc8129531
 AUX styles-menu-user 93 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094 WHIRLPOOL 57fca7ee543c74bf8cc0157c3965cc0b820673168c6fcec66afac9af2b78e54ad9a7c7960c7f66444e68da7ec9f7814e5cdedb1487818aeb08610c2f11c025c4
 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
 EBUILD fluxbox-1.3.2.ebuild 3074 SHA256 2b40e87e859143f3ee4624b43dceb3aa2a6d7ef91e8ff0f0ed0b2baa761019a6 SHA512 2b7d10575df296824b792b199aeb0b42422b95394bb4dbb1c2074adba351d8ec2870a75e898901d96d469de23ebd3ff6ee1f912e1f874301ec9816f08b9d5bb0 WHIRLPOOL caa40774d95533f3cedd31f41531de367c7166f2a8f2cd804a0361cf8cda62bb35de8ef09eba3e8118b26434bf4437538706e12397391cbca79567f01a1871b7
 EBUILD fluxbox-1.3.5.ebuild 3083 SHA256 4c12b378f43ee54d4050482ee24a29f9f2d3743aa09c7489783f290883fe4e60 SHA512 ae2cb749ba7d2b01d164cb45c5efe3915e10dfebc34e46137d4e6140460a08a9d5a43d95702cf29cc04e02da642d7e71cb44030bf71e0f79377774b29a001dee WHIRLPOOL f030681745432da81fa9ecbbfe83d47928d79092e24eaa4b8834baa8acc2191793e98b93289d669e2bcafd84743fbcbfc6ec2e9d78c94ff52093eccb29819807
+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 57189 SHA256 b30044ea57c4e7b7b86614a47f7e07f95ea7fa0222593103e3a9d6eceb4ea749 SHA512 7b3d06bdf11fade4ad5f607a3cc178a1890397f58c05034c2fcf5f5d438d9d94bdf85a1f36050cf2fa8665a1622f9398130db009aee659865f2df049dd075a83 WHIRLPOOL 11cf469758b292ccf2f472fe7bf359f88b9eafab09840c731c1f6c00baa34263109867f4211121932f4e461d147737e01fb092a5afe4d9571948f6cd0db561d3
+MISC ChangeLog 57363 SHA256 ced58496de7c9481f9fba71b82a370627552943b79a084d1583b809593c0d3c4 SHA512 46877bf8988b95303accacf55b9017d6ad9ba4029ad6827cf43b089737d1ce577f31740256368391fcd7801a6dc404cf58c32738146005c8500b1ce2a8ade320 WHIRLPOOL fed180e67fc1f062d739aba085ea8078c27e0d3daa4d99f799f0d453d6b3dbbc4f11a09bbcc5ae54687d985536cb7df5c457af8cdced6e276e7e424adc316749
 MISC metadata.xml 967 SHA256 2ffac0979f0372a134fd4d867258de0771847fe5114e58aedc0bc6d51cc43955 SHA512 f5b54fcf45f9dde3370ef781d8ae52aa696d260ef113555f34e6b17beca7d96a3992cf0713aed33d5daf215990d3d35244253b99b93b2fecb332ae630d486234 WHIRLPOOL 7262d71d2ddb256766535935fe9403aa1ac81b37b03f78b513e6a5700250ca10e9cac65a110498186736eca17e6703bd5555770383daef426fea445ca285409c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSs4YIACgkQVWmRsqeSphOYTACfdSj+iCo3h1GzuG+FrQ9eNNuI
-Gi4AniSpkbGMJk394O+VSWQ0pDkoA86N
-=NPqo
+iF4EAREIAAYFAlSysHEACgkQVxOqA9G7/aD17wEAnGbTZ8hRoNGBu5auORhoXbM1
+wxQr2zk9ybkW90VRCsUBAJyKM2qJZYHmJnv4tCfEhqi6UQTSBc7EHo3vT0vLdhw1
+=wvaz
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/fluxbox-1.3.6.ebuild b/x11-wm/fluxbox/fluxbox-1.3.6.ebuild
new file mode 100644
index 000000000000..9034a8f492e5
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.6.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.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
+}