Version cleanup, also fixes bug 207504

(Portage version: 2.1.4_rc14)

4 files changed, 6 insertions, 162 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 62ccecef7d2c..206fa65b63b4 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,10 @@
 # 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.244 2007/12/26 19:27:02 lack Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.245 2008/01/28 14:45:11 lack Exp $
+
+  28 Jan 2008; Jim Ramsay <lack@gentoo.org>
+  -files/1.0_rc3/gentoo_style_location.patch, -fluxbox-1.0_rc3_p4983.ebuild:
+  Version cleanup, also fixes bug 207504
 
 *fluxbox-1.0.0-r1 (26 Dec 2007)
 
diff --git a/x11-wm/fluxbox/files/1.0_rc3/gentoo_style_location.patch b/x11-wm/fluxbox/files/1.0_rc3/gentoo_style_location.patch
deleted file mode 100644
index 3bf59802ab1f..000000000000
--- a/x11-wm/fluxbox/files/1.0_rc3/gentoo_style_location.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- util/fluxbox-generate_menu.in.orig	2007-07-13 13:47:11.000000000 -0600
-+++ util/fluxbox-generate_menu.in	2007-07-13 13:51:03.000000000 -0600
-@@ -1803,12 +1803,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] (~/.@pkgprefix@fluxbox@pkgsuffix@/styles)"
-+    append_submenu "Styles"
-+        append "[include] (/usr/share/fluxbox/menu.d/styles/)"
-     append_menu_end
- 
-     # Backgroundmenu
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3_p4983 b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3_p4983
deleted file mode 100644
index d8fc75258545..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3_p4983
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31765a651afb84b86822f39379893574 fluxbox-1.0_rc3_p4983.patch.gz 115293
-RMD160 425c937fdd0b25503b50a3c490725aee52b31d29 fluxbox-1.0_rc3_p4983.patch.gz 115293
-SHA256 051ce8d5d37f2ab22ac25db71a0a557244adc5b5a67e207dfb6204ffde8788fd fluxbox-1.0_rc3_p4983.patch.gz 115293
-MD5 8ed52d10d7de72efab0948eaaa4a6a50 fluxbox-1.0rc3.tar.bz2 780622
-RMD160 5086545ea2c2b0dd71f17d314838d04f197a1294 fluxbox-1.0rc3.tar.bz2 780622
-SHA256 cf1e2aa77716e42b2457b19989c2b2d2fc5f7d900cc16a3621a2e42372f474b6 fluxbox-1.0rc3.tar.bz2 780622
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc3_p4983.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc3_p4983.ebuild
deleted file mode 100644
index db1e3985f513..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.0_rc3_p4983.ebuild
+++ /dev/null
@@ -1,137 +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_rc3_p4983.ebuild,v 1.10 2007/10/11 18:19:43 lack Exp $
-
-inherit eutils autotools versionator
-
-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.0rc3"
-MY_PBASE=$(get_version_component_range 1-3)
-MY_SVN=$(get_version_component_range 4)
-
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/fluxbox/${MY_P}.tar.bz2
-	mirror://gentoo/${P}.patch.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. 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
-	!<=x11-misc/fluxconf-0.9.9"
-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 ~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}"
-
-	epatch "${WORKDIR}/${P}.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}/${MY_PBASE}/gentoo_style_location.patch"
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="${MY_SVN}-gentoo"
-	else
-		suffix="${MY_SVN}-gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-
-	# 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
-
-	eautoreconf
-
-	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
-}