[gentoo-commits] gentoo-x86 commit in x11-wm/fluxbox: metadata.xml ChangeLog fluxbox-1.1.1-r2.ebuild

[Jim Ramsay (lack)]

lack        10/05/29 15:01:29

  Modified:             metadata.xml ChangeLog
  Added:                fluxbox-1.1.1-r2.ebuild
  Log:
  Fix focus-follows-mouse (Bug #290649)
  (Portage version: 2.1.8.3/cvs/Linux i686)

Revision  Changes    Path
1.10                 x11-wm/fluxbox/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/metadata.xml?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/metadata.xml?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/metadata.xml?r1=1.9&r2=1.10

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml	22 Sep 2008 13:12:30 -0000	1.9
+++ metadata.xml	29 May 2010 15:01:29 -0000	1.10
@@ -18,5 +18,7 @@
 		<flag name='disabletoolbar'>Disables the fluxbox toolbar</flag>
 		<flag name='slit'>Enables the fluxbox slit (or dock)</flag>
 		<flag name='toolbar'>Enables the fluxbox toolbar</flag>
+		<flag name='newmousefocus'>Patches the focus model to the upcoming 1.1.2
+			model, which adds a new 'StrictMouseFocus' mode</flag>
 	</use>
 </pkgmetadata>



1.275                x11-wm/fluxbox/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.275&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?rev=1.275&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/ChangeLog?r1=1.274&r2=1.275

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- ChangeLog	14 Nov 2009 16:09:34 -0000	1.274
+++ ChangeLog	29 May 2010 15:01:29 -0000	1.275
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/fluxbox
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.274 2009/11/14 16:09:34 scarabeus Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.275 2010/05/29 15:01:29 lack Exp $
+
+*fluxbox-1.1.1-r2 (29 May 2010)
+
+  29 May 2010; Jim Ramsay <lack@g.o> +fluxbox-1.1.1-r2.ebuild,
+  +files/mousefocus-1.1.1-r2.patch, +files/strictmousefocus-1.1.1.patch,
+  metadata.xml:
+  Fix focus-follows-mouse (Bug #290649)
 
   14 Nov 2009; Tomáš Chvátal <scarabeus@g.o> fluxbox-9999.ebuild:
   QA: drop Keywords from live ebuild, make ebuild properly eapi2.



1.1                  x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild?rev=1.1&content-type=text/plain

Index: fluxbox-1.1.1-r2.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild,v 1.1 2010/05/29 15:01:29 lack Exp $

EAPI="2"
inherit eutils

IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax -newmousefocus"

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="gnome" simply adds support for some gnome protocols, and
# does not depend on external libraries.  However, it does make the binary a
# fair bit bigger, so we don't want to turn it on unless the user actually wants
# it.

RDEPEND="x11-libs/libXpm
	x11-libs/libXrandr
	xinerama? ( x11-libs/libXinerama )
	x11-apps/xmessage
	x11-libs/libXft
	truetype? ( media-libs/freetype )
	imlib? ( >=media-libs/imlib2-1.2.0[X] )
	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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"

src_prepare() {
	# 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}/gentoo_style_location-1.1.x.patch"

	# Patch to handle a broken key file gracefully, #263379
	epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"

	# Patch to quiet fbsetbg on upgrade
	epatch "${FILESDIR}/fbsetbg-quiet-1.1.1.patch"

	# Patch to fix window focus bug when you have "focus-follows-mouse"
	if use newmousefocus; then
		# These change 'MouseFocus' behaviour to what will be in fluxbox-1.1.2
		# and add the new 'StrictMouseFocus' mode.
		epatch "${FILESDIR}/mousefocus-1.1.1.patch"
		epatch "${FILESDIR}/strictmousefocus-1.1.1.patch"
	else
		epatch "${FILESDIR}/mousefocus-1.1.1-r2.patch"
	fi

	# 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_configure() {
	econf \
		$(use_enable nls) \
		$(use_enable xinerama) \
		$(use_enable truetype xft) \
		$(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}
}

src_compile() {
	default

	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}" STRIP="" 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
}