Moved local USE flags to metadata.xml, and cleaned up some versions

(Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo x86_64)

5 files changed, 13 insertions, 185 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 007a14502506..1c3a9a7033fa 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.252 2008/07/25 20:22:45 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.253 2008/07/29 15:18:42 lack Exp $
+
+  29 Jul 2008; Jim Ramsay <lack@gentoo.org>
+  -files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch,
+  -files/0.9.15/129065-fix-doubleclick-64bit.patch, metadata.xml,
+  -fluxbox-0.9.15.1-r2.ebuild:
+  Moved local USE flags to metadata.xml, and cleaned up some versions
 
   25 Jul 2008; Jim Ramsay <lack@gentoo.org> fluxbox-1.0.0-r2.ebuild:
   Enabling imlib USE flag by default.
diff --git a/x11-wm/fluxbox/files/0.9.15/129065-fix-doubleclick-64bit.patch b/x11-wm/fluxbox/files/0.9.15/129065-fix-doubleclick-64bit.patch
deleted file mode 100644
index 569c4081822f..000000000000
--- a/x11-wm/fluxbox/files/0.9.15/129065-fix-doubleclick-64bit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/src/FbWinFrame.cc	2006/04/09 13:38:13	4293
-+++ trunk/src/FbWinFrame.cc	2006/04/14 14:32:16	4300
-@@ -856,7 +856,7 @@
-     if (event.button < 1 || event.button > 5)
-         return;
- 
--    static int last_release_time = 0;
-+    static Time last_release_time = 0;
-     bool double_click = (event.time - last_release_time <= m_double_click_time);
-     last_release_time = event.time;
-     int real_button = event.button - 1;
diff --git a/x11-wm/fluxbox/files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch b/x11-wm/fluxbox/files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch
deleted file mode 100644
index 01e4470c4c2b..000000000000
--- a/x11-wm/fluxbox/files/0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- util/fluxbox-generate_menu.in	2005-04-28 11:21:09.000000000 +0100
-+++ util/fluxbox-generate_menu.in.new	2005-05-13 23:46:12.647655824 +0100
-@@ -1638,12 +1638,8 @@
- append_submenu "${FBSETTINGSMENU}"
-     append "[config] (${CONFIGUREMENU})"
- 
--    append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
--        append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
--    append_menu_end
--
--    append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
--        append "[stylesdir] (~/.fluxbox/styles)"
-+    append_submenu "Styles"
-+        append "[include] (/usr/share/fluxbox/menu.d/styles/)"
-     append_menu_end
- 
-     # Backgroundmenu
diff --git a/x11-wm/fluxbox/fluxbox-0.9.15.1-r2.ebuild b/x11-wm/fluxbox/fluxbox-0.9.15.1-r2.ebuild
deleted file mode 100644
index 9b854f187a87..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.15.1-r2.ebuild
+++ /dev/null
@@ -1,156 +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-r2.ebuild,v 1.11 2007/07/22 04:33:42 omp 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 )
-	x11-apps/xmessage
-	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 )
-	${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.15/${PN}-0.9.15-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/metadata.xml b/x11-wm/fluxbox/metadata.xml
index 94426944f3ae..20560c664b33 100644
--- a/x11-wm/fluxbox/metadata.xml
+++ b/x11-wm/fluxbox/metadata.xml
@@ -13,4 +13,10 @@
 		better KDE and GNOME integration, an integrated keygrabber and countless
 		additonal features.
 		]]></longdescription>
+	<use>
+		<flag name='disableslit'>Disables the fluxbox slit (or dock)</flag>
+		<flag name='disabletoolbar'>Disables the fluxbox toolbar</flag>
+		<flag name='slit'>Enables the fluxbox slit (or dock)</flag>
+		<flag name='toolbar'>Enables the fluxbox toolbar</flag>
+	</use>
 </pkgmetadata>