upstream bugfix1 patch

6 files changed, 19 insertions, 53 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 06e8cb5327f8..583ba4e0cf41 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.25 2002/09/05 04:34:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.26 2002/09/10 09:12:47 seemant Exp $
+
+*fluxbox-0.1.11-r2 (10 Sep 2002)
+
+  10 Sep 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.11-r2.ebuild
+  files/digest-fluxbox-0.1.11-r2 :
+
+  upstream bugfix1 patch.
 
 *fluxbox-0.1.11-r1 (04 Sep 2002)
 
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.10 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.10
deleted file mode 100644
index 043a096878a0..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47b1ffec935466db56d26476a62a9d58 fluxbox-0.1.10.tar.gz 381482
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.11 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.11
deleted file mode 100644
index 9116d391f209..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 41f10c899ff47f2f5eb9e34a9302fd89 fluxbox-0.1.11.tar.gz 416820
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.11-r2 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.11-r2
new file mode 100644
index 000000000000..4868ffab9bc4
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.1.11-r2
@@ -0,0 +1,2 @@
+MD5 41f10c899ff47f2f5eb9e34a9302fd89 fluxbox-0.1.11.tar.gz 416820
+MD5 ce9ae070ee635cb517790a665bf12251 fluxbox-0.1.11-bugfix1.patch 17484
diff --git a/x11-wm/fluxbox/fluxbox-0.1.10.ebuild b/x11-wm/fluxbox/fluxbox-0.1.10.ebuild
deleted file mode 100644
index 48dd17158554..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.1.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.10.ebuild,v 1.6 2002/08/28 04:49:18 naz Exp $
-
-inherit commonbox flag-o-matic
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Window manager based on Blackbox and pwm -- has tabs."
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz"
-HOMEPAGE="http://fluxbox.sf.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc sparc64"
-
-mydoc="ChangeLog COPYING NEWS"
-myconf="--enable-xinerama"
-filter-flags -fno-exceptions
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${PN}-vano-gentoo.patch
-}
-
-src_compile() {
-
-	commonbox_src_compile
-
-	cd data
-	make init
-}
-
-
-src_install() {
-
-	commonbox_src_install
-	cd data
-	insinto /usr/share/commonbox
-	doins init
-	insinto /usr/share/commonbox/fluxbox
-	doins keys
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.1.11.ebuild b/x11-wm/fluxbox/fluxbox-0.1.11-r2.ebuild
index e5bd106ceb33..15f5b66fdbe7 100644
--- a/x11-wm/fluxbox/fluxbox-0.1.11.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.1.11-r2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.11.ebuild,v 1.1 2002/09/04 12:18:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.11-r2.ebuild,v 1.1 2002/09/10 09:12:47 seemant Exp $
 
 inherit commonbox flag-o-matic
 
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Window manager based on Blackbox and pwm -- has tabs."
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz"
+SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
+	http://fluxbox.sourceforge.net/download/patches/${P}-bugfix1.patch"
 HOMEPAGE="http://fluxbox.sf.net"
 
 LICENSE="GPL-2"
@@ -22,9 +23,11 @@ export WANT_AUTOCONF_2_5=1
 
 src_unpack() {
 
-	commonbox_src_unpack
+	unpack ${P}.tar.gz
+
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${PN}-vano-gentoo.patch
+	patch -p1 < ${FILESDIR}/${PN}-vano-gentoo.patch || die
+	patch -p1 < ${DISTDIR}/${P}-bugfix1.patch || die
 }
 
 src_compile() {
@@ -32,7 +35,8 @@ src_compile() {
 	commonbox_src_compile
 
 	cd data
-	make init
+	make \
+		pkgdatadir=/usr/share/commonbox init
 }