Version Bump + patch, bug #129065, thanks to ChazeFroy for reporting

Package-Manager: portage-2.1_pre9-r4

5 files changed, 199 insertions, 15 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index fc7ff12ac38c..3bd629b4996a 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,13 @@
 # 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.187 2006/04/28 00:01:31 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.188 2006/04/28 06:15:38 antarus Exp $
+
+*fluxbox-0.9.15.1 (28 Apr 2006)
+
+  28 Apr 2006; Alec Warner <antarus@gentoo.org>
+  +files/0.9.15/129065-fix-doubleclick-64bit.patch,
+  +fluxbox-0.9.15.1.ebuild:
+  Version Bump + patch, bug #129065, thanks to ChazeFroy for reporting
 
   28 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
   Fixing SHA256 digest, pass four
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 2ee4587d56f4..b6e5b2ad1d62 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch 829 RMD160 3b6347fb7545e1651287e076aaad099a762b6af0 SHA1 ccdcc1be109cc9a1a40ad27f05d5929767510930 SHA256 74191692966d89b2a94d66501bd88a4f76d286b86d840d2bcaa073f754d28d4a size 829
 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
@@ -9,6 +6,10 @@ AUX 0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch 653 RMD160 32e2d79cf6510
 MD5 17110f6fe071a751aaa29832e92832fd files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch 653
 RMD160 32e2d79cf651073efffb3f27aa54fa8b1738e98f files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch 653
 SHA256 699f2e563f582362b0ed9d4f53a20fa930abfca1262bb0fb71e7f738e8eadcc4 files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch 653
+AUX 0.9.15/129065-fix-doubleclick-64bit.patch 431 RMD160 764e8b5522a36cc1dc5e18083f3631314d8c3364 SHA1 269c0acdcff131b9f3e2bf90e301c2d44cab0ea3 SHA256 7aec914f3e5b8de5029e01fa6d5c75276a072269735b19d85dbacb89f5f073a1 size 431
+MD5 d97cb145e49bef0dc45d56b8428d8ba7 files/0.9.15/129065-fix-doubleclick-64bit.patch 431
+RMD160 764e8b5522a36cc1dc5e18083f3631314d8c3364 files/0.9.15/129065-fix-doubleclick-64bit.patch 431
+SHA256 7aec914f3e5b8de5029e01fa6d5c75276a072269735b19d85dbacb89f5f073a1 files/0.9.15/129065-fix-doubleclick-64bit.patch 431
 AUX fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57b4d0fad653660cc6cf0a2cd808b7a34d72b95 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834 size 202
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a files/fluxbox.desktop 202
@@ -26,19 +27,24 @@ MD5 9ae40c5c7aebae1c5919adbd888710b4 files/styles-menu-user 93
 RMD160 2a6831b45ce1d655586b699d16c0547de201d187 files/styles-menu-user 93
 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 files/styles-menu-user 93
 DIST fluxbox-0.9.14.tar.bz2 671916 RMD160 17cb299115164303972988471526a57bf0eeebde SHA256 5560873a192013483b77281c7c31e0ebaa081181e9471a1b2eb6ed40f905eb6f size 671916
+DIST fluxbox-0.9.15.1.tar.bz2 685740 RMD160 aa9418de9ff700c14b21911f6de24503449e7f0f SHA256 b72bfcbe26651323d975a2469ba426da8e8e7d96b813061386f4bc5148dfb2b9 size 685740
 DIST fluxbox-0.9.15.tar.bz2 685941 RMD160 5359cc09ac960f94232aa0009077592929cb01b1 SHA256 99726df74bc21abc5f417f858dca700b3baef62c9a21d35c890bd75113ad55a6 size 685941
 EBUILD fluxbox-0.9.14-r1.ebuild 4691 RMD160 43ef60415f912e6a4b3bf0fb282c2baecb08a22c SHA1 e7231474efd754a7cd58f60e4893ec44c786bd01 SHA256 54b1f9c86f239370e44d90f7a8076545b747a2b6a7a0f5a01eeed974d75a60c1 size 4691
 MD5 ab77cbf9ad71d52ed2586c9e3c7145c7 fluxbox-0.9.14-r1.ebuild 4691
 RMD160 43ef60415f912e6a4b3bf0fb282c2baecb08a22c fluxbox-0.9.14-r1.ebuild 4691
 SHA256 54b1f9c86f239370e44d90f7a8076545b747a2b6a7a0f5a01eeed974d75a60c1 fluxbox-0.9.14-r1.ebuild 4691
+EBUILD fluxbox-0.9.15.1.ebuild 5114 RMD160 ad4006d2fa33cb703f2b114c9b64a411c8a1c0d6 SHA1 48600f6e2cb6933508b8e2d83567d1dc61f49d86 SHA256 bce66b432bfd9c48b247ddbb2b8e891a27a37da99ac7c68e45781a14a3b5f3a5 size 5114
+MD5 dc6eb7cfa68277864e59572c1bf7e2d9 fluxbox-0.9.15.1.ebuild 5114
+RMD160 ad4006d2fa33cb703f2b114c9b64a411c8a1c0d6 fluxbox-0.9.15.1.ebuild 5114
+SHA256 bce66b432bfd9c48b247ddbb2b8e891a27a37da99ac7c68e45781a14a3b5f3a5 fluxbox-0.9.15.1.ebuild 5114
 EBUILD fluxbox-0.9.15.ebuild 5049 RMD160 c216785e9eadaf8b1fa0e03ffa4c5f3cbf7d7fe5 SHA1 942422f0b7e05338468e099ed7a9411ef249d5c1 SHA256 8391fbb259f81b5c578d72d2259dcc8a570ca7614d35788a179db94fd98182ff size 5049
 MD5 0d65dd14ec1373a969f9706aa68e6281 fluxbox-0.9.15.ebuild 5049
 RMD160 c216785e9eadaf8b1fa0e03ffa4c5f3cbf7d7fe5 fluxbox-0.9.15.ebuild 5049
 SHA256 8391fbb259f81b5c578d72d2259dcc8a570ca7614d35788a179db94fd98182ff fluxbox-0.9.15.ebuild 5049
-MISC ChangeLog 34398 RMD160 9ee8cb0bae01a7f0f1b67721eb1815d0380294b0 SHA1 0809243fed32beddabaec6e7c2b65cc6af644816 SHA256 73f9f53f4ecd4477892311923720ec29e8ed441e43b364d1903c18a1dae47f3d size 34398
-MD5 13ddee43f92accd96a73a9608f0f1bef ChangeLog 34398
-RMD160 9ee8cb0bae01a7f0f1b67721eb1815d0380294b0 ChangeLog 34398
-SHA256 73f9f53f4ecd4477892311923720ec29e8ed441e43b364d1903c18a1dae47f3d ChangeLog 34398
+MISC ChangeLog 34631 RMD160 962d91e8fcf1aac1b27adf48a08148cbf854827f SHA1 4b49ab465129ba839e5a606cf8003dc3ab362f04 SHA256 69887dd42d2f835f24728a0f1430a449f15b8deffd2dca66bac5f70f37bc3c84 size 34631
+MD5 8c43f7cfc579b0bd4b75b915af964355 ChangeLog 34631
+RMD160 962d91e8fcf1aac1b27adf48a08148cbf854827f ChangeLog 34631
+SHA256 69887dd42d2f835f24728a0f1430a449f15b8deffd2dca66bac5f70f37bc3c84 ChangeLog 34631
 MISC metadata.xml 716 RMD160 479551dffdca1bf48f1c1d0ec0cf6be270f4140f SHA1 a3f0dadd1b9431d74510c432e07937a5e978210c SHA256 abfaab6f64db4c995bf80d426bc532165fac413db0ed3b0428013505ff41eca0 size 716
 MD5 9eff4fe08df1b95e788ad1fb2945da34 metadata.xml 716
 RMD160 479551dffdca1bf48f1c1d0ec0cf6be270f4140f metadata.xml 716
@@ -49,10 +55,6 @@ SHA256 5be811149e1902b109e685a85781a6f67a375a57df4cb00f7cb33e3785edf883 files/di
 MD5 5c17e536f0b994902b27c1c31cfcb75e files/digest-fluxbox-0.9.15 247
 RMD160 fbcc8d173205dd9178394834434657e7895b2d9b files/digest-fluxbox-0.9.15 247
 SHA256 2e11b8367e4bb34f6faa6c7e091ce84207fb4411824daad176282636b1fe62dd files/digest-fluxbox-0.9.15 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEUVtdW78445TWHXcRApRJAJ9Z3MD8Q3hhxMZeLdsMv5o3ndYO2ACgjoN/
-50pcwqPMfJg9d4xd4KDakko=
-=xlJR
------END PGP SIGNATURE-----
+MD5 7d40f503caa288bafab48f9ee3afabef files/digest-fluxbox-0.9.15.1 253
+RMD160 6517107f981cdef6babc9d593c64d17dee1e2264 files/digest-fluxbox-0.9.15.1 253
+SHA256 e5ca0cf2ad588a6c263c9d2f32d28ecc5e06ce603c71805213bd4a58ac34ac5c files/digest-fluxbox-0.9.15.1 253
diff --git a/x11-wm/fluxbox/files/0.9.15/129065-fix-doubleclick-64bit.patch b/x11-wm/fluxbox/files/0.9.15/129065-fix-doubleclick-64bit.patch
new file mode 100644
index 000000000000..569c4081822f
--- /dev/null
+++ b/x11-wm/fluxbox/files/0.9.15/129065-fix-doubleclick-64bit.patch
@@ -0,0 +1,11 @@
+--- trunk/src/FbWinFrame.cc	2006/04/09 13:38:13	4293
++++ trunk/src/FbWinFrame.cc	2006/04/14 14:32:16	4300
+@@ -856,7 +856,7 @@
+     if (event.button < 1 || event.button > 5)
+         return;
+ 
+-    static int last_release_time = 0;
++    static Time last_release_time = 0;
+     bool double_click = (event.time - last_release_time <= m_double_click_time);
+     last_release_time = event.time;
+     int real_button = event.button - 1;
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.15.1 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.15.1
new file mode 100644
index 000000000000..4ff624e35814
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.9.15.1
@@ -0,0 +1,3 @@
+MD5 098eb36a09338aabb63b938a5eab9ef6 fluxbox-0.9.15.1.tar.bz2 685740
+RMD160 aa9418de9ff700c14b21911f6de24503449e7f0f fluxbox-0.9.15.1.tar.bz2 685740
+SHA256 b72bfcbe26651323d975a2469ba426da8e8e7d96b813061386f4bc5148dfb2b9 fluxbox-0.9.15.1.tar.bz2 685740
diff --git a/x11-wm/fluxbox/fluxbox-0.9.15.1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.15.1.ebuild
new file mode 100644
index 000000000000..16688cdcb150
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-0.9.15.1.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.1.ebuild,v 1.1 2006/04/28 06:15:38 antarus 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"
+	epatch "${FILESDIR}/0.9.15/129065-fix-doubleclick-64bit.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
+}
+