Fix mips asm/siginfo.h and add test to prevent it in the future.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index eef3a626186b46e91b4aaf9e0a0187d3e2215122..cbafb2d9e5716e309ba36ad5568bb9323418e30d 100644 (file)
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.438 2015/04/15 04:23:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.439 2015/04/21 18:41:13 vapier Exp $
+
+  21 Apr 2015; Mike Frysinger <vapier@gentoo.org> linux-headers-4.0.ebuild:
+  Fix mips asm/siginfo.h and add test to prevent it in the future.
 
 *linux-headers-4.0 (15 Apr 2015)
 

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 131127802b7dcf5019fb5ea559987ed21a8f98d1..db0475156465a54700bcd9d1ac745c2ba91f3c71 100644 (file)
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -25,7 +25,7 @@ DIST gentoo-headers-3.6-1.tar.xz 3520 SHA256 367d83b367f163b07deb10ad8b0fd306d8a
 DIST gentoo-headers-3.7-1.tar.xz 3212 SHA256 f07407df6577a1a544ed485e0285ad6adca66b516e4ff6af525f36ad2a6cece1 SHA512 d802cf3f3964a80ef2ffa3750139c0aa6b6520e78ec6eaa087532964a6a80999c937b8deb47ac76a250f649d8080308e8f5a5f33bb4859f3907d5dd41fede93f WHIRLPOOL be6aa3e709295d9a74841bf8fb4823ffe3019700ee9ac118b78bbcab50b60a3c404699e0a96267a9aeb71d6e7e62ed770ab5dbb0d8a0097a47f4b20cad663835
 DIST gentoo-headers-3.8-1.tar.xz 3204 SHA256 6790d6934be43251bcc40d19da3776cd004affcf8f62bac7bc9cde91cfd065ba SHA512 b5534730f4a50b41b220f5041aad6b871a7a05bb2fa19f67523baa3788a9ab355cf26f3f3443e50e7defe754a6b828e169f8ce5dc427de3a6690adccaa33add3 WHIRLPOOL efad77ad1a3788eb088393ee67d688d981c768fc4ad5d40b7764e8811e0e002ad0b9cdd2590f61997b277d86414a1e68bc709e923876d91a545a184530da54f2
 DIST gentoo-headers-3.9-1.tar.xz 3204 SHA256 b7f54447f0787cef16796e64a52fe7a4891d1b0c7198d87d00b4203eb40a938a SHA512 c206dccafa969d80406cdc4b6747aeff7451c5eab6b4b35827eaa102cdda4f69a3944d79b3b78276ca5122a68e980bf047f2cc53255aff7959fa5863cbfdf59c WHIRLPOOL 19e84a5ef8274adc9cffe383f4c95180210c8fb871082eab90bdc8d7ec98d617ab858e6c3aa19f61fa388f171ee695553b4aea1b6853a8d50a96debb15fda471
-DIST gentoo-headers-4.0-1.tar.xz 4232 SHA256 565ba3d4bb15dcc26c4b7f3908a1467cef4872f56f278aaa92bc21d2a08e1197 SHA512 1d9b42e4d2e6235781d7dda6bfb516ef4f528a16e2830844c4eadc74588d4899d4b215b622354b117c5ac7360380eeb6baada8a3d641b2ee8ec87d528e2792f8 WHIRLPOOL 599660497c757ff7f1ea7b6bfdfaebd35dec8f0d162d4e143be908b074b62aa66a1feafbbb10ef0eed3e97377d3d66b08a5ec74fa91756dfff8234adc171a5d8
+DIST gentoo-headers-4.0-2.tar.xz 5368 SHA256 ac090b3ced9f1a4b046795402ef919a756570b33f605a8a963af421d5a86af5e SHA512 2c7687c460bba24c8ed6e1df6f55ae79acbdc9f0f5b83074ec062226208fa0384b9660850ebe699bf72eeb8d44716f71115d802858bdf3147fa91c2f85eed85e WHIRLPOOL fcc530b2b973817cd5a16a34e26b1f817b67d622ab6cdcf0398ced6b73a6a626d7d1179b30895e2a33eb044d304fc98ed313e0353cf55fe4d791cd8959b202a8
 DIST gentoo-headers-base-3.1.tar.xz 4814816 SHA256 76bc4baeb1d039a171f6316d3ac6b8f50341937242570988d6705b2d9b02a0c0 SHA512 1218eba261172f5480d6b399be25f9fff0d3c9de48f6b47669820d746957cd9225a7beb3d94eb3d7779c1d28a97da0623dd494a56c8761c092d939afcd99d42f WHIRLPOOL 85869c824fa2a691f50feb94d85aa63103e4cece793273e8d9eca7b23e8459e5fbe31b46e1f97e4f62a1fc8e03b27827ac70ed061369c9df8efadc6e8beb7962
 DIST gentoo-headers-base-3.10.tar.xz 3643164 SHA256 ac054e6370381f6ba504371e6125551489f0dbb3207a79f9f328a0b9a6eac8bb SHA512 1c2c6cbdd5dd7bcabdd0854376202806bd45af519046aa776c3cad54730b8d4f5b0eb7e7bc580314aca070ce7f9f548c43b74fd11c8fc19e4a65c8834e0112ca WHIRLPOOL f86788bffee26f9598fa9d94ad4c590558d6d08f85c4d7888e9115aefe4d783a4234f835c93f2137abdebba8f84d5a8fdb89e9e21bb72073902a49584b0b9932
 DIST gentoo-headers-base-3.11.tar.xz 3664640 SHA256 09765c907425044efbc423e00b48ffa3a976a73ff9a71bb03139fa4ec924b240 SHA512 59ae911e9780e49954ce9671ef109537c90180c24c7eb6e639e8d4d2a4bec503d5c198cacfece4d203762a15ad69a11e05e22d31ea373deea4b9d7105047b513 WHIRLPOOL 67b64bc74321e36a1b125ed4db45df9a8af8acd4854cf51eadf4d8080c47c1a3ecc485758d518c5035ec2b14aa32ad69ec06ab0c670f117be02059c8005d011e
@@ -73,23 +73,23 @@ EBUILD linux-headers-3.6.ebuild 1375 SHA256 630a9237c33ac12b51ce5697be63c387345d
 EBUILD linux-headers-3.7.ebuild 1375 SHA256 5fc58ab8e3e53eab8ed0bbd62c9830e9fbc052cebd306ada51338a16a6fe3777 SHA512 3f1f7e62db7fd353681ffcc38ca4871754bb09ae19828bfff7cbd74d04ae8f0e45ca0f17eb1aec63206281c976b51009a1681e08ef085204d6e099aca315ec9d WHIRLPOOL 918e7ad6c5864ecb58555a4ee8c93e70c924708318310a35a4a75729ee0c39457ace8c88379f012c2ecdbba7c5d5bec427d380d5210486048eea88d410d07cf2
 EBUILD linux-headers-3.8.ebuild 1388 SHA256 4e89ec02e1317603a557678695922bfc152917fd8998711209533bc0a8d97e77 SHA512 598b61a3183784b3327e558bf97bfad10601be1e0e23851995d3ff64e2ca1873b8e6a0ccf304b84ee8abc7bbadd717dff30f9934c241567af8a84881e46a96d1 WHIRLPOOL b1842d98095967869330803cdb47597ea3c5c8d1a2d27ea2947fc679faea8c1fa0ce11bbe23d536833433d8c30200e33ba1a16a365e5d3974a61a2f460dff94a
 EBUILD linux-headers-3.9.ebuild 1669 SHA256 cdb9545f30837ba0072f732fd1f2670e3aeba7e6ae73cf78407dd4602d7a5b63 SHA512 fc08db156a84194bf44f4b572533c37abc8ef12123afc3ade0d485db7cbc53c0305be3232b67a77327f650845a00f5836fa268c2ee8bb987e4c610562dc8f129 WHIRLPOOL 96fa6e8122ec0a833fc78945ffd956c44e09bfc11feb1f55f8e5ef765bc6a7112be9729075a16a07d0dd23f37734a0f2752f2f45c114bcf9c8d56f5e919b9762
-EBUILD linux-headers-4.0.ebuild 1587 SHA256 4824cf2a19203f366070cb2a269ce42d0d5a18c61d477e13f655c067bde17008 SHA512 fa725a9ae14c45da58f49c03a7c6d104f21f52bcfddf01f10836eada2c0f1d69ebe61f32c66a3204b002de307d55efa65b6c459861d958bf9449a32ef6cc8d86 WHIRLPOOL 7231561a31b692be178a9d4df720372f31fd470b4e8e6a7b5ad8c238c95a0e347337098644521b2b1156c3c2c7acade908302f5a3a76ba1b708428830fce4a76
-MISC ChangeLog 68298 SHA256 95f671186b108cb7b79ee709a11e07d7da88d1dc7ac1659ff4e5917b41c70b36 SHA512 6d1f36f3695117cc9947e674364612f68d7ac076eedd704894a80856295ad33827084c8153e16c4c96b435364acc7f559815a56788707e7f4c71a28aa44baf49 WHIRLPOOL 17f7fd2a45222da6e009bdec982e436d7f26d6602835ef1727422e19ad05adb421a4d7b49bc79f7d069a16d8485713eeed5c9a006511d05873c2b63b45c01ed2
+EBUILD linux-headers-4.0.ebuild 1734 SHA256 8f6f12b9782f647a2b16b2974936a9cf026f431e72803f6a7a3e55b7c167e71a SHA512 fb676e8626c3212526db448b21bd15ce9e86c5ec8102e21f1f49378e5dca4fe811bf7440741a2d3f11c72b76bfa20e98bf309d58cdff9b624ebe5942e57cacfa WHIRLPOOL 7038e1f6848c135be0e6515137bf2923ccf80cf7d1adc0c4934789d2d4aaa9ea7e150ddf9b0d2e332636514c55a251269486500efed4fb174caeaeabab63f877
+MISC ChangeLog 68442 SHA256 caf4a626bed1a9ab3c5ac6c0f6b681a5e55415ebd6c2ed1d20d9af54801b64de SHA512 f1c29329721fb40cf47b9add579baff26215eb9424dbeda304f492ea906514e98f6cc5efeceeffa266acaad49e3909e62e8febd7383059a9d8070fdb2cbc5991 WHIRLPOOL 4f359012a6417ef118fa29a83c488031aa73126de0816b7a3d1d974f264ee937c98a7b7e5c826f12019bcde2a40a93a0e3ba84ae353d26ea035364927df75a70
 MISC metadata.xml 247 SHA256 6858f34fb3375b80b0071f911f6ead887ae327e0e27ecd39be3e8ccb2609fa0a SHA512 b82456bc3441754e0f316575316497d293374ac4bb80e1b7e4b158358a3e920a6da4bb223a97412bbeba8f51ea4555a84267f4ebc8eecdb06941038efd03c47f WHIRLPOOL 96213c23913ccc5a89e2fa924701b916106c15cd24940f7bc2c8896c6a5545f840c1bd21ccc0882a928fd44628cce49c7cd8d25957ffe6c64b4755b467e6344d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVLefgAAoJEPGu1DbS6WIAngcP/1Jp929pJCcwgDjjsOfrrFoT
-gbt0vUvKKCw4e1v8laWJ4E2DCb6k3yaAWMyuIpPBBDjZE7WkC155Lwm0cKutItFY
-hAmEfXFEEB1tf3fF02RqiYW9Nm3ZmYILC13HtLwgYmObtXf2QML9HDesOuatGBzz
-2ndkMFwg45DvTirGkb8toDVhxOQb2VuMEIjLpbPFGtI0GhoNCeDi6QwRDSBj8fz+
-+T1ukvvneOW6DWdH4yCmuW69ohL3Iz9fazVMlmSS8EAFhL4T08rvKumJFWXW0pHc
-6vzzfIlxNiijW5mTnLXE8+0KbwNOhHPG/e/M2X38n6RWnZrRO35uSYtonQRZZhO3
-h/Yw81dxqtMpouhc65IkMAM2L1RKfJv9PjYbqYjnPiiDs3XlPYcnDXNf+q6xvJLA
-V7uTUoRmO0bFaDQXbi+Cly3wKYNXWv8IJc+BD4ZIyxnMn1Sdd4KAOF3nuiY7J/d4
-nQ+l7dEvnKgjx2vl/exthACREpe3rlJQBLhdQmSf47qilAdL8HLZuXz7BUrfzq7J
-f68koLiJJG/H8b+xCBApXbD7besWAGS7EEhspHZNP1xe5sut6BCc00YFqb5aWQ0S
-P+RJ+ZTZn1N/uKhYyc0oP2f1g8U+WgTCe8fHm7ornf2219Hei3R6INMVUE6goTNX
-x6WnmhLqlRAh4f1MGuDu
-=lbNB
+iQIcBAEBCAAGBQJVNpnKAAoJEPGu1DbS6WIA+2MP/iXFOLdZAVmLRIFB/Xc7/Hsa
+qjP6s1bFnvIiYibGj4+R9oQZdC4bqTOKXrWDdHon5LXuEIFYbSyH1bZllAD5SFA+
+gc1DK+3xsvHaPPCD6dhoE7tZTCFxX8aCHlGJtxihuKBWlt62WZwloWCzK4HhkfsS
+dMTgQlRq5NRXiNZ9lgns7LaNidpOT+hSTqN9hfFHlKpcsSfWfy3dJ652tK+EjQib
+NsdbZoWWwJ7quEr2dgtk20SFNsBXXzE6h9sqYaU6H6giER85yofCnU2Xi7VOgETQ
+zf5tQuvtz5VojZSO4JYxdlq1Cz8yMSbli4vE3KdTdd3UVadtQxFxMI/6mp5EuK5N
+VkwVa04do0hylcd58ZvKZWN0ZDY1o/ut4YQVWnZk8b08J5sJah7tOFjvY6zQ7l46
+tKeHxgxqirSkYJAGhn90qpVFJAt539Hy37MbXs1/L1RClQ0pLurZ2T/tYSrA1v8E
+i+MF7+jiO16ltknYXFmc4K4PeiU+6dIouv9o3qndqOD7LA63BtOgx9vQKfEjvPRP
+PbeS8ws0yQH3a4tRFI/XEqAcBuZl8LJ65DoXpbG+YlRK9vWbkD4Lr2885TCLe8d4
+aDINhT11/uBTj6lOSB3PdRRcEqERmGkhuUkVrs/zt5QpSLoQnyjIi/3HN++KF7vi
+Iw7A6Ql9Jx0njYzJEqgK
+=4zgb
 -----END PGP SIGNATURE-----

diff --git a/sys-kernel/linux-headers/linux-headers-4.0.ebuild b/sys-kernel/linux-headers/linux-headers-4.0.ebuild
index ea3c9518b943698438ef3c8cca016ec1a1fe0dc2..3e791e1a9b557daed517bd4eab520a34275f8df6 100644 (file)
--- a/sys-kernel/linux-headers/linux-headers-4.0.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-4.0.ebuild,v 1.1 2015/04/15 04:23:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-4.0.ebuild,v 1.2 2015/04/21 18:41:13 vapier Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64
 inherit kernel-2
 detect_version
 
-PATCH_VER="1"
+PATCH_VER="2"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
        ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
@@ -41,6 +41,11 @@ src_install() {
 }
 
 src_test() {
+       # Make sure no uapi/ include paths are used by accident.
+       egrep -r \
+               -e '# *include.*["<]uapi/' \
+               "${D}" && die "#include uapi/xxx detected"
+
        einfo "Possible unescaped attribute/type usage"
        egrep -r \
                -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \