version bump

5 files changed, 62 insertions, 104 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 255f972fc02e..7f95b28d176a 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,61 +1,68 @@
 # 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.17 2002/07/11 01:32:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.18 2002/07/14 23:03:47 seemant Exp $
 
-*fluxbox-0.19-r5 (10 Jul 2002)
+*fluxbox-0.1.10 (14 Jul 2002)
 
-  10 Jul 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.19-r5.ebuild
-  files/fluxbox-0.19-gentoo.diff files/digest-fluxbox-0.19-r5 :
+  14 Jul 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.10.ebuild
+  files/digest-fluxbox-0.1.10 :
+
+  Version bump, and now uses the commonbox eclass.
+
+*fluxbox-0.1.9-r5 (10 Jul 2002)
+
+  10 Jul 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.9-r5.ebuild
+  files/fluxbox-0.1.9-gentoo.diff files/digest-fluxbox-0.1.9-r5 :
 
   Added transient window patch to avoid xine hardlocking things up.  Patch
   from some fluxbox developer through: matt@oddprocess.org (Matthew
   Daubenspeck) in bug #4837
 
-*fluxbox-0.19-r4 (7 Jul 2002)
+*fluxbox-0.1.9-r4 (7 Jul 2002)
   
   7 Jul 2002; Daniel Robbins <drobbins@gentoo.org> : xinerama (multi-monitor
   support) is now enabled by default.  This closes bug #4514.
 
-*fluxbox-0.19-r3 (1 Jul 2002)
+*fluxbox-0.1.9-r3 (1 Jul 2002)
   
-  1 Jul 2002; Owen Stampflee <owen@gentoo.org> fluxbox-0.19-r3.ebuild
+  1 Jul 2002; Owen Stampflee <owen@gentoo.org> fluxbox-0.1.9-r3.ebuild
   Fixed a slight syntax error in the -r2 ebuild.
 
-*fluxbox-0.19-r2 (1 Jul 2002)
+*fluxbox-0.1.9-r2 (1 Jul 2002)
 
-  1 Jul 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.19-r2.ebuild
-  files/digest-fluxbox-0.19-r2 :
+  1 Jul 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.9-r2.ebuild
+  files/digest-fluxbox-0.1.9-r2 :
 
   Added Oly's antialiasing patch, as suggested in bug #4376 by:
   depairet@gmx.de (dominik) who also submitted a patched ebuild for it.
 
-*fluxbox-0.19-r1 (19 Jun 2002)
+*fluxbox-0.1.9-r1 (1.9 Jun 2002)
 
-  19 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> fluxbox-0.19-r1.ebuild
+  19 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> fluxbox-0.1.9-r1.ebuild
   
   Upstream bugfix patch (#2) applied. Also closes (#3864).
   
-*fluxbox-0.19 (24 May 2002)
+*fluxbox-0.1.9 (24 May 2002)
 
-  24 May 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.19.ebuild
-  files/digest-fluxbox-0.19 :
+  24 May 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.9.ebuild
+  files/digest-fluxbox-0.1.9 :
 
   Version bump.
 
-*fluxbox-0.18-r2 (14 May 2002)
+*fluxbox-0.1.8-r2 (14 May 2002)
 
   14 May 2002; Grant Goodyear <g2boojum@gentoo.org> :
 
   Upstream bugfix patch (#2) applied.  Old 0.1.8 versions removed.
 
-*fluxbox-0.18-r1 (29 Apr 2002)
+*fluxbox-0.1.8-r1 (29 Apr 2002)
 
   29 Apr 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.8-r1.ebuild.
-  files/fluxbox-0.18-bugfix1.patch, files/diges-fluxbox-0.1.8-r1 :
+  files/fluxbox-0.1.8-bugfix1.patch, files/diges-fluxbox-0.1.8-r1 :
 
   Upstream bugfix patch applied.
 
-*fluxbox-0.18 (19 Apr 2002)
+*fluxbox-0.1.8 (1.9 Apr 2002)
 
   19 Apr 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.8.ebuild,
   files/digest-fluxbox-0.1.8 :
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.10 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.10
new file mode 100644
index 000000000000..16a0161adb8e
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.1.10
@@ -0,0 +1,2 @@
+MD5 47b1ffec935466db56d26476a62a9d58 fluxbox-0.1.10.tar.gz 381482
+MD5 3c1043fbcc87a8241dcca0c36f037423 fluxbox-0.1.9-oly-allinone.patch.bz2 110919
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.9-r4 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.9-r4
deleted file mode 100644
index 077e6e656071..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.1.9-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 adfecad6a050572e4cb1fcc079dc491d fluxbox-0.1.9.tar.gz 440638
-MD5 51bb4dca071958d7ffcc5d90c3a26eca fluxbox-0.1.9-bugfix2.patch 1377
-MD5 3c1043fbcc87a8241dcca0c36f037423 fluxbox-0.1.9-oly-allinone.patch.bz2 110919
diff --git a/x11-wm/fluxbox/fluxbox-0.1.10.ebuild b/x11-wm/fluxbox/fluxbox-0.1.10.ebuild
new file mode 100644
index 000000000000..09770be7cf87
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-0.1.10.ebuild
@@ -0,0 +1,34 @@
+# 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.1 2002/07/14 23:03:47 seemant Exp $
+
+inherit commonbox
+
+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"
+
+mydoc="ChangeLog COPYING NEWS"
+myconf="--enable-xinerama"
+
+src_compile() {
+
+	commonbox_src_compile
+
+	cd data
+	make init
+}
+
+
+src_install() {
+
+	commonbox_src_install
+	cd data
+	insinto /usr/share/commonbox
+	doins init
+}
diff --git a/x11-wm/fluxbox/fluxbox-0.1.9-r4.ebuild b/x11-wm/fluxbox/fluxbox-0.1.9-r4.ebuild
deleted file mode 100644
index e77fc0e2793f..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.1.9-r4.ebuild
+++ /dev/null
@@ -1,82 +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.9-r4.ebuild,v 1.1 2002/07/09 01:53:21 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-	http://fluxbox.sourceforge.net/download/patches/${P}-bugfix2.patch
-	truetype? ( http://www.oberdorf.org/oly/Computers/OlyWare/FluxBoxAA/${P}-oly-allinone.patch.bz2 )"
-
-HOMEPAGE="http://fluxbox.sf.net"
-
-DEPEND="virtual/x11"
-	
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/blackbox"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	patch -p1 < ${DISTDIR}/${P}-bugfix2.patch || die
-
-	use truetype && \
-		bzcat ${DISTDIR}/${P}-oly-allinone.patch.bz2 | patch -p1
-}
-
-src_compile() {
-	local myconf
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-
-	use kde \
-		&& myconf="${myconf} --enable-kde" \
-		&& export KDEDIR=/usr/kde/2 \
-		|| myconf="${myconf} --disable-kde"
-
-	use gnome \
-		&& myconf="${myconf} --enable-gnome" \
-		|| myconf="${myconf} --disable-gnome"
-
-	use truetype \
-		&& myconf="${myconf} --enable-antialiasing" \
-		|| myconf="${myconf} --disable-antialiasing"
-
-	econf ${myconf} --enable-xinerama || die
-
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11/fluxbox \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		install || die
-
-	dodoc ChangeLog AUTHORS COPYING INSTALL README TODO NEWS
-	docinto data
-	dodoc data/README*
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/fluxbox" > ${D}/etc/X11/Sessions/fluxbox
-	fperm +x /etc/X11/Sessions/fluxbox
-}
-
-
-pkg_postinst() {
-
-	if [ "`use truetype`" ]
-	then
-		einfo "To actually enable anti-aliasing in fluxbox, you must call"
-		einfo "it using: fluxbox -antialias"
-	fi
-}