New version, should build with g++4.1 now (bug #125996). Check that imlib2 is built with X if we're using imlib (bug #125454).

(I have a cunning Portage version: 2.1_pre6-r3, my Lord)

4 files changed, 184 insertions, 8 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index ebe9ab95db6d..962035741920 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.183 2006/02/17 21:56:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.184 2006/03/19 23:13:27 ciaranm Exp $
+
+*fluxbox-0.9.15 (19 Mar 2006)
+
+  19 Mar 2006; Ciaran McCreesh <ciaranm@gentoo.org> +fluxbox-0.9.15.ebuild:
+  New version, should build with g++4.1 now (bug #125996). Check that imlib2
+  is built with X if we're using imlib (bug #125454).
 
   17 Feb 2006; Aron Griffis <agriffis@gentoo.org> ChangeLog:
   . #120081
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index cecc20bed075..6557f0c276e9 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 68ce0d057b390b3eae6c203558081d7e ChangeLog 33872
-RMD160 fc81f0de3c4933aa3e5cab098ef65142185efbc4 ChangeLog 33872
-SHA256 5d91f3a23350ba0176e7fa7ff14c5476a956049a5598bee929a998fab276eb72 ChangeLog 33872
+MD5 36b26e8468b641c1718c7f1f9bfa8e17 ChangeLog 34110
+RMD160 17eb7358a45c4a10a8237e824e7f95cef69d4163 ChangeLog 34110
+SHA256 a1af9daa79c29f46d25ebce3fcbf21cf23201f3f3e6719dd2931c65ae33acafe ChangeLog 34110
 MD5 36db5c88337dd805a65f485604e321d6 files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch 829
 RMD160 3b6347fb7545e1651287e076aaad099a762b6af0 files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch 829
 SHA256 74191692966d89b2a94d66501bd88a4f76d286b86d840d2bcaa073f754d28d4a files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch 829
@@ -16,6 +16,9 @@ SHA256 f30ae303e129d788eb1dc0fb8f40860b6f1cac480d19e1c3d5341441a6f45b19 files/di
 MD5 dfa28a0b7c21fa818670b20865976738 files/digest-fluxbox-0.9.14-r1 67
 RMD160 13b702a6d21ce19e3835e7a92e5545fddcfce78f files/digest-fluxbox-0.9.14-r1 67
 SHA256 2cd35a39b2287d5f1c3952f7d428788059e73dc2125325000e1cbc8a29dbe5c3 files/digest-fluxbox-0.9.14-r1 67
+MD5 5c17e536f0b994902b27c1c31cfcb75e files/digest-fluxbox-0.9.15 247
+RMD160 fbcc8d173205dd9178394834434657e7895b2d9b files/digest-fluxbox-0.9.15 247
+SHA256 ec66a03ca1d44b3832aa2907084b3de448a98b6106d4dcdc6102c9fe3af17984 files/digest-fluxbox-0.9.15 247
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a files/fluxbox.desktop 202
 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834 files/fluxbox.desktop 202
@@ -34,13 +37,16 @@ SHA256 ed17ba690c2a4431630200f04bdbb2061c91ebb8f5a5b36399cb85a1a6f36e3b fluxbox-
 MD5 b0443d66082554a81ab3b42d2eac70d8 fluxbox-0.9.14-r1.ebuild 4691
 RMD160 4d74e6c8ccb18c1204f376ee746a2edc9913f9a2 fluxbox-0.9.14-r1.ebuild 4691
 SHA256 0dafda37ff813ee41a5b437db54eef3be5c900d0e6a6addfc7e7d9af283a0b47 fluxbox-0.9.14-r1.ebuild 4691
+MD5 0d65dd14ec1373a969f9706aa68e6281 fluxbox-0.9.15.ebuild 5049
+RMD160 c216785e9eadaf8b1fa0e03ffa4c5f3cbf7d7fe5 fluxbox-0.9.15.ebuild 5049
+SHA256 8391fbb259f81b5c578d72d2259dcc8a570ca7614d35788a179db94fd98182ff fluxbox-0.9.15.ebuild 5049
 MD5 98e195900ff544008f69d01184844b26 metadata.xml 530
 RMD160 86ba08209332492f739b8c927f1313e5dad7e4fa metadata.xml 530
 SHA256 5593429e2f7639289998b1568857eb6c12aa238ea900fa93099645ab7ebd265f metadata.xml 530
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD/HdYLLFUmVNQ7rkRAq15AJ9BoZD6J/LFKrMalhmsgigtQQoy0wCfa8mz
-rY0+UoNsN3WPloOJ9Ya6gkc=
-=U3aM
+iD8DBQFEHeWlLLFUmVNQ7rkRAopjAJ9u7LWb6itER2f1XR9gjwRVKBQCeACeK9lK
+xQDQr05vOU2p9qzQznWdb5M=
+=22ke
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.15 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.15
new file mode 100644
index 000000000000..b9691698fbce
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.9.15
@@ -0,0 +1,3 @@
+MD5 5fd0353b79d433c117f650a53c254e88 fluxbox-0.9.15.tar.bz2 685941
+RMD160 5359cc09ac960f94232aa0009077592929cb01b1 fluxbox-0.9.15.tar.bz2 685941
+SHA256 99726df74bc21abc5f417f858dca700b3baef62c9a21d35c890bd75113ad55a6 fluxbox-0.9.15.tar.bz2 685941
diff --git a/x11-wm/fluxbox/fluxbox-0.9.15.ebuild b/x11-wm/fluxbox/fluxbox-0.9.15.ebuild
new file mode 100644
index 000000000000..a932f775c005
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-0.9.15.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.15.ebuild,v 1.1 2006/03/19 23:13:27 ciaranm Exp $
+
+inherit eutils
+
+IUSE="nls xinerama truetype kde gnome imlib disableslit"
+
+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"
+
+# Please note that USE="kde gnome" simply adds support for the respective
+# protocols, and does not depend on external libraries. They do, however,
+# make the binary a fair bit bigger, so we don't want to turn them on unless
+# the user actually wants them.
+
+RDEPEND="|| ( ( x11-libs/libXpm
+			x11-libs/libXrandr
+			xinerama? ( x11-libs/libXinerama )
+		)
+		virtual/x11
+	)
+	virtual/xft
+	truetype? ( media-libs/freetype )
+	imlib? ( >=media-libs/imlib2-1.2.0 )
+	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
+DEPEND=">=sys-devel/autoconf-2.52
+		nls? ( sys-devel/gettext )
+		|| ( ( x11-proto/xextproto
+				xinerama? ( x11-proto/xineramaproto )
+			)
+			virtual/x11
+		)
+		${RDEPEND}"
+PROVIDE="virtual/blackbox"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+
+pkg_setup() {
+	if use imlib ; then
+		if ! built_with_use media-libs/imlib2 X ; then
+			eerror "To build fluxbox with imlib in USE, you need an X enabled"
+			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
+			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
+			die "USE=imlib requires imlib2 with USE=X"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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}/0.9.13/${PN}-0.9.13-our-styles-go-over-here.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"
+
+	# Turn on aa by default if possible. Fluxbox fonts are really frickin'
+	# broken, we'll do what we can to make it less painful by default.
+	use truetype 1>/dev/null && \
+		echo "session.screen0.antialias: true" >> data/init.in
+
+	# Fix broken styles
+	ebegin "Fixing backgrounds..."
+	for style in "${S}/data/styles/"* ; do
+		[[ -f "${style}" ]] || continue
+		sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \
+			|| die "styles sed failed on ${style}"
+	done
+	eend 0
+}
+
+src_compile() {
+	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable truetype xft) \
+		$(use_enable kde) \
+		$(use_enable gnome) \
+		$(use_enable imlib imlib2) \
+		$(use_enable !disableslit slit ) \
+		--sysconfdir=/etc/X11/${PN} \
+		--with-style=/usr/share/fluxbox/styles/Emerge \
+		${myconf} || die "configure failed"
+
+	emake || die "make failed"
+
+	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
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	dodir /usr/share/xsessions
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
+	fperms a+x /etc/X11/Sessions/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" || die
+	doins "${FILESDIR}/styles-menu-commonbox" || die
+	doins "${FILESDIR}/styles-menu-user" || die
+}
+
+pkg_postinst() {
+	einfo "As of fluxbox 0.9.10-r3, we are using an improved layout for"
+	einfo "styles to avoid problems with huge menus. Use the following"
+	einfo "in the menu for your menu styles section:"
+	einfo
+	einfo "    [submenu] (Styles) {Select a Style}"
+	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
+	einfo "    [end]"
+	einfo
+	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
+	einfo "menu file, this will already be present."
+	einfo
+	ewarn "Note that menumaker and similar utilities do *not* support"
+	ewarn "this out of the box."
+	einfo
+	einfo "As of fluxbox 0.9.14_pre1, Fluxbox uses XFT for font rendering. If"
+	einfo "you experience font problems, try tinkering with your theme files."
+	einfo "You can check the validity of a font name using:"
+	einfo
+	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
+	einfo
+	einfo "The slow startup issues in previous versions should now be fixed;"
+	einfo "if you still encounter problems, please report bugs upstream."
+	epause
+}
+