Version cleanup

(Portage version: 2.1.2.4)

17 files changed, 8 insertions, 1306 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index d717451de30c..2312966524ee 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.210 2007/04/19 18:48:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.211 2007/04/19 19:35:14 lack Exp $
+
+  19 Apr 2007; Jim Ramsay <lack@gentoo.org> -fluxbox-0.9.14-r1.ebuild,
+  -fluxbox-0.9.14-r2.ebuild, -fluxbox-0.9.15.ebuild,
+  -fluxbox-0.9.15.1.ebuild, -fluxbox-0.9.15.1-r1.ebuild,
+  -fluxbox-1.0_rc1.ebuild, -fluxbox-1.0_rc2-r1.ebuild,
+  -fluxbox-1.0_rc2-r2.ebuild:
+  Version cleanup
 
   19 Apr 2007; Fabian Groffen <grobian@gentoo.org> fluxbox-0.9.14-r1.ebuild,
   fluxbox-0.9.14-r2.ebuild, fluxbox-0.9.15.ebuild, fluxbox-0.9.15.1.ebuild,
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.14-r1 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.14-r1
deleted file mode 100644
index fa99125543e6..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.14-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7641aaea532841e103e9705bb5b98f62 fluxbox-0.9.14.tar.bz2 671916
-RMD160 17cb299115164303972988471526a57bf0eeebde fluxbox-0.9.14.tar.bz2 671916
-SHA256 5560873a192013483b77281c7c31e0ebaa081181e9471a1b2eb6ed40f905eb6f fluxbox-0.9.14.tar.bz2 671916
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.14-r2 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.14-r2
deleted file mode 100644
index fa99125543e6..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.14-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7641aaea532841e103e9705bb5b98f62 fluxbox-0.9.14.tar.bz2 671916
-RMD160 17cb299115164303972988471526a57bf0eeebde fluxbox-0.9.14.tar.bz2 671916
-SHA256 5560873a192013483b77281c7c31e0ebaa081181e9471a1b2eb6ed40f905eb6f fluxbox-0.9.14.tar.bz2 671916
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.15 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.15
deleted file mode 100644
index b9691698fbce..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5fd0353b79d433c117f650a53c254e88 fluxbox-0.9.15.tar.bz2 685941
-RMD160 5359cc09ac960f94232aa0009077592929cb01b1 fluxbox-0.9.15.tar.bz2 685941
-SHA256 99726df74bc21abc5f417f858dca700b3baef62c9a21d35c890bd75113ad55a6 fluxbox-0.9.15.tar.bz2 685941
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.15.1 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.15.1
deleted file mode 100644
index 4ff624e35814..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.15.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 098eb36a09338aabb63b938a5eab9ef6 fluxbox-0.9.15.1.tar.bz2 685740
-RMD160 aa9418de9ff700c14b21911f6de24503449e7f0f fluxbox-0.9.15.1.tar.bz2 685740
-SHA256 b72bfcbe26651323d975a2469ba426da8e8e7d96b813061386f4bc5148dfb2b9 fluxbox-0.9.15.1.tar.bz2 685740
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.15.1-r1 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.15.1-r1
deleted file mode 100644
index 4ff624e35814..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.15.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 098eb36a09338aabb63b938a5eab9ef6 fluxbox-0.9.15.1.tar.bz2 685740
-RMD160 aa9418de9ff700c14b21911f6de24503449e7f0f fluxbox-0.9.15.1.tar.bz2 685740
-SHA256 b72bfcbe26651323d975a2469ba426da8e8e7d96b813061386f4bc5148dfb2b9 fluxbox-0.9.15.1.tar.bz2 685740
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc1 b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc1
deleted file mode 100644
index 7776f06956e0..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e0d3e8b41261fc9b03ac75c014051806 fluxbox-1.0rc.tar.bz2 744865
-RMD160 7b3f4e3a3dc270798eb6c6c303b48f404e606719 fluxbox-1.0rc.tar.bz2 744865
-SHA256 7f714fe8d2526a0e8406af63a5e4ec497cc2092b6c220100574c5ac1ab4f77cb fluxbox-1.0rc.tar.bz2 744865
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc2-r1 b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc2-r1
deleted file mode 100644
index b7899558f6bc..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c270d29663d14470b39e9c1811fa6ff0 fluxbox-1.0rc2.tar.bz2 752913
-RMD160 6094001f653aaaaef6d625ded1c716669113bc8b fluxbox-1.0rc2.tar.bz2 752913
-SHA256 8780a608510f59c99a9dcc2174185fb1a370b1e485ce1cb93e27da75954dd6e3 fluxbox-1.0rc2.tar.bz2 752913
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc2-r2 b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc2-r2
deleted file mode 100644
index b7899558f6bc..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c270d29663d14470b39e9c1811fa6ff0 fluxbox-1.0rc2.tar.bz2 752913
-RMD160 6094001f653aaaaef6d625ded1c716669113bc8b fluxbox-1.0rc2.tar.bz2 752913
-SHA256 8780a608510f59c99a9dcc2174185fb1a370b1e485ce1cb93e27da75954dd6e3 fluxbox-1.0rc2.tar.bz2 752913
diff --git a/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild
deleted file mode 100644
index 0bd35be92cb5..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild,v 1.17 2007/04/19 18:48:03 grobian Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib disableslit"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="|| ( ( x11-libs/libXpm
-			x11-libs/libXrandr
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
-	virtual/xft
-	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
-		nls? ( sys-devel/gettext )
-		|| ( ( x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-		)
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/0.9.13/${PN}-0.9.13-our-styles-go-over-here.patch"
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-
-	# Turn on aa by default if possible. Fluxbox fonts are really frickin'
-	# broken, we'll do what we can to make it less painful by default.
-	use truetype 1>/dev/null && \
-		echo "session.screen0.antialias: true" >> data/init.in
-
-	# Fix broken styles
-	ebegin "Fixing backgrounds..."
-	for style in "${S}/data/styles/"* ; do
-		[[ -f "${style}" ]] || continue
-		sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \
-			|| die "styles sed failed on ${style}"
-	done
-	eend 0
-}
-
-src_compile() {
-	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable kde) \
-		$(use_enable gnome) \
-		$(use_enable imlib imlib2) \
-		$(use_enable !disableslit slit ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
-	fperms a+x /etc/X11/Sessions/fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
-
-	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox" || die
-	doins "${FILESDIR}/styles-menu-commonbox" || die
-	doins "${FILESDIR}/styles-menu-user" || die
-}
-
-pkg_postinst() {
-	einfo "As of fluxbox 0.9.10-r3, we are using an improved layout for"
-	einfo "styles to avoid problems with huge menus. Use the following"
-	einfo "in the menu for your menu styles section:"
-	einfo
-	einfo "    [submenu] (Styles) {Select a Style}"
-	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
-	einfo "    [end]"
-	einfo
-	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
-	einfo "menu file, this will already be present."
-	einfo
-	ewarn "Note that menumaker and similar utilities do *not* support"
-	ewarn "this out of the box."
-	einfo
-	einfo "As of fluxbox 0.9.14_pre1, Fluxbox uses XFT for font rendering. If"
-	einfo "you experience font problems, try tinkering with your theme files."
-	einfo "You can check the validity of a font name using:"
-	einfo
-	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
-	einfo
-	einfo "The slow startup issues in previous versions should now be fixed;"
-	einfo "if you still encounter problems, please report bugs upstream."
-	epause
-}
-
diff --git a/x11-wm/fluxbox/fluxbox-0.9.14-r2.ebuild b/x11-wm/fluxbox/fluxbox-0.9.14-r2.ebuild
deleted file mode 100644
index 7fc3efacad27..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.14-r2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.14-r2.ebuild,v 1.2 2007/04/19 18:48:03 grobian Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="|| ( ( x11-libs/libXpm
-			x11-libs/libXrandr
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
-	virtual/xft
-	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
-		nls? ( sys-devel/gettext )
-		|| ( ( x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-		)
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/0.9.13/${PN}-0.9.13-our-styles-go-over-here.patch"
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-
-	# Turn on aa by default if possible. Fluxbox fonts are really frickin'
-	# broken, we'll do what we can to make it less painful by default.
-	use truetype 1>/dev/null && \
-		echo "session.screen0.antialias: true" >> data/init.in
-
-	# Fix broken styles
-	ebegin "Fixing backgrounds..."
-	for style in "${S}/data/styles/"* ; do
-		[[ -f "${style}" ]] || continue
-		sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \
-			|| die "styles sed failed on ${style}"
-	done
-	eend 0
-}
-
-src_compile() {
-	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable kde) \
-		$(use_enable gnome) \
-		$(use_enable imlib imlib2) \
-		$(use_enable !disableslit slit ) \
-		$(use_enable !disabletoolbar toolbar ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
-	fperms a+x /etc/X11/Sessions/fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
-
-	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox" || die
-	doins "${FILESDIR}/styles-menu-commonbox" || die
-	doins "${FILESDIR}/styles-menu-user" || die
-}
-
-pkg_postinst() {
-	einfo "As of fluxbox 0.9.10-r3, we are using an improved layout for"
-	einfo "styles to avoid problems with huge menus. Use the following"
-	einfo "in the menu for your menu styles section:"
-	einfo
-	einfo "    [submenu] (Styles) {Select a Style}"
-	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
-	einfo "    [end]"
-	einfo
-	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
-	einfo "menu file, this will already be present."
-	einfo
-	einfo "Note that menumaker and similar utilities do *not* support"
-	einfo "this out of the box."
-	einfo
-	einfo "As of fluxbox 0.9.14_pre1, Fluxbox uses XFT for font rendering. If"
-	einfo "you experience font problems, try tinkering with your theme files."
-	einfo "You can check the validity of a font name using:"
-	einfo
-	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
-	einfo
-	einfo "The slow startup issues in previous versions should now be fixed;"
-	einfo "if you still encounter problems, please report bugs upstream."
-	epause
-}
-
diff --git a/x11-wm/fluxbox/fluxbox-0.9.15.1-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.15.1-r1.ebuild
deleted file mode 100644
index efd02d40cbf4..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.15.1-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.15.1-r1.ebuild,v 1.7 2007/04/19 18:48:03 grobian Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="|| ( ( x11-libs/libXpm
-			x11-libs/libXrandr
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
-	virtual/xft
-	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
-		nls? ( sys-devel/gettext )
-		|| ( ( x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-		)
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-pkg_setup() {
-	if use imlib ; then
-		if ! built_with_use media-libs/imlib2 X ; then
-			eerror "To build fluxbox with imlib in USE, you need an X enabled"
-			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
-			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
-			die "USE=imlib requires imlib2 with USE=X"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/0.9.13/${PN}-0.9.13-our-styles-go-over-here.patch"
-	epatch "${FILESDIR}/0.9.15/129065-fix-doubleclick-64bit.patch"
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-
-	# Turn on aa by default if possible. Fluxbox fonts are really frickin'
-	# broken, we'll do what we can to make it less painful by default.
-	use truetype 1>/dev/null && \
-		echo "session.screen0.antialias: true" >> data/init.in
-
-	# Fix broken styles
-	ebegin "Fixing backgrounds..."
-	for style in "${S}/data/styles/"* ; do
-		[[ -f "${style}" ]] || continue
-		sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \
-			|| die "styles sed failed on ${style}"
-	done
-	eend 0
-}
-
-src_compile() {
-	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable kde) \
-		$(use_enable gnome) \
-		$(use_enable imlib imlib2) \
-		$(use_enable !disableslit slit ) \
-		$(use_enable !disabletoolbar toolbar ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
-	fperms a+x /etc/X11/Sessions/fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
-
-	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox" || die
-	doins "${FILESDIR}/styles-menu-commonbox" || die
-	doins "${FILESDIR}/styles-menu-user" || die
-}
-
-pkg_postinst() {
-	einfo "As of fluxbox 0.9.10-r3, we are using an improved layout for"
-	einfo "styles to avoid problems with huge menus. Use the following"
-	einfo "in the menu for your menu styles section:"
-	einfo
-	einfo "    [submenu] (Styles) {Select a Style}"
-	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
-	einfo "    [end]"
-	einfo
-	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
-	einfo "menu file, this will already be present."
-	einfo
-	einfo "Note that menumaker and similar utilities do *not* support"
-	einfo "this out of the box."
-	einfo
-	einfo "As of fluxbox 0.9.14_pre1, Fluxbox uses XFT for font rendering. If"
-	einfo "you experience font problems, try tinkering with your theme files."
-	einfo "You can check the validity of a font name using:"
-	einfo
-	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
-	einfo
-	einfo "The slow startup issues in previous versions should now be fixed;"
-	einfo "if you still encounter problems, please report bugs upstream."
-	epause
-}
-
diff --git a/x11-wm/fluxbox/fluxbox-0.9.15.1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.15.1.ebuild
deleted file mode 100644
index eb2cc56455be..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.15.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.15.1.ebuild,v 1.2 2007/04/19 18:48:03 grobian Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib disableslit"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="|| ( ( x11-libs/libXpm
-			x11-libs/libXrandr
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
-	virtual/xft
-	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
-		nls? ( sys-devel/gettext )
-		|| ( ( x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-		)
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-pkg_setup() {
-	if use imlib ; then
-		if ! built_with_use media-libs/imlib2 X ; then
-			eerror "To build fluxbox with imlib in USE, you need an X enabled"
-			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
-			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
-			die "USE=imlib requires imlib2 with USE=X"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/0.9.13/${PN}-0.9.13-our-styles-go-over-here.patch"
-	epatch "${FILESDIR}/0.9.15/129065-fix-doubleclick-64bit.patch"
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-
-	# Turn on aa by default if possible. Fluxbox fonts are really frickin'
-	# broken, we'll do what we can to make it less painful by default.
-	use truetype 1>/dev/null && \
-		echo "session.screen0.antialias: true" >> data/init.in
-
-	# Fix broken styles
-	ebegin "Fixing backgrounds..."
-	for style in "${S}/data/styles/"* ; do
-		[[ -f "${style}" ]] || continue
-		sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \
-			|| die "styles sed failed on ${style}"
-	done
-	eend 0
-}
-
-src_compile() {
-	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable kde) \
-		$(use_enable gnome) \
-		$(use_enable imlib imlib2) \
-		$(use_enable !disableslit slit ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
-	fperms a+x /etc/X11/Sessions/fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
-
-	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox" || die
-	doins "${FILESDIR}/styles-menu-commonbox" || die
-	doins "${FILESDIR}/styles-menu-user" || die
-}
-
-pkg_postinst() {
-	einfo "As of fluxbox 0.9.10-r3, we are using an improved layout for"
-	einfo "styles to avoid problems with huge menus. Use the following"
-	einfo "in the menu for your menu styles section:"
-	einfo
-	einfo "    [submenu] (Styles) {Select a Style}"
-	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
-	einfo "    [end]"
-	einfo
-	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
-	einfo "menu file, this will already be present."
-	einfo
-	ewarn "Note that menumaker and similar utilities do *not* support"
-	ewarn "this out of the box."
-	einfo
-	einfo "As of fluxbox 0.9.14_pre1, Fluxbox uses XFT for font rendering. If"
-	einfo "you experience font problems, try tinkering with your theme files."
-	einfo "You can check the validity of a font name using:"
-	einfo
-	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
-	einfo
-	einfo "The slow startup issues in previous versions should now be fixed;"
-	einfo "if you still encounter problems, please report bugs upstream."
-	epause
-}
-
diff --git a/x11-wm/fluxbox/fluxbox-0.9.15.ebuild b/x11-wm/fluxbox/fluxbox-0.9.15.ebuild
deleted file mode 100644
index 93497094ad25..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.15.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.15.ebuild,v 1.2 2007/04/19 18:48:03 grobian Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib disableslit"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="|| ( ( x11-libs/libXpm
-			x11-libs/libXrandr
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
-	virtual/xft
-	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
-		nls? ( sys-devel/gettext )
-		|| ( ( x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-		)
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-pkg_setup() {
-	if use imlib ; then
-		if ! built_with_use media-libs/imlib2 X ; then
-			eerror "To build fluxbox with imlib in USE, you need an X enabled"
-			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
-			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
-			die "USE=imlib requires imlib2 with USE=X"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/0.9.13/${PN}-0.9.13-our-styles-go-over-here.patch"
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-
-	# Turn on aa by default if possible. Fluxbox fonts are really frickin'
-	# broken, we'll do what we can to make it less painful by default.
-	use truetype 1>/dev/null && \
-		echo "session.screen0.antialias: true" >> data/init.in
-
-	# Fix broken styles
-	ebegin "Fixing backgrounds..."
-	for style in "${S}/data/styles/"* ; do
-		[[ -f "${style}" ]] || continue
-		sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \
-			|| die "styles sed failed on ${style}"
-	done
-	eend 0
-}
-
-src_compile() {
-	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable kde) \
-		$(use_enable gnome) \
-		$(use_enable imlib imlib2) \
-		$(use_enable !disableslit slit ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
-	fperms a+x /etc/X11/Sessions/fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
-
-	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox" || die
-	doins "${FILESDIR}/styles-menu-commonbox" || die
-	doins "${FILESDIR}/styles-menu-user" || die
-}
-
-pkg_postinst() {
-	einfo "As of fluxbox 0.9.10-r3, we are using an improved layout for"
-	einfo "styles to avoid problems with huge menus. Use the following"
-	einfo "in the menu for your menu styles section:"
-	einfo
-	einfo "    [submenu] (Styles) {Select a Style}"
-	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
-	einfo "    [end]"
-	einfo
-	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
-	einfo "menu file, this will already be present."
-	einfo
-	ewarn "Note that menumaker and similar utilities do *not* support"
-	ewarn "this out of the box."
-	einfo
-	einfo "As of fluxbox 0.9.14_pre1, Fluxbox uses XFT for font rendering. If"
-	einfo "you experience font problems, try tinkering with your theme files."
-	einfo "You can check the validity of a font name using:"
-	einfo
-	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
-	einfo
-	einfo "The slow startup issues in previous versions should now be fixed;"
-	einfo "if you still encounter problems, please report bugs upstream."
-	epause
-}
-
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc1.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc1.ebuild
deleted file mode 100644
index 92eb04d5d41f..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.0_rc1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0_rc1.ebuild,v 1.2 2007/04/19 18:48:03 grobian Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-MY_P="fluxbox-1.0rc"
-
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/fluxbox/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="|| ( ( x11-libs/libXpm
-			x11-libs/libXrandr
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
-	virtual/xft
-	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
-		nls? ( sys-devel/gettext )
-		|| ( ( x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-		)
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-pkg_setup() {
-	if use imlib ; then
-		if ! built_with_use media-libs/imlib2 X ; then
-			eerror "To build fluxbox with imlib in USE, you need an X enabled"
-			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
-			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
-			die "USE=imlib requires imlib2 with USE=X"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/1.0_rc1/${PN}-1.0_rc1-our-styles-go-over-here.patch"
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-
-	# Turn on aa by default if possible. Fluxbox fonts are really frickin'
-	# broken, we'll do what we can to make it less painful by default.
-	use truetype 1>/dev/null && \
-		echo "session.screen0.antialias: true" >> data/init.in
-
-	# Fix broken styles
-	ebegin "Fixing backgrounds..."
-	for style in "${S}/data/styles/"* ; do
-		[[ -f "${style}" ]] || continue
-		sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \
-			|| die "styles sed failed on ${style}"
-	done
-	eend 0
-}
-
-src_compile() {
-	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable kde) \
-		$(use_enable gnome) \
-		$(use_enable imlib imlib2) \
-		$(use_enable !disableslit slit ) \
-		$(use_enable !disabletoolbar toolbar ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
-	fperms a+x /etc/X11/Sessions/fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
-
-	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox" || die
-	doins "${FILESDIR}/styles-menu-commonbox" || die
-	doins "${FILESDIR}/styles-menu-user" || die
-}
-
-pkg_postinst() {
-	einfo "As of fluxbox 0.9.10-r3, we are using an improved layout for"
-	einfo "styles to avoid problems with huge menus. Use the following"
-	einfo "in the menu for your menu styles section:"
-	einfo
-	einfo "    [submenu] (Styles) {Select a Style}"
-	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
-	einfo "    [end]"
-	einfo
-	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
-	einfo "menu file, this will already be present."
-	einfo
-	einfo "Note that menumaker and similar utilities do *not* support"
-	einfo "this out of the box."
-	einfo
-	einfo "As of fluxbox 0.9.14_pre1, Fluxbox uses XFT for font rendering. If"
-	einfo "you experience font problems, try tinkering with your theme files."
-	einfo "You can check the validity of a font name using:"
-	einfo
-	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
-	einfo
-	einfo "The slow startup issues in previous versions should now be fixed;"
-	einfo "if you still encounter problems, please report bugs upstream."
-	epause
-}
-
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc2-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc2-r1.ebuild
deleted file mode 100644
index d18d7c5ddfb3..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0_rc2-r1.ebuild,v 1.2 2007/04/19 18:48:03 grobian Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-MY_P="fluxbox-1.0rc2"
-
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/fluxbox/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="|| ( ( x11-libs/libXpm
-			x11-libs/libXrandr
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
-	virtual/xft
-	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
-		nls? ( sys-devel/gettext )
-		|| ( ( x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-		)
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-pkg_setup() {
-	if use imlib ; then
-		if ! built_with_use media-libs/imlib2 X ; then
-			eerror "To build fluxbox with imlib in USE, you need an X enabled"
-			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
-			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
-			die "USE=imlib requires imlib2 with USE=X"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/1.0_rc2/${PN}-1.0_rc2-our-styles-go-over-here.patch"
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-
-	# Turn on aa by default if possible. Fluxbox fonts are really frickin'
-	# broken, we'll do what we can to make it less painful by default.
-	use truetype 1>/dev/null && \
-		echo "session.screen0.antialias: true" >> data/init.in
-
-	# Fix broken styles
-	ebegin "Fixing backgrounds..."
-	for style in "${S}/data/styles/"* ; do
-		[[ -f "${style}" ]] || continue
-		sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \
-			|| die "styles sed failed on ${style}"
-	done
-	eend 0
-}
-
-src_compile() {
-	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable kde) \
-		$(use_enable gnome) \
-		$(use_enable imlib imlib2) \
-		$(use_enable !disableslit slit ) \
-		$(use_enable !disabletoolbar toolbar ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
-	fperms a+x /etc/X11/Sessions/fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
-
-	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox" || die
-	doins "${FILESDIR}/styles-menu-commonbox" || die
-	doins "${FILESDIR}/styles-menu-user" || die
-}
-
-pkg_postinst() {
-	einfo "As of fluxbox 0.9.10-r3, we are using an improved layout for"
-	einfo "styles to avoid problems with huge menus. Use the following"
-	einfo "in the menu for your menu styles section:"
-	einfo
-	einfo "    [submenu] (Styles) {Select a Style}"
-	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
-	einfo "    [end]"
-	einfo
-	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
-	einfo "menu file, this will already be present."
-	einfo
-	einfo "Note that menumaker and similar utilities do *not* support"
-	einfo "this out of the box."
-	einfo
-	einfo "As of fluxbox 0.9.14_pre1, Fluxbox uses XFT for font rendering. If"
-	einfo "you experience font problems, try tinkering with your theme files."
-	einfo "You can check the validity of a font name using:"
-	einfo
-	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
-	einfo
-	einfo "The slow startup issues in previous versions should now be fixed;"
-	einfo "if you still encounter problems, please report bugs upstream."
-	epause
-}
-
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc2-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc2-r2.ebuild
deleted file mode 100644
index 4d3cbeaba138..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.0_rc2-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0_rc2-r2.ebuild,v 1.3 2007/04/19 18:48:03 grobian Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-MY_P="fluxbox-1.0rc2"
-
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/fluxbox/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="|| ( ( x11-libs/libXpm
-			x11-libs/libXrandr
-			xinerama? ( x11-libs/libXinerama )
-			x11-apps/xmessage
-		)
-		virtual/x11
-	)
-	virtual/xft
-	truetype? ( media-libs/freetype )
-	imlib? ( >=media-libs/imlib2-1.2.0 )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
-		nls? ( sys-devel/gettext )
-		|| ( ( x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-		)
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-pkg_setup() {
-	if use imlib ; then
-		if ! built_with_use media-libs/imlib2 X ; then
-			eerror "To build fluxbox with imlib in USE, you need an X enabled"
-			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
-			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
-			die "USE=imlib requires imlib2 with USE=X"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/1.0_rc2/${PN}-1.0_rc2-our-styles-go-over-here.patch"
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-
-	# Turn on aa by default if possible. Fluxbox fonts are really frickin'
-	# broken, we'll do what we can to make it less painful by default.
-	use truetype 1>/dev/null && \
-		echo "session.screen0.antialias: true" >> data/init.in
-
-	# Fix broken styles
-	ebegin "Fixing backgrounds..."
-	for style in "${S}/data/styles/"* ; do
-		[[ -f "${style}" ]] || continue
-		sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \
-			|| die "styles sed failed on ${style}"
-	done
-	eend 0
-}
-
-src_compile() {
-	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable kde) \
-		$(use_enable gnome) \
-		$(use_enable imlib imlib2) \
-		$(use_enable !disableslit slit ) \
-		$(use_enable !disabletoolbar toolbar ) \
-		--sysconfdir=/etc/X11/${PN} \
-		--with-style=/usr/share/fluxbox/styles/Emerge \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
-	fperms a+x /etc/X11/Sessions/fluxbox
-
-	dodir /usr/share/fluxbox/menu.d
-
-	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/styles-menu-fluxbox" || die
-	doins "${FILESDIR}/styles-menu-commonbox" || die
-	doins "${FILESDIR}/styles-menu-user" || die
-}
-
-pkg_postinst() {
-	einfo "As of fluxbox 0.9.10-r3, we are using an improved layout for"
-	einfo "styles to avoid problems with huge menus. Use the following"
-	einfo "in the menu for your menu styles section:"
-	einfo
-	einfo "    [submenu] (Styles) {Select a Style}"
-	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
-	einfo "    [end]"
-	einfo
-	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
-	einfo "menu file, this will already be present."
-	einfo
-	einfo "Note that menumaker and similar utilities do *not* support"
-	einfo "this out of the box."
-	einfo
-	einfo "As of fluxbox 0.9.14_pre1, Fluxbox uses XFT for font rendering. If"
-	einfo "you experience font problems, try tinkering with your theme files."
-	einfo "You can check the validity of a font name using:"
-	einfo
-	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
-	einfo
-	einfo "The slow startup issues in previous versions should now be fixed;"
-	einfo "if you still encounter problems, please report bugs upstream."
-	epause
-}
-