First svn snapshot release of fluxbox-1.0_rc3, fixes all previously patched bugs in the 1.0_rc3-r* series, and many others. Equivalent to upstream SVN revision 4937.

Package-Manager: portage-2.1.2.7

4 files changed, 168 insertions, 5 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 25c975894047..ac4107d16abf 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,16 @@
 # 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.219 2007/06/07 15:14:12 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.220 2007/06/10 18:41:36 lack Exp $
+
+*fluxbox-1.0_rc3-r493700 (10 Jun 2007)
+
+  10 Jun 2007; Jim Ramsay <lack@gentoo.org> +fluxbox-1.0_rc3-r493700.ebuild:
+  First svn snapshot release of fluxbox-1.0_rc3, fixes all previously patched
+  bugs in the 1.0_rc3-r* series, and many others. New naming scheme for this
+  snapshot series: -rXXXXYY where XXXX is the SVN revision number, and YY is a
+  2-digit ebuild revision number. For example, -r493700 is the first ebuild
+  equivalent to the upstream SVN revision 4937. -r500022 would be the 23rd
+  version equivalent to upstream SVN revision 5000.
 
   07 Jun 2007; Jim Ramsay <lack@gentoo.org>
   files/1.0_rc3/startfluxbox_doesnt.patch:
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index b81df9fd57c4..122f2bfc75eb 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -43,6 +43,7 @@ MD5 9ae40c5c7aebae1c5919adbd888710b4 files/styles-menu-user 93
 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.0rc3-svn-4937.tar.bz2 864552 RMD160 1559db3cae589b1bc576c0a5601c9fe5a008a90c SHA1 dff90bdf7a1a03ec52f45cd7084a5756f6a23517 SHA256 5b3cc757ec4f5638b2beab29068482f3abb57be0e077acdbc9be1ad720ef25d7
 DIST fluxbox-1.0rc3.tar.bz2 780622 RMD160 5086545ea2c2b0dd71f17d314838d04f197a1294 SHA1 4524960e3e9702b61e29c5e1dfae8c050abaaf7f SHA256 cf1e2aa77716e42b2457b19989c2b2d2fc5f7d900cc16a3621a2e42372f474b6
 EBUILD fluxbox-0.9.15.1-r2.ebuild 5173 RMD160 41fb610a145c8cfed7c290304e68a3858c1575bc SHA1 aba132309a83e34b16079b72376d9105640082cc SHA256 e4ce515b657430b4966199a5382f2913dfd8e06b2c7aff92fdc250b64fd3c035
 MD5 b4b79dffe112a09a3a0f2d8269711a1c fluxbox-0.9.15.1-r2.ebuild 5173
@@ -60,14 +61,18 @@ EBUILD fluxbox-1.0_rc3-r3.ebuild 5747 RMD160 453ad9fc3638312e30a1d23e9533892fb36
 MD5 b4e93e1f9bc2d1ce206645a2ba8795ff fluxbox-1.0_rc3-r3.ebuild 5747
 RMD160 453ad9fc3638312e30a1d23e9533892fb36b81ec fluxbox-1.0_rc3-r3.ebuild 5747
 SHA256 781df4e370585edb995724db28b81b8af9a4c732573ab0da70269a2c1b71df2e fluxbox-1.0_rc3-r3.ebuild 5747
+EBUILD fluxbox-1.0_rc3-r493700.ebuild 4257 RMD160 01003bd5448d8a9fec7323dcfaab0d15dede5b55 SHA1 dbda052c70e8504271e7b6054d9fe5171f57e165 SHA256 57104c0f819366634719ff0bcd1bf73002b8e2e59cf46011977bc584c533d410
+MD5 ba8ac7a7c1d65ddcf31db3384d70a153 fluxbox-1.0_rc3-r493700.ebuild 4257
+RMD160 01003bd5448d8a9fec7323dcfaab0d15dede5b55 fluxbox-1.0_rc3-r493700.ebuild 4257
+SHA256 57104c0f819366634719ff0bcd1bf73002b8e2e59cf46011977bc584c533d410 fluxbox-1.0_rc3-r493700.ebuild 4257
 EBUILD fluxbox-1.0_rc3.ebuild 5206 RMD160 053f656541826414b42e6a058d438db37cb45358 SHA1 3d28bb84d15a545a268f1f295cd4b6aca251c2d2 SHA256 5c2e02382b2a7082f27480f3b67892a3ba2ff98ad6ff31441571858dbc1021fc
 MD5 43c14c5c89b22332e4b1722911b05bba fluxbox-1.0_rc3.ebuild 5206
 RMD160 053f656541826414b42e6a058d438db37cb45358 fluxbox-1.0_rc3.ebuild 5206
 SHA256 5c2e02382b2a7082f27480f3b67892a3ba2ff98ad6ff31441571858dbc1021fc fluxbox-1.0_rc3.ebuild 5206
-MISC ChangeLog 39977 RMD160 679907d26322cee321eea1d0b9c361829203171e SHA1 85907a8961a1a54ed886d409f701946298cea71f SHA256 9f66c403f811404d422fdf3a9beeab00ae1ccef87755c6379be3bb8e55c8a0c9
-MD5 a631e9fa17c665e3d9e054b94a655f34 ChangeLog 39977
-RMD160 679907d26322cee321eea1d0b9c361829203171e ChangeLog 39977
-SHA256 9f66c403f811404d422fdf3a9beeab00ae1ccef87755c6379be3bb8e55c8a0c9 ChangeLog 39977
+MISC ChangeLog 40532 RMD160 97ffd684ad9e03e742fac658128bd73a2f49f06a SHA1 33b317c8cd776359e4b7d8330f10c8fd55ca7ef5 SHA256 159827b43ca3ba7281440323ab26d5315012bf2b1e033f698c557f9a42698a79
+MD5 2d034a77b1eb2b4ea80014d9c2f77c2a ChangeLog 40532
+RMD160 97ffd684ad9e03e742fac658128bd73a2f49f06a ChangeLog 40532
+SHA256 159827b43ca3ba7281440323ab26d5315012bf2b1e033f698c557f9a42698a79 ChangeLog 40532
 MISC metadata.xml 712 RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 SHA1 9f493761c477ad9b3f532638a1351489442d4f54 SHA256 415fa5c634f5ee4aa0a77dab674282588c0befbb209ce31c0eb4375e4ec36b65
 MD5 2c8f22e229558b963d967e6ca024506e metadata.xml 712
 RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 metadata.xml 712
@@ -87,3 +92,6 @@ SHA256 6594c7d9ba41cbbc106a5de7278f79a7942fafa02af975e9850f21e6ae9d38d8 files/di
 MD5 fdc3d0163e8c8ff13b9aed68158c5db6 files/digest-fluxbox-1.0_rc3-r3 247
 RMD160 71dc64686695fd855492bfa426f3f9a5986b8247 files/digest-fluxbox-1.0_rc3-r3 247
 SHA256 6594c7d9ba41cbbc106a5de7278f79a7942fafa02af975e9850f21e6ae9d38d8 files/digest-fluxbox-1.0_rc3-r3 247
+MD5 79076209dcd820596bf667b36244392f files/digest-fluxbox-1.0_rc3-r493700 274
+RMD160 6a2b2e97caa903430245ae0822157c351f1c324e files/digest-fluxbox-1.0_rc3-r493700 274
+SHA256 ff56c7c3862da60f8cb857e521792f3ea708fbb8551d724d56b8a12cc4c031bf files/digest-fluxbox-1.0_rc3-r493700 274
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3-r493700 b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3-r493700
new file mode 100644
index 000000000000..1d8853f9559f
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3-r493700
@@ -0,0 +1,3 @@
+MD5 e2d2ee9ceb3ab742e85c7da02715f4f1 fluxbox-1.0rc3-svn-4937.tar.bz2 864552
+RMD160 1559db3cae589b1bc576c0a5601c9fe5a008a90c fluxbox-1.0rc3-svn-4937.tar.bz2 864552
+SHA256 5b3cc757ec4f5638b2beab29068482f3abb57be0e077acdbc9be1ad720ef25d7 fluxbox-1.0rc3-svn-4937.tar.bz2 864552
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc3-r493700.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc3-r493700.ebuild
new file mode 100644
index 000000000000..0c8163284e31
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.0_rc3-r493700.ebuild
@@ -0,0 +1,142 @@
+# 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-r493700.ebuild,v 1.1 2007/06/10 18:41:36 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-svn-4937"
+
+S="${WORKDIR}/${MY_P}"
+#SRC_URI="mirror://sourceforge/fluxbox/${MY_P}.tar.bz2"
+SRC_URI="mirror://gentoo/${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="!<=x11-misc/fluxconf-0.9.9
+		>=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 ~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}/${PV}/${P}-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
+}
+