Fluxbox-1.3.1 is released. Plus cleanup of a prefix patch for osx (Bug #355177)

(Portage version: 2.1.9.34/cvs/Linux i686)

8 files changed, 133 insertions, 30 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 35dfdf00d623..fa6acce7e567 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.285 2011/02/22 13:31:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.286 2011/02/28 00:32:30 lack Exp $
+
+*fluxbox-1.3.1 (28 Feb 2011)
+
+  28 Feb 2011; Jim Ramsay <lack@gentoo.org> fluxbox-1.1.1-r1.ebuild,
+  fluxbox-1.1.1-r2.ebuild, fluxbox-1.1.1-r3.ebuild,
+  -files/fluxbox-1.1.1-osx-has-otool.patch, fluxbox-1.3.0.ebuild,
+  -files/fluxbox-1.3.0-osx-has-otool.patch, +fluxbox-1.3.1.ebuild,
+  +files/osx-has-otool.patch:
+  Fluxbox-1.3.1 is released. Plus cleanup of a prefix patch for osx (Bug
+  #355177)
 
   22 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> fluxbox-1.3.0.ebuild:
   Remove needless ||die statements with eapi4.
diff --git a/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch b/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch
deleted file mode 100644
index 637d2a824669..000000000000
--- a/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- util/fbsetbg
-+++ util/fbsetbg
-@@ -356,7 +356,10 @@
-             if [ ! "$wpsetter" = Esetroot ]; then
-                 WPSETTER=$wpsetter
-                 break
--            elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
-+            elif ( [[ `type -t otool` == file ]] \
-+                && otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null ) \
-+              || ( [[ `type -t ldd` == file ]] \
-+                && ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null ); then
-                 WPSETTER=$wpsetter
-                 break
-             else
diff --git a/x11-wm/fluxbox/files/fluxbox-1.1.1-osx-has-otool.patch b/x11-wm/fluxbox/files/osx-has-otool.patch
index 637d2a824669..7671dd83647c 100644
--- a/x11-wm/fluxbox/files/fluxbox-1.1.1-osx-has-otool.patch
+++ b/x11-wm/fluxbox/files/osx-has-otool.patch
@@ -1,14 +1,12 @@
 --- util/fbsetbg
 +++ util/fbsetbg
-@@ -356,7 +356,10 @@
+@@ -356,7 +356,8 @@
              if [ ! "$wpsetter" = Esetroot ]; then
                  WPSETTER=$wpsetter
                  break
 -            elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
-+            elif ( [[ `type -t otool` == file ]] \
-+                && otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null ) \
-+              || ( [[ `type -t ldd` == file ]] \
-+                && ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null ); then
++            elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null || \
++                otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
                  WPSETTER=$wpsetter
                  break
              else
diff --git a/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild
index 401a16369afc..533f646dcda9 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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-r1.ebuild,v 1.8 2010/08/16 19:43:13 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r1.ebuild,v 1.9 2011/02/28 00:32:30 lack Exp $
 
 EAPI="3"
 inherit eutils prefix
@@ -45,7 +45,7 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
 	eprefixify util/fluxbox-generate_menu.in
 
-	epatch "${FILESDIR}"/${P}-osx-has-otool.patch
+	epatch "${FILESDIR}"/osx-has-otool.patch
 
 	# Patch to handle a broken key file gracefully, #263379
 	epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"
diff --git a/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild
index ae0677aa66b1..7fd822f16708 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2 2010/08/16 19:43:13 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r2.ebuild,v 1.3 2011/02/28 00:32:30 lack Exp $
 
 EAPI="3"
 inherit eutils prefix
@@ -45,7 +45,7 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
 	eprefixify util/fluxbox-generate_menu.in
 
-	epatch "${FILESDIR}"/${P}-osx-has-otool.patch
+	epatch "${FILESDIR}"/osx-has-otool.patch
 
 	# Patch to handle a broken key file gracefully, #263379
 	epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"
diff --git a/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild
index 9610f1691da0..a8e8665f0239 100644
--- a/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r3.ebuild,v 1.6 2011/02/20 23:50:34 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1-r3.ebuild,v 1.7 2011/02/28 00:32:30 lack Exp $
 
 EAPI="3"
 inherit eutils prefix
@@ -45,7 +45,7 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
 	eprefixify util/fluxbox-generate_menu.in
 
-	epatch "${FILESDIR}"/${P}-osx-has-otool.patch
+	epatch "${FILESDIR}"/osx-has-otool.patch
 
 	# Patch to handle a broken key file gracefully, #263379
 	epatch "${FILESDIR}/macrocmd-crash-1.1.1.patch"
diff --git a/x11-wm/fluxbox/fluxbox-1.3.0.ebuild b/x11-wm/fluxbox/fluxbox-1.3.0.ebuild
index 00e59f0e05cf..4d81d27db391 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.0.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.0.ebuild,v 1.2 2011/02/22 13:31:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.0.ebuild,v 1.3 2011/02/28 00:32:30 lack Exp $
 
 EAPI=4
 inherit eutils prefix
@@ -46,7 +46,7 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
 	eprefixify util/fluxbox-generate_menu.in
 
-	epatch "${FILESDIR}"/${P}-osx-has-otool.patch
+	epatch "${FILESDIR}"/osx-has-otool.patch
 
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
diff --git a/x11-wm/fluxbox/fluxbox-1.3.1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.1.ebuild
new file mode 100644
index 000000000000..e5be2bab322d
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.1.ebuild,v 1.1 2011/02/28 00:32:30 lack Exp $
+
+EAPI=4
+inherit eutils prefix
+
+IUSE="nls xinerama bidi +truetype 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="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 )
+	bidi? ( dev-libs/fribidi )
+	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 ~x86-interix ~amd64-linux ~x86-linux"
+
+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"
+	eprefixify util/fluxbox-generate_menu.in
+
+	epatch "${FILESDIR}"/osx-has-otool.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_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable truetype xft) \
+		$(use_enable gnome) \
+		$(use_enable imlib imlib2) \
+		$(use_enable bidi fribidi ) \
+		$(use_enable slit ) \
+		$(use_enable toolbar ) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/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
+	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"
+	doins "${FILESDIR}/styles-menu-commonbox"
+	doins "${FILESDIR}/styles-menu-user"
+}