Work around build failure on Linux 3.0.

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

4 files changed, 39 insertions, 10 deletions

diff --git a/app-editors/jasspa-microemacs/ChangeLog b/app-editors/jasspa-microemacs/ChangeLog
index 172620e179dd..a9005e925892 100644
--- a/app-editors/jasspa-microemacs/ChangeLog
+++ b/app-editors/jasspa-microemacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/jasspa-microemacs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.47 2010/10/17 15:56:16 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.48 2011/08/18 21:26:25 ulm Exp $
+
+  18 Aug 2011; Ulrich Mueller <ulm@gentoo.org> +files/20091011-linux3.patch,
+  jasspa-microemacs-20091011-r1.ebuild:
+  Work around build failure on Linux 3.0.
 
   17 Oct 2010; Ulrich Mueller <ulm@gentoo.org>
   jasspa-microemacs-20091011-r1.ebuild:
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 0947bf9bc681..98586c4d5ffe 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 20091011-linux3.patch 723 RMD160 6720aafb7eb206f567880ee700d995f4e0a77deb SHA1 77f727c24ea1de3ddcdc6c260c5f19d861808ca3 SHA256 6a00571de9320f3def48c83e6c5717f26a98f16a3aa3271c246491d3090a6cdb
 AUX 20091011-ncurses.patch 583 RMD160 4cda187fcdb25d1ed0e3d9542730b36bdfbc654a SHA1 556de21b4835f6c4a748f9c25708c3492542bd50 SHA256 8b8937c4668d4f026a65eb31d3602565299d3b866802f5b89ed6b67f66a9aab4
 AUX jasspa-microemacs.desktop 282 RMD160 102529b939ee5f4e70f54cd3ca214db23278d9d1 SHA1 9c412a51086b055ac4189aedcabaf5a256d759ca SHA256 9c77adfb1eb77eb0e313add3bc5f1c06d56cfaf1a1d096751d225d3586347c88
 DIST jasspa-mehtml-20091011.tar.gz 628008 RMD160 1b622f7448cc205ca610a35266d0e6b3ffa4ee91 SHA1 fdc75f5d50fb3532ef0fa97d03d9ac19bf4bf3fa SHA256 c106af1a7a1bd5862883ae237ae8a27dccfa30f300944211995658bcfb8621d0
 DIST jasspa-memacros-20091011.tar.gz 1105320 RMD160 7b96c454a89da60fd9c4d6f32628a6457b3a5059 SHA1 a9c28d52573d9edfc6797d4cc035ec74482b22c9 SHA256 a010d51c7a7e8efd19b7f837566569f446dfbda8fe9eda96e45b1951e2f5ddec
 DIST jasspa-mesrc-20091011.tar.gz 810128 RMD160 b65816f7704af7b3587ac32f31f7e45cdc66638e SHA1 d252c9d34cdb802a9e890a378462b12a58a2a3c7 SHA256 44109a9118da34a1d026450ec85a3f85d983c4015c97db2b9abbad69e8d90889
 DIST meicons-extra.tar.gz 43345 RMD160 6fab9d24f82bbdce9d043d1c5b483eee42f1e780 SHA1 5a196c1bcd3a6a3afaa619b719848f775a3a910b SHA256 d56864a6abccda2b6f79b8b86c545ae4b2abb40b8761cd97bda986aed454e8ef
-EBUILD jasspa-microemacs-20091011-r1.ebuild 2157 RMD160 e9dc3ed756a36da5ac3515b42c7eefc3494c8462 SHA1 9806b33be605cab9d1dcf0f6da5b8e6f5b7e5a38 SHA256 cfdea81713bb6ed146a182345f65df41e44909202f01a9c0e4b1d90cd863290d
-MISC ChangeLog 7992 RMD160 fc5241b98fa9a42e1d1d47bc90d1d5c775875f4f SHA1 91f3d0c48abbd41aaa72c20220466e8d90752e7e SHA256 e313e62a7c5326cf5f2293a4426e034355dfa74bbf5db84c3245d4f9e4c621fe
+EBUILD jasspa-microemacs-20091011-r1.ebuild 2198 RMD160 db34202ff8c6be0d52d0a28a341ea3b7519e1aa9 SHA1 0234abd278186516cf19de2ef91937864ab15d44 SHA256 ee7972edb513d21d34b164e7e2b85e22d091074757021532c099a9395ce74aea
+MISC ChangeLog 8152 RMD160 5646c42a2c34952f5990c6f33602b19b21fa827e SHA1 57529d9553ef485772905cf352d4323aa13a0ec8 SHA256 ad0ffe3d5ee3d46b012217077bdbc9762bbb56dfbee675865c575e9e74008da1
 MISC metadata.xml 1001 RMD160 5ee6ad89fad2090878597910c1d2bbc87b16da94 SHA1 5cc031f57eb5092959b28c169c46ec500cafb509 SHA256 ce5887d8c485076c2a80ce19cf9dbef7bba962052758729577832b9a225ef827
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAky7HSEACgkQOeoy/oIi7uyJPACeOnPGwZTaghDWxPRqTT/85BNC
-FIoAn1ehPDiLTSQ82Gw6CWkdXNNk+xxu
-=8Pd0
+iEYEARECAAYFAk5NhNsACgkQOeoy/oIi7uyURgCeNsBCn/udQbv8qkiIf+KM+CXo
+md4AoLG9lFMgQUCGwBbalJtUI6xlu1xk
+=Phay
 -----END PGP SIGNATURE-----
diff --git a/app-editors/jasspa-microemacs/files/20091011-linux3.patch b/app-editors/jasspa-microemacs/files/20091011-linux3.patch
new file mode 100644
index 000000000000..35a5b22a1dce
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/20091011-linux3.patch
@@ -0,0 +1,23 @@
+Work around build failure on Linux 3.0.
+
+--- me091011-orig/src/build
++++ me091011/src/build
+@@ -130,17 +130,7 @@
+             MAKEBAS=irix6
+         fi
+     elif [ $PLATFORM = "Linux" ] ; then
+-        MACHINE=`uname -m | cut -c 1-3`
+-        if [ $MACHINE = "arm" ] ; then
+-            MAKEBAS=zaurus
+-        else
+-            KERNEL_MAJOR=`uname -r | cut -c 1-1`
+-            KERNEL_MINOR=`uname -r | cut -c 3-3`
+-            MAKEBAS="linux$KERNEL_MAJOR$KERNEL_MINOR"
+-            if [ ! -r $MAKEBAS.gmk ] ; then
+-                MAKEBAS="linux2"
+-            fi                
+-        fi
++        MAKEBAS=linux26
+         X11_MAKELIB=/usr/X11R6/lib
+     elif [ $PLATFORM = "OpenBSD" ] ; then
+         MAKEBAS=openbsd
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild
index 1ffbac753282..76b973669ce6 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild,v 1.5 2010/10/17 15:56:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild,v 1.6 2011/08/18 21:26:25 ulm Exp $
 
 EAPI=3
 
@@ -42,6 +42,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PV}-ncurses.patch"
+	epatch "${FILESDIR}/${PV}-linux3.patch"
 
 	# allow for some variables to be passed to make
 	sed -i '/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" LDFLAGS="$LDFLAGS" STRIP=true/' \