Version bump: 1.3.2 is released, now with true ARGB (Xrender transparency)

support.

Also fixes bug #388569: Removing 'gnome' USE flag as there is no
corresponding option in the application any more.

Package-Manager: portage-2.1.10.31/cvs/Linux x86_64

4 files changed, 141 insertions, 19 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 3dea856df6c3..f866d3929a7d 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.296 2011/08/20 16:03:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.297 2011/11/29 14:08:31 lack Exp $
+
+*fluxbox-1.3.2 (29 Nov 2011)
+
+  29 Nov 2011; Jim Ramsay <jim_ramsay@gentoo.org> +fluxbox-1.3.2.ebuild,
+  fluxbox-9999.ebuild:
+  Version bump: 1.3.2 is released, now with true ARGB (Xrender transparency)
+  support.
+
+  Also fixes bug #388569: Removing 'gnome' USE flag as there is no
+  corresponding
+  option in the application any more.
 
   20 Aug 2011; Jeroen Roovers <jer@gentoo.org> fluxbox-1.3.1.ebuild:
   Stable for HPPA (bug #375013).
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index a1ad75da5ab6..7de7ff72ceaf 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -22,15 +22,27 @@ AUX styles-menu-fluxbox 117 RMD160 a2f3ced8acd6bd9057aea30b6ca374cff7d3db3e SHA1
 AUX styles-menu-user 93 RMD160 2a6831b45ce1d655586b699d16c0547de201d187 SHA1 84a02411e552875877c169a08b49dc452176c474 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946
 DIST fluxbox-1.1.1.tar.bz2 777660 RMD160 aabfdd10c835d0ef903885646a7f34f7df75af17 SHA1 6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f SHA256 903f676a71a301513cd0b3db17e49f88c8d91583793176c4c70358a3012cca34
 DIST fluxbox-1.3.1.tar.bz2 799235 RMD160 529d2f23d9446b3e76f3974e14c8b9459d788ecb SHA1 1c4755b8ac1042c98f700848240ac99ef18dca01 SHA256 c47b2615608151dd19bf9d738badb30ea4179dbe4edeb2243a269a9bb932628c
+DIST fluxbox-1.3.2.tar.bz2 787400 RMD160 b0b5f1ca76f7776d90c7619148dca6aa999bd2a9 SHA1 069d810d449c2a223f447aa7a2374f42094bd87b SHA256 e8aaf46c043eb6186383c6dde8bf98dbd62305b202ad4d8ebb39508b1b710167
 EBUILD fluxbox-1.1.1-r3.ebuild 3863 RMD160 3bf900d98dc13bb4e087a2d2db5dad329c1c7ecf SHA1 df92afa33f7c1c84eae9aae67617c8b52b19b34c SHA256 d5196b53c400d0b2c7d3241e09f17ae6024896606a5a9012ba0adacc9ea8b5e1
 EBUILD fluxbox-1.3.1.ebuild 3218 RMD160 7f09226fb977776b18787cc4d64a8cb7ffc679d1 SHA1 3ae05ab0da11df72ced554aafc160482340383c7 SHA256 521097fea5fa22f16329fc0c651452d132a6016833fc71042b5443d947b8d1c4
-EBUILD fluxbox-9999.ebuild 3141 RMD160 ddccbc8cb55d417b5861132ba465da966a37481c SHA1 8350c530538ae0f96756b271e6c7c722f619020a SHA256 43e1b5a32f2286277d43e60a5888c7f3617061b51db659c71ebed77c2c449853
-MISC ChangeLog 54167 RMD160 14af0ecbfc68585de4a2c26e484cd1f4b0b6de2c SHA1 c735408697c7f3de05ecac3c97be73f9d6831c53 SHA256 5e2713764756bc883bb0b4d9edaa1009ba3a137b10fafee7c70e7e1904df4ab3
+EBUILD fluxbox-1.3.2.ebuild 2943 RMD160 88d3b51f7d7c9654acf9aea43d05c29ed18a59db SHA1 cb750d373f37042c8fc0f75ed1b46a864665a1e9 SHA256 efe1e84ba0620671be7a9c85383afd93a2a5c129809cb86f5c1c82ddfef7364f
+EBUILD fluxbox-9999.ebuild 2921 RMD160 4b731e38753d34b345d2b504c892a3794e6779cf SHA1 23d89e5ff775f8962ff750cc18102fd711e54054 SHA256 258ae4d5bc16d941e52700338c715f4cceb3bc80e3ac8529b260a78c34979090
+MISC ChangeLog 54505 RMD160 4b3f3a1db01c2663a7c162b0c0d2f497c0aa9691 SHA1 11d25fe5c784808f2e3f5066cc9c65a5b3bbf063 SHA256 a57eb1f01d3cd27a5dcd42f48ea6886187f41d55cdf245f84c245d6460b3d4f4
 MISC metadata.xml 988 RMD160 0253bdcc0ce18a493f7365905f78af4775ae71ad SHA1 bc77bef49bdb06a5f5aca2d604022a35381c51d0 SHA256 cb33cb06c573bda189a04cbb6e6e8c792cf59f8ad3267ee55c2e73dd651e93c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5P2uAACgkQVWmRsqeSphOjlACfdWgeheihSGz6+du6bIXTTcrY
-fZ4AnA9YzyPp/58JIeINCMDEEhaFhXkd
-=Fx87
+iQIcBAEBAgAGBQJO1OdpAAoJEA8o5SF9Rr6qLYYQAJzmJWUjCBaODQIeNWk8Avl6
+7MNlGQqfRqP1n64aft0Dzai/3haaXNEEwxE4l6D/tnK1fdqLX8sClObyz3Dlhi2b
+psSozkA28IzwidiuRqJ5+J5dY8g8JSrkGe2UbuJ2188JXfBf0W0AJ2WdlmgXsb52
+Z9JXFR60K+lPv5VSYs6F/ATkd3UaeWWP2h1Tg4PtqCLheim+/EEOogDABgNqDyPf
+Dw4d0CFXYCZirO/JNRmfwAaIZLqlAvqP9CQEpZLfx6KvT4/4AajT3lefF9cZuWwX
+WeJUECS6B82TyxgisffIae4ToYiSN1MOh9d9xKcptZQ7hq+7GFp/OvY44UoKMNFs
+BkaHdEB8ZNihvPX3+w/sGESxyH433HDjewbYHhVHSU67Ege+HKsCSe64lo0WiOhP
+gX9XUd/NKWFCBjlXwG7Ywwt8s8GkK9pBOExlWNO/YoxTg9UsVp7F9fi5lUU7/WY1
+z4zljw1VnXS0eCTkPhGaWJA9MMeJT+DAZd+J/ATkJhpQSsCYVqn7LEamWW7bLvo3
+3kQ1JlwVfqWiI1dzt1S0yB3mFF1qtwlKT7f/drf/CQHXhhQzqUCje7vp5AXE54ft
+55JqvzcRFUiBH2j491I/1gcO7OjR2jBhVidFsa9/jbW4G4D3dXXoki5Iml6m17Qi
+NtrxwCXbDbtqvoF2pv65
+=7KrC
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/fluxbox-1.3.2.ebuild b/x11-wm/fluxbox/fluxbox-1.3.2.ebuild
new file mode 100644
index 000000000000..d15c9d8d4247
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.2.ebuild,v 1.1 2011/11/29 14:08:31 lack Exp $
+
+EAPI=4
+inherit eutils 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.bz2"
+HOMEPAGE="http://www.fluxbox.org"
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrender
+	|| ( x11-misc/gkmessage x11-apps/xmessage )
+	xinerama? ( x11-libs/libXinerama )
+	truetype? ( media-libs/freetype )
+	bidi? ( dev-libs/fribidi )
+	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="nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+	${RDEPEND}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+
+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() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable truetype xft) \
+		$(use_enable imlib imlib2) \
+		$(use_enable bidi fribidi ) \
+		$(use_enable slit ) \
+		$(use_enable toolbar ) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
+		${myconf}
+}
+
+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"
+}
diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
index c4d9ce2e39f6..7ca6a6012a4e 100644
--- a/x11-wm/fluxbox/fluxbox-9999.ebuild
+++ b/x11-wm/fluxbox/fluxbox-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 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.9 2011/07/14 03:05:22 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.10 2011/11/29 14:08:31 lack Exp $
 
-EAPI=3
+EAPI=4
 inherit eutils git-2 prefix
 
-IUSE="nls xinerama bidi +truetype gnome +imlib +slit +toolbar vim-syntax"
+IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
 
 DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
 
@@ -13,16 +13,13 @@ EGIT_REPO_URI="git://git.fluxbox.org/fluxbox.git"
 SRC_URI=""
 HOMEPAGE="http://www.fluxbox.org"
 
-# Please note that USE="gnome" simply adds support for the respective
-# protocol, and does not depend on external libraries. It does, however,
-# make the binary a fair bit bigger, so we don't want to turn it on unless
-# the user actually wants them.
-
 RDEPEND="x11-libs/libXpm
 	x11-libs/libXrandr
-	xinerama? ( x11-libs/libXinerama )
-	x11-apps/xmessage
+	x11-libs/libXext
 	x11-libs/libXft
+	x11-libs/libXrender
+	|| ( x11-misc/gkmessage x11-apps/xmessage )
+	xinerama? ( x11-libs/libXinerama )
 	truetype? ( media-libs/freetype )
 	bidi? ( dev-libs/fribidi )
 	imlib? ( >=media-libs/imlib2-1.2.0[X] )
@@ -32,7 +29,6 @@ RDEPEND="x11-libs/libXpm
 	!!<=x11-misc/fbdesk-1.2.1"
 DEPEND="nls? ( sys-devel/gettext )
 	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
 	${RDEPEND}"
 
 SLOT="0"
@@ -61,10 +57,10 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-dependency-tracking \
 		$(use_enable nls) \
 		$(use_enable xinerama) \
 		$(use_enable truetype xft) \
-		$(use_enable gnome) \
 		$(use_enable imlib imlib2) \
 		$(use_enable slit ) \
 		$(use_enable toolbar ) \