Add 1.0_rc2 to ~arch

Package-Manager: portage-2.1-r1

5 files changed, 209 insertions, 6 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index e2a25c1b808b..39756104f3ad 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.192 2006/07/18 19:50:31 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.193 2006/07/31 21:43:15 tercel Exp $
+
+*fluxbox-1.0_rc2 (31 Jul 2006)
+
+  31 Jul 2006; Colin Kingsley <tercel@gentoo.org>
+  +files/1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch,
+  +fluxbox-1.0_rc2.ebuild:
+  Add 1.0_rc2 to ~arch
 
   18 Jul 2006; Herbie Hopkins <herbs@gentoo.org> fluxbox-0.9.15.1-r1.ebuild:
   Stable on amd64 wrt bug #139876.
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index b584674427f4..f8089c5d2550 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -14,6 +14,10 @@ AUX 1.0_rc1/fluxbox-1.0_rc1-our-styles-go-over-here.patch 653 RMD160 058f69363e8
 MD5 9f435966e5fec7450005c4e1672f58c2 files/1.0_rc1/fluxbox-1.0_rc1-our-styles-go-over-here.patch 653
 RMD160 058f69363e88fa40be28ff5b3fa991fe2e03031f files/1.0_rc1/fluxbox-1.0_rc1-our-styles-go-over-here.patch 653
 SHA256 9f823872980c8566aeaf0e163d00854987c7ea9115b898bc49d8003bb776fc2d files/1.0_rc1/fluxbox-1.0_rc1-our-styles-go-over-here.patch 653
+AUX 1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch 653 RMD160 058f69363e88fa40be28ff5b3fa991fe2e03031f SHA1 e3f9a51d51cfa39b5cef7b507636b5a78029e5fc SHA256 9f823872980c8566aeaf0e163d00854987c7ea9115b898bc49d8003bb776fc2d
+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 fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57b4d0fad653660cc6cf0a2cd808b7a34d72b95 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a files/fluxbox.desktop 202
@@ -32,7 +36,7 @@ RMD160 2a6831b45ce1d655586b699d16c0547de201d187 files/styles-menu-user 93
 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 files/styles-menu-user 93
 DIST fluxbox-0.9.14.tar.bz2 671916 RMD160 17cb299115164303972988471526a57bf0eeebde SHA1 6e9d6d42631bb92b2fcfa1b74476b4383af91c3b SHA256 5560873a192013483b77281c7c31e0ebaa081181e9471a1b2eb6ed40f905eb6f
 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 SHA256 99726df74bc21abc5f417f858dca700b3baef62c9a21d35c890bd75113ad55a6
+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
 EBUILD fluxbox-0.9.14-r1.ebuild 4691 RMD160 43ef60415f912e6a4b3bf0fb282c2baecb08a22c SHA1 e7231474efd754a7cd58f60e4893ec44c786bd01 SHA256 54b1f9c86f239370e44d90f7a8076545b747a2b6a7a0f5a01eeed974d75a60c1
 MD5 ab77cbf9ad71d52ed2586c9e3c7145c7 fluxbox-0.9.14-r1.ebuild 4691
@@ -58,10 +62,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
-MISC ChangeLog 35376 RMD160 2a2364812521fd0631e483abd10d7999afd02007 SHA1 92c18bfdf51ba51eb7bb6484631dc0c8976024ce SHA256 97268369afa2f6766fbf2cad59f169a83837862c8cc2f6231ac50b7c7c5819a9
-MD5 7d20c574bfbf67dd5f63017f9f0fb8a7 ChangeLog 35376
-RMD160 2a2364812521fd0631e483abd10d7999afd02007 ChangeLog 35376
-SHA256 97268369afa2f6766fbf2cad59f169a83837862c8cc2f6231ac50b7c7c5819a9 ChangeLog 35376
+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
 MISC metadata.xml 716 RMD160 479551dffdca1bf48f1c1d0ec0cf6be270f4140f SHA1 a3f0dadd1b9431d74510c432e07937a5e978210c SHA256 abfaab6f64db4c995bf80d426bc532165fac413db0ed3b0428013505ff41eca0
 MD5 9eff4fe08df1b95e788ad1fb2945da34 metadata.xml 716
 RMD160 479551dffdca1bf48f1c1d0ec0cf6be270f4140f metadata.xml 716
@@ -84,3 +92,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
diff --git a/x11-wm/fluxbox/files/1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch b/x11-wm/fluxbox/files/1.0_rc2/fluxbox-1.0_rc2-our-styles-go-over-here.patch
new file mode 100644
index 000000000000..40f5cd50c5c4
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.0_rc2/fluxbox-1.0_rc2-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_rc2 b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc2
new file mode 100644
index 000000000000..7776f06956e0
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc2
@@ -0,0 +1,3 @@
+MD5 e0d3e8b41261fc9b03ac75c014051806 fluxbox-1.0rc.tar.bz2 744865
+RMD160 7b3f4e3a3dc270798eb6c6c303b48f404e606719 fluxbox-1.0rc.tar.bz2 744865
+SHA256 7f714fe8d2526a0e8406af63a5e4ec497cc2092b6c220100574c5ac1ab4f77cb fluxbox-1.0rc.tar.bz2 744865
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc2.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc2.ebuild
new file mode 100644
index 000000000000..f0f916b71774
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.0_rc2.ebuild
@@ -0,0 +1,165 @@
+# 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
+}
+