commit a revision to 1.0_rc2 to fix MY_P

(Portage version: 2.1-r1)
 (Unsigned Manifest commit)

2 files changed, 12 insertions, 176 deletions

diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index f8089c5d2550..223fd835e19b 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -38,6 +38,7 @@ DIST fluxbox-0.9.14.tar.bz2 671916 RMD160 17cb299115164303972988471526a57bf0eeeb
 DIST fluxbox-0.9.15.1.tar.bz2 685740 RMD160 aa9418de9ff700c14b21911f6de24503449e7f0f SHA1 94652432037203f1619ba8ed657339fb85b3c894 SHA256 b72bfcbe26651323d975a2469ba426da8e8e7d96b813061386f4bc5148dfb2b9
 DIST fluxbox-0.9.15.tar.bz2 685941 RMD160 5359cc09ac960f94232aa0009077592929cb01b1 SHA1 ab76c90e400267a6ad7e600f50a7353a9bd1c2f9 SHA256 99726df74bc21abc5f417f858dca700b3baef62c9a21d35c890bd75113ad55a6
 DIST fluxbox-1.0rc.tar.bz2 744865 RMD160 7b3f4e3a3dc270798eb6c6c303b48f404e606719 SHA1 7ac9373d044b693b6c9779372c8e1e3f31c02af0 SHA256 7f714fe8d2526a0e8406af63a5e4ec497cc2092b6c220100574c5ac1ab4f77cb
+DIST fluxbox-1.0rc2.tar.bz2 752913 RMD160 6094001f653aaaaef6d625ded1c716669113bc8b SHA1 fb9dc0913b2362e714a63e1bddff1960fd5c2c54 SHA256 8780a608510f59c99a9dcc2174185fb1a370b1e485ce1cb93e27da75954dd6e3
 EBUILD fluxbox-0.9.14-r1.ebuild 4691 RMD160 43ef60415f912e6a4b3bf0fb282c2baecb08a22c SHA1 e7231474efd754a7cd58f60e4893ec44c786bd01 SHA256 54b1f9c86f239370e44d90f7a8076545b747a2b6a7a0f5a01eeed974d75a60c1
 MD5 ab77cbf9ad71d52ed2586c9e3c7145c7 fluxbox-0.9.14-r1.ebuild 4691
 RMD160 43ef60415f912e6a4b3bf0fb282c2baecb08a22c fluxbox-0.9.14-r1.ebuild 4691
@@ -62,14 +63,14 @@ EBUILD fluxbox-1.0_rc1.ebuild 5158 RMD160 ebbfaa7a262c4d7dead1968abcef42c4a4dee9
 MD5 1a9671cc29560401cafabd879e0f645b fluxbox-1.0_rc1.ebuild 5158
 RMD160 ebbfaa7a262c4d7dead1968abcef42c4a4dee957 fluxbox-1.0_rc1.ebuild 5158
 SHA256 188f3516c0cd17ecfeb3506f7f4ae01675e507fad10be1723bd2d41a775fbe22 fluxbox-1.0_rc1.ebuild 5158
-EBUILD fluxbox-1.0_rc2.ebuild 5157 RMD160 f03380a72e97767de2649cd9b142fc5fc01ab051 SHA1 6a8e560af6aa68095cba335118ef5496e02f9e2c SHA256 95b6a009b81b0c3d62baaee8329b139181b3574705e2db094382c4fa2370767c
-MD5 3cc3e675a7b126d32571b970946ec2cb fluxbox-1.0_rc2.ebuild 5157
-RMD160 f03380a72e97767de2649cd9b142fc5fc01ab051 fluxbox-1.0_rc2.ebuild 5157
-SHA256 95b6a009b81b0c3d62baaee8329b139181b3574705e2db094382c4fa2370767c fluxbox-1.0_rc2.ebuild 5157
-MISC ChangeLog 35574 RMD160 f898e4a650f6cc6cc97ef894e8bbdbcbe55cdfe1 SHA1 42032548eb1d23e009feb4a5679a181b188e4e28 SHA256 e217f106556becfbc1c26a4415afa4ecdeea018d9360b5ecabc4eec98eeeb824
-MD5 c1a32e2d81a92abb462474563ea92241 ChangeLog 35574
-RMD160 f898e4a650f6cc6cc97ef894e8bbdbcbe55cdfe1 ChangeLog 35574
-SHA256 e217f106556becfbc1c26a4415afa4ecdeea018d9360b5ecabc4eec98eeeb824 ChangeLog 35574
+EBUILD fluxbox-1.0_rc2-r1.ebuild 5161 RMD160 0441721b79f5cf663f158fbe614cf3d1e1a9d53b SHA1 cd91fce23d40d1b7d6048559c4d0f90693cbbcba SHA256 a8ca7a69e3ee4894e5ecdd9b9dcad5e726afc3dd2d0eb05559b32f8beb197093
+MD5 86564646603f32f408b6e39b7be7626e fluxbox-1.0_rc2-r1.ebuild 5161
+RMD160 0441721b79f5cf663f158fbe614cf3d1e1a9d53b fluxbox-1.0_rc2-r1.ebuild 5161
+SHA256 a8ca7a69e3ee4894e5ecdd9b9dcad5e726afc3dd2d0eb05559b32f8beb197093 fluxbox-1.0_rc2-r1.ebuild 5161
+MISC ChangeLog 35758 RMD160 0777530da4b1612ad77c55f9cecd902023c405aa SHA1 7acb6b5534a28ec248e52c61d45f7b6e65df8a82 SHA256 3d60c8643238bceb117b4045dbab4e61aed959100292203169070cdc375e2455
+MD5 2c891d72e8b651d42f5cd1e41d0827fb ChangeLog 35758
+RMD160 0777530da4b1612ad77c55f9cecd902023c405aa ChangeLog 35758
+SHA256 3d60c8643238bceb117b4045dbab4e61aed959100292203169070cdc375e2455 ChangeLog 35758
 MISC metadata.xml 716 RMD160 479551dffdca1bf48f1c1d0ec0cf6be270f4140f SHA1 a3f0dadd1b9431d74510c432e07937a5e978210c SHA256 abfaab6f64db4c995bf80d426bc532165fac413db0ed3b0428013505ff41eca0
 MD5 9eff4fe08df1b95e788ad1fb2945da34 metadata.xml 716
 RMD160 479551dffdca1bf48f1c1d0ec0cf6be270f4140f metadata.xml 716
@@ -92,6 +93,6 @@ SHA256 e5ca0cf2ad588a6c263c9d2f32d28ecc5e06ce603c71805213bd4a58ac34ac5c files/di
 MD5 187ebf3fd8a34d37cd154fda68b7e160 files/digest-fluxbox-1.0_rc1 244
 RMD160 097185a6326939377be0469b33da32294ddc385f files/digest-fluxbox-1.0_rc1 244
 SHA256 85f06107df7ce829c7677bb0dd68d3d054163af6448f818e2dc44c004673edbc files/digest-fluxbox-1.0_rc1 244
-MD5 187ebf3fd8a34d37cd154fda68b7e160 files/digest-fluxbox-1.0_rc2 244
-RMD160 097185a6326939377be0469b33da32294ddc385f files/digest-fluxbox-1.0_rc2 244
-SHA256 85f06107df7ce829c7677bb0dd68d3d054163af6448f818e2dc44c004673edbc files/digest-fluxbox-1.0_rc2 244
+MD5 2894ca2733ef7b78556f942b24b867b4 files/digest-fluxbox-1.0_rc2-r1 247
+RMD160 aa5498e0b1980fca272cc6adbdd233bdd6d0c12b files/digest-fluxbox-1.0_rc2-r1 247
+SHA256 4f802c83b5645ead39d3bd90e14a850d8102873475b3255ac693fde354358bac files/digest-fluxbox-1.0_rc2-r1 247
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc2.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc2.ebuild
deleted file mode 100644
index f0f916b71774..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.0_rc2.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0_rc2.ebuild,v 1.1 2006/07/31 21:43:15 tercel Exp $
-
-inherit eutils
-
-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.0rc"
-
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/fluxbox/${MY_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 )
-		)
-		virtual/x11
-	)
-	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 )
-			)
-			virtual/x11
-		)
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~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}/1.0_rc2/${PN}-1.0_rc2-our-styles-go-over-here.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
-}
-