small cleanups.

6 files changed, 8 insertions, 198 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index b64494155c1f..c92cad4eb5db 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.65 2003/09/13 14:39:39 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.66 2003/09/13 14:48:53 tseng Exp $
+
+*fluxbox-0.9.6_pre1 (13 Sep 2003)
+
+  13 Sep 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.6_pre1.ebuild,
+  fluxbox-0.9.6_pre4.ebuild:
+  Small cleanups.
 
 *fluxbox-0.9.6_pre6 (13 Sep 2003)
 
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 7d4f658207b0..c0ec2b5ffedb 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -4,10 +4,8 @@ MD5 fb61b125c186ccacacdada381ba054cc fluxbox-0.9.0.ebuild 997
 MD5 143110b2a988e0a383142062b0fa41b6 fluxbox-0.9.3.ebuild 2718
 MD5 584949bdc5b17f5f5219e820d739c815 fluxbox-0.9.4.ebuild 2718
 MD5 05b1b1b37d0da0bcbe5f826a04430791 fluxbox-0.9.5.ebuild 2718
-MD5 0dc4300bf996697cc40e684b63c63bc1 fluxbox-0.9.6_pre1.ebuild 2744
 MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
-MD5 b3a73be796f8e8b8681e64e6e7f89d51 fluxbox-0.9.6_pre4.ebuild 2742
-MD5 69bc73656b3d717bd8a9c2ba29649d38 ChangeLog 14529
+MD5 3d674a98c9c755f2a020eb7520a1c241 ChangeLog 14686
 MD5 8d50756bc51e5476cc57811d42d27e3b fluxbox-0.9.6_pre5.ebuild 2742
 MD5 35a520b3ef5fb39d77f7e8d0f50d8391 fluxbox-0.9.6_pre6.ebuild 2742
 MD5 3661fa0f4811d5de5119163ee43ac690 files/digest-fluxbox-0.1.12-r1 132
@@ -28,7 +26,5 @@ MD5 96957d6246f0287f85531f6447a077c7 files/fluxbox-0.1.14-menukey.patch 6267
 MD5 0836c864c5f49e72c19bef764dbdfcac files/fluxbox-0.1.14-remember.patch 42020
 MD5 7b7044a97f3d2f84897e7fddf925b309 files/fluxbox-0.1.14-toggledecor.patch 823
 MD5 ddf99954256a3dc12763651bbf63bf3a files/fluxbox-vano-gentoo.patch 1092
-MD5 1463eabb26ce5831ca4ba51f4fb265f0 files/digest-fluxbox-0.9.6_pre1 134
-MD5 28d91d3624ec1741326f74dd57969182 files/digest-fluxbox-0.9.6_pre4 134
 MD5 060013fdc317caaf43dd90e5f0f2f9cf files/digest-fluxbox-0.9.6_pre5 134
 MD5 060013fdc317caaf43dd90e5f0f2f9cf files/digest-fluxbox-0.9.6_pre6 134
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre1 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre1
deleted file mode 100644
index 00dc2ccd60a9..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a956d88e701f6ee869ee9894abde5650 fluxbox-0.9.6pre1.tar.gz 623189
-MD5 f6fa316baa5aa593c7bc4c40ac7e4517 blueflux_0.1.0.tar.gz 17601
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre4 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre4
deleted file mode 100644
index 0007cad8d657..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 469f39a882654095e2ad03c3bb982846 fluxbox-0.9.6pre4.tar.gz 626859
-MD5 f6fa316baa5aa593c7bc4c40ac7e4517 blueflux_0.1.0.tar.gz 17601
diff --git a/x11-wm/fluxbox/fluxbox-0.9.6_pre1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.6_pre1.ebuild
deleted file mode 100644
index 253161937d74..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.6_pre1.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_pre1.ebuild,v 1.3 2003/09/06 11:03:41 seemant Exp $
-
-IUSE="gnome kde nls xinerama truetype"
-
-#inherit flag-o-matic eutils
-
-MY_P="${PN}-0.9.6pre1"
-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"
-
-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_pre4.ebuild b/x11-wm/fluxbox/fluxbox-0.9.6_pre4.ebuild
deleted file mode 100644
index f59ded6ec333..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.6_pre4.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_pre4.ebuild,v 1.2 2003/09/10 11:23:32 tseng Exp $
-
-IUSE="gnome kde nls xinerama truetype"
-
-#inherit flag-o-matic eutils
-
-MY_P="${PN}-0.9.6pre4"
-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"
-
-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
-}