cleanups

5 files changed, 13 insertions, 165 deletions

diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 304e86a5a414..eb372c4385d2 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,25 +1,21 @@
-MD5 40e17a3f9b6b5ed31682e3a4d8cf3426 fluxbox-0.1.14-r2.ebuild 1489
-MD5 0e02321152808bb4b60b6569f1efbb67 fluxbox-0.9.6_pre9.ebuild 2745
-MD5 b230c2c80c9f64406ebc96723d610081 fluxbox-0.1.14-r1.ebuild 1426
-MD5 afc4599a57283088b5e8339b1777a717 fluxbox-0.9.6_pre8.ebuild 2745
 MD5 32608db33853f189afe6596fd0c52eb7 ChangeLog 15832
+MD5 b230c2c80c9f64406ebc96723d610081 fluxbox-0.1.14-r1.ebuild 1426
+MD5 40e17a3f9b6b5ed31682e3a4d8cf3426 fluxbox-0.1.14-r2.ebuild 1489
 MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
-MD5 534927faffc95004edaa95f7adf436fe fluxbox-0.1.12-r1.ebuild 1029
-MD5 f0a0494829d2f32f6c17073ebb87f60a files/fluxbox-0.1.13-nls.patch 581
-MD5 ecd86299d1554e7b08784e43077c2d32 files/fluxbox-0.1.14-ja.patch 2459
-MD5 0836c864c5f49e72c19bef764dbdfcac files/fluxbox-0.1.14-remember.patch 42020
-MD5 c28b191f95d32d2ab4d6c4f353faa070 files/fluxbox 27
-MD5 7f9e9a76b3680c9ff5412c14a38b6198 files/fluxbox-0.1.14-gcc33.patch 4525
-MD5 1613a723da70c8ef3f16df1f5639990b files/fluxbox-0.1.13-Xft2.patch 1408
-MD5 7b7044a97f3d2f84897e7fddf925b309 files/fluxbox-0.1.14-toggledecor.patch 823
-MD5 3661fa0f4811d5de5119163ee43ac690 files/digest-fluxbox-0.1.12-r1 132
+MD5 0e02321152808bb4b60b6569f1efbb67 fluxbox-0.9.6_pre9.ebuild 2745
 MD5 1c3ae2ce22f7f2a778a8ad5a5631df28 files/digest-fluxbox-0.1.14-r1 67
 MD5 1c3ae2ce22f7f2a778a8ad5a5631df28 files/digest-fluxbox-0.1.14-r2 67
+MD5 395d40ebc808880f6345acd3e4db1f50 files/digest-fluxbox-0.9.6_pre9 134
+MD5 c28b191f95d32d2ab4d6c4f353faa070 files/fluxbox 27
+MD5 1613a723da70c8ef3f16df1f5639990b files/fluxbox-0.1.13-Xft2.patch 1408
+MD5 9a521a2ef9c0942ec02b714c3637e789 files/fluxbox-0.1.13-aa2.patch 1365
 MD5 86549bc3a5561ad2a0400a3b405003f4 files/fluxbox-0.1.13-menukey.patch 6269
+MD5 f0a0494829d2f32f6c17073ebb87f60a files/fluxbox-0.1.13-nls.patch 581
+MD5 5f1cedd6893799695fbbc3a19f5c5cff files/fluxbox-0.1.13-openoffice.patch 525
 MD5 5ad4a28ef73318001e9526c5f2915355 files/fluxbox-0.1.13-remember.patch 38913
-MD5 9a521a2ef9c0942ec02b714c3637e789 files/fluxbox-0.1.13-aa2.patch 1365
-MD5 db6dfdb6098aba50091fadd34fe0bc29 files/digest-fluxbox-0.9.6_pre8 134
-MD5 395d40ebc808880f6345acd3e4db1f50 files/digest-fluxbox-0.9.6_pre9 134
+MD5 7f9e9a76b3680c9ff5412c14a38b6198 files/fluxbox-0.1.14-gcc33.patch 4525
+MD5 ecd86299d1554e7b08784e43077c2d32 files/fluxbox-0.1.14-ja.patch 2459
 MD5 96957d6246f0287f85531f6447a077c7 files/fluxbox-0.1.14-menukey.patch 6267
-MD5 5f1cedd6893799695fbbc3a19f5c5cff files/fluxbox-0.1.13-openoffice.patch 525
+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
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.12-r1 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.12-r1
deleted file mode 100644
index d0417e564cbb..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.1.12-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f90b191af969b49be3dcf901c36d5e13 fluxbox-0.1.12.tar.gz 417680
-MD5 cc62ebef6a0ea4fca7bfcc9cdfa2afca fluxbox-gentoo.diff.bz2 2703
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre8 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre8
deleted file mode 100644
index 2b3f7fe6bab2..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a0c612f133e3258d587f5045aecd9299 fluxbox-0.9.6pre8.tar.gz 631484
-MD5 f6fa316baa5aa593c7bc4c40ac7e4517 blueflux_0.1.0.tar.gz 17601
diff --git a/x11-wm/fluxbox/fluxbox-0.1.12-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.1.12-r1.ebuild
deleted file mode 100644
index 1d16f0d9da76..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.1.12-r1.ebuild
+++ /dev/null
@@ -1,50 +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.1.12-r1.ebuild,v 1.10 2003/06/03 20:53:51 mkeadle Exp $
-
-IUSE="kde gnome nls xinerama truetype"
-
-inherit commonbox flag-o-matic
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Window manager based on Blackbox -- has tabs."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PN}-gentoo.diff.bz2"
-HOMEPAGE="http://fluxbox.sf.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-
-mydoc="ChangeLog COPYING NEWS"
-filter-flags -fno-exceptions
-export WANT_AUTOMAKE_1_6=1
-export WANT_AUTOCONF_2_5=1
-
-src_unpack() {
-
-	unpack ${P}.tar.gz
-
-	cd ${S}
-	bzcat ${DISTDIR}/${PN}-gentoo.diff.bz2 | patch -p1 || 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.9.6_pre8.ebuild b/x11-wm/fluxbox/fluxbox-0.9.6_pre8.ebuild
deleted file mode 100644
index b3709f89600c..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.6_pre8.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_pre8.ebuild,v 1.3 2003/09/24 10:42:13 weeve Exp $
-
-IUSE="gnome kde nls xinerama truetype"
-
-#inherit flag-o-matic eutils
-
-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
-	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
-}