From 06161c72b0d73e7f158c7297b70e60b71a47ea24 Mon Sep 17 00:00:00 2001
From: Jim Ramsay <lack@gentoo.org>
Date: Thu, 28 Feb 2008 15:25:45 +0000
Subject: [PATCH] Patch for gcc-4.3 compatibility, from bug #211675
 Package-Manager: portage-2.1.4.1

---
 x11-wm/fluxbox/ChangeLog                 |   8 +-
 x11-wm/fluxbox/Manifest                  |   6 +-
 x11-wm/fluxbox/files/1.0.0/gcc-4.3.patch |  15 +++
 x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild   |   7 +-
 x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild   | 118 +++++++++++++++++++++++
 5 files changed, 149 insertions(+), 5 deletions(-)
 create mode 100644 x11-wm/fluxbox/files/1.0.0/gcc-4.3.patch
 create mode 100644 x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 206fa65b63b4..1bfee610fa2f 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.245 2008/01/28 14:45:11 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.246 2008/02/28 15:25:44 lack Exp $
+
+*fluxbox-1.0.0-r2 (28 Feb 2008)
+
+  28 Feb 2008; Jim Ramsay <lack@gentoo.org> +files/1.0.0/gcc-4.3.patch,
+  fluxbox-1.0.0-r1.ebuild, +fluxbox-1.0.0-r2.ebuild:
+  Patch for gcc-4.3 compatibility, from bug #211675
 
   28 Jan 2008; Jim Ramsay <lack@gentoo.org>
   -files/1.0_rc3/gentoo_style_location.patch, -fluxbox-1.0_rc3_p4983.ebuild:
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index a3bbe62b89ae..d658e381e600 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,5 +1,6 @@
 AUX 0.9.15/129065-fix-doubleclick-64bit.patch 431 RMD160 764e8b5522a36cc1dc5e18083f3631314d8c3364 SHA1 269c0acdcff131b9f3e2bf90e301c2d44cab0ea3 SHA256 7aec914f3e5b8de5029e01fa6d5c75276a072269735b19d85dbacb89f5f073a1
 AUX 0.9.15/fluxbox-0.9.15-our-styles-go-over-here.patch 653 RMD160 32e2d79cf651073efffb3f27aa54fa8b1738e98f SHA1 96bbbab6007e40c44659c3854ec2eb3f691c1546 SHA256 699f2e563f582362b0ed9d4f53a20fa930abfca1262bb0fb71e7f738e8eadcc4
+AUX 1.0.0/gcc-4.3.patch 258 RMD160 c2a45bbb135f43ed008bb76c8e545d113169dcb8 SHA1 9ff072a88470c277f9e4ab641587f0a35aa81548 SHA256 d4de739b1883377947ac2d67677bac79be0af10ef8272e75bb86f729374125c2
 AUX 1.0.0/generate-menu.patch 1369 RMD160 58c1e756f7a2eb2d25d87dda9b6aaa7efb31288a SHA1 975b782c35d43a7ddbf408ba5e7a743f7872f969 SHA256 93bfb1d51eba8ad06eb7c47896c0d17bb107f9bc04309049a8acf6f522fa08ef
 AUX 1.0.0/gentoo_style_location.patch 676 RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f SHA1 83d725fd320b8f9af329176bc8941b843e4ab559 SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f
 AUX fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57b4d0fad653660cc6cf0a2cd808b7a34d72b95 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834
@@ -10,7 +11,8 @@ 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 9b2034c00a21d0b08d5e3fe0a334f455f85f25f9 SHA1 3486aee5c30c9f91fb7613a9e91a245983dc4ac6 SHA256 37532473ddeee6ed38839a606bc357cd9f615a0a6ae633da4edf13c61bba457f
+EBUILD fluxbox-1.0.0-r1.ebuild 3627 RMD160 812da3ebc2cca177df8b9e0ec347af6a16e19d00 SHA1 fcfbdc42f04717256e4e82014058990cc69d4026 SHA256 c5a6d98c68937073ba5eb084750b7e016e26d8c5b8d58b021423cb64d6ba9c75
+EBUILD fluxbox-1.0.0-r2.ebuild 3554 RMD160 753ec25cc888d23762c6a12eccfea6dea071d115 SHA1 377432c7b06a944ca79e7ad86dd139c7cbe7020c SHA256 deb92660f5a8cd3cdd1767ad29e47bf13efa16d30644a6ef8959b9a0eefaa219
 EBUILD fluxbox-1.0.0.ebuild 3479 RMD160 4f03ae5c929ec5a5bf29910860d49c13588ee204 SHA1 7bfeb545af7967ed61a960569184fcb159f1224b SHA256 02181696623588a70588203a6e8c876d3f1eb84d1a8544b88bc3dea9c09ac580
-MISC ChangeLog 45755 RMD160 065ec15aca42673a31cf620cc03ee863d2f45d49 SHA1 567307a5bcc6c1e023f66b480c34ccf41f0499d9 SHA256 ad921c46941efd1bb7614d4e0bb3cb9dfb106a8495fa5bc381d3db531f279f0a
+MISC ChangeLog 45966 RMD160 2701489e23def1de3920c4c3c410247b8f5d7cfe SHA1 aa3b797653e0de7e1720a69cd63cce6ea72df6f7 SHA256 9ee16e4e8c5ec06838282831240a8f10d9b9ee79dce38757804cbd33d36745d5
 MISC metadata.xml 618 RMD160 d06c3246e645704d853d41cde2a107862c01bc66 SHA1 7be20ded4b048a03e245f8e57f5729a4820f8919 SHA256 7d683754723ec39ae547fc1ddfb6d538e6dd3bec053d668b8a2ded890612695e
diff --git a/x11-wm/fluxbox/files/1.0.0/gcc-4.3.patch b/x11-wm/fluxbox/files/1.0.0/gcc-4.3.patch
new file mode 100644
index 000000000000..a4f14de2b250
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.0.0/gcc-4.3.patch
@@ -0,0 +1,15 @@
+--- fluxbox-1.0.0/src/main.cc
++++ fluxbox-1.0.0/src/main.cc
+@@ -45,6 +45,12 @@
+   #include <stdlib.h>
+ #endif
+ 
++#ifdef HAVE_CSTRING
++  #include <cstring>
++#else
++  #include <string.h>
++#endif
++
+ #include <iostream>
+ #include <fstream>
+ #include <stdexcept>
diff --git a/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild
index af7a6cde07e2..455f2abda9ab 100644
--- a/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.1 2007/12/26 19:27:02 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild,v 1.2 2008/02/28 15:25:44 lack Exp $
 
 EAPI=1
 inherit eutils
@@ -59,6 +59,9 @@ src_unpack() {
 	# A couple menu generation fixes, #199437 and #199439
 	epatch "${FILESDIR}/${PV}/generate-menu.patch"
 
+	# Patch for gcc-4.3, #211675
+	epatch "${FILESDIR}/${PV}/gcc-4.3.patch"
+
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
 		suffix="gentoo"
diff --git a/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..596169f28522
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild
@@ -0,0 +1,118 @@
+# 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.1 2008/02/28 15:25:44 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
+}
-- 
2.26.2