fix abort on 64bit architectures (bug 231299 by Alex 'wired' Alexander <alex DOT alexander AT gmail DOT com>); correct HOMEPAGE and add media-fonts/font-misc-misc as dependency (forums by superwutze)

(Portage version: 2.1.6.13/cvs/Linux i686)

4 files changed, 28 insertions, 10 deletions

diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index d5702b727917..5f82929e9f3d 100644
--- a/x11-wm/wmii/ChangeLog
+++ b/x11-wm/wmii/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/wmii
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.27 2008/04/24 08:07:50 omp Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.28 2009/06/11 10:15:09 fauli Exp $
+
+  11 Jun 2009; Christian Faulhammer <fauli@gentoo.org> wmii-3.6-r1.ebuild,
+  wmii-3.6-r2.ebuild, +files/wmii-3.6-64bit-safe.patch:
+  fix abort on 64bit architectures (bug 231299 by Alex 'wired' Alexander
+  <alex DOT alexander AT gmail DOT com>); correct HOMEPAGE and add
+  media-fonts/font-misc-misc as dependency (forums by superwutze)
 
 *wmii-3.6-r2 (24 Apr 2008)
 
diff --git a/x11-wm/wmii/files/wmii-3.6-64bit-safe.patch b/x11-wm/wmii/files/wmii-3.6-64bit-safe.patch
new file mode 100644
index 000000000000..6cdf06833dca
--- /dev/null
+++ b/x11-wm/wmii/files/wmii-3.6-64bit-safe.patch
@@ -0,0 +1,8 @@
+--- mk/gcc.mk.orig	2009-06-11 12:06:32.819113775 +0200
++++ mk/gcc.mk	2009-06-11 12:07:37.719827797 +0200
+@@ -1,5 +1,4 @@
+ CFLAGS += \
+-	-std=c99 \
+ 	-pipe \
+ 	-Wall \
+ 	-Wno-parentheses \
diff --git a/x11-wm/wmii/wmii-3.6-r1.ebuild b/x11-wm/wmii/wmii-3.6-r1.ebuild
index bdc720bde9ef..c201ddc194f3 100644
--- a/x11-wm/wmii/wmii-3.6-r1.ebuild
+++ b/x11-wm/wmii/wmii-3.6-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.6-r1.ebuild,v 1.1 2007/11/19 05:40:17 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.6-r1.ebuild,v 1.2 2009/06/11 10:15:09 fauli Exp $
 
 inherit multilib toolchain-funcs
 
 DESCRIPTION="A dynamic window manager for X11"
-HOMEPAGE="http://www.suckless.org/wiki/wmii"
+HOMEPAGE="http://wmii.suckless.org/"
 SRC_URI="http://www.suckless.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/x11-wm/wmii/wmii-3.6-r2.ebuild b/x11-wm/wmii/wmii-3.6-r2.ebuild
index e0d3d4b480f0..f286f2b2cea7 100644
--- a/x11-wm/wmii/wmii-3.6-r2.ebuild
+++ b/x11-wm/wmii/wmii-3.6-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.6-r2.ebuild,v 1.1 2008/04/24 08:07:50 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.6-r2.ebuild,v 1.2 2009/06/11 10:15:09 fauli Exp $
 
-inherit multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A dynamic window manager for X11"
-HOMEPAGE="http://www.suckless.org/wiki/wmii"
+HOMEPAGE="http://wmii.suckless.org/"
 SRC_URI="http://www.suckless.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -18,7 +18,8 @@ DEPEND=">=sys-libs/libixp-0.4
 RDEPEND="${DEPEND}
 	x11-apps/xmessage
 	x11-apps/xsetroot
-	x11-misc/dmenu"
+	x11-misc/dmenu
+	media-fonts/font-misc-misc"
 
 src_unpack() {
 	unpack ${A}
@@ -32,6 +33,9 @@ src_unpack() {
 		-e "/^ETC/s|=.*|= ${D}/etc|" \
 		-e "/^LIBDIR/s|=.*|= /usr/$(get_libdir)|" \
 		config.mk || die "sed failed"
+
+	# bug 231299
+	epatch "${FILESDIR}"/${P}-64bit-safe.patch
 }
 
 src_compile() {