Version cleanup, also fixes bug 207504

Package-Manager: portage-2.1.4_rc14

5 files changed, 10 insertions, 179 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/Manifest b/x11-wm/fluxbox/Manifest
index 2662befcf210..b9f29848cc56 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -14,10 +14,6 @@ AUX 1.0.0/gentoo_style_location.patch 676 RMD160 1425985eaa03a4404a4a0128d7e695d
 MD5 2440cd51fb1517b9f949fbbdc50d8d19 files/1.0.0/gentoo_style_location.patch 676
 RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f files/1.0.0/gentoo_style_location.patch 676
 SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f files/1.0.0/gentoo_style_location.patch 676
-AUX 1.0_rc3/gentoo_style_location.patch 676 RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f SHA1 83d725fd320b8f9af329176bc8941b843e4ab559 SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f
-MD5 2440cd51fb1517b9f949fbbdc50d8d19 files/1.0_rc3/gentoo_style_location.patch 676
-RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f files/1.0_rc3/gentoo_style_location.patch 676
-SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f files/1.0_rc3/gentoo_style_location.patch 676
 AUX fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57b4d0fad653660cc6cf0a2cd808b7a34d72b95 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a files/fluxbox.desktop 202
@@ -40,8 +36,6 @@ RMD160 2a6831b45ce1d655586b699d16c0547de201d187 files/styles-menu-user 93
 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 files/styles-menu-user 93
 DIST fluxbox-0.9.15.1.tar.bz2 685740 RMD160 aa9418de9ff700c14b21911f6de24503449e7f0f SHA1 94652432037203f1619ba8ed657339fb85b3c894 SHA256 b72bfcbe26651323d975a2469ba426da8e8e7d96b813061386f4bc5148dfb2b9
 DIST fluxbox-1.0.0.tar.bz2 767586 RMD160 320b11a1cf96a757da079886cd6496b9d84ab202 SHA1 7985e35fbb170fda24b9e04610690cd04c7a8748 SHA256 3c27672fdd4709d7f5c7968b4197ef704fce82766f51a5bebf411953516794c5
-DIST fluxbox-1.0_rc3_p4983.patch.gz 115293 RMD160 425c937fdd0b25503b50a3c490725aee52b31d29 SHA1 d1782d1d3a88c3b432cad7a68e051780e1d701d3 SHA256 051ce8d5d37f2ab22ac25db71a0a557244adc5b5a67e207dfb6204ffde8788fd
-DIST fluxbox-1.0rc3.tar.bz2 780622 RMD160 5086545ea2c2b0dd71f17d314838d04f197a1294 SHA1 4524960e3e9702b61e29c5e1dfae8c050abaaf7f SHA256 cf1e2aa77716e42b2457b19989c2b2d2fc5f7d900cc16a3621a2e42372f474b6
 EBUILD fluxbox-0.9.15.1-r2.ebuild 5101 RMD160 691d8e8de1005a729c88b88430f6b527153a750d SHA1 b9dc8faebcd3e6faed83349fbc5bf2e62f935c7e SHA256 70de14f0efc8dcf9f2de41b30fd7a7a9fdb9333037e79c9e8599bcbbcf01af7c
 MD5 4df14c6939f328d192e057445f3ab068 fluxbox-0.9.15.1-r2.ebuild 5101
 RMD160 691d8e8de1005a729c88b88430f6b527153a750d fluxbox-0.9.15.1-r2.ebuild 5101
@@ -54,14 +48,10 @@ EBUILD fluxbox-1.0.0.ebuild 3479 RMD160 4f03ae5c929ec5a5bf29910860d49c13588ee204
 MD5 3c1270af4ae771790d0cb2f18b984e5a fluxbox-1.0.0.ebuild 3479
 RMD160 4f03ae5c929ec5a5bf29910860d49c13588ee204 fluxbox-1.0.0.ebuild 3479
 SHA256 02181696623588a70588203a6e8c876d3f1eb84d1a8544b88bc3dea9c09ac580 fluxbox-1.0.0.ebuild 3479
-EBUILD fluxbox-1.0_rc3_p4983.ebuild 4076 RMD160 f077de39e00780dcc7ccb0c2db263aebe59a6079 SHA1 9a5c9918ae75dff4be208b6f866385c084e39005 SHA256 30042d57f5f5af21f60fb87732cbbc533d16272a573af89446ee9b71bc8ce14c
-MD5 8cf6d392ffcf5cd57c0459bc3bf251d0 fluxbox-1.0_rc3_p4983.ebuild 4076
-RMD160 f077de39e00780dcc7ccb0c2db263aebe59a6079 fluxbox-1.0_rc3_p4983.ebuild 4076
-SHA256 30042d57f5f5af21f60fb87732cbbc533d16272a573af89446ee9b71bc8ce14c fluxbox-1.0_rc3_p4983.ebuild 4076
-MISC ChangeLog 45592 RMD160 f3c8bd8796ec275ec1c29453de30ba059f43bf10 SHA1 57eddd4b4436d6956f7c233fd410dc31f3418d43 SHA256 42fc089d4940e062cf932a23fa6fee9f144924c227ff6e10542d49e81601ffa8
-MD5 0889d6ea4af7279a32413df661719be1 ChangeLog 45592
-RMD160 f3c8bd8796ec275ec1c29453de30ba059f43bf10 ChangeLog 45592
-SHA256 42fc089d4940e062cf932a23fa6fee9f144924c227ff6e10542d49e81601ffa8 ChangeLog 45592
+MISC ChangeLog 45755 RMD160 065ec15aca42673a31cf620cc03ee863d2f45d49 SHA1 567307a5bcc6c1e023f66b480c34ccf41f0499d9 SHA256 ad921c46941efd1bb7614d4e0bb3cb9dfb106a8495fa5bc381d3db531f279f0a
+MD5 670496dbb92c4972e20a943456a71559 ChangeLog 45755
+RMD160 065ec15aca42673a31cf620cc03ee863d2f45d49 ChangeLog 45755
+SHA256 ad921c46941efd1bb7614d4e0bb3cb9dfb106a8495fa5bc381d3db531f279f0a ChangeLog 45755
 MISC metadata.xml 618 RMD160 d06c3246e645704d853d41cde2a107862c01bc66 SHA1 7be20ded4b048a03e245f8e57f5729a4820f8919 SHA256 7d683754723ec39ae547fc1ddfb6d538e6dd3bec053d668b8a2ded890612695e
 MD5 82f81c9a33a16467c021014cf7511273 metadata.xml 618
 RMD160 d06c3246e645704d853d41cde2a107862c01bc66 metadata.xml 618
@@ -75,6 +65,3 @@ SHA256 5d61d717895c9d2413e9999992553461d3df1da7d215a3b504a8974b4af9a31b files/di
 MD5 3a99f696be3311117d9958369fb6e80f files/digest-fluxbox-1.0.0-r1 244
 RMD160 6cdebf42f5f096a58246c074f4b28debf053f000 files/digest-fluxbox-1.0.0-r1 244
 SHA256 5d61d717895c9d2413e9999992553461d3df1da7d215a3b504a8974b4af9a31b files/digest-fluxbox-1.0.0-r1 244
-MD5 9d783a1fd8f4c0dc6c0584ae93f61e27 files/digest-fluxbox-1.0_rc3_p4983 518
-RMD160 66957ca6a555227dde85e936915ce4547eb969db files/digest-fluxbox-1.0_rc3_p4983 518
-SHA256 f2c2246121242476d9d9f40597aa820b4e70c1d4bc3dd5b6839b92a92fa5718e files/digest-fluxbox-1.0_rc3_p4983 518
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
-}