Removed negative USE flags, added 'vim-syntax' USE, and fixed bugs #199437, #199439, and #201535.

Package-Manager: portage-2.1.4_rc4

6 files changed, 263 insertions, 15 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index bb2a6c7d9364..62ccecef7d2c 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,16 @@
 # 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.243 2007/12/25 16:13:37 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.244 2007/12/26 19:27:02 lack Exp $
+
+*fluxbox-1.0.0-r1 (26 Dec 2007)
+
+  26 Dec 2007; Jim Ramsay <lack@gentoo.org>
+  +files/1.0.0/generate-menu.patch, +files/fluxbox.xsession,
+  +fluxbox-1.0.0-r1.ebuild:
+  Changed 'disableslit' and 'disabletoolbar' to 'slit' and 'toolbar' using new
+  EAPI=1 USE-defaults. Added 'vim-syntax' plugin to pull in
+  app-vim/fluxbox-syntax. Fixed menu generation for bugs #199437 and #199439.
+  Adding proper xsession script, as per #201535
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing tercel from metadata.xml as per #88960.
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 3c4a7acb4450..2662befcf210 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
@@ -9,6 +6,10 @@ AUX 0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch 653 RMD160 32e2d79cf6510
 MD5 17110f6fe071a751aaa29832e92832fd files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch 653
 RMD160 32e2d79cf651073efffb3f27aa54fa8b1738e98f files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch 653
 SHA256 699f2e563f582362b0ed9d4f53a20fa930abfca1262bb0fb71e7f738e8eadcc4 files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch 653
+AUX 1.0.0/generate-menu.patch 1369 RMD160 58c1e756f7a2eb2d25d87dda9b6aaa7efb31288a SHA1 975b782c35d43a7ddbf408ba5e7a743f7872f969 SHA256 93bfb1d51eba8ad06eb7c47896c0d17bb107f9bc04309049a8acf6f522fa08ef
+MD5 4115190225f6918bd8d978de3b721fc6 files/1.0.0/generate-menu.patch 1369
+RMD160 58c1e756f7a2eb2d25d87dda9b6aaa7efb31288a files/1.0.0/generate-menu.patch 1369
+SHA256 93bfb1d51eba8ad06eb7c47896c0d17bb107f9bc04309049a8acf6f522fa08ef files/1.0.0/generate-menu.patch 1369
 AUX 1.0.0/gentoo_style_location.patch 676 RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f SHA1 83d725fd320b8f9af329176bc8941b843e4ab559 SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f
 MD5 2440cd51fb1517b9f949fbbdc50d8d19 files/1.0.0/gentoo_style_location.patch 676
 RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f files/1.0.0/gentoo_style_location.patch 676
@@ -21,6 +22,10 @@ AUX fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a files/fluxbox.desktop 202
 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834 files/fluxbox.desktop 202
+AUX fluxbox.xsession 2004 RMD160 9a5f192628d6d888734f24b9ff4f6f1b7e8f178b SHA1 ec59f4611868866b8bc6d7fc9762bbc9bca640c3 SHA256 dbff4840a2c32c8ab837e4f34cb002f810dccca107f5e04a28c22d33db2a59bd
+MD5 9e8a2916f653a8d387db1348149372f5 files/fluxbox.xsession 2004
+RMD160 9a5f192628d6d888734f24b9ff4f6f1b7e8f178b files/fluxbox.xsession 2004
+SHA256 dbff4840a2c32c8ab837e4f34cb002f810dccca107f5e04a28c22d33db2a59bd files/fluxbox.xsession 2004
 AUX styles-menu-commonbox 127 RMD160 e5668235e10ffa8fa73683d23d4483c85bf4296e SHA1 59c6aed23a105536de1b1264f94ee75008d74557 SHA256 44a56b182b0da9bf26ac41ff7e5ea8da3ddb7c5cbca0f554e3c74f15c72a3d98
 MD5 9f6f105cbf9396f450e77dbf885b0a02 files/styles-menu-commonbox 127
 RMD160 e5668235e10ffa8fa73683d23d4483c85bf4296e files/styles-menu-commonbox 127
@@ -41,6 +46,10 @@ EBUILD fluxbox-0.9.15.1-r2.ebuild 5101 RMD160 691d8e8de1005a729c88b88430f6b52715
 MD5 4df14c6939f328d192e057445f3ab068 fluxbox-0.9.15.1-r2.ebuild 5101
 RMD160 691d8e8de1005a729c88b88430f6b527153a750d fluxbox-0.9.15.1-r2.ebuild 5101
 SHA256 70de14f0efc8dcf9f2de41b30fd7a7a9fdb9333037e79c9e8599bcbbcf01af7c fluxbox-0.9.15.1-r2.ebuild 5101
+EBUILD fluxbox-1.0.0-r1.ebuild 3554 RMD160 9b2034c00a21d0b08d5e3fe0a334f455f85f25f9 SHA1 3486aee5c30c9f91fb7613a9e91a245983dc4ac6 SHA256 37532473ddeee6ed38839a606bc357cd9f615a0a6ae633da4edf13c61bba457f
+MD5 438bfb3a29c58a237ff16af669c47862 fluxbox-1.0.0-r1.ebuild 3554
+RMD160 9b2034c00a21d0b08d5e3fe0a334f455f85f25f9 fluxbox-1.0.0-r1.ebuild 3554
+SHA256 37532473ddeee6ed38839a606bc357cd9f615a0a6ae633da4edf13c61bba457f fluxbox-1.0.0-r1.ebuild 3554
 EBUILD fluxbox-1.0.0.ebuild 3479 RMD160 4f03ae5c929ec5a5bf29910860d49c13588ee204 SHA1 7bfeb545af7967ed61a960569184fcb159f1224b SHA256 02181696623588a70588203a6e8c876d3f1eb84d1a8544b88bc3dea9c09ac580
 MD5 3c1270af4ae771790d0cb2f18b984e5a fluxbox-1.0.0.ebuild 3479
 RMD160 4f03ae5c929ec5a5bf29910860d49c13588ee204 fluxbox-1.0.0.ebuild 3479
@@ -49,10 +58,10 @@ EBUILD fluxbox-1.0_rc3_p4983.ebuild 4076 RMD160 f077de39e00780dcc7ccb0c2db263aeb
 MD5 8cf6d392ffcf5cd57c0459bc3bf251d0 fluxbox-1.0_rc3_p4983.ebuild 4076
 RMD160 f077de39e00780dcc7ccb0c2db263aebe59a6079 fluxbox-1.0_rc3_p4983.ebuild 4076
 SHA256 30042d57f5f5af21f60fb87732cbbc533d16272a573af89446ee9b71bc8ce14c fluxbox-1.0_rc3_p4983.ebuild 4076
-MISC ChangeLog 45162 RMD160 ec7a3443ceeedacb2733378ed2b90f443d39e256 SHA1 3184794dd6add01ec2bb8f72b96a26fd49889100 SHA256 db87432cadb1ab2b1712f21797eb8cf97fe454b1060fb490b6fe9eeb182f4433
-MD5 d055850954ca30a61c0f8670166b41e4 ChangeLog 45162
-RMD160 ec7a3443ceeedacb2733378ed2b90f443d39e256 ChangeLog 45162
-SHA256 db87432cadb1ab2b1712f21797eb8cf97fe454b1060fb490b6fe9eeb182f4433 ChangeLog 45162
+MISC ChangeLog 45592 RMD160 f3c8bd8796ec275ec1c29453de30ba059f43bf10 SHA1 57eddd4b4436d6956f7c233fd410dc31f3418d43 SHA256 42fc089d4940e062cf932a23fa6fee9f144924c227ff6e10542d49e81601ffa8
+MD5 0889d6ea4af7279a32413df661719be1 ChangeLog 45592
+RMD160 f3c8bd8796ec275ec1c29453de30ba059f43bf10 ChangeLog 45592
+SHA256 42fc089d4940e062cf932a23fa6fee9f144924c227ff6e10542d49e81601ffa8 ChangeLog 45592
 MISC metadata.xml 618 RMD160 d06c3246e645704d853d41cde2a107862c01bc66 SHA1 7be20ded4b048a03e245f8e57f5729a4820f8919 SHA256 7d683754723ec39ae547fc1ddfb6d538e6dd3bec053d668b8a2ded890612695e
 MD5 82f81c9a33a16467c021014cf7511273 metadata.xml 618
 RMD160 d06c3246e645704d853d41cde2a107862c01bc66 metadata.xml 618
@@ -63,13 +72,9 @@ SHA256 e5ca0cf2ad588a6c263c9d2f32d28ecc5e06ce603c71805213bd4a58ac34ac5c files/di
 MD5 3a99f696be3311117d9958369fb6e80f files/digest-fluxbox-1.0.0 244
 RMD160 6cdebf42f5f096a58246c074f4b28debf053f000 files/digest-fluxbox-1.0.0 244
 SHA256 5d61d717895c9d2413e9999992553461d3df1da7d215a3b504a8974b4af9a31b files/digest-fluxbox-1.0.0 244
+MD5 3a99f696be3311117d9958369fb6e80f files/digest-fluxbox-1.0.0-r1 244
+RMD160 6cdebf42f5f096a58246c074f4b28debf053f000 files/digest-fluxbox-1.0.0-r1 244
+SHA256 5d61d717895c9d2413e9999992553461d3df1da7d215a3b504a8974b4af9a31b files/digest-fluxbox-1.0.0-r1 244
 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.7 (GNU/Linux)
-
-iD8DBQFHcSw2yuNVb5qfaOYRAtJOAKC5eHaTGMLfqsJ7wCF60d8hB8t6wQCfSG5U
-+0O3jyiPCyiWUNX47XNP8Ww=
-=hu2Q
------END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/files/1.0.0/generate-menu.patch b/x11-wm/fluxbox/files/1.0.0/generate-menu.patch
new file mode 100644
index 000000000000..1656fe23f175
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.0.0/generate-menu.patch
@@ -0,0 +1,22 @@
+--- util/fluxbox-generate_menu.in.orig	2007-12-26 13:46:13.000000000 -0500
++++ util/fluxbox-generate_menu.in	2007-12-26 13:54:59.000000000 -0500
+@@ -1685,6 +1685,7 @@
+        append_submenu "${GRAPHICMENU}"
+                normal_find gimp gimp2 gimp-2.2 inkscape sodipodi xv gqview showimg xpaint kpaint kiconedit \
+                    ee xzgv xscreensaver-demo xlock gphoto tuxpaint krita skencil
++					find_it display          append "[exec] (ImageMagick Display) {display}"	
+                find_it xnview           append "[exec] (xnview browser) {xnview -browser}"
+                find_it blender          append "[exec] (blender) {blender -w}"
+                find_it gears            append "[exec] (Mesa gears) {gears}"
+@@ -1718,9 +1719,10 @@
+     find_it gcalc           append "[exec] (gcalc) {gcalc}" || \
+         find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}"
+     find_it ical            append "[exec] (Calendar)   {ical}"
++	 find_it sunbird         append "[exec] (Sunbird)    {sunbird}"
+ 
+     # older <=1.1.3 apparently have stuff like swriter, not sowriter
+-    for ext in s so oo xoo; do
++    for ext in oo xoo; do
+         find_it ${ext}ffice2 && (
+             find_it ${ext}ffice2        append "[exec] (Open Office 2)  {${ext}ffice2}"
+             find_it ${ext}base2         append "[exec] (OO Base 2)      {${ext}base2}"
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-1.0.0-r1 b/x11-wm/fluxbox/files/digest-fluxbox-1.0.0-r1
new file mode 100644
index 000000000000..16570da510f1
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-1.0.0-r1
@@ -0,0 +1,3 @@
+MD5 990e276ead0d04421dce4080f485caca fluxbox-1.0.0.tar.bz2 767586
+RMD160 320b11a1cf96a757da079886cd6496b9d84ab202 fluxbox-1.0.0.tar.bz2 767586
+SHA256 3c27672fdd4709d7f5c7968b4197ef704fce82766f51a5bebf411953516794c5 fluxbox-1.0.0.tar.bz2 767586
diff --git a/x11-wm/fluxbox/files/fluxbox.xsession b/x11-wm/fluxbox/files/fluxbox.xsession
new file mode 100644
index 000000000000..0fb9dcd6c77c
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox.xsession
@@ -0,0 +1,90 @@
+#!/bin/sh
+# Fluxbox Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.fluxbox-errors" "${TMPDIR-/tmp}/fluxbox-$USER" "/tmp/fluxbox-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+	    . "$i"
+        fi
+    done
+fi
+
+exec /usr/bin/startfluxbox
diff --git a/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..af7a6cde07e2
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild
@@ -0,0 +1,118 @@
+# 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.0-r1.ebuild,v 1.1 2007/12/26 19:27:02 lack Exp $
+
+EAPI=1
+inherit eutils
+
+IUSE="nls xinerama truetype kde gnome 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"
+
+# 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 )
+	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
+	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 && ! 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
+}
+
+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}/${PV}/gentoo_style_location.patch"
+
+	# A couple menu generation fixes, #199437 and #199439
+	epatch "${FILESDIR}/${PV}/generate-menu.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_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable truetype xft) \
+		$(use_enable kde) \
+		$(use_enable gnome) \
+		$(use_enable imlib imlib2) \
+		$(use_enable slit ) \
+		$(use_enable 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
+	emake DESTDIR="${D}" install || die "install failed"
+	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" || die
+	doins "${FILESDIR}/styles-menu-commonbox" || die
+	doins "${FILESDIR}/styles-menu-user" || die
+}