new commonbox class to correct openbox errors, version bump on fluxbox, and version bumpo on commonbox-styles

5 files changed, 22 insertions, 59 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 16622385765f..c04ed6043865 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.7 2002/08/17 05:29:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.8 2002/09/04 12:18:42 seemant Exp $
+
+*openbox-2.0.0 (04 Sep 2002)
+
+  04 Sep 2002; Seemant Kulleen <seemant@gentoo.org> openbox-2.0.0-r1.ebuild
+  files/digest-openbox-2.0.0-r1 :
+
+  epist and xftlsfonts were not being installed.  This corrects that.
+  Thanks to xOr and gentoo users reporting to him about him (hint:
+  bugs.gentoo.org people!).
 
 *openbox-2.0.0 (16 Aug 2002)
 
diff --git a/x11-wm/openbox/files/digest-openbox-1.2.5_beta20020714-r1 b/x11-wm/openbox/files/digest-openbox-1.2.5_beta20020714-r1
deleted file mode 100644
index ada795a5a6b0..000000000000
--- a/x11-wm/openbox/files/digest-openbox-1.2.5_beta20020714-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbb75618367de9d6808546932491d064 openbox-1.2.5_beta20020714.tar.gz 253492
diff --git a/x11-wm/openbox/files/digest-openbox-2.0.0 b/x11-wm/openbox/files/digest-openbox-2.0.0-r1
index 58aeeaa5b884..58aeeaa5b884 100644
--- a/x11-wm/openbox/files/digest-openbox-2.0.0
+++ b/x11-wm/openbox/files/digest-openbox-2.0.0-r1
diff --git a/x11-wm/openbox/openbox-1.2.5_beta20020714-r1.ebuild b/x11-wm/openbox/openbox-2.0.0-r1.ebuild
index 829da1ce9d1b..463f79c0d464 100644
--- a/x11-wm/openbox/openbox-1.2.5_beta20020714-r1.ebuild
+++ b/x11-wm/openbox/openbox-2.0.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-1.2.5_beta20020714-r1.ebuild,v 1.2 2002/08/14 15:45:39 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.0.0-r1.ebuild,v 1.1 2002/09/04 12:18:43 seemant Exp $
 
 inherit commonbox
 
-S=${WORKDIR}/${PN}-14072002
+S=${WORKDIR}/${P}
 DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="ftp://sunsite.dk/projects/openbox/${P}.tar.gz"
 HOMEPAGE="http://openbox.sunsite.dk"
 
 SLOT="2"
@@ -14,11 +14,18 @@ LICENSE="BSD"
 KEYWORDS="x86 sparc sparc64"
 
 MYBIN="${PN}-dev"
-mydoc="CHANGE* TODO LICENSE BUGS CodingStyle data/README*"
-myconf="--program-suffix=-dev --enable-xft"
+mydoc="CHANGE* TODO LICENSE data/README*"
+myconf="--enable-xinerama"
 
 src_compile() {
 
 	./bootstrap
+
+	BOOTSTRAP="1"
 	commonbox_src_compile
 }
+
+src_install() {
+	
+	commonbox_src_install
+}
diff --git a/x11-wm/openbox/openbox-2.0.0.ebuild b/x11-wm/openbox/openbox-2.0.0.ebuild
deleted file mode 100644
index 2ab9839a39ac..000000000000
--- a/x11-wm/openbox/openbox-2.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.0.0.ebuild,v 1.2 2002/09/03 10:48:03 seemant Exp $
-
-inherit commonbox
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="ftp://sunsite.dk/projects/openbox/${P}.tar.gz"
-HOMEPAGE="http://openbox.sunsite.dk"
-
-SLOT="2"
-LICENSE="BSD"
-KEYWORDS="x86 sparc sparc64"
-
-MYBIN="${PN}"
-mydoc="CHANGE* TODO LICENSE data/README*"
-myconf="--enable-xinerama"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	cp Makefile.am Makefile.am.orig
-	sed 's/data //' Makefile.am.orig > Makefile.am
-
-	cd ${S}/util
-	cp Makefile.am Makefile.am.orig
-	sed -e 's/bsetbg//' \
-		-e 's/bsetroot//' \
-		Makefile.am.orig > Makefile.am
-}
-
-
-
-src_compile() {
-
-	${S}/bootstrap
-
-	commonise=""
-	commonbox_src_compile
-}
-
-src_install() {
-
-	commonbox_src_install
-	mv ${D}/usr/bin/openbox ${D}/usr/bin/openbox-dev
-	mv ${D}/usr/share/man/man1/openbox.1.gz \
-		{D}/usr/share/man/man1/openbox-dev.1.gz
-
-}