Fixed build on alpha (bug #339462). Report and fix by Kazuyoshi Furutaka.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 43 insertions, 6 deletions

diff --git a/x11-misc/xosview/ChangeLog b/x11-misc/xosview/ChangeLog
index 0ed406e7e17f..0e6ace04a2f2 100644
--- a/x11-misc/xosview/ChangeLog
+++ b/x11-misc/xosview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xosview
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.42 2009/12/23 16:16:17 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.43 2011/08/16 06:15:27 slyfox Exp $
+
+  16 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> xosview-1.8.3-r1.ebuild,
+  +files/xosview-1.8.3-alpha-build-fix.patch:
+  Fixed build on alpha (bug #339462). Report and fix by Kazuyoshi Furutaka.
 
 *xosview-1.8.3-r1 (23 Dec 2009)
 
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index d9e51bcd8c4e..4cc46698f802 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xosview-1.8.3-alpha-build-fix.patch 748 RMD160 4e9b94522da0e08f724b495c8d27218ebd363b58 SHA1 5972a74a2805d24050acabf7eedeef5e8d4bbb3b SHA256 bc5919139e1debda4fb1a90cf50536abb2833fc1bf4be90ff3feb280346bfd41
 AUX xosview-1.8.3-gcc44.patch 730 RMD160 5abcf2d62dcbfdefa1593f633117df1de1fb9bdc SHA1 e0c1a78365e9293e0e68bb1898acdaeed449ca80 SHA256 6afa06f4dc73c2e8c8bdec7f9bdab278f1c82b294ca6cb7e19dc0119780b80f2
 AUX xosview-1.8.3-remove-serialmeter.patch 2306 RMD160 972a2f585342d8b8bf62a50395628c1b3bdad6ce SHA1 c4420fd9ae13b4840512e22383d4cc4e7aaddfad SHA256 957edf6f7faeda3f8bdad80ffa982cc95a14833e82636d60e918377fec3f8681
 AUX xosview-emptyxpaths.patch 1861 RMD160 e3c1d82654843335db656a12cb820f74e5a53692 SHA1 ae1a154a490c086be351ddb432d35fd1814f2007 SHA256 64e87a9c6e03e682be98986fa4fef68b57a779d93908f5bf9c8b2d4efd0930b8
 AUX xosview-resdir.patch 2253 RMD160 075a0abaecd8fd24a8a87ac4dfb8710202208138 SHA1 c17968f8c81eeaacea59d1e91f59a47205a4ad74 SHA256 85e40ec105077eadd60ef46a1a9994fff6f0a5d9bb550d120cad21e3e8911e94
 DIST xosview-1.8.3.tar.gz 259793 RMD160 595e812dee686ccaa5d95eb537782679d752271b SHA1 420fd0620ff9fb9ba83fc833eeb8b872414e377e SHA256 3aa28fb12552ea106e06f6958e1a0913bde8b0bb1491c091a3f1849717736b66
-EBUILD xosview-1.8.3-r1.ebuild 1006 RMD160 9a0987366dd9a72ddb4acaa1eaf1a732d4d85e0e SHA1 dd5d8e1641cbbe39cbb09af84cdc611536b8b02c SHA256 423c2efb7512bad146b862ea0af4f44b4b8f00d5c06da01cf0c29d2e936aa1cd
-MISC ChangeLog 7059 RMD160 b8d7c2e53f0dd6a49fe9ef43b0ae9c18853eb320 SHA1 3b6834aa683ee2f977922fb6eefe2e630079e3d4 SHA256 dc8bc60813e161ff098b8d0296d4386e76e1bdf79ddbd59fec3a195aeb100fe2
+EBUILD xosview-1.8.3-r1.ebuild 1052 RMD160 10f56c3c13fb1ed6ebf84f0d67941b2bc15a02af SHA1 7ee67888d79f2e97372090a732030d8e94ff0641 SHA256 31e5439c59237bd4cd74b6571d13b3afd1f66ffe9c0319c3e29387a332e90fc0
+MISC ChangeLog 7258 RMD160 1a534633704d161619ab4ca0350e8115d5142723 SHA1 971a2471b2265fa381d5ca4008df5af8a8c7aa92 SHA256 49e3f332ab95f368376deb0f1071bc03c5fc4d455b6407a16e955f75b0736ba9
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5KCwgACgkQcaHudmEf86pEDgCfb9lBqWdCEdUbesgvsaFur8+3
+ydoAn2VQfpXjLAm/kI4CXjetDQs1bmkC
+=bqeB
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xosview/files/xosview-1.8.3-alpha-build-fix.patch b/x11-misc/xosview/files/xosview-1.8.3-alpha-build-fix.patch
new file mode 100644
index 000000000000..def92a3b05f9
--- /dev/null
+++ b/x11-misc/xosview/files/xosview-1.8.3-alpha-build-fix.patch
@@ -0,0 +1,21 @@
+fix build failure on Alpha
+
+    $ alpha-unknown-linux-gnu-g++ -mieee -pipe -O2 -mcpu=ev4 -mieee -pipe -O2 ... -c intmeter.cc -o intmeter.o
+    intmeter.cc:16:21: fatal error: asm/irq.h: No such file or directory
+    compilation terminated.
+    make[1]: *** [intmeter.o] Error 1
+
+Patch by Kazuyoshi Furutaka <furutaka@jb3.so-net.ne.jp>
+diff -uNr xosview-1.8.3.orig/linux/intmeter.cc xosview-1.8.3/linux/intmeter.cc
+--- xosview-1.8.3.orig/linux/intmeter.cc	2006-02-18 13:33:06.000000000 +0900
++++ xosview-1.8.3/linux/intmeter.cc	2010-10-02 21:04:14.000000000 +0900
+@@ -12,9 +12,6 @@
+ #include <fstream>
+ #include <sstream>
+ #include <stdlib.h>
+-#ifdef __alpha__
+-#include <asm/irq.h>
+-#endif
+ 
+ 
+ static const char *INTFILE     = "/proc/interrupts";
diff --git a/x11-misc/xosview/xosview-1.8.3-r1.ebuild b/x11-misc/xosview/xosview-1.8.3-r1.ebuild
index df16a6a30cb8..22c59d37aefb 100644
--- a/x11-misc/xosview/xosview-1.8.3-r1.ebuild
+++ b/x11-misc/xosview/xosview-1.8.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3-r1.ebuild,v 1.1 2009/12/23 16:16:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3-r1.ebuild,v 1.2 2011/08/16 06:15:27 slyfox Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/xosview-resdir.patch
 	epatch "${FILESDIR}"/${P}-remove-serialmeter.patch
 	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${FILESDIR}"/${P}-alpha-build-fix.patch
 }
 
 src_install() {