bump and cleanups

17 files changed, 15 insertions, 532 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 4d24c0ab0e41..6a87291c61f8 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.70 2003/09/24 10:42:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.71 2003/09/26 03:15:27 tseng Exp $
+
+*fluxbox-0.9.6_pre9 (25 Sep 2003)
+
+  25 Sep 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.0.ebuild,
+  fluxbox-0.9.3.ebuild, fluxbox-0.9.4.ebuild, fluxbox-0.9.5.ebuild,
+  fluxbox-0.9.6_pre5.ebuild, fluxbox-0.9.6_pre6.ebuild,
+  fluxbox-0.9.6_pre7.ebuild, fluxbox-0.9.6_pre9.ebuild:
+  Version bump + cleanups
 
 *fluxbox-0.9.0 (24 Sep 2003)
 
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index be422ef6bc3b..0a123aca8abb 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,10 +1,10 @@
-MD5 57b62dc9b4e0f41431b4de432f08e89f ChangeLog 15363
+MD5 bca9e0c829cf1e0d29fdcdd0fa575fe4 ChangeLog 15674
 MD5 534927faffc95004edaa95f7adf436fe fluxbox-0.1.12-r1.ebuild 1029
 MD5 b230c2c80c9f64406ebc96723d610081 fluxbox-0.1.14-r1.ebuild 1426
 MD5 63eb87e2e5804012e8bfb11b5e607421 fluxbox-0.1.14-r2.ebuild 1480
 MD5 afc4599a57283088b5e8339b1777a717 fluxbox-0.9.6_pre8.ebuild 2745
 MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
-MD5 afc4599a57283088b5e8339b1777a717 fluxbox-0.9.6_pre9.ebuild 2745
+MD5 0e02321152808bb4b60b6569f1efbb67 fluxbox-0.9.6_pre9.ebuild 2745
 MD5 3661fa0f4811d5de5119163ee43ac690 files/digest-fluxbox-0.1.12-r1 132
 MD5 1c3ae2ce22f7f2a778a8ad5a5631df28 files/digest-fluxbox-0.1.14-r1 67
 MD5 1c3ae2ce22f7f2a778a8ad5a5631df28 files/digest-fluxbox-0.1.14-r2 67
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.0 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.0
deleted file mode 100644
index d4fc9b89dc13..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9125c81971bef44fba431c0239ba8822 fluxbox-0.9.0.tar.gz 540218
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.3 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.3
deleted file mode 100644
index 824df5bab161..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 22b3323e948c32ff81afef9e18aa2ac6 fluxbox-0.9.3.tar.gz 564444
-MD5 f6fa316baa5aa593c7bc4c40ac7e4517 blueflux_0.1.0.tar.gz 17601
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.4 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.4
deleted file mode 100644
index 5e2bdb840043..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f13a28d594cb5cce899ea6628175bce1 fluxbox-0.9.4.tar.gz 589307
-MD5 f6fa316baa5aa593c7bc4c40ac7e4517 blueflux_0.1.0.tar.gz 17601
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.5 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.5
deleted file mode 100644
index acd30488539c..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5da272e1a6f53b9a406ccecd348c8871 fluxbox-0.9.5.tar.gz 622330
-MD5 f6fa316baa5aa593c7bc4c40ac7e4517 blueflux_0.1.0.tar.gz 17601
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre5 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre5
deleted file mode 100644
index 4e9ab9b81f40..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cac20792e9f0ed01ed416abaccce7f1d fluxbox-0.9.6pre5.tar.gz 628253
-MD5 f6fa316baa5aa593c7bc4c40ac7e4517 blueflux_0.1.0.tar.gz 17601
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre6 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre6
deleted file mode 100644
index 136861ed23c1..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0f8705e55c6ede0d04fc5d47083299be fluxbox-0.9.6pre6.tar.gz 630858
-MD5 f6fa316baa5aa593c7bc4c40ac7e4517 blueflux_0.1.0.tar.gz 17601
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre7 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre7
deleted file mode 100644
index 8d215e6a8435..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a2c18793f30bca4073e0778618fb2689 fluxbox-0.9.6pre7.tar.gz 631373
-MD5 f6fa316baa5aa593c7bc4c40ac7e4517 blueflux_0.1.0.tar.gz 17601
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre9 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre9
new file mode 100644
index 000000000000..8eb24a1deab9
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre9
@@ -0,0 +1,2 @@
+MD5 25b50d9cb00701a9b6a40149d026df31 fluxbox-0.9.6pre9.tar.gz 631548
+MD5 f6fa316baa5aa593c7bc4c40ac7e4517 blueflux_0.1.0.tar.gz 17601
diff --git a/x11-wm/fluxbox/fluxbox-0.9.0.ebuild b/x11-wm/fluxbox/fluxbox-0.9.0.ebuild
deleted file mode 100644
index e20f63fe7492..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.0.ebuild,v 1.5 2003/09/24 10:42:13 weeve Exp $
-
-IUSE="gnome kde nls xinerama truetype"
-
-inherit commonbox flag-o-matic eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Windows manager based on Blackbox and pwm - Development Build."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://fluxbox.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-
-mydoc="ChangeLog COPYING NEWS"
-#if pkg-config xft
-#then
-#	CXXFLAGS="${CXXFLAGS} -I/usr/include/freetype2"
-#fi
-filter-flags -fnoexceptions
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-}
-
-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 keys
-	rmdir ${D}/usr/share/commonbox/fluxbox
-	rm -f ${D}/usr/bin/fluxbox-generate_menu
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.3.ebuild b/x11-wm/fluxbox/fluxbox-0.9.3.ebuild
deleted file mode 100644
index 90fc1b3212ce..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.3.ebuild,v 1.3 2003/09/24 10:42:13 weeve Exp $
-
-IUSE="gnome kde nls xinerama truetype"
-
-#inherit flag-o-matic eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Fluxbox is yet another windowmanager for X. It's based on the Blackbox 0.61.1 code. Fluxbox looks like blackbox and handles styles, colors, window placement and similar thing exactly like blackbox (100% theme/style compability). So what's the difference between fluxbox and blackbox then? The answer is: LOTS! *This is a development release and should not be considered stable.* *This release includes the Blueflux style.*"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	http://koti.mbnet.fi/bionik/blueflux/blueflux_0.1.0.tar.gz"
-HOMEPAGE="http://fluxbox.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-DEPEND="virtual/x11
-		>=sys-devel/autoconf-2.52"
-RDEPEND="x11-misc/commonbox-utils
-		x11-themes/commonbox-styles"
-PROVIDE="virtual/blackbox"
-
-mydoc="ChangeLog COPYING NEWS"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	use nls && ( \
-		einfo "Redirecting NLS"
-		for i in `find ${S} -name 'Makefile.am'`
-		do
-			sed -i -e 's:$(pkgdatadir)/nls:/usr/share/locale:' ${i}
-		done
-	)
-
-	sed -i -e 's:bsetroot.1::' ${S}/doc/Makefile.am
-	sed -i -e 's:bsetroot::' ${S}/util/Makefile.*
-}
-
-
-src_compile() {
-
-	econf \
-		`use_enable nls` \
-		`use_enable kde` \
-		`use_enable gnome` \
-		`use_enable xinerama` \
-		`use_enable truetype xft` \
-		--sysconfdir=/etc/X11/${PN} \
-		--datadir=/usr/share/commonbox \
-		${myconf} || die
-
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/Makefile
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/data/Makefile
-
-	emake \
-		pkgdatadir=/usr/share/commonbox || die
-
-	cd data make \
-		pkgdatadir=/usr/share/commonbox init
-}
-
-src_install() {
-
-	dodir /usr/share/commonbox/${PN}
-	dodir /usr/share/commonbox/styles
-	make DESTDIR=${D} install || die
-	dodoc README* AUTHORS TODO* ${mydoc}
-	rmdir ${D}/usr/share/${PN}
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/${PN}" > ${D}/etc/X11/Sessions/${PN}
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	cd data
-	insinto /usr/share/commonbox
-	doins init keys
-	insinto /usr/share/commonbox/styles
-	doins ${D}/usr/share/commonbox/fluxbox/styles/Meta
-	rm -rf ${D}/usr/share/commonbox/fluxbox
-
-	# blueflux style
-	insinto /usr/share/commonbox/pixmaps
-	doins ${WORKDIR}/pixmaps/*
-	# fix some paths and change b->B at the same time
-	sed -e 's:\.fluxbox:/usr/share/commonbox:' ${WORKDIR}/styles/blueflux \
-		> ${WORKDIR}/styles/Blueflux
-	insinto /usr/share/commonbox/styles
-	doins ${WORKDIR}/styles/Blueflux
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.4.ebuild b/x11-wm/fluxbox/fluxbox-0.9.4.ebuild
deleted file mode 100644
index 29ff5a0b1c4c..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.4.ebuild,v 1.3 2003/09/24 10:42:13 weeve Exp $
-
-IUSE="gnome kde nls xinerama truetype"
-
-#inherit flag-o-matic eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Fluxbox is yet another windowmanager for X. It's based on the Blackbox 0.61.1 code. Fluxbox looks like blackbox and handles styles, colors, window placement and similar thing exactly like blackbox (100% theme/style compability). So what's the difference between fluxbox and blackbox then? The answer is: LOTS! *This is a development release and should not be considered stable.* *This release includes the Blueflux style.*"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	http://koti.mbnet.fi/bionik/blueflux/blueflux_0.1.0.tar.gz"
-HOMEPAGE="http://fluxbox.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-DEPEND="virtual/x11
-		>=sys-devel/autoconf-2.52"
-RDEPEND="x11-misc/commonbox-utils
-		x11-themes/commonbox-styles"
-PROVIDE="virtual/blackbox"
-
-mydoc="ChangeLog COPYING NEWS"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	use nls && ( \
-		einfo "Redirecting NLS"
-		for i in `find ${S} -name 'Makefile.am'`
-		do
-			sed -i -e 's:$(pkgdatadir)/nls:/usr/share/locale:' ${i}
-		done
-	)
-
-	sed -i -e 's:bsetroot.1::' ${S}/doc/Makefile.am
-	sed -i -e 's:bsetroot::' ${S}/util/Makefile.*
-}
-
-
-src_compile() {
-
-	econf \
-		`use_enable nls` \
-		`use_enable kde` \
-		`use_enable gnome` \
-		`use_enable xinerama` \
-		`use_enable truetype xft` \
-		--sysconfdir=/etc/X11/${PN} \
-		--datadir=/usr/share/commonbox \
-		${myconf} || die
-
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/Makefile
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/data/Makefile
-
-	emake \
-		pkgdatadir=/usr/share/commonbox || die
-
-	cd data make \
-		pkgdatadir=/usr/share/commonbox init
-}
-
-src_install() {
-
-	dodir /usr/share/commonbox/${PN}
-	dodir /usr/share/commonbox/styles
-	make DESTDIR=${D} install || die
-	dodoc README* AUTHORS TODO* ${mydoc}
-	rmdir ${D}/usr/share/${PN}
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/${PN}" > ${D}/etc/X11/Sessions/${PN}
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	cd data
-	insinto /usr/share/commonbox
-	doins init keys
-	insinto /usr/share/commonbox/styles
-	doins ${D}/usr/share/commonbox/fluxbox/styles/Meta
-	rm -rf ${D}/usr/share/commonbox/fluxbox
-
-	# blueflux style
-	insinto /usr/share/commonbox/pixmaps
-	doins ${WORKDIR}/pixmaps/*
-	# fix some paths and change b->B at the same time
-	sed -e 's:\.fluxbox:/usr/share/commonbox:' ${WORKDIR}/styles/blueflux \
-		> ${WORKDIR}/styles/Blueflux
-	insinto /usr/share/commonbox/styles
-	doins ${WORKDIR}/styles/Blueflux
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.5.ebuild b/x11-wm/fluxbox/fluxbox-0.9.5.ebuild
deleted file mode 100644
index 9c231add0fb9..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.5.ebuild,v 1.3 2003/09/24 10:42:13 weeve Exp $
-
-IUSE="gnome kde nls xinerama truetype"
-
-#inherit flag-o-matic eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Fluxbox is yet another windowmanager for X. It's based on the Blackbox 0.61.1 code. Fluxbox looks like blackbox and handles styles, colors, window placement and similar thing exactly like blackbox (100% theme/style compability). So what's the difference between fluxbox and blackbox then? The answer is: LOTS! *This is a development release and should not be considered stable.* *This release includes the Blueflux style.*"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	http://koti.mbnet.fi/bionik/blueflux/blueflux_0.1.0.tar.gz"
-HOMEPAGE="http://fluxbox.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-DEPEND="virtual/x11
-		>=sys-devel/autoconf-2.52"
-RDEPEND="x11-misc/commonbox-utils
-		x11-themes/commonbox-styles"
-PROVIDE="virtual/blackbox"
-
-mydoc="ChangeLog COPYING NEWS"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	use nls && ( \
-		einfo "Redirecting NLS"
-		for i in `find ${S} -name 'Makefile.am'`
-		do
-			sed -i -e 's:$(pkgdatadir)/nls:/usr/share/locale:' ${i}
-		done
-	)
-
-	sed -i -e 's:bsetroot.1::' ${S}/doc/Makefile.am
-	sed -i -e 's:bsetroot::' ${S}/util/Makefile.*
-}
-
-
-src_compile() {
-
-	econf \
-		`use_enable nls` \
-		`use_enable kde` \
-		`use_enable gnome` \
-		`use_enable xinerama` \
-		`use_enable truetype xft` \
-		--sysconfdir=/etc/X11/${PN} \
-		--datadir=/usr/share/commonbox \
-		${myconf} || die
-
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/Makefile
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/data/Makefile
-
-	emake \
-		pkgdatadir=/usr/share/commonbox || die
-
-	cd data make \
-		pkgdatadir=/usr/share/commonbox init
-}
-
-src_install() {
-
-	dodir /usr/share/commonbox/${PN}
-	dodir /usr/share/commonbox/styles
-	make DESTDIR=${D} install || die
-	dodoc README* AUTHORS TODO* ${mydoc}
-	rmdir ${D}/usr/share/${PN}
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/${PN}" > ${D}/etc/X11/Sessions/${PN}
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	cd data
-	insinto /usr/share/commonbox
-	doins init keys
-	insinto /usr/share/commonbox/styles
-	doins ${D}/usr/share/commonbox/fluxbox/styles/Meta
-	rm -rf ${D}/usr/share/commonbox/fluxbox
-
-	# blueflux style
-	insinto /usr/share/commonbox/pixmaps
-	doins ${WORKDIR}/pixmaps/*
-	# fix some paths and change b->B at the same time
-	sed -e 's:\.fluxbox:/usr/share/commonbox:' ${WORKDIR}/styles/blueflux \
-		> ${WORKDIR}/styles/Blueflux
-	insinto /usr/share/commonbox/styles
-	doins ${WORKDIR}/styles/Blueflux
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.6_pre5.ebuild b/x11-wm/fluxbox/fluxbox-0.9.6_pre5.ebuild
deleted file mode 100644
index 89d49b575b13..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.6_pre5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.6_pre5.ebuild,v 1.2 2003/09/24 10:42:13 weeve Exp $
-
-IUSE="gnome kde nls xinerama truetype"
-
-#inherit flag-o-matic eutils
-
-MY_P="${PN}-0.9.6pre5"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Fluxbox is yet another windowmanager for X. It's based on the Blackbox 0.61.1 code. Fluxbox looks like blackbox and handles styles, colors, window placement and similar thing exactly like blackbox (100% theme/style compability). So what's the difference between fluxbox and blackbox then? The answer is: LOTS! *This is a development release and should not be considered stable.* *This release includes the Blueflux style.*"
-SRC_URI="http://fluxbox.org/download/${MY_P}.tar.gz
-	http://koti.mbnet.fi/bionik/blueflux/blueflux_0.1.0.tar.gz"
-HOMEPAGE="http://www.fluxbox.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-DEPEND="virtual/x11
-		>=sys-devel/autoconf-2.52"
-RDEPEND="x11-misc/commonbox-utils
-		x11-themes/commonbox-styles"
-PROVIDE="virtual/blackbox"
-
-mydoc="ChangeLog COPYING NEWS"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	use nls && ( \
-		einfo "Redirecting NLS"
-		for i in `find ${S} -name 'Makefile.am'`
-		do
-			sed -i -e 's:$(pkgdatadir)/nls:/usr/share/locale:' ${i}
-		done
-	)
-
-	sed -i -e 's:bsetroot.1::' ${S}/doc/Makefile.am
-	sed -i -e 's:bsetroot::' ${S}/util/Makefile.*
-}
-
-
-src_compile() {
-
-	econf \
-		`use_enable nls` \
-		`use_enable kde` \
-		`use_enable gnome` \
-		`use_enable xinerama` \
-		`use_enable truetype xft` \
-		--sysconfdir=/etc/X11/${PN} \
-		--datadir=/usr/share/commonbox \
-		${myconf} || die
-
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/Makefile
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/data/Makefile
-
-	emake \
-		pkgdatadir=/usr/share/commonbox || die
-
-	cd data make \
-		pkgdatadir=/usr/share/commonbox init
-}
-
-src_install() {
-
-	dodir /usr/share/commonbox/${PN}
-	dodir /usr/share/commonbox/styles
-	make DESTDIR=${D} install || die
-	dodoc README* AUTHORS TODO* ${mydoc}
-	rmdir ${D}/usr/share/${PN}
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/${PN}" > ${D}/etc/X11/Sessions/${PN}
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	cd data
-	insinto /usr/share/commonbox
-	doins init keys
-	insinto /usr/share/commonbox/styles
-	doins ${D}/usr/share/commonbox/fluxbox/styles/Meta
-	rm -rf ${D}/usr/share/commonbox/fluxbox
-
-	# blueflux style
-	insinto /usr/share/commonbox/pixmaps
-	doins ${WORKDIR}/pixmaps/*
-	# fix some paths and change b->B at the same time
-	sed -e 's:\.fluxbox:/usr/share/commonbox:' ${WORKDIR}/styles/blueflux \
-		> ${WORKDIR}/styles/Blueflux
-	insinto /usr/share/commonbox/styles
-	doins ${WORKDIR}/styles/Blueflux
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.6_pre7.ebuild b/x11-wm/fluxbox/fluxbox-0.9.6_pre7.ebuild
deleted file mode 100644
index c0e0d1c84453..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.6_pre7.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.6_pre7.ebuild,v 1.2 2003/09/24 10:42:13 weeve Exp $
-
-IUSE="gnome kde nls xinerama truetype"
-
-#inherit flag-o-matic eutils
-
-MY_P="${PN}-0.9.6pre7"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Fluxbox is yet another windowmanager for X. It's based on the Blackbox 0.61.1 code. Fluxbox looks like blackbox and handles styles, colors, window placement and similar thing exactly like blackbox (100% theme/style compability). So what's the difference between fluxbox and blackbox then? The answer is: LOTS! *This is a development release and should not be considered stable.* *This release includes the Blueflux style.*"
-SRC_URI="http://fluxbox.org/download/${MY_P}.tar.gz
-	http://koti.mbnet.fi/bionik/blueflux/blueflux_0.1.0.tar.gz"
-HOMEPAGE="http://www.fluxbox.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-DEPEND="virtual/x11
-		>=sys-devel/autoconf-2.52"
-RDEPEND="x11-misc/commonbox-utils
-		x11-themes/commonbox-styles"
-PROVIDE="virtual/blackbox"
-
-mydoc="ChangeLog COPYING NEWS"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	use nls && ( \
-		einfo "Redirecting NLS"
-		for i in `find ${S} -name 'Makefile.am'`
-		do
-			sed -i -e 's:$(pkgdatadir)/nls:/usr/share/locale:' ${i}
-		done
-	)
-
-	sed -i -e 's:bsetroot.1::' ${S}/doc/Makefile.am
-	sed -i -e 's:bsetroot::' ${S}/util/Makefile.*
-}
-
-
-src_compile() {
-
-	econf \
-		`use_enable nls` \
-		`use_enable kde` \
-		`use_enable gnome` \
-		`use_enable xinerama` \
-		`use_enable truetype xft` \
-		--sysconfdir=/etc/X11/${PN} \
-		--datadir=/usr/share/commonbox \
-		${myconf} || die
-
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/Makefile
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/data/Makefile
-
-	emake \
-		pkgdatadir=/usr/share/commonbox || die
-
-	cd data make \
-		pkgdatadir=/usr/share/commonbox init
-}
-
-src_install() {
-
-	dodir /usr/share/commonbox/${PN}
-	dodir /usr/share/commonbox/styles
-	make DESTDIR=${D} install || die
-	dodoc README* AUTHORS TODO* ${mydoc}
-	rmdir ${D}/usr/share/${PN}
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/${PN}" > ${D}/etc/X11/Sessions/${PN}
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	cd data
-	insinto /usr/share/commonbox
-	doins init keys
-	insinto /usr/share/commonbox/styles
-	doins ${D}/usr/share/commonbox/fluxbox/styles/Meta
-	rm -rf ${D}/usr/share/commonbox/fluxbox
-
-	# blueflux style
-	insinto /usr/share/commonbox/pixmaps
-	doins ${WORKDIR}/pixmaps/*
-	# fix some paths and change b->B at the same time
-	sed -e 's:\.fluxbox:/usr/share/commonbox:' ${WORKDIR}/styles/blueflux \
-		> ${WORKDIR}/styles/Blueflux
-	insinto /usr/share/commonbox/styles
-	doins ${WORKDIR}/styles/Blueflux
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.6_pre6.ebuild b/x11-wm/fluxbox/fluxbox-0.9.6_pre9.ebuild
index e3f074b599b3..8be434982122 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.6_pre6.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.6_pre9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.6_pre6.ebuild,v 1.3 2003/09/24 10:42:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.6_pre9.ebuild,v 1.1 2003/09/26 03:15:27 tseng Exp $
 
 IUSE="gnome kde nls xinerama truetype"
 
 #inherit flag-o-matic eutils
 
-MY_P="${PN}-0.9.6pre6"
+MY_P=${P/_pre/pre}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Fluxbox is yet another windowmanager for X. It's based on the Blackbox 0.61.1 code. Fluxbox looks like blackbox and handles styles, colors, window placement and similar thing exactly like blackbox (100% theme/style compability). So what's the difference between fluxbox and blackbox then? The answer is: LOTS! *This is a development release and should not be considered stable.* *This release includes the Blueflux style.*"
 SRC_URI="http://fluxbox.org/download/${MY_P}.tar.gz