Version bump - 1.0rc3 is released

Package-Manager: portage-2.1.2-r10

6 files changed, 215 insertions, 11 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 65ddba240d09..aaade06f747b 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,13 @@
 # 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.203 2007/02/16 17:56:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.204 2007/03/20 21:38:21 lack Exp $
+
+*fluxbox-1.0_rc3 (20 Mar 2007)
+
+  20 Mar 2007; Jim Ramsay <lack@gentoo.org>
+  +files/1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch,
+  metadata.xml, +fluxbox-1.0_rc3.ebuild:
+  Version bump - 1.0rc3 is released
 
   16 Feb 2007; Raúl Porcel <armin76@gentoo.org> fluxbox-0.9.15.1-r2.ebuild:
   x86 stable
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 71bffdc4adac..f54b838fb1d6 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -18,6 +18,10 @@ AUX 1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch 653 RMD160 058f69363e8
 MD5 9f435966e5fec7450005c4e1672f58c2 files/1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch 653
 RMD160 058f69363e88fa40be28ff5b3fa991fe2e03031f files/1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch 653
 SHA256 9f823872980c8566aeaf0e163d00854987c7ea9115b898bc49d8003bb776fc2d files/1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch 653
+AUX 1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch 653 RMD160 058f69363e88fa40be28ff5b3fa991fe2e03031f SHA1 e3f9a51d51cfa39b5cef7b507636b5a78029e5fc SHA256 9f823872980c8566aeaf0e163d00854987c7ea9115b898bc49d8003bb776fc2d
+MD5 9f435966e5fec7450005c4e1672f58c2 files/1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch 653
+RMD160 058f69363e88fa40be28ff5b3fa991fe2e03031f files/1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch 653
+SHA256 9f823872980c8566aeaf0e163d00854987c7ea9115b898bc49d8003bb776fc2d files/1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch 653
 AUX fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57b4d0fad653660cc6cf0a2cd808b7a34d72b95 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a files/fluxbox.desktop 202
@@ -39,6 +43,7 @@ DIST fluxbox-0.9.15.1.tar.bz2 685740 RMD160 aa9418de9ff700c14b21911f6de24503449e
 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
+DIST fluxbox-1.0rc3.tar.bz2 780622 RMD160 5086545ea2c2b0dd71f17d314838d04f197a1294 SHA1 4524960e3e9702b61e29c5e1dfae8c050abaaf7f SHA256 cf1e2aa77716e42b2457b19989c2b2d2fc5f7d900cc16a3621a2e42372f474b6
 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
@@ -75,14 +80,18 @@ EBUILD fluxbox-1.0_rc2-r2.ebuild 5195 RMD160 8c8bae2f336609f780f3224606121630cfa
 MD5 bb8f70662ec1a1be953302c7f0efee49 fluxbox-1.0_rc2-r2.ebuild 5195
 RMD160 8c8bae2f336609f780f3224606121630cfae8269 fluxbox-1.0_rc2-r2.ebuild 5195
 SHA256 569edd5c22e1df1eba48c6034518361fba0b36826efb11dfa4000b05d3605b54 fluxbox-1.0_rc2-r2.ebuild 5195
-MISC ChangeLog 36786 RMD160 81d6590af6119780e79ebdadc42b2d5e182a763b SHA1 f86f4b75657a36e6f6c39670c77971c818347032 SHA256 719fe363846745faae2576a173a41d0953bc4af4cb6b72aeb42fba79d65ab261
-MD5 67b9ec7d2e4f2ee0adef154579a56e2f ChangeLog 36786
-RMD160 81d6590af6119780e79ebdadc42b2d5e182a763b ChangeLog 36786
-SHA256 719fe363846745faae2576a173a41d0953bc4af4cb6b72aeb42fba79d65ab261 ChangeLog 36786
-MISC metadata.xml 716 RMD160 479551dffdca1bf48f1c1d0ec0cf6be270f4140f SHA1 a3f0dadd1b9431d74510c432e07937a5e978210c SHA256 abfaab6f64db4c995bf80d426bc532165fac413db0ed3b0428013505ff41eca0
-MD5 9eff4fe08df1b95e788ad1fb2945da34 metadata.xml 716
-RMD160 479551dffdca1bf48f1c1d0ec0cf6be270f4140f metadata.xml 716
-SHA256 abfaab6f64db4c995bf80d426bc532165fac413db0ed3b0428013505ff41eca0 metadata.xml 716
+EBUILD fluxbox-1.0_rc3.ebuild 5195 RMD160 2c32374bf35d7cab0865bd12be53c56c93cd398d SHA1 9f774367ae0ccfb088052872491e9640b5377dfa SHA256 26583971580ea75d302f58e2013faa8f1b2fb1b475a572f48e498f446c536700
+MD5 802ceb47f9981634035d4da929604829 fluxbox-1.0_rc3.ebuild 5195
+RMD160 2c32374bf35d7cab0865bd12be53c56c93cd398d fluxbox-1.0_rc3.ebuild 5195
+SHA256 26583971580ea75d302f58e2013faa8f1b2fb1b475a572f48e498f446c536700 fluxbox-1.0_rc3.ebuild 5195
+MISC ChangeLog 37001 RMD160 ee8f2055430d43b95558b91609f3af0e70d4282d SHA1 6ad43516c44a8628eff7e8e69e7e1532eedee510 SHA256 c6d578d9218155cf834fc9ac26f3128a22837b76409235122d72d93ecf5d6c0d
+MD5 9f173dce4cde68c10e1b53f762f210b8 ChangeLog 37001
+RMD160 ee8f2055430d43b95558b91609f3af0e70d4282d ChangeLog 37001
+SHA256 c6d578d9218155cf834fc9ac26f3128a22837b76409235122d72d93ecf5d6c0d ChangeLog 37001
+MISC metadata.xml 712 RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 SHA1 9f493761c477ad9b3f532638a1351489442d4f54 SHA256 415fa5c634f5ee4aa0a77dab674282588c0befbb209ce31c0eb4375e4ec36b65
+MD5 2c8f22e229558b963d967e6ca024506e metadata.xml 712
+RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 metadata.xml 712
+SHA256 415fa5c634f5ee4aa0a77dab674282588c0befbb209ce31c0eb4375e4ec36b65 metadata.xml 712
 MD5 ef1570fb5bdb41bf45c0ed8072fb5b3f files/digest-fluxbox-0.9.14-r1 247
 RMD160 e6cdcf60eac8fb0784f5d041918895e10ad3ced7 files/digest-fluxbox-0.9.14-r1 247
 SHA256 5be811149e1902b109e685a85781a6f67a375a57df4cb00f7cb33e3785edf883 files/digest-fluxbox-0.9.14-r1 247
@@ -110,3 +119,6 @@ SHA256 4f802c83b5645ead39d3bd90e14a850d8102873475b3255ac693fde354358bac files/di
 MD5 2894ca2733ef7b78556f942b24b867b4 files/digest-fluxbox-1.0_rc2-r2 247
 RMD160 aa5498e0b1980fca272cc6adbdd233bdd6d0c12b files/digest-fluxbox-1.0_rc2-r2 247
 SHA256 4f802c83b5645ead39d3bd90e14a850d8102873475b3255ac693fde354358bac files/digest-fluxbox-1.0_rc2-r2 247
+MD5 fdc3d0163e8c8ff13b9aed68158c5db6 files/digest-fluxbox-1.0_rc3 247
+RMD160 71dc64686695fd855492bfa426f3f9a5986b8247 files/digest-fluxbox-1.0_rc3 247
+SHA256 6594c7d9ba41cbbc106a5de7278f79a7942fafa02af975e9850f21e6ae9d38d8 files/digest-fluxbox-1.0_rc3 247
diff --git a/x11-wm/fluxbox/files/1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch b/x11-wm/fluxbox/files/1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch
new file mode 100644
index 000000000000..40f5cd50c5c4
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch
@@ -0,0 +1,17 @@
+--- util/fluxbox-generate_menu.in	2006-06-10 19:04:11.000000000 +0200
++++ util/fluxbox-generate_menu.in.new	2006-06-14 14:39:04.000000000 +0200
+@@ -1735,12 +1735,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/files/digest-fluxbox-1.0_rc3 b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3
new file mode 100644
index 000000000000..a68891bf80b5
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3
@@ -0,0 +1,3 @@
+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.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc3.ebuild
new file mode 100644
index 000000000000..fb001eeb5235
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.0_rc3.ebuild
@@ -0,0 +1,165 @@
+# 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.ebuild,v 1.1 2007/03/20 21:38:21 lack 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.0rc3"
+
+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 )
+			x11-apps/xmessage
+		)
+		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 ~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}"
+
+	# 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_rc3/${PN}-1.0_rc3-our-styles-go-over-here.patch" ||	die "Patch failed"
+
+	# 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:"
+	echo
+	einfo "    [submenu] (Styles) {Select a Style}"
+	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
+	einfo "    [end]"
+	echo
+	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
+	einfo "menu file, this will already be present."
+	echo
+	einfo "Note that menumaker and similar utilities do *not* support"
+	einfo "this out of the box."
+	echo
+	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:"
+	echo
+	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
+	echo
+	einfo "The slow startup issues in previous versions should now be fixed;"
+	einfo "if you still encounter problems, please report bugs upstream."
+}
+
diff --git a/x11-wm/fluxbox/metadata.xml b/x11-wm/fluxbox/metadata.xml
index 2b7b73a734dc..2ec54a07cb5f 100644
--- a/x11-wm/fluxbox/metadata.xml
+++ b/x11-wm/fluxbox/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>antarus@gentoo.org</email>
-		<name>Alec Warner</name>
+		<email>lack@gentoo.org</email>
+		<name>Jim Ramsay</name>
 	</maintainer>
 	<maintainer>
 		<email>tercel@gentoo.org</email>