Version bump.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 123 insertions, 18 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index eade097b3806..fc30dc0e10ae 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.306 2013/01/08 21:32:50 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.307 2013/03/19 12:42:54 jer Exp $
+
+*fluxbox-1.3.5 (19 Mar 2013)
+
+  19 Mar 2013; Jeroen Roovers <jer@gentoo.org> +fluxbox-1.3.5.ebuild:
+  Version bump.
 
 *fluxbox-1.3.3 (08 Jan 2013)
 
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index f121d5e52e25..ef570e363eaa 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -20,31 +20,23 @@ AUX strictmousefocus-1.1.1.patch 8989 SHA256 4bbcf304c161246acb7d515dc3b185ceab6
 AUX styles-menu-commonbox 127 SHA256 44a56b182b0da9bf26ac41ff7e5ea8da3ddb7c5cbca0f554e3c74f15c72a3d98 SHA512 116876f0edb60b993738b367f5c6a25a401cfd26a9062416e6d4e58dd92e814f79c43357352a1fddf9e52b6274914efa4b41479643557a38295b0d9e5c2c9dee WHIRLPOOL 1191e39ce909dcf6bbd6d7c28d6badacf08e8968d82472abe45e1935b7fb883eb972bf726f2c9cc93a4541409bb8404f3f5787e39d2c09ba79f70e6440bf04bf
 AUX styles-menu-fluxbox 117 SHA256 f5829a442d8653941e2741ab73f49e9d9c95fc8129531e4197730c0bbb2f2989 SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622 WHIRLPOOL 48e609de77393de670fccdc91d6291dbe13559a6fea824822266850155b84b42e86ae0001926ad7d64f1b67ee9328d9993b6904d0ac4df9ae280f7adc7734b02
 AUX styles-menu-user 93 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094 WHIRLPOOL 57fca7ee543c74bf8cc0157c3965cc0b820673168c6fcec66afac9af2b78e54ad9a7c7960c7f66444e68da7ec9f7814e5cdedb1487818aeb08610c2f11c025c4
-DIST fluxbox-1.1.1.tar.bz2 777660 SHA256 903f676a71a301513cd0b3db17e49f88c8d91583793176c4c70358a3012cca34
-DIST fluxbox-1.3.1.tar.bz2 799235 SHA256 c47b2615608151dd19bf9d738badb30ea4179dbe4edeb2243a269a9bb932628c
-DIST fluxbox-1.3.2.tar.bz2 787400 SHA256 e8aaf46c043eb6186383c6dde8bf98dbd62305b202ad4d8ebb39508b1b710167
+DIST fluxbox-1.1.1.tar.bz2 777660 SHA256 903f676a71a301513cd0b3db17e49f88c8d91583793176c4c70358a3012cca34 SHA512 2e3dd1956e130b4cc7e224346b3a1a219f20ac7b720f3166b73563c329d29f4dfe5640cea01a6a28deafb6d3383a2c736881e1fead2865bbc417b43f03443495 WHIRLPOOL fbeda7c3361b6b79fcf3ca412aede2cd543a64f2e1c4e89a0e547a1046d2c8f72d3f0ff303932919fd5ca7093d0d05a92373218d5754d4e663a01990d0c0780b
+DIST fluxbox-1.3.1.tar.bz2 799235 SHA256 c47b2615608151dd19bf9d738badb30ea4179dbe4edeb2243a269a9bb932628c SHA512 b6069a26aaf22abeca4810ad6decc083fb8a20edd9610bbcd8f34426001f268d9d6d061faceb20e332d65d050b6f150bd5243f02e15416f2a108d2c8d76a8d09 WHIRLPOOL 8a4f2120eff1ef40d7b9185ca3d60bbf0fa3007f253cc9ede657e7ae08be150d1b20a0740d9943728cd700102a785cb2664150f9886ced96d9c013c5f8026551
+DIST fluxbox-1.3.2.tar.bz2 787400 SHA256 e8aaf46c043eb6186383c6dde8bf98dbd62305b202ad4d8ebb39508b1b710167 SHA512 2624c337e85b98e39398319170cbf57f8ab031539844e62f2f61aefd5c2e307b8390261b9658073bcf557f7f006c9df95c72a4420f12fa7122742b4623a17d49 WHIRLPOOL 6f6fae12c265f2cf1e700a257fa89f291adea9838714f8bc861c2f37f3d036caa16e269e8b5ff18d687bf6f77a4f1661df864e9ec98f3d2d14e3d3186d2ebdde
 DIST fluxbox-1.3.3.tar.lzma 678937 SHA256 b96310427f0fecc83c01664e18bfe618844c6a148f050249831171246af75ad1 SHA512 69ecfd3726efe18d3a9f99e2b015b22659dc35a0114654651e9ff41d01ab98c071ffb3679db8ac30a458a25e832288b35c4546a0ea49e3b722084e87f2a2844d WHIRLPOOL 27394268d46020d2fc9ebb968e73bdeab5338be159e3bbb0bf7a64570d170579a806f36c1c243a25061a175951752ea185e0a55ce5fcf8ff692a8c8ebd4b37a2
+DIST fluxbox-1.3.5.tar.lzma 694672 SHA256 f4faf1fcb995dbe85d272e511e388de347ff07b69e9f8c5af0248cf330ee2a07 SHA512 55d1689660b9240851be55183f665efff281f8f344474ddd1bee089635cb34e343cca85743900675c21579cf9e58c7bd756932a30c2ff4e6384b500d7c4bdcd8 WHIRLPOOL 6f379f9f224478556c53e2585f76c28f29c20b1fce5ab24ed0d06a813e51ddb1e0eaea7658ec1fa5979b951613542dd47dad4fd7af17bbdf0530653b8583b18d
 EBUILD fluxbox-1.1.1-r3.ebuild 3863 SHA256 d5196b53c400d0b2c7d3241e09f17ae6024896606a5a9012ba0adacc9ea8b5e1 SHA512 2141f8cb8be6b90b849eb04d6a5494119f6a4804e9fc425b5b9aa4b8ee223b55873fd2c60c8d89e5c0ae8d19ac45a29f8e9b0f20f669755e0f4d531d000e6c8e WHIRLPOOL 60afc766418c9c86d3f5d31714a9fe08fe9313b5186b2cdbf69112e44608058f7dc365a978ae78647e7119788ee2a5422cad119efa521740394e0c3b47ca1dae
 EBUILD fluxbox-1.3.1.ebuild 3218 SHA256 521097fea5fa22f16329fc0c651452d132a6016833fc71042b5443d947b8d1c4 SHA512 55c49532a381c0c232ced7853fedd69627f95eee6022a065a53c0b35a7ad78bdda71346185a7131dc44ce2e38597c2ba560476d66806e1a410d18f3264286096 WHIRLPOOL cf99fbd498f3f02e1af8a2e64704c9bf3630ab3ef3de45b53d82bd7133ba09b4393e52079dc3d2c617dd66f83fbace1ffde7222894439bd2ad77fc89445e26b6
 EBUILD fluxbox-1.3.2.ebuild 3074 SHA256 2b40e87e859143f3ee4624b43dceb3aa2a6d7ef91e8ff0f0ed0b2baa761019a6 SHA512 2b7d10575df296824b792b199aeb0b42422b95394bb4dbb1c2074adba351d8ec2870a75e898901d96d469de23ebd3ff6ee1f912e1f874301ec9816f08b9d5bb0 WHIRLPOOL caa40774d95533f3cedd31f41531de367c7166f2a8f2cd804a0361cf8cda62bb35de8ef09eba3e8118b26434bf4437538706e12397391cbca79567f01a1871b7
 EBUILD fluxbox-1.3.3.ebuild 3083 SHA256 c470c3d5c6d7bd3761f26fcc499717f3c515ef80f0202e7d7762e281a9c55850 SHA512 32d61c6e7240f9f8e77c1fc48ec9c0d45089fe6d60e2942c091f1becaae53bae32672e5a683ae33c73278d1f4446e448a5c0368f50c873968b24608df3c4eeb3 WHIRLPOOL 3ce390298f803df81977d830658cba1dd83988ffc8af7c4b6982b2e3550ac57e65b513706fc55adb461dfdb72665acbe4e3349dfb578b272364146144bf5ea4f
+EBUILD fluxbox-1.3.5.ebuild 3083 SHA256 4c12b378f43ee54d4050482ee24a29f9f2d3743aa09c7489783f290883fe4e60 SHA512 ae2cb749ba7d2b01d164cb45c5efe3915e10dfebc34e46137d4e6140460a08a9d5a43d95702cf29cc04e02da642d7e71cb44030bf71e0f79377774b29a001dee WHIRLPOOL f030681745432da81fa9ecbbfe83d47928d79092e24eaa4b8834baa8acc2191793e98b93289d669e2bcafd84743fbcbfc6ec2e9d78c94ff52093eccb29819807
 EBUILD fluxbox-9999.ebuild 2960 SHA256 297cf54004736243350e870ca81bd15e3e26f1a3bd758c17c49d6bdb1364f1fd SHA512 cdc5279caa7919e38c72001f0b6048709874f7b4283f96dbdc7105b3d656bbfa3ca8cad5f4c754a5cb7e22c8bd6e3033af79d0057ed95284a731f19a20676c9d WHIRLPOOL 66e3f7ff9f35c5f89a551a80a48f15846f9c1b966eed2564978b72bff215aa27654bc64286cadcc7da0cf00ca1ade5ee1a70195d1cb3357547a85822eb2e23b7
-MISC ChangeLog 55720 SHA256 2ea2f9a1c7dfdcd5ff88ffeb7b46f11ed9e7ff4fec2fb0a9c1da3677d1de4d77 SHA512 f5fa43cf41a9e9978d6ac8fb8da964bef64281088dfbeb49676d4b4dc09eaf83cc409c89d260c6bb83b816d1148a97c32990b07db4f96a2989ec4b84f2a5c2df WHIRLPOOL b582967c764f04f129a70c6aab239c22eebbba10494c8f38d35af1bffbc84d3037f1b5ba9125890b3ae9a95198ec3c33a3b51cc7a49ee56db56241afb4498e47
+MISC ChangeLog 55836 SHA256 98f9c82bfde5e0443948ed0f9ec8b38c99c35a01cd3477260fe204a05d06f06c SHA512 9f77c0527cd19e3df1737ad5906781d0a531a1e4d04619bc85537066da20585896a70a464e26d127f4408521a1a09d72e49590aeb0ee0666c1872e9665fbe850 WHIRLPOOL 66a1d3dfd3eafdc60ee3c7d5943038f5d1e5c9d5cbc2036cfd402619ab8b8d82af0cb0ba4eaa6ccb4b4c32db450f05987152e8afc92bc72a093c3279a490bece
 MISC metadata.xml 988 SHA256 cb33cb06c573bda189a04cbb6e6e8c792cf59f8ad3267ee55c2e73dd651e93c7 SHA512 db883109bd214b18b728f2f36353b190d4634b7fe8fb9e347245182b4b2480187ad32e98eb34e1a8988689e209cb7c48c68b806d43117cf418698388e5c55810 WHIRLPOOL cae397a11cea4cc02ff6186c9117f1847fcea8184fa339f40d2acde2b8efd8feff41a500ea0945e7c48ae99bccdd878e734da23b0f87b2368bb4ab91aded108a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ7JCIAAoJEA8o5SF9Rr6qsWIP/3pP1alg8hZPVvq66OvSJp2z
-MPVXU2UjKbVpA2vMF1dS8drcswRwNc75I/l4aOKeFm5IsW74/iwTolfK/j++n4Gh
-9eWBpnLX8NcWeuBJQT6XX3rXnMWK8B2xyGukTawTdtuUkEET9T2V/0M+uGb7VpBI
-39IOCq6gORIez2npu6hR5k7L+dsmhw+tgx9VNjodh50eknvZBg4p5X2cHh2cT3wC
-MD/1CAZY7RyaJwcW4H7L6uca8j2QpvII9BHg6/A+nB9l1XXuHlSG0kbmhALx9kW0
-0l1hoAdiqIMbAZCD+cprG/Sp9CkivtLlHbwlrLKy+7UZpRsLQxEE/PrlUNQi5hqH
-NJZJLJo00Vh3Rq48zRTxXOaOw7f3DgesVa/OPRWrVo056gG+9iy3CZ80kSA/SAm7
-CO8djLjAu2lA1gpDaERmLQRxK7Mb3skjo4nxMDDxdCOg3gBsHIidpCv0PSH210eG
-O8WDCenS4LEk0KbBR8ZIwSFxCJcBb4czrkr0HmiWGuDlOd8FSPrx+6RD20iGxKRE
-IO3Vig3eoXwFX4vbKUJ19fn+BWNBUNfx8vE6GXEpPHtxDV+wuKPNsEXBjdcocjzb
-MuU/glaRy9Fe3ND6OIJDyrNS+6Oznpb4rwGFKcnUpMXdr3g/xF0hKnKS/BdHuork
-LqFW7zzfU0ExuTeih8n8
-=eRcT
+iEYEAREIAAYFAlFIXVAACgkQVWmRsqeSphOAFgCeLUHWJ+qJ9bf2wI4w1Osf4KV0
+oh0Anjcskhd0moyBtIAQhIj0OTi7T4bS
+=LFyd
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/fluxbox-1.3.5.ebuild b/x11-wm/fluxbox/fluxbox-1.3.5.ebuild
new file mode 100644
index 000000000000..77377a28680e
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 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.ebuild,v 1.1 2013/03/19 12:42:54 jer 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.lzma"
+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"
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		"${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
+	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"
+	doins "${FILESDIR}/styles-menu-user"
+}