summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-wm/fluxbox/ChangeLog7
-rw-r--r--x11-wm/fluxbox/files/fluxbox-0.9.9-gcc3.4.patch18
-rw-r--r--x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild4
-rw-r--r--x11-wm/fluxbox/fluxbox-0.9.8-r1.ebuild4
-rw-r--r--x11-wm/fluxbox/fluxbox-0.9.8.ebuild4
-rw-r--r--x11-wm/fluxbox/fluxbox-0.9.9.ebuild16
6 files changed, 42 insertions, 11 deletions
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 8b9da4441958..dea999664f9c 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-wm/fluxbox
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.99 2004/04/26 11:05:52 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.100 2004/04/29 08:36:57 ciaranm Exp $
+
+ 29 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+ +files/fluxbox-0.9.9-gcc3.4.patch, fluxbox-0.1.14-r2.ebuild,
+ fluxbox-0.9.8-r1.ebuild, fluxbox-0.9.8.ebuild, fluxbox-0.9.9.ebuild:
+ Added in gcc 3.4 patch from upstream, changed LICENCE to MIT
*fluxbox-0.9.9 (26 Apr 2004)
diff --git a/x11-wm/fluxbox/files/fluxbox-0.9.9-gcc3.4.patch b/x11-wm/fluxbox/files/fluxbox-0.9.9-gcc3.4.patch
new file mode 100644
index 000000000000..dd686149d474
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox-0.9.9-gcc3.4.patch
@@ -0,0 +1,18 @@
+Index: src/FbTk/FbPixmap.hh
+===================================================================
+RCS file: src/FbTk/FbPixmap.hh,v
+retrieving revision 1.10
+retrieving revision 1.11
+diff -r1.10 -r1.11
+38c38
+< explicit FbPixmap(const FbPixmap &copy);
+---
+> FbPixmap(const FbPixmap &copy);
+Index: src/FbTk/Resource.hh
+===================================================================
+RCS file: src/FbTk/Resource.hh,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -r1.7 -r1.8
+34a35
+> #include "XrmDatabaseHelper.hh"
diff --git a/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild b/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild
index c88b9cbe8db9..6680fb6e688c 100644
--- a/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild,v 1.11 2004/04/26 11:05:52 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild,v 1.12 2004/04/29 08:36:57 ciaranm Exp $
IUSE="kde gnome nls xinerama truetype cjk"
@@ -11,7 +11,7 @@ DESCRIPTION="Window manager based on Blackbox -- has tabs."
SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.bz2"
HOMEPAGE="http://fluxbox.sf.net"
-LICENSE="as-is"
+LICENSE="MIT"
SLOT="0"
KEYWORDS="x86 ppc sparc hppa mips ~amd64 alpha"
PROVIDE="virtual/blackbox"
diff --git a/x11-wm/fluxbox/fluxbox-0.9.8-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.8-r1.ebuild
index 2930c98958b9..db132ca40263 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.8-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.8-r1.ebuild,v 1.1 2004/03/07 23:42:01 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.8-r1.ebuild,v 1.2 2004/04/29 08:36:57 ciaranm Exp $
IUSE="nls xinerama truetype kde gnome"
@@ -18,7 +18,7 @@ RDEPEND="virtual/x11
PROVIDE="virtual/blackbox"
SLOT="0"
-LICENSE="as-is"
+LICENSE="MIT"
KEYWORDS="x86 ppc sparc amd64 alpha hppa ia64 ~mips"
src_compile() {
diff --git a/x11-wm/fluxbox/fluxbox-0.9.8.ebuild b/x11-wm/fluxbox/fluxbox-0.9.8.ebuild
index 7a55d61a7010..4c9a8d973ba3 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.8.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.8.ebuild,v 1.10 2004/03/01 23:39:05 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.8.ebuild,v 1.11 2004/04/29 08:36:57 ciaranm Exp $
IUSE="nls xinerama truetype kde gnome"
@@ -18,7 +18,7 @@ RDEPEND="virtual/x11
PROVIDE="virtual/blackbox"
SLOT="0"
-LICENSE="as-is"
+LICENSE="MIT"
KEYWORDS="x86 ppc sparc amd64 alpha hppa ia64 ~mips"
src_compile() {
diff --git a/x11-wm/fluxbox/fluxbox-0.9.9.ebuild b/x11-wm/fluxbox/fluxbox-0.9.9.ebuild
index f810017d3599..c5bb06bb6a28 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.9.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.9.ebuild,v 1.1 2004/04/26 11:05:52 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.9.ebuild,v 1.2 2004/04/29 08:36:57 ciaranm Exp $
IUSE="nls xinerama truetype kde gnome"
@@ -10,17 +10,25 @@ 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.
-DEPEND=">=sys-devel/autoconf-2.52
- ${RDEPEND}"
RDEPEND="virtual/x11
truetype? ( media-libs/freetype )
nls? ( sys-devel/gettext )"
+DEPEND=">=sys-devel/autoconf-2.52
+ ${RDEPEND}"
PROVIDE="virtual/blackbox"
SLOT="0"
-LICENSE="as-is"
+LICENSE="MIT"
KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ # upstream tell us we probably want to apply this if there's any chance
+ # anyone will ever try to compile using gcc 3.4.
+ epatch ${FILESDIR}/${PN}-0.9.9-gcc3.4.patch
+}
+
src_compile() {
econf \
`use_enable nls` \