Adding SVN snapshot 5059, which includes more bugfixes

Package-Manager: portage-2.1.3.7

5 files changed, 183 insertions, 15 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index a7957b5c8d5a..08415825c588 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.226 2007/07/22 04:33:42 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.227 2007/09/05 17:46:39 lack Exp $
+
+*fluxbox-1.0_rc3_p5059 (05 Sep 2007)
+
+  05 Sep 2007; Jim Ramsay <lack@gentoo.org>
+  +files/1.0_rc3/gentoo_style_location.patch, +fluxbox-1.0_rc3_p5059.ebuild:
+  Adding SVN snapshot 5059, which includes more bugfixes
 
   22 Jul 2007; David Shakaryan <omp@gentoo.org> fluxbox-0.9.15.1-r2.ebuild,
   fluxbox-1.0_rc3.ebuild, fluxbox-1.0_rc3-r1.ebuild,
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 31e9a94fa8e1..8614959e7e4b 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.9.15/129065-fix-doubleclick-64bit.patch 431 RMD160 764e8b5522a36cc1dc5e18083f3631314d8c3364 SHA1 269c0acdcff131b9f3e2bf90e301c2d44cab0ea3 SHA256 7aec914f3e5b8de5029e01fa6d5c75276a072269735b19d85dbacb89f5f073a1
 MD5 d97cb145e49bef0dc45d56b8428d8ba7 files/0.9.15/129065-fix-doubleclick-64bit.patch 431
 RMD160 764e8b5522a36cc1dc5e18083f3631314d8c3364 files/0.9.15/129065-fix-doubleclick-64bit.patch 431
@@ -25,6 +22,10 @@ AUX 1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch 1367 RMD160 71105d042a
 MD5 540deca02f9a4b05e5e0c952d2fac426 files/1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch 1367
 RMD160 71105d042a915375a0a9685569188d7c63cac22a files/1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch 1367
 SHA256 f8cbae58370d6173f018a5e87f3e86e2d45b06796f61bc6ba4ef3420d05250dd files/1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch 1367
+AUX 1.0_rc3/gentoo_style_location.patch 676 RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f SHA1 83d725fd320b8f9af329176bc8941b843e4ab559 SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f
+MD5 2440cd51fb1517b9f949fbbdc50d8d19 files/1.0_rc3/gentoo_style_location.patch 676
+RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f files/1.0_rc3/gentoo_style_location.patch 676
+SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f files/1.0_rc3/gentoo_style_location.patch 676
 AUX 1.0_rc3/startfluxbox_doesnt.patch 273 RMD160 2b5efe9d2c854ae5db8aece1866ca5f53ee0da20 SHA1 f3de0b54fdf7556110677dedb86c87be567cc3f8 SHA256 cde4b152bbcd69157a3dd4ae50cceb07abec750d47c2515ff6ef5f1ffbeb3fe3
 MD5 58cdb1948e1f5802cfbe0f33cdf1e7ed files/1.0_rc3/startfluxbox_doesnt.patch 273
 RMD160 2b5efe9d2c854ae5db8aece1866ca5f53ee0da20 files/1.0_rc3/startfluxbox_doesnt.patch 273
@@ -67,6 +68,7 @@ RMD160 2a6831b45ce1d655586b699d16c0547de201d187 files/styles-menu-user 93
 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 files/styles-menu-user 93
 DIST fluxbox-0.9.15.1.tar.bz2 685740 RMD160 aa9418de9ff700c14b21911f6de24503449e7f0f SHA1 94652432037203f1619ba8ed657339fb85b3c894 SHA256 b72bfcbe26651323d975a2469ba426da8e8e7d96b813061386f4bc5148dfb2b9
 DIST fluxbox-1.0_rc3_p4983.patch.gz 115293 RMD160 425c937fdd0b25503b50a3c490725aee52b31d29 SHA1 d1782d1d3a88c3b432cad7a68e051780e1d701d3 SHA256 051ce8d5d37f2ab22ac25db71a0a557244adc5b5a67e207dfb6204ffde8788fd
+DIST fluxbox-1.0_rc3_p5059.patch.gz 323324 RMD160 acf3ff859e8cdde6c93313069e775854e0532615 SHA1 6b1d64a4d882d501a83c8f88c6e9ce9870dff005 SHA256 c5c8af2d3cdadebe69ca47d79da660b40ac66fb0e36544fd2184a0b801949803
 DIST fluxbox-1.0rc3-svn-4937.tar.bz2 864552 RMD160 1559db3cae589b1bc576c0a5601c9fe5a008a90c SHA1 dff90bdf7a1a03ec52f45cd7084a5756f6a23517 SHA256 5b3cc757ec4f5638b2beab29068482f3abb57be0e077acdbc9be1ad720ef25d7
 DIST fluxbox-1.0rc3.tar.bz2 780622 RMD160 5086545ea2c2b0dd71f17d314838d04f197a1294 SHA1 4524960e3e9702b61e29c5e1dfae8c050abaaf7f SHA256 cf1e2aa77716e42b2457b19989c2b2d2fc5f7d900cc16a3621a2e42372f474b6
 EBUILD fluxbox-0.9.15.1-r2.ebuild 5101 RMD160 691d8e8de1005a729c88b88430f6b527153a750d SHA1 b9dc8faebcd3e6faed83349fbc5bf2e62f935c7e SHA256 70de14f0efc8dcf9f2de41b30fd7a7a9fdb9333037e79c9e8599bcbbcf01af7c
@@ -101,10 +103,14 @@ EBUILD fluxbox-1.0_rc3_p4983.ebuild 4076 RMD160 884adab54e418f02ed65e91eccfb8701
 MD5 7c144bdb4ea4e45bbe7c6456eacb1b7b fluxbox-1.0_rc3_p4983.ebuild 4076
 RMD160 884adab54e418f02ed65e91eccfb87010441bbc1 fluxbox-1.0_rc3_p4983.ebuild 4076
 SHA256 fdbdd901a117f128306826dd94dff2bf51fc50d70cdc9c99fbfafa712f0ef71f fluxbox-1.0_rc3_p4983.ebuild 4076
-MISC ChangeLog 42302 RMD160 089c74ebeb2d020db7860c5ad0c4b928f3dab33c SHA1 aaac5442d28075ce20f9640b268b7c774e2eeae0 SHA256 c3ede38fc597c554b10d23f0fbc42761db3dfe2258fc8e5a04910634e2cb90f9
-MD5 5e3661824bb3e4abff8865e6b5339432 ChangeLog 42302
-RMD160 089c74ebeb2d020db7860c5ad0c4b928f3dab33c ChangeLog 42302
-SHA256 c3ede38fc597c554b10d23f0fbc42761db3dfe2258fc8e5a04910634e2cb90f9 ChangeLog 42302
+EBUILD fluxbox-1.0_rc3_p5059.ebuild 4080 RMD160 3af4b320937d527f2fe820aebb9c1cd634b7313e SHA1 61c07454e488a32d7651dd5c70f7095bd7e0b372 SHA256 d3ab9bfdda005b8ac00f6728372f87547c0383c70d319310596fb99ac5bff84c
+MD5 9f6885bfbbea50f578b8bfe5bf180d98 fluxbox-1.0_rc3_p5059.ebuild 4080
+RMD160 3af4b320937d527f2fe820aebb9c1cd634b7313e fluxbox-1.0_rc3_p5059.ebuild 4080
+SHA256 d3ab9bfdda005b8ac00f6728372f87547c0383c70d319310596fb99ac5bff84c fluxbox-1.0_rc3_p5059.ebuild 4080
+MISC ChangeLog 42520 RMD160 49da50fa7737a96056bb0f9b1c28454cb1c2bcbe SHA1 810e1b2d6ce8ce5485939fda2893079e7ec24817 SHA256 7e5aad3c92253252dfebef534f4a73d8ff6d954987dbe805eb065ff366e3f549
+MD5 64f3d6db6d094cbd12ba3d1e350fb454 ChangeLog 42520
+RMD160 49da50fa7737a96056bb0f9b1c28454cb1c2bcbe ChangeLog 42520
+SHA256 7e5aad3c92253252dfebef534f4a73d8ff6d954987dbe805eb065ff366e3f549 ChangeLog 42520
 MISC metadata.xml 712 RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 SHA1 9f493761c477ad9b3f532638a1351489442d4f54 SHA256 415fa5c634f5ee4aa0a77dab674282588c0befbb209ce31c0eb4375e4ec36b65
 MD5 2c8f22e229558b963d967e6ca024506e metadata.xml 712
 RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 metadata.xml 712
@@ -133,10 +139,6 @@ SHA256 ff56c7c3862da60f8cb857e521792f3ea708fbb8551d724d56b8a12cc4c031bf files/di
 MD5 9d783a1fd8f4c0dc6c0584ae93f61e27 files/digest-fluxbox-1.0_rc3_p4983 518
 RMD160 66957ca6a555227dde85e936915ce4547eb969db files/digest-fluxbox-1.0_rc3_p4983 518
 SHA256 f2c2246121242476d9d9f40597aa820b4e70c1d4bc3dd5b6839b92a92fa5718e files/digest-fluxbox-1.0_rc3_p4983 518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGot4qvSApE0uP4UsRAoxMAJ9UuFGCoWX24cnECwUWgcKYMyPV3gCbBpd/
-o8gPgyaFeIipRvYjhVaO5gA=
-=n+kx
------END PGP SIGNATURE-----
+MD5 fc624e46d85f0efbbe23862b6f10da40 files/digest-fluxbox-1.0_rc3_p5059 518
+RMD160 df4a7fd61c2f84dbe979b733649fbc9b9635112b files/digest-fluxbox-1.0_rc3_p5059 518
+SHA256 ccb128d40b3c11eb28997df646b1049e8e20c0fe7ee1ad263183c7292e6993b4 files/digest-fluxbox-1.0_rc3_p5059 518
diff --git a/x11-wm/fluxbox/files/1.0_rc3/gentoo_style_location.patch b/x11-wm/fluxbox/files/1.0_rc3/gentoo_style_location.patch
new file mode 100644
index 000000000000..3bf59802ab1f
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.0_rc3/gentoo_style_location.patch
@@ -0,0 +1,17 @@
+--- util/fluxbox-generate_menu.in.orig	2007-07-13 13:47:11.000000000 -0600
++++ util/fluxbox-generate_menu.in	2007-07-13 13:51:03.000000000 -0600
+@@ -1803,12 +1803,8 @@
+ append_submenu "${FBSETTINGSMENU}"
+     append "[config] (${CONFIGUREMENU})"
+ 
+-    append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
+-        append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
+-    append_menu_end
+-
+-    append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
+-        append "[stylesdir] (~/.@pkgprefix@fluxbox@pkgsuffix@/styles)"
++    append_submenu "Styles"
++        append "[include] (/usr/share/fluxbox/menu.d/styles/)"
+     append_menu_end
+ 
+     # Backgroundmenu
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3_p5059 b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3_p5059
new file mode 100644
index 000000000000..70fea30b5a66
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3_p5059
@@ -0,0 +1,6 @@
+MD5 0e00c0c400b7a4ae628d32ae6a8f24a2 fluxbox-1.0_rc3_p5059.patch.gz 323324
+RMD160 acf3ff859e8cdde6c93313069e775854e0532615 fluxbox-1.0_rc3_p5059.patch.gz 323324
+SHA256 c5c8af2d3cdadebe69ca47d79da660b40ac66fb0e36544fd2184a0b801949803 fluxbox-1.0_rc3_p5059.patch.gz 323324
+MD5 8ed52d10d7de72efab0948eaaa4a6a50 fluxbox-1.0rc3.tar.bz2 780622
+RMD160 5086545ea2c2b0dd71f17d314838d04f197a1294 fluxbox-1.0rc3.tar.bz2 780622
+SHA256 cf1e2aa77716e42b2457b19989c2b2d2fc5f7d900cc16a3621a2e42372f474b6 fluxbox-1.0rc3.tar.bz2 780622
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc3_p5059.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc3_p5059.ebuild
new file mode 100644
index 000000000000..146e0aa8e274
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.0_rc3_p5059.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0_rc3_p5059.ebuild,v 1.1 2007/09/05 17:46:39 lack Exp $
+
+inherit eutils autotools versionator
+
+IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+MY_P="fluxbox-1.0rc3"
+MY_PBASE=$(get_version_component_range 1-3)
+MY_SVN=$(get_version_component_range 4)
+
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/fluxbox/${MY_P}.tar.bz2
+	mirror://gentoo/${P}.patch.gz"
+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 )
+	x11-apps/xmessage
+	virtual/xft
+	truetype? ( media-libs/freetype )
+	imlib? ( >=media-libs/imlib2-1.2.0 )
+	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
+DEPEND="!<=x11-misc/fluxconf-0.9.9
+	>=sys-devel/autoconf-2.52
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+	${RDEPEND}"
+PROVIDE="virtual/blackbox"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+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}"
+
+	epatch "${WORKDIR}/${P}.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}/${MY_PBASE}/gentoo_style_location.patch"
+
+	# Add in the Gentoo -r number to fluxbox -version output.
+	if [[ "${PR}" == "r0" ]] ; then
+		suffix="${MY_SVN}-gentoo"
+	else
+		suffix="${MY_SVN}-gentoo-${PR}"
+	fi
+	sed -i \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
+		version.h.in || die "version sed failed"
+
+	# 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
+
+	eautoreconf
+
+	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 ) \
+		$(use_enable !disabletoolbar toolbar ) \
+		--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
+}