upstream bugfix

6 files changed, 13 insertions, 59 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 861da65afc97..774d71a631e3 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.28 2002/09/11 10:30:38 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.29 2002/09/14 01:52:22 seemant Exp $
+
+*fluxbox-0.1.12 (13 Sep 2002)
+
+  13 Sep 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.12.ebuild
+  files/digest-fluxbox-0.1.12 :
+
+  Upstream version bump, which is really just identical to 0.1.11-r3.
 
 *fluxbox-0.1.11-r3 (11 Sep 2002)
 
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.11-r1 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.11-r1
deleted file mode 100644
index 9116d391f209..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.1.11-r1
+++ /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
deleted file mode 100644
index 4868ffab9bc4..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.1.11-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 41f10c899ff47f2f5eb9e34a9302fd89 fluxbox-0.1.11.tar.gz 416820
-MD5 ce9ae070ee635cb517790a665bf12251 fluxbox-0.1.11-bugfix1.patch 17484
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.12 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.12
new file mode 100644
index 000000000000..f1155a66225a
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.1.12
@@ -0,0 +1 @@
+MD5 f90b191af969b49be3dcf901c36d5e13 fluxbox-0.1.12.tar.gz 417680
diff --git a/x11-wm/fluxbox/fluxbox-0.1.11-r2.ebuild b/x11-wm/fluxbox/fluxbox-0.1.11-r2.ebuild
deleted file mode 100644
index 15f5b66fdbe7..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.1.11-r2.ebuild
+++ /dev/null
@@ -1,51 +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.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
-	http://fluxbox.sourceforge.net/download/patches/${P}-bugfix1.patch"
-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
-export WANT_AUTOMAKE_1_6=1
-export WANT_AUTOCONF_2_5=1
-
-src_unpack() {
-
-	unpack ${P}.tar.gz
-
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${PN}-vano-gentoo.patch || die
-	patch -p1 < ${DISTDIR}/${P}-bugfix1.patch || die
-}
-
-src_compile() {
-
-	commonbox_src_compile
-
-	cd data
-	make \
-		pkgdatadir=/usr/share/commonbox 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-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.1.12.ebuild
index 25b42c2457da..e32751f9e6ca 100644
--- a/x11-wm/fluxbox/fluxbox-0.1.11-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.1.12.ebuild
@@ -1,10 +1,9 @@
 # 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-r1.ebuild,v 1.2 2002/09/05 08:50:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.12.ebuild,v 1.1 2002/09/14 01:52:22 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"
@@ -22,9 +21,10 @@ 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
 }
 
 src_compile() {