fixed build with linux-3.17 (bug #524614)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

diff --git a/sys-power/acpi_call/ChangeLog b/sys-power/acpi_call/ChangeLog
index a4c7b867de282b848f449880bd227bbe70859fba..8d4fd06271de927bbb6c74d6de728c208c691b74 100644 (file)
--- a/sys-power/acpi_call/ChangeLog
+++ b/sys-power/acpi_call/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/acpi_call
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpi_call/ChangeLog,v 1.7 2013/07/18 14:14:47 ottxor Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpi_call/ChangeLog,v 1.8 2014/12/19 03:06:53 ottxor Exp $
+
+*acpi_call-1.1.0-r1 (19 Dec 2014)
+
+  19 Dec 2014; Christoph Junghans <ottxor@gentoo.org>
+  +acpi_call-1.1.0-r1.ebuild, +files/acpi_call-1.1.0-linux-3.17.patch:
+  fixed build with linux-3.17 (bug #524614)
 
 *acpi_call-1.1.0 (18 Jul 2013)
 

diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index 5abc13f61eb568f8874780b8b368f0b1ae0204c2..b4f3746283a2dba0a0c0b7a11c0709df00b05f02 100644 (file)
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX acpi_call-1.1.0-linux-3.17.patch 605 SHA256 65c7c2a4d95632aba17b54c42b43094e95dcad785506747c2c55c5d4e87005ab SHA512 da72c5eaafda00eb3cbf9e53b4f36ce44881aa50a674536732899ff97b23edbbf65a69479caad4f8a119efa1accca0ad0ceca9a1218d21cdc22b79f0f3397e76 WHIRLPOOL 2be3a73b20d51b06ced5da216d1a72a115355d13938610f08bc511bcd895b8ba872b87314c84374d1d1bef59b14fb8680e6611092b739058478b86e4379da309
 DIST acpi_call-1.1.0.tar.gz 10470 SHA256 d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0 SHA512 d5cf13c15f9057e3a27aaacfee6dcdb17b6a79194bdc8fd57b8140c07a532e2e58151bea881aa158c1183ac3bbe89f83fcfc2279ffd9e945a72331b6ddbf2c70 WHIRLPOOL 9cfc9e8a9b21e712eb21ee2e708e9f1825f5ad19ddfc292e9b0c9e126b7841114f9e6bee2716bc58094a71a7cb231cdc70943cf33b2a5d8c15bd477af0abe849
+EBUILD acpi_call-1.1.0-r1.ebuild 896 SHA256 99722df13d4c03f9d7bf0178fe058fc14049a6a029d1966c193226e4518547f0 SHA512 5a9123a99f8864135818a51c6265860faeae204fff387cfd3d396bd7a3818133d6a9913aecebcc363cea5e96a635fa37592285959aa09cee53df781d77df865a WHIRLPOOL fc420c2b3b1c3a74db6836a23508087cbaf235c3a08a212336e42abb435cee7331c5a6f4a7b88a98d437b4eb9394a08dc27e46a76ad9dacc2fecb4d884e107dc
 EBUILD acpi_call-1.1.0.ebuild 824 SHA256 b424879b698eb04b1cdb782aab631a6c2128c96c8fac7caf71661f197a1e59d7 SHA512 826c4f25b07f977cdbf0035bea5795aba1c1962c230086ae1aed65451c544de0529b20bb136e1de16fe82ce65d4eb770120ab2493ea53a5ff55d1df89dd2e985 WHIRLPOOL c74781b4c74314555cf39cccb1d24ce65ef3d487c8a1b1cfc356bb63a325ad77f9592d8fafb1b246bd459e2083bf62134b6d75e7895836d10cc33a9fa32f39a2
 EBUILD acpi_call-9999.ebuild 823 SHA256 ba6561ee316ad993a58d85c525e996e8b1386fdab8e5da74c80beb5b491cdd68 SHA512 f56360cffbae46195d865308824aa6a8b42150674f27ae0e3d88c1c5e5b6cd160ee64856f3527792319f8e0154cd6c894309eb90184d4d6001ea7031003d6450 WHIRLPOOL be890b886df72f134128684ee75fd98bf6d3e93b6ea0bf87d26dee2495e0d4520b079743fe93c37a6691ba9ab6fcc7b4b16d4ebba4fc99b5d69b6f947fc98848
-MISC ChangeLog 1205 SHA256 9ae04af0e4a97b16379ff38cc8599952a12760880a276de9d4401ed9ae446f31 SHA512 60c2d918470678ed66367d1196ea38e3ecdf18c77c349b99880714eb467ada8edb2438c0ab99ed19f0e546e2684b0dd05f661a7b1f223ef5762911ab2aed2057 WHIRLPOOL a5ece0c10c1de104af8d69024a1697faad3bb9e9815524fa989a6daf3cd79d9fbabe36214288d8f6d5b5686c61c75492836dbdbe952f9b026f08b8b2a650f9b5
+MISC ChangeLog 1410 SHA256 01cad6f333e7ee5b64bf817e6a267fd5bf9f59c5d4848af691b812481fb9c262 SHA512 57d3769a45b47f67f8e1a7025293b1ac54a03c0bce8805a1c6eeda654787d6c13ee9e5e490fa8fadf0ca7654491fa7119f83331646fd3349812f1b818685ca77 WHIRLPOOL 3c186037e75d8b28b3f097f6f2fe1975b11801a9b7fb8359a02fba71aa59bf29affe79257b98d508706b855884107a8793400978f7afbf6169a5e7307e5576fe
 MISC metadata.xml 387 SHA256 f4314fdc21e06e96da9a8fc57ed95a80787c80b25ecf2038368b6b82fbcf516b SHA512 082000dbb0cb8a1c88d74125866fea785aa7aded5f33efd66b14d505638e87fdd7db7f71c9bfb3e1b8c135e228afd672f0ab5f9801b4e56ac2711b346df8f459 WHIRLPOOL c3306abccb74886cc537bf09f778283f18efc06316f8013b4632c990abc444be081028b07959adcc83b7b94fb07f3d7fa306dccd5ba7069e2c8587f2a2cd5b75
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJR5/hdAAoJEOeBhlrCAAWGO0UH/3kHYsPiKLVo4cZJSYZugrnT
-4UbZpCXWdRDp+fWSxTctX/KfPUBBoVdAQ2flsbm0KyRMXcmmKSSia5He9fq00S+U
-NxhP8MbUbvSgx8fKhKMmUWzCXVRGVJs25P43nbkUsKq8tXr7KyZ/m3we3BIfbmdy
-NBt+QOOQSguuCQ5GRhCxscazMTqTT96ipZXlpishkcpP+ORH/8KCGhBn2hJ75yg9
-45Jb9B2hrYhlrL+WEhHX/J1XXf7u9o0dNI5Uc4Sh+HnpRF4quQUJoD0TPfTNUyfS
-8E2LLk9ZnBKRkGpRisBBpCnlUEitTB89OFmC5e9AKndKtrS9gOwRpidOmzvZ4f0=
-=RBSC
+iQEcBAEBCAAGBQJUk5ZSAAoJEOeBhlrCAAWGSIUH/3nRmUZVidPMsgxq39yihsRy
+LHhByaK+OQCDyVJmkGHmBFOyG12B0PxE1afJ+MzaP4twEF5M2hDicDCVHI+DBwL+
+G5gu/Mi+umbmYHYZvuCzgfI6djcvF+iCcjb46gOE/fQan6aUpbJMvfl2UR0OxJVS
+l/cIjfYhq6JmisfSz4EemSwohuqS3fI8fXik0aLEVgDG/avWVQgLU6N/9AafmqqG
+FbZruTfpAlJfE0WkaNYvydQNdUnSyaTy+u/hwkHmkIs6LYsOl7+Ofj14N7BdbIge
+VKS8ag3M7q5pFh790rAr4q7eNeyMrD1SQvsx+dXq4iFmozENET46Cu5PsrrB02k=
+=iYjw
 -----END PGP SIGNATURE-----

diff --git a/sys-power/acpi_call/acpi_call-1.1.0-r1.ebuild b/sys-power/acpi_call/acpi_call-1.1.0-r1.ebuild
new file mode 100644 (file)
index 0000000..9747612
--- /dev/null
+++ b/sys-power/acpi_call/acpi_call-1.1.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpi_call/acpi_call-1.1.0-r1.ebuild,v 1.1 2014/12/19 03:06:53 ottxor Exp $
+
+EAPI=5
+
+inherit eutils linux-info linux-mod
+
+if [ "${PV}" = "9999" ]; then
+       inherit git-2
+       EGIT_REPO_URI="git://github.com/mkottman/acpi_call.git"
+       KEYWORDS=""
+else
+       inherit vcs-snapshot
+       SRC_URI="https://github.com/mkottman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A kernel module that enables you to call ACPI methods"
+HOMEPAGE="http://github.com/mkottman/acpi_call"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+CONFIG_CHECK="ACPI"
+MODULE_NAMES="acpi_call(misc:${S})"
+BUILD_TARGETS="default"
+
+src_prepare(){
+       epatch "${FILESDIR}/${P}-linux-3.17.patch"
+}
+
+src_compile(){
+       BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+       linux-mod_src_compile
+}

diff --git a/sys-power/acpi_call/files/acpi_call-1.1.0-linux-3.17.patch b/sys-power/acpi_call/files/acpi_call-1.1.0-linux-3.17.patch
new file mode 100644 (file)
index 0000000..32923a4
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-1.1.0-linux-3.17.patch
@@ -0,0 +1,26 @@
+From c5b7a4bf93a28e6ce68beb54b48d3745db943e54 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <ottxor@gentoo.org>
+Date: Mon, 27 Oct 2014 21:57:10 -0600
+Subject: [PATCH] fix build with linux-3.17
+
+https://bugs.gentoo.org/show_bug.cgi?id=524614
+---
+ acpi_call.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index 3025d97..fa4f2c6 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -6,7 +6,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/slab.h>
+ #include <asm/uaccess.h>
+-#include <acpi/acpi.h>
++#include <linux/acpi.h>
+ 
+ MODULE_LICENSE("GPL");
+ 
+-- 
+2.0.4
+