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)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 36 insertions, 17 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/Manifest b/x11-wm/wmii/Manifest
index d1c18daba82f..348440f091be 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -2,20 +2,21 @@
 Hash: SHA1
 
 AUX wmii-2_050802.patch 1015 RMD160 1733e59413d375b385de912d8f48f3a1f7d5776d SHA1 a72bc43b0a40dda12d74f5050f94a0ff63e76b1e SHA256 4b514fbee6e9042017cc5259ef3c4d100ee9040cb55b5dddda26d3c97ff749a7
+AUX wmii-3.6-64bit-safe.patch 188 RMD160 2c1e2abc99b6ecf6789cb85c6365e96cac0d8c27 SHA1 56273d3ca1dd420df08207a84f937385fb360598 SHA256 7cf2500d3d1f445c9a1aebd91a42ecfeb84fd90806306d95a89b92ffc42946b2
 AUX wmii.desktop 121 RMD160 ce7d82f84e2ae07609d94516587cbe0d0caa96c4 SHA1 155f9f65d21929e2af359d7e6f2513adf44c8136 SHA256 36770dab753dc2e6745dac9c02bc8f76f21e44c526d6dabbae97949dbbacd8f2
 DIST wmii-2.tar.bz2 67004 RMD160 80aaca41643e9632dc63341b63f80a6c1c92e6d8 SHA1 76c2bbe0970f57fa160f13c2ae37a009e84bf5b7 SHA256 d5025527bb04ce34e082f6298cbede72ff36f6a94f2e21582290bcf16b558767
 DIST wmii-3.5.1.tar.gz 41658 RMD160 6a89d8deab3716d10f45c20e8538856f9e5ef44e SHA1 642237a5e93ecb38462ee924ea3c722a04600b1d SHA256 6ce10c0805c2ff05952f7566b9af134ae76fdeb518dc7d9c413f0dd58635e6d1
 DIST wmii-3.6.tar.gz 208249 RMD160 29462b9ecc7d68e8e00e5f3eec82c2a46e268a52 SHA1 48e24f84f60b9c6ce37f715a46bc32e35d2086f3 SHA256 46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216
 EBUILD wmii-2.ebuild 1727 RMD160 a7c6b9646afea2a1e0421b98a37acc1c10b2dba2 SHA1 43e653cd4c7340a613f04a4ab0045ae7558f7738 SHA256 45bb5bfb563139ac0655c69df8bf205a0657cb785613d46b623dbc3bfd6e0cc4
 EBUILD wmii-3.5.1.ebuild 1133 RMD160 1d290a8cee3c54ba81d15a37c3373348abe0d772 SHA1 e124b493f216f1e8d40fe7c681c9428e5e062a91 SHA256 c596b8ba1980b9e5d3221a9924e1918d218e2df749001af88670ab77e2f0882e
-EBUILD wmii-3.6-r1.ebuild 1211 RMD160 c34f2ac7859841236b3f1f4514026215efce4518 SHA1 18470ee4ec3c547cde1c4ef816214724d597f563 SHA256 8ed5cc25d559e23f55cd34d490788532ca5d4d61e0b2cef902ce870ec98d29fb
-EBUILD wmii-3.6-r2.ebuild 1301 RMD160 588506b32310ee5592f62a4889230d447f811d9b SHA1 e9b4e80b14e97646e07b413d69c741bf50b7382b SHA256 934787b206ca913fdf737e663b4ca44ab74684ca49d190a1699116b3d4461af4
-MISC ChangeLog 4175 RMD160 657cda2667ccb96e32334d783cd71c6633fae092 SHA1 7651b6a43924239604279362304def6a359da91a SHA256 50709c683c2cddc27ae2425e5c022e2220b9efd467cefb4ee9433b86bdc55c94
+EBUILD wmii-3.6-r1.ebuild 1205 RMD160 505a433cc27390997da23e1da4975ae9dbf3616e SHA1 bce22021889061fc1c52a63f437ea988e95f443f SHA256 7330aa43f01feac42762d1747af4cad4d6ce0e6cf71616ce30b2c638af884416
+EBUILD wmii-3.6-r2.ebuild 1389 RMD160 c7b1c8871bf3bfa501c4cbd3bcf52c8ea41ba5a8 SHA1 e190ce0414ad9c374241bd7c18fa51ead5cc52b8 SHA256 8b72525419ff1cb8e922766c01a1d8a6566c1aaeb589e00903af8b1908de99c1
+MISC ChangeLog 4515 RMD160 5911af4f4b4eafb72fb543ab86ac584087a3d336 SHA1 dade482641b7b7078e3d9832d7fec951df270964 SHA256 fb477ebaee939dde8b6354d6c18278f7ffd028512c2ea2ba9f79d5adff28736d
 MISC metadata.xml 694 RMD160 e87d8b4bc25a7a7f90bd31f56b7f3276b2449bd0 SHA1 7b97d946a5538f2ba73e652dc60a2994714c5382 SHA256 5a59ed4f579bee8cf8973150ec17e51a44dc3013a00d7846d5a6d0b570e95689
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkgQP94ACgkQvSApE0uP4UujcQCcCLJ9UUHNGEOaIYJK81GQ6k4e
-vboAoIArdxTkYJCbhaOU7DyA79bnpEHd
-=uQSL
+iEYEARECAAYFAkow2UAACgkQNQqtfCuFneMLfwCfZRFosznzsMisG4uopyy32Ncx
+o1YAn1MwiFT1EMLGF/tNJMHlYZQ+tuEa
+=ntUL
 -----END PGP SIGNATURE-----
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() {