Bump. Pull in pretty much everything from upstream -cvs to date. This should fix any remaining locale / font problems. Experimental XComposite support is also available.

4 files changed, 193 insertions, 21 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index efd80eb755ed..b6884ba147bb 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.122 2004/10/04 20:17:28 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.123 2004/10/04 21:35:41 ciaranm Exp $
+
+*fluxbox-0.9.10-r4 (04 Oct 2004)
+
+  04 Oct 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  +fluxbox-0.9.10-r4.ebuild:
+  Bump. Pull in pretty much everything from upstream -cvs to date. This should
+  fix any remaining locale / font problems. Experimental XComposite support is
+  also available.
 
   25 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.10-r3.ebuild:
   Stable on x86, sparc after discussion with upstream. There may be an -r4
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 798be8d95d57..48262c4ff4d0 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,30 +1,42 @@
-MD5 b2bac3fd73b8f4215029b843fad6f06a fluxbox-0.9.10-r1.ebuild 1835
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6266d9ec84f9b20d2735085225734d45 ChangeLog 24347
 MD5 061609a2a096a72c443d7ef5d0aa7972 fluxbox-0.9.10-r2.ebuild 2011
-MD5 da496f41507bb64dc6b95c4149f0d4af fluxbox-0.9.10-r3.ebuild 4109
-MD5 72eaed6596c18b00e8764b9b8d141d94 fluxbox-0.9.8-r1.ebuild 1628
 MD5 a6ccc60a2244f7fbd8d33671f3bbf1a9 fluxbox-0.9.9.ebuild 1708
+MD5 8d4f4b36edc864e2631b9efab75ad89d fluxbox-0.9.10-r4.ebuild 5031
+MD5 b2bac3fd73b8f4215029b843fad6f06a fluxbox-0.9.10-r1.ebuild 1835
+MD5 72eaed6596c18b00e8764b9b8d141d94 fluxbox-0.9.8-r1.ebuild 1628
 MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
-MD5 fd5667ce1aa0eecddb42b61c1f0bf30f ChangeLog 24056
-MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r1 67
-MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r2 67
-MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r3 67
+MD5 da496f41507bb64dc6b95c4149f0d4af fluxbox-0.9.10-r3.ebuild 4109
 MD5 c11d6a60aaece3dd919a1802a23ecc7a files/digest-fluxbox-0.9.8-r1 65
-MD5 cde8982304ad765c60a68874325d66fb files/digest-fluxbox-0.9.9 65
+MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r1 67
+MD5 8371840822662e7d40019b5f5ee7888f files/digest-fluxbox-0.9.10-r4 150
 MD5 4bafaa2a6712efa9f0c040b6072c8169 files/fluxbox-0.9.9-gcc3.4.patch 527
+MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r3 67
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
-MD5 97574b9984c119ced3c259bd8c314588 files/0.9.10/fluxbox-0.9.10-all-about-me.patch 674
-MD5 ee36523cd5cf3281d0261244260840c9 files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch 774
-MD5 8b288a50d112b48b73c791893dac61f9 files/0.9.10/fluxbox-0.9.10-editor-thingies.patch 804
-MD5 05e049a3f92497ddb1cf615abfdc5f35 files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch 946
-MD5 b5f651453c6bbf6089cf65ec5cd83722 files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch 563
-MD5 7295edfc76f1cca87164e419e2d3b637 files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch 1948
-MD5 61d8fb7f72eb34b75cbf5c2e9b291fa3 files/0.9.10/fluxbox-0.9.10-misc-updates.patch 13915
+MD5 cde8982304ad765c60a68874325d66fb files/digest-fluxbox-0.9.9 65
+MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r2 67
+MD5 71a4dfce6e2832c47b9191caab6e3d35 files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch 2510
+MD5 9ae40c5c7aebae1c5919adbd888710b4 files/0.9.10/styles-menu-user 93
 MD5 1c0b2aaf218be67efc82bcb455e713ec files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch 968
-MD5 b285687968580fa55ffcf5e586426ee7 files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch 889
 MD5 48b051c794986e9acb73631e0642e2d9 files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch 3203
-MD5 a39d5b26fb1695fd9264cca078ad0d58 files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch 7008
-MD5 71a4dfce6e2832c47b9191caab6e3d35 files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch 2510
-MD5 33fa4c925ae4fe1b5797673a4508c548 files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch 2616
+MD5 61d8fb7f72eb34b75cbf5c2e9b291fa3 files/0.9.10/fluxbox-0.9.10-misc-updates.patch 13915
+MD5 b5f651453c6bbf6089cf65ec5cd83722 files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch 563
+MD5 05e049a3f92497ddb1cf615abfdc5f35 files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch 946
+MD5 ee36523cd5cf3281d0261244260840c9 files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch 774
 MD5 9f6f105cbf9396f450e77dbf885b0a02 files/0.9.10/styles-menu-commonbox 127
+MD5 a39d5b26fb1695fd9264cca078ad0d58 files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch 7008
+MD5 97574b9984c119ced3c259bd8c314588 files/0.9.10/fluxbox-0.9.10-all-about-me.patch 674
+MD5 8b288a50d112b48b73c791893dac61f9 files/0.9.10/fluxbox-0.9.10-editor-thingies.patch 804
 MD5 4db83b69b94628dc9f05c797bd01c95b files/0.9.10/styles-menu-fluxbox 117
-MD5 9ae40c5c7aebae1c5919adbd888710b4 files/0.9.10/styles-menu-user 93
+MD5 b285687968580fa55ffcf5e586426ee7 files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch 889
+MD5 33fa4c925ae4fe1b5797673a4508c548 files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch 2616
+MD5 7295edfc76f1cca87164e419e2d3b637 files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch 1948
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBYcFPLLFUmVNQ7rkRAvEVAKCXmNnYU6EH3HZk/1svUd0I5H8TBQCfWcX+
+nxIoGxKoFGfwNYeFnoHBe/g=
+=/Fpt
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r4 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r4
new file mode 100644
index 000000000000..a9ebe0ee627c
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r4
@@ -0,0 +1,2 @@
+MD5 7a04a21960b8bc364bcc002389008989 fluxbox-0.9.10.tar.bz2 556030
+MD5 123d70b4481cd897fe8356694a58cff7 fluxbox-0.9.10-biiiiig-update.patch.bz2 46527
diff --git a/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild b/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild
new file mode 100644
index 000000000000..e0d386fa7f4f
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild,v 1.1 2004/10/04 21:35:41 ciaranm Exp $
+
+inherit eutils
+
+IUSE="nls xinerama truetype kde gnome bigger-fonts"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2
+	mirror://gentoo/${P}-biiiiig-update.patch.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="virtual/x11
+	truetype? ( media-libs/freetype )
+	nls? ( sys-devel/gettext )
+	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
+DEPEND=">=sys-devel/autoconf-2.52
+		${RDEPEND}"
+PROVIDE="virtual/blackbox"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips ~ppc64 ~macos ~ppc-macos"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Branch update from upstream CVS
+	epatch ${WORKDIR}/${PN}-${PV}-biiiiig-update.patch
+
+	# Some fluxbox-generate_menu things. These are ciaranm's fault...
+	epatch ${FILESDIR}/${PV}/${PN}-${PV}-posix-on-toast.patch
+	epatch ${FILESDIR}/${PV}/${PN}-${PV}-my-term-is-better-than-your-term.patch
+	epatch ${FILESDIR}/${PV}/${PN}-${PV}-editor-thingies.patch
+	epatch ${FILESDIR}/${PV}/${PN}-${PV}-all-about-me.patch
+
+	# 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}/${PV}/${PN}-${PV}-fancy-gentoo-styledirs.patch
+
+	# Add in the Gentoo -r number to fluxbox -version output.
+	sed -i \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-gentoo${PR:+-${PR}}~" \
+		version.h.in || die "version sed failed"
+
+	# Use a less fugly default theme
+	sed -i \
+		-e 's~styles/Meta~styles/Emerge~' data/init.in
+
+	# 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
+
+	ebegin "Fixing style fonts..."
+	for style in data/styles/* ; do
+		[[ -d "${style}" ]] && style=${style}/theme.cfg
+		[[ -f "${style}" ]] || die "waah! ${style} doesn't exist"
+
+		# Make fonts more readable if we use bigger-fonts
+		use bigger-fonts 1>/dev/null && ( sed -i \
+			-e 's~\([fF]ont:[ \t]\+[a-zA-Z]\+-\)[789]~\110~' \
+			${style} || die "sed voodoo failed (insufficient goats?)" )
+
+		# We don't have a reliable sans font alias, change it to lucidasans.
+		# That might not work either, but it's more likely...
+		sed -i \
+			-e 's~\([ \t:]\)sans\(-\|$\)~\1lucidasans\2~' \
+			${style} || die "sed voodoo failed (not a full moon)"
+	done
+	eend $?
+}
+
+src_compile() {
+	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
+
+	# Our megapatch means we need to regen this little lot...
+	ebegin "Updating autotools-generated files"
+	aclocal -I . || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	automake -a || die "automake failed"
+	autoconf || die "autoconf failed"
+	eend $?
+
+	econf \
+		`use_enable nls` \
+		`use_enable xinerama` \
+		`use_enable truetype xft` \
+		`use_enable kde` \
+		`use_enable gnome` \
+		--sysconfdir=/etc/X11/${PN} \
+		${myconf} || die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	dodir /usr/share/fluxbox
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc README* AUTHORS TODO* COPYING
+
+	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}/${PV}/styles-menu-fluxbox
+	doins ${FILESDIR}/${PV}/styles-menu-commonbox
+	doins ${FILESDIR}/${PV}/styles-menu-user
+}
+
+pkg_postinst() {
+	einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
+	einfo "handling styles in the menu. To take advantage of this, use"
+	einfo "the following 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 " "
+	if has_version '<x11-wm/fluxbox-0.9.10-r3' ; then
+		ewarn "You must restart fluxbox before using the [include] /directory/"
+		ewarn "feature if you are upgrading from an older fluxbox!"
+		ewarn " "
+	fi
+	ewarn "Be warned that anything involving XComposite is extremely "
+	ewarn "experimental. Please don't report bugs unless they also occur "
+	ewarn "with XComposite disabled."
+	ewarn " "
+	epause
+}