Bring patch back from the dead because it is still needed

Package-Manager: portage-2.1.2.5

5 files changed, 18 insertions, 9 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index c5556b36feee..55301485a350 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.216 2007/05/14 21:23:18 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.217 2007/05/23 23:01:54 lack Exp $
+
+  23 May 2007; Jim Ramsay <lack@gentoo.org>
+  +files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch,
+  fluxbox-0.9.15.1-r2.ebuild, fluxbox-1.0_rc3.ebuild,
+  fluxbox-1.0_rc3-r1.ebuild, fluxbox-1.0_rc3-r2.ebuild:
+  Bring patch back from the dead because it is still needed
 
 *fluxbox-1.0_rc3-r2 (14 May 2007)
 
diff --git a/x11-wm/fluxbox/fluxbox-0.9.15.1-r2.ebuild b/x11-wm/fluxbox/fluxbox-0.9.15.1-r2.ebuild
index 3dfc0c90a6fd..023d46cc5858 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.15.1-r2.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.15.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-0.9.15.1-r2.ebuild,v 1.8 2007/04/19 18:48:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.15.1-r2.ebuild,v 1.9 2007/05/23 23:01:54 lack Exp $
 
 inherit eutils
 
@@ -58,7 +58,7 @@ src_unpack() {
 	# 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}/0.9.13/${PN}-0.9.13-our-styles-go-over-here.patch"
+	epatch "${FILESDIR}/0.9.15/${PN}-0.9.15-our-styles-go-over-here.patch"
 	epatch "${FILESDIR}/0.9.15/129065-fix-doubleclick-64bit.patch"
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc3-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc3-r1.ebuild
index 04635809f4a3..2dc55f8a792a 100644
--- a/x11-wm/fluxbox/fluxbox-1.0_rc3-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.0_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2007/05/07 15:22:25 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0_rc3-r1.ebuild,v 1.2 2007/05/23 23:01:54 lack Exp $
 
 inherit eutils
 
@@ -29,7 +29,8 @@ RDEPEND="|| ( ( x11-libs/libXpm
 	truetype? ( media-libs/freetype )
 	imlib? ( >=media-libs/imlib2-1.2.0 )
 	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
+DEPEND="!<=x11-misc/fluxconf-0.9.9
+		>=sys-devel/autoconf-2.52
 		nls? ( sys-devel/gettext )
 		|| ( ( x11-proto/xextproto
 				xinerama? ( x11-proto/xineramaproto )
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc3-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc3-r2.ebuild
index d527f3499ce4..47057eb124d3 100644
--- a/x11-wm/fluxbox/fluxbox-1.0_rc3-r2.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.0_rc3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2007/05/14 21:23:18 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0_rc3-r2.ebuild,v 1.2 2007/05/23 23:01:54 lack Exp $
 
 inherit eutils
 
@@ -29,7 +29,8 @@ RDEPEND="|| ( ( x11-libs/libXpm
 	truetype? ( media-libs/freetype )
 	imlib? ( >=media-libs/imlib2-1.2.0 )
 	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
+DEPEND="!<=x11-misc/fluxconf-0.9.9
+		>=sys-devel/autoconf-2.52
 		nls? ( sys-devel/gettext )
 		|| ( ( x11-proto/xextproto
 				xinerama? ( x11-proto/xineramaproto )
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc3.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc3.ebuild
index 89373a3b17cf..9fd6c666ca82 100644
--- a/x11-wm/fluxbox/fluxbox-1.0_rc3.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.9 2007/05/14 16:41:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0_rc3.ebuild,v 1.10 2007/05/23 23:01:54 lack Exp $
 
 inherit eutils
 
@@ -29,7 +29,8 @@ RDEPEND="|| ( ( x11-libs/libXpm
 	truetype? ( media-libs/freetype )
 	imlib? ( >=media-libs/imlib2-1.2.0 )
 	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
+DEPEND="!<=x11-misc/fluxconf-0.9.9
+		>=sys-devel/autoconf-2.52
 		nls? ( sys-devel/gettext )
 		|| ( ( x11-proto/xextproto
 				xinerama? ( x11-proto/xineramaproto )