Fix bug #235495.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26 x86_64

4 files changed, 47 insertions, 6 deletions

diff --git a/sys-libs/lrmi/ChangeLog b/sys-libs/lrmi/ChangeLog
index ed0ca94a8bc5..324a5d2cbd88 100644
--- a/sys-libs/lrmi/ChangeLog
+++ b/sys-libs/lrmi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/lrmi
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/ChangeLog,v 1.17 2007/04/10 09:14:47 spock Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/ChangeLog,v 1.18 2008/08/23 12:44:25 spock Exp $
+
+  23 Aug 2008; Michał Januszewski <spock@gentoo.org>
+  +files/lrmi-0.10-kernel-2.6.26.patch, lrmi-0.10-r1.ebuild:
+  Fix bug #235495.
 
   10 Apr 2007; Michał Januszewski <spock@gentoo.org> metadata.xml:
   Add myself as maintainer.
diff --git a/sys-libs/lrmi/Manifest b/sys-libs/lrmi/Manifest
index 7ba02e77ba78..8325cf3ad24a 100644
--- a/sys-libs/lrmi/Manifest
+++ b/sys-libs/lrmi/Manifest
@@ -1,13 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX lrmi-0.10-kernel-2.6.26.patch 593 RMD160 a30d5164643be00dfcb2e45623aaa7626c25f1d2 SHA1 d00ea0857bbef88425bee9928a1b28b9fd5193a2 SHA256 44249d94d58bcac734683c3a15b5b9bcefc815b7aa4df1e053172e90c3c3ab9d
 DIST lrmi-0.10.tar.gz 10271 RMD160 3805b41fd2a558ec145991c30a7f88101af48f1c SHA1 1495b3c2f3613979eb0396fd99a8e5e52d53ec80 SHA256 b0be55c14407f586dc10836e8f348b3a002c461a9b47a302071eac0ef85770da
 DIST lrmi-0.6.tar.gz 7104 RMD160 ceee0bd35488641b332ff4bcda765b9f1958a610 SHA1 ee91d369aec959c30d8c3f4cfa3489ab75da5cda SHA256 13f59e327d6e5bfb1280f50225df05449508841aa433abd52d56cd7c803f332b
 DIST lrmi-0.7.tar.gz 7768 RMD160 bef134d1a1e69a335da9d70be10ae2367f4c42ce SHA1 b6a6308a8337bf6401ee1d19556d2de7b2d9dbf0 SHA256 501c4b48e2ff5f892d28b9322909c26d992368f26671225472049ae5bbd866e4
 DIST lrmi-0.8.tar.gz 9347 RMD160 680c7f7e6599f71b942edef10846991e1c1ce14b SHA1 e01ba74b5343551b8d717c2fa9c365cb11d1ab48 SHA256 d62c60557340b8b0607e91ca84439682dff5a91dfb94d2e7d6c5d9b6439cccd2
 DIST lrmi-0.9.tar.gz 10180 RMD160 710d851351008560b6b81af42e919f33bddad338 SHA1 0a2c5326dec2ea8a278156e42ad867ec7dac7a76 SHA256 985db7027fcac8e1bbe2e618a32693599ac88bf5fe04bc5526f9b06179d8129d
-EBUILD lrmi-0.10-r1.ebuild 804 RMD160 45425b6ed80993740d85ba310897d399d051b40c SHA1 e5c59eefae5c9160cd3d49063ac50df6ede7cc2d SHA256 623d2717da2af16f70e0f4df1b4414c0c9cc0d77b3afc1dc78b12bb24238dbb5
+EBUILD lrmi-0.10-r1.ebuild 913 RMD160 97b491b71f22c5398afa3b4a03711f890f3440a9 SHA1 4e0ffaa01c64f0c893fdb63f48530d6cc4711205 SHA256 d0f3141946d24b217f1f715d3ab1dee524a0cfc6027f9cf04a3a8f6c2d4c47fa
 EBUILD lrmi-0.10.ebuild 781 RMD160 96222f90ba71b35abdc96b247c3eca4b55d9b66f SHA1 a8a2ff9e98343ea3457f1dbec51f900361a2b376 SHA256 805e519bd1772535ba5e2845a9cbe2da4763f5a273ab46441a614d0e441a9961
 EBUILD lrmi-0.6.ebuild 641 RMD160 5e0eed67e93881eda5f76fe3f5b8be90daeb6eff SHA1 ca5416936f95558dcde762706c15caa7067e29a9 SHA256 0725608b09b25165a4cb7475ce0d64245a6bd199a807fb4348a6f8e703551f1d
 EBUILD lrmi-0.7.ebuild 640 RMD160 ae279ad1f858cb2d18a07159f638133681f7bd37 SHA1 1cbf970e90c06468736259df6273486542fceae1 SHA256 788c2c5487979f4224fba359c97b18defede5a8fb96173ab4a9d20cb2a14996e
 EBUILD lrmi-0.8.ebuild 730 RMD160 ac42b900e69e4def60de213c4d8738100877066a SHA1 7adc8ad0214d2de26de2c1c35fc232c9fdc0a52c SHA256 ca49ba0c3f8e3a47183c80159d84269b50f1f12c91fa0a5280e7fbc5513c4924
 EBUILD lrmi-0.9.ebuild 780 RMD160 8fb5708f1f14d464c37b868981e755ad01a62d6d SHA1 529dcccea72cb1da09f95b5cbc3c1366aa78313f SHA256 db3af04d359ab95cc7db18148277e37c273948cd6ab487c773e5c410e2d7bc83
-MISC ChangeLog 1849 RMD160 220a9dfa6283fed078e1bac42a17f251f47d20d7 SHA1 962ad886c027dca17e8ad58cdf92db9cdc45ce83 SHA256 d3713f138af634190aaf59cff0bc6aed9b70b1b7a2d9f1bb253e6dbfe9bf30fa
+MISC ChangeLog 1984 RMD160 8d1281458d985c7198393625800db576fb201139 SHA1 f0784c22857a4c773901e3dd4ec76146855eb2fe SHA256 df3d78f15704fd154de01577f3ba310001653b1d72bfcbfd63bfb5ad622463b5
 MISC metadata.xml 224 RMD160 feb568b578b888bb1a208ef3c1302c877d5b7fb7 SHA1 bcce7e3df01f53ecf5e01edd7a39772dec9cc45f SHA256 4faffbdf0669222627d57d9614686ffe729da609af533c4dbd394682b2668e30
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiwBicACgkQchej4aZK9/eN8ACcDpEBfrb4jlAQD+D30xCkxe1s
+y2EAnj9idiYL7XW5f53Bw1Tciphz6U6/
+=ZqX2
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch b/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch
new file mode 100644
index 000000000000..9547439376a3
--- /dev/null
+++ b/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch
@@ -0,0 +1,18 @@
+diff -Naurp lrmi-0.10-orig/lrmi.c lrmi-0.10/lrmi.c
+--- lrmi-0.10-orig/lrmi.c	2008-08-23 14:39:44.000000000 +0200
++++ lrmi-0.10/lrmi.c	2008-08-23 14:40:25.000000000 +0200
+@@ -61,6 +61,14 @@ OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "lrmi.h"
+ 
++/* 2.6.26+ kernels don't define the legacy masks. */
++#if defined(__linux__) && !defined(TF_MASK)
++	#define TF_MASK X86_EFLAGS_TF
++	#define IF_MASK X86_EFLAGS_IF
++	#define VIF_MASK X86_EFLAGS_VIF
++	#define IOPL_MASK X86_EFLAGS_IOPL
++#endif
++
+ #define REAL_MEM_BASE 	((void *)0x10000)
+ #define REAL_MEM_SIZE 	0x40000
+ #define REAL_MEM_BLOCKS 	0x100
diff --git a/sys-libs/lrmi/lrmi-0.10-r1.ebuild b/sys-libs/lrmi/lrmi-0.10-r1.ebuild
index a576207fe675..b22f75160007 100644
--- a/sys-libs/lrmi/lrmi-0.10-r1.ebuild
+++ b/sys-libs/lrmi/lrmi-0.10-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.10-r1.ebuild,v 1.1 2006/02/14 00:25:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.10-r1.ebuild,v 1.2 2008/08/23 12:44:25 spock Exp $
+
+inherit eutils
 
 DESCRIPTION="library for calling real mode BIOS routines under Linux"
 HOMEPAGE="http://www.sourceforge.net/projects/lrmi/"
@@ -14,6 +16,12 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/lrmi-0.10-kernel-2.6.26.patch
+}
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die
 }