Marking stable on amd64, plus some small version cleanups

Package-Manager: portage-2.1.5.2

4 files changed, 9 insertions, 124 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 82fa82b94bd0..4f6354ee86a3 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,10 @@
 # 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.250 2008/05/13 18:34:39 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.251 2008/05/22 13:36:02 lack Exp $
+
+  22 May 2008; Jim Ramsay <lack@gentoo.org> -fluxbox-1.0.0-r1.ebuild,
+  fluxbox-1.0.0-r2.ebuild:
+  Marking stable on amd64, plus some small version cleanups
 
   13 May 2008; Joseph Jezak <josejx@gentoo.org> fluxbox-1.0.0-r2.ebuild:
   Marked ppc stable.
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 68da90f822f3..de6db9309439 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -11,8 +11,7 @@ AUX styles-menu-user 93 RMD160 2a6831b45ce1d655586b699d16c0547de201d187 SHA1 84a
 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
 EBUILD fluxbox-0.9.15.1-r2.ebuild 5101 RMD160 691d8e8de1005a729c88b88430f6b527153a750d SHA1 b9dc8faebcd3e6faed83349fbc5bf2e62f935c7e SHA256 70de14f0efc8dcf9f2de41b30fd7a7a9fdb9333037e79c9e8599bcbbcf01af7c
-EBUILD fluxbox-1.0.0-r1.ebuild 3554 RMD160 16907693e27f9ae22be7ef1181d4730e4cd14ce2 SHA1 88e764534722753f7ec32cff0394eceb50d4a209 SHA256 4c60c8cc95010f4efe0f77fec18e7191c9c79e23aa33cc8631f7b1b4ac163243
-EBUILD fluxbox-1.0.0-r2.ebuild 3623 RMD160 18e888cdc2748376bb70e989fd72546cbfc47c8b SHA1 e9c5ab880695d4d5cc44beb6fcd8e144df4960da SHA256 218bde145af069f2c2f442c23aab1a634aad388c25efd2d396aeabb44bcb3cf1
+EBUILD fluxbox-1.0.0-r2.ebuild 3620 RMD160 bacaa7bb3d56173da6e0245b2ab580c40f3e0af1 SHA1 2de35e297ff939c324dd3ba25be21ef84e23b471 SHA256 b39f9039b6d9b35c6dd858a9c55674b53fc5e288419ef060ba9d03bdccd7beb8
 EBUILD fluxbox-1.0.0.ebuild 3479 RMD160 4f03ae5c929ec5a5bf29910860d49c13588ee204 SHA1 7bfeb545af7967ed61a960569184fcb159f1224b SHA256 02181696623588a70588203a6e8c876d3f1eb84d1a8544b88bc3dea9c09ac580
-MISC ChangeLog 46417 RMD160 c5cab482549ded7f630bf3df47f3c59c09dcc53a SHA1 0504e704281220be93aafdbee8292b2837075580 SHA256 cf2dcce3914bcabb296e1750e31cb7861ab1c55f46968ab8ee3cfb2aed019b36
+MISC ChangeLog 46573 RMD160 3bdce07570b90eec3a2ada38783d2a5be2663276 SHA1 5d1898db06a8d320e924ff4cbb15a7d518897da6 SHA256 1cfc2b82725fb43bf72ff96dde47ef7446c2a0f68f6b269555c325e391d466bb
 MISC metadata.xml 618 RMD160 d06c3246e645704d853d41cde2a107862c01bc66 SHA1 7be20ded4b048a03e245f8e57f5729a4820f8919 SHA256 7d683754723ec39ae547fc1ddfb6d538e6dd3bec053d668b8a2ded890612695e
diff --git a/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild
deleted file mode 100644
index ae43e5357619..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild,v 1.3 2008/02/28 15:27:57 lack Exp $
-
-EAPI=1
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib +slit +toolbar vim-syntax"
-
-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 )
-	vim-syntax? ( app-vim/fluxbox-syntax )
-	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	!<=x11-misc/fluxconf-0.9.9
-	!<=x11-misc/fbdesk-1.2.1"
-DEPEND="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 && ! 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
-}
-
-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}/${PV}/gentoo_style_location.patch"
-
-	# A couple menu generation fixes, #199437 and #199439
-	epatch "${FILESDIR}/${PV}/generate-menu.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"
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable kde) \
-		$(use_enable gnome) \
-		$(use_enable imlib imlib2) \
-		$(use_enable slit ) \
-		$(use_enable 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
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}/${PN}.xsession" 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
-}
diff --git a/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
index af4f3fa9cccf..0962b106b7a8 100644
--- a/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.5 2008/05/13 18:34:39 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.6 2008/05/22 13:36:03 lack Exp $
 
 EAPI=1
 inherit eutils
@@ -36,7 +36,7 @@ PROVIDE="virtual/blackbox"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
 pkg_setup() {
 	if use imlib && ! built_with_use media-libs/imlib2 X ; then