Tidy up

(Portage version: 2.0.51.21-r1 goat on a rope edition)

7 files changed, 6 insertions, 338 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 861e41eaaffb..461b0b45321c 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.152 2005/05/14 02:30:26 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.153 2005/05/14 02:46:34 ciaranm Exp $
+
+  14 May 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  -fluxbox-0.9.8-r1.ebuild, -fluxbox-0.9.10-r3.ebuild,
+  -fluxbox-0.9.10-r4.ebuild:
+  Tidy up
 
 *fluxbox-0.9.13 (14 May 2005)
 
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r3 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r3
deleted file mode 100644
index 102f1b571a9e..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a04a21960b8bc364bcc002389008989 fluxbox-0.9.10.tar.bz2 556030
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r4 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r4
deleted file mode 100644
index a9ebe0ee627c..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.10-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7a04a21960b8bc364bcc002389008989 fluxbox-0.9.10.tar.bz2 556030
-MD5 123d70b4481cd897fe8356694a58cff7 fluxbox-0.9.10-biiiiig-update.patch.bz2 46527
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.8-r1 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.8-r1
deleted file mode 100644
index abcc6ec7c3bb..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bee6a71fe57be7b31cbcdaf72816130b fluxbox-0.9.8.tar.gz 687539
diff --git a/x11-wm/fluxbox/fluxbox-0.9.10-r3.ebuild b/x11-wm/fluxbox/fluxbox-0.9.10-r3.ebuild
deleted file mode 100644
index 4958a970c327..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.10-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.10-r3.ebuild,v 1.11 2005/01/02 18:21:50 hansmi Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs, an iconbar and KDE/GNOME protocol support"
-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="virtual/x11
-	truetype? ( media-libs/freetype )
-	nls? ( sys-devel/gettext )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 ppc sparc amd64 alpha hppa ~ia64 ~mips ~ppc64 ~ppc-macos"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix crashy badness on amd64. From upstream.
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-amd64-font-fix.patch
-
-	# Other crash fixes. Pulled from -cvs upstream.
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-windowmenu-crash.patch
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-workspacemenu-crash.patch
-
-	# Make xcomposite not screw things up. From upstream.
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-make-pretty-eye-candy-work.patch
-
-	# Scary X error updates from upstream.
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-misc-updates.patch
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-super-x-voodoo.patch
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-super-x-voodoo-two.patch
-
-	# Some fluxbox-generate_menu things. These are ciaranm's fault...
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-posix-on-toast.patch
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-my-term-is-better-than-your-term.patch
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-editor-thingies.patch
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-all-about-me.patch
-
-	# 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}/${PV}/${PN}-${PV}-menu-include-directories.patch
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-fancy-gentoo-styledirs.patch
-
-	# Since we're patching heavily, make fluxbox -version say what we're
-	# really running.
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1${PR:+-gentoo-${PR}}~" \
-		version.h.in || die "version sed failed"
-}
-
-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` \
-		--sysconfdir=/etc/X11/${PN} \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc README* AUTHORS TODO* COPYING
-
-	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}/${PV}/styles-menu-fluxbox
-	doins ${FILESDIR}/${PV}/styles-menu-commonbox
-	doins ${FILESDIR}/${PV}/styles-menu-user
-}
-
-pkg_postinst() {
-	einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
-	einfo "handling styles in the menu. To take advantage of this, use"
-	einfo "the following 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."
-	ewarn " "
-	ewarn "You must restart fluxbox before using the [include] /directory/"
-	ewarn "feature!"
-	ewarn " "
-	epause
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild b/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild
deleted file mode 100644
index 4c8401e9a580..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild,v 1.5 2005/01/02 18:21:50 hansmi Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome bigger-fonts"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2
-	mirror://gentoo/${P}-biiiiig-update.patch.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="virtual/x11
-	truetype? ( media-libs/freetype )
-	nls? ( sys-devel/gettext )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips ppc64 ~ppc-macos"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Branch update from upstream CVS
-	epatch ${WORKDIR}/${PN}-${PV}-biiiiig-update.patch
-
-	# Fix locales, see discussion in bug 65803.
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-eat-this-setlocale.patch
-
-	# Some fluxbox-generate_menu things. These are ciaranm's fault...
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-posix-on-toast.patch
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-my-term-is-better-than-your-term.patch
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-editor-thingies.patch
-	epatch ${FILESDIR}/${PV}/${PN}-${PV}-all-about-me.patch
-
-	# 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}/${PV}/${PN}-${PV}-fancy-gentoo-styledirs.patch
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-gentoo${PR:+-${PR}}~" \
-		version.h.in || die "version sed failed"
-
-	# Use a less fugly default theme
-	sed -i \
-		-e 's~styles/Meta~styles/Emerge~' data/init.in
-
-	# 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
-
-	ebegin "Fixing style fonts..."
-	for style in data/styles/* ; do
-		[[ -d "${style}" ]] && style=${style}/theme.cfg
-		[[ -f "${style}" ]] || die "waah! ${style} doesn't exist"
-
-		# Make fonts more readable if we use bigger-fonts
-		use bigger-fonts 1>/dev/null && ( sed -i \
-			-e 's~\([fF]ont:[ \t]\+[a-zA-Z]\+-\)[789]~\110~' \
-			${style} || die "sed voodoo failed (insufficient goats?)" )
-
-		# We don't have a reliable sans font alias, change it to lucidasans.
-		# That might not work either, but it's more likely...
-		sed -i \
-			-e 's~\([ \t:]\)sans\(-\|$\)~\1lucidasans\2~' \
-			${style} || die "sed voodoo failed (not a full moon)"
-	done
-	eend $?
-}
-
-src_compile() {
-	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
-	# Our megapatch means we need to regen this little lot...
-	ebegin "Updating autotools-generated files"
-	aclocal -I . || die "aclocal failed"
-	autoheader || die "autoheader failed"
-	automake -a || die "automake failed"
-	autoconf || die "autoconf failed"
-	eend $?
-
-	econf \
-		`use_enable nls` \
-		`use_enable xinerama` \
-		`use_enable truetype xft` \
-		`use_enable kde` \
-		`use_enable gnome` \
-		--sysconfdir=/etc/X11/${PN} \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc README* AUTHORS TODO* COPYING
-
-	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}/${PV}/styles-menu-fluxbox
-	doins ${FILESDIR}/${PV}/styles-menu-commonbox
-	doins ${FILESDIR}/${PV}/styles-menu-user
-}
-
-pkg_postinst() {
-	einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
-	einfo "handling styles in the menu. To take advantage of this, use"
-	einfo "the following 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 " "
-	if has_version '<x11-wm/fluxbox-0.9.10-r3' ; then
-		ewarn "You must restart fluxbox before using the [include] /directory/"
-		ewarn "feature if you are upgrading from an older fluxbox!"
-		ewarn " "
-	fi
-	ewarn "Be warned that anything involving XComposite is extremely "
-	ewarn "experimental. Please don't report bugs unless they also occur "
-	ewarn "with XComposite disabled."
-	ewarn " "
-	epause
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.8-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.8-r1.ebuild
deleted file mode 100644
index 0be62a8efe03..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.8-r1.ebuild,v 1.5 2005/01/02 18:21:50 hansmi Exp $
-
-IUSE="nls xinerama truetype kde gnome"
-
-DESCRIPTION="Fluxbox is a lightweight windowmanager for X featuring tabs."
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.gz"
-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.
-DEPEND=">=sys-devel/autoconf-2.52
-		${RDEPEND}"
-RDEPEND="virtual/x11
-	truetype? ( media-libs/freetype )
-	nls? ( sys-devel/gettext )"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 ppc sparc amd64 alpha hppa ia64 mips"
-
-src_compile() {
-	econf \
-		`use_enable nls` \
-		`use_enable xinerama` \
-		`use_enable truetype xft` \
-		`use_enable kde` \
-		`use_enable gnome` \
-		--sysconfdir=/etc/X11/${PN} \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc README* AUTHORS TODO* COPYING
-
-	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
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "Please note that this release no longer uses commonbox.eclass"
-	ewarn "and now installs data files in /usr/share/fluxbox."
-	ewarn
-	einfo "This ebuild now creates an /etc/X11/Sessions entry."
-	einfo
-}
-