Remove the real real big bad hack (possibly bug #540304).

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 44 insertions, 23 deletions

diff --git a/media-sound/fmdrv/ChangeLog b/media-sound/fmdrv/ChangeLog
index d5fe77bf2a5e..e38211da7e2c 100644
--- a/media-sound/fmdrv/ChangeLog
+++ b/media-sound/fmdrv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/fmdrv
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/fmdrv/ChangeLog,v 1.10 2013/02/02 18:52:06 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fmdrv/ChangeLog,v 1.11 2015/02/16 19:34:57 jer Exp $
+
+  16 Feb 2015; Jeroen Roovers <jer@gentoo.org> fmdrv-1.0.7.ebuild,
+  +files/fmdrv-1.0.7-ioperm.patch:
+  Remove the real real big bad hack (possibly bug #540304).
 
   02 Feb 2013; Ulrich Müller <ulm@gentoo.org> fmdrv-1.0.7.ebuild:
   Fix LICENSE, see README.html, bug 453184.
diff --git a/media-sound/fmdrv/Manifest b/media-sound/fmdrv/Manifest
index e9cda4492a19..e48cf130fac6 100644
--- a/media-sound/fmdrv/Manifest
+++ b/media-sound/fmdrv/Manifest
@@ -1,24 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX fmdrv-1.0.7-ioperm.patch 434 SHA256 e0b94d1e5ad3ec6b4686e779bc5ee5dbd2c32e85604cb3d6ac560438ace188e7 SHA512 c092de86d3d2ec1dd403304b918b96196d4ceeb1856a1e2c21c1af5a5b71ab3cfa2a9e461de007296a74206cebc25c0f9633425b921f58d645a024bbbc2755b4 WHIRLPOOL ded13f1869c47478ec4bc775ae829a65e2eef8204229a06dd418c5e3f9b652783b685095aa6276007dbcdc30945323ad6293198c22c474078d239a6ea32b7d2c
 DIST fmdrv-1.0.7.tar.bz2 61373 SHA256 85bbb651a531e86b7aa07fa9efcb2c62344484cb3999b36539af6002188cbaa1 SHA512 d5533aee5c4c4e6a08dd2ede07c2f657edf93cf89bdb43d3453badd8dde68ec39a94820f91098192202490d59e2abda49af03737db39d2bfdd6b009a65824f1d WHIRLPOOL 8486f8ba5f61c441cae76531bb3e16962b934e0db495db3e6afc8228d38336201f1f2f5ce712a0d29363a4e77373c619b49c9f3bf26104a97d8350e5f27e9477
-EBUILD fmdrv-1.0.7.ebuild 841 SHA256 dd002d57043d2be08dc1c76ec491608320cd7f4277dc37e332cd3a293c1100d3 SHA512 fc66e3a1ae127575a5728542048241799e8ed19d4e964eac8829ffd0af2d5f47f74d55a53ecd7b5d10d936ac4e952fbd8d1097af6a0b47feee10d60d83e64e48 WHIRLPOOL c364892e611f074dd8c48d30ccc975d912fae9c232f96e0e989d54294c8f17b9884d092fbe597e959f56c6977338efb014f8679682caff5f8b45258a3ab85a29
-MISC ChangeLog 1292 SHA256 fa2aa3d6988c82510ee5eb7dee05278cb9c6a8341c4b095a1dd37d3a52158cd1 SHA512 526e2cd32ad86586443e3e31fa61bf3c89c5c3668fd8229fe2336a2c5e9aa53188896ef87e6717b17d88e6f0ece31ef4df408434e54f4aff85ddb1a38e8f8f64 WHIRLPOOL 7b06c0e488dd031737bab437928d91dcad5eb829fa6e112621b6696e3edf1ac16e1c4393e8076df887b4afc3c9a6ac7f4dd3559d4c698f93054699d004d368c0
+EBUILD fmdrv-1.0.7.ebuild 939 SHA256 e047f7f2c1f233d44314909d77b768507fdd6194a3bbea714865e8653c18aea3 SHA512 11d83bd554d2ccdd46748b9e3d7ab12e8d98f8850f5ca109c6d975dda2488335a08f11a7d10034574fcab95890aff8f6776b4ab86a50fd06a6edce0ef46792e3 WHIRLPOOL 7a8495b01e7009c59409f8d5311018275696f567a4d4e3c8af39760d6b9cc04c773474fe440dc4132e2f2545406873c77155dfb78f26722c42db205912e3c6c1
+MISC ChangeLog 1455 SHA256 6c4b46a148734e07ce184770cdb93c50d342dcbba725affe0ce3a74cb9ee0076 SHA512 610681c3178150c7c0b529141c493af03553844ca8b94712d81545cbb098b24f6d1d24b4b95e39d4184c0f97d6b3718d3ad346b2271723a470ff92a0863037b3 WHIRLPOOL c58bcb9a573e3c32e629446b7889819a75b31dadceff32be9ca7dc1612d5e6c337c29ebd415f2552df81101f70be96ccea3b33c713cdfac0b07f63be078e7713
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJRDWEfAAoJEDxpGckxwJCBAu4P/2kaSwMIaaR/6yXMWEAS8wVZ
-JHy4Rk3lSKbmIaN7VcbANkPtOfM8dnuk9HXp+nYPwPTjMyjihumLK6ibNlvbTOxP
-o8uPk6DUkcQk0QRQMT4CEOgtI++uf5h/ekpx1dq5igNJhWwtFN/fsMuSaBz8V4gv
-gjxAsR/U4+UdOnQurh+C07YlXQ4uyvRSDtu8P8KhQWjB1NNGnYm/L3Rq4MOxvgIx
-KgMEBzTHBx08DOUX+JBtb+n2Eis+0LbhFpSOiteI+yTmuqbuXrmB9swGKRtYiME6
-9sa9G+MfaDkaxzubP8MJoENlvQEYTODS6W4sTmwzZbL/6ln6EG5R8ejqUw4dLRZB
-kIloTDAfWcbQwzynCcZ2xxPhBJz9n67UuOCUqY245r9VdjBrhflgPPjstuLmi11d
-2sFl9obA0+u3kdjnnNTRK2jTL//bmCpkrBCmJzO8cYqh3alRsDjSVIibLnGew4OP
-Eyp1oGGFGbr2WpOKUPQh1hkFT0PrCdSy41koWnkoewBC9EdcrLz//sDlWbjwE9u/
-LlDjeJOBwrbyhQlcGa0SCgcuK9nsNGuTooRcJgd7i3ZPPJ0Ahwa398KOLKlqP5Xp
-r0qHIK3WwnUu2PDU8b4Lbjf1U/NuS1XxWDd+mpqCJjpE7MbCSppBoZ0Ru/bi0Z0r
-1bXEsm8whXcv7fLqKBHx
-=Xd7E
+iEYEAREIAAYFAlTiRmIACgkQVWmRsqeSphNd2gCffCtf3iKbBpSEBjYg5RLXP4mO
+ayMAnjndIwyInyubDgL7BTihD0lSf1Qf
+=ASYh
 -----END PGP SIGNATURE-----
diff --git a/media-sound/fmdrv/files/fmdrv-1.0.7-ioperm.patch b/media-sound/fmdrv/files/fmdrv-1.0.7-ioperm.patch
new file mode 100644
index 000000000000..ef719a4ac546
--- /dev/null
+++ b/media-sound/fmdrv/files/fmdrv-1.0.7-ioperm.patch
@@ -0,0 +1,20 @@
+--- a/sysdeps.c
++++ b/sysdeps.c
+@@ -1,17 +1,7 @@
+ #include "sysdeps.h"
+ 
+ #ifdef linux
+-/* A real real big bad hack. *
+- * Never try this at home!   */
+-# define extern static
+-# if 0 /* This is required on older Linux versions, not anymore */
+-#  include <asm/io.h>
+-#  undef extern
+ #  include <sys/io.h>
+-# else
+-#  include <sys/io.h>
+-#  undef extern
+-# endif
+ # define inportb(x) inb(x)
+ # define outportb(p,x) outb(x,p)
+ #endif
diff --git a/media-sound/fmdrv/fmdrv-1.0.7.ebuild b/media-sound/fmdrv/fmdrv-1.0.7.ebuild
index b507f5d31ddc..375b5d7a6c94 100644
--- a/media-sound/fmdrv/fmdrv-1.0.7.ebuild
+++ b/media-sound/fmdrv/fmdrv-1.0.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/fmdrv/fmdrv-1.0.7.ebuild,v 1.9 2013/02/02 18:52:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/fmdrv/fmdrv-1.0.7.ebuild,v 1.10 2015/02/16 19:34:57 jer Exp $
 
-inherit toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Console mode MIDI player with builtin userland OPL2 driver"
 HOMEPAGE="http://bisqwit.iki.fi/source/fmdrv.html"
@@ -11,13 +12,18 @@ SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 LICENSE="fmdrv GPL-2" # GPL-2 only
 SLOT="0"
 KEYWORDS="x86 amd64"
-IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ioperm.patch
+}
+
+src_configure() { :; } # it is a fake
 
 src_compile() {
 	emake fmdrv \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {