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

(Portage version: 2.1.4_rc4)

5 files changed, 244 insertions, 1 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/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
+}