Patch 3.10.1 to work on linux-4, bug #543648. Thanks Janne Grunau <janne-gentoo@jannau.net>.

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

4 files changed, 55 insertions, 17 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 912a8617b223..ea732c70a4c8 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.183 2015/03/12 10:05:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.184 2015/03/19 23:57:01 blueness Exp $
+
+  19 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +files/valgrind-3.10.1-linux-4.patch, valgrind-3.10.1.ebuild:
+  Patch 3.10.1 to work on linux-4, bug #543648.  Thanks Janne Grunau <janne-
+  gentoo@jannau.net>.
 
   12 Mar 2015; Agostino Sarubbo <ago@gentoo.org> valgrind-3.10.1.ebuild:
   Stable for amd64, wrt bug #541952
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index e07bfb00b33b..26f7ea50e6cc 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX valgrind-3.10.0-non-exec-stack.patch 6019 SHA256 9256d9c9132492bd937cfaffabfc061601d8f5f5b36adb6bdc53722df14117ee SHA512 8db8ae59ce4f4334c4ee8ea556d2ed5b4c2826bb5753239b47e6c5c3ca9cedc687731d145e8650f84c753a39d1d509bc5bf758204f5b4bdf99a20d2bbee21bdd WHIRLPOOL 3ea723057ba9834c6827a168cf781bd31733d4e50af135e3b08d06d7c2a6ac360e19beed1b58537e8d1f60054315e31d2abef1ed5febd297e17082892d7e2157
+AUX valgrind-3.10.1-linux-4.patch 972 SHA256 08956afc6390188a6c8bc0cebb81e806d4006e635076878e21043a57e5df4816 SHA512 22fda4cb41ee38e5b871217abf7c697ac6d1f088e9d6f5c035c6c54b0d008f2f23fe900fc036f0990fbad6284d357838e344ec43c156a5d8ec60d7b377abceaf WHIRLPOOL 99528549388b189328de8fe40715cdeac86f22726c62f9ae5aa677ac1a33aeb610230c421738342c4ed8b3b55e43372ecda943d5c2a4e74a26484ff1c1ef8c50
 AUX valgrind-3.10.1-non-exec-stack.patch 6019 SHA256 812560566e56c32db2ad3a97a2e52327d84648698987079ccf3843203c1e6ddc SHA512 015da8132bb72b81bd017b3e3faefb408a8f053676ff605bec411e40d9b7de21b197f660139df7e540756462406442325305d52ae0da04ac44ec66612fb1b0b3 WHIRLPOOL ddaf89092c4915662e6ba048668715f13e8634edc7cf490099870edda3b23799a76e3c677a430bf966295f84010829217aa0c0f887e48762969b805a365ef101
 AUX valgrind-3.6.0-local-labels.patch 1388 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def SHA512 079abe5bd99e2acf0e33a46db3772e264a2051d048c1cd34a4ee350395ea38b815f7909008ed1123324857ed25ab0159da4c5da37701570be012a0664481bbc6 WHIRLPOOL ba737636a547154947073478048f693bb28a9e353b8a1ac195d701bb8be69e182aa5d043b1c6085639c80752c68e5c8b26e3ec54bdcff7ac53ca71bc62768f58
 AUX valgrind-3.7.0-automake-1.11.2.patch 1436 SHA256 c5cf935bcb74c1e890183602d34a3d86eae65844cfe034e517dc3667e48b278d SHA512 c450fa127f5516b4efe2cc7dacc3f0dd32ee9375d6f121f5a0f3ba0d5479003ec9a894cd27e954fe914661fb701024f6b5d4f4f02eb015245f6ee755e75fe9e2 WHIRLPOOL 058779e298d6a94dd9f95c93f18bc1cac40fe471d5850ccab38009f446f546c1c0ccc4181229f1b8e014b62dbc6b7d3f72cd1ed9dc260596acff1788632f15c9
@@ -20,26 +21,26 @@ DIST valgrind-3.10.1.tar.bz2 10967905 SHA256 fa253dc26ddb661b6269df58144eff607ea
 DIST valgrind-3.7.0.tar.bz2 6624216 SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6 SHA512 0ccf6607fe6d26f0dc0f3d6e45f84645925d0a90ce4ecf6acfc6b4d374d3e909b2a628b03c0a964a45d2462cca6877f818a5f72b3e4a5bbf3a2d9b8a9a343d5f WHIRLPOOL 44bf8c423d6f3222f5e777333acc21e94dfa680509b2152289129961296d8afc090466b6407248b6e172b3c42da5448206f257bd63f8e44aba01007f92a6fde1
 DIST valgrind-3.8.1.tar.bz2 7962963 SHA256 473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db SHA512 ba31f5d43bd2d9533846bed6456a0eae40ac071ff8732201dd75c9e2cd7e9ce3224cb5928b9c8fc859a75ce6867a9b6a1fb2ba8ab62cd3944893d6d4156ab25c WHIRLPOOL 81e63bb649455ed29fcd60fc7f3cebde456a610118b9b24530d3b2e8aa4a7561369e992af86ffb158e1f7fc0db7b91738564402931a947a79bb789bd26a8e065
 DIST valgrind-3.9.0.tar.bz2 10003156 SHA256 e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0 SHA512 4b748f9f9a647df50db75fb56f83ee2f25bad9f1f4e4f05c4ac1d1e919e6cd954975c1f325dbedb509c44be1a8516ac2a5f269090946a0d728166ab183016c7b WHIRLPOOL e73c4dcdff829a34889f5654c5ec314f32d2c33f9e64bde3f811359a252749a6c677db80bf2aa2647f935cd38a0ccc19c0358a7b13198032c5d636f97e9e71de
-EBUILD valgrind-3.10.1.ebuild 3453 SHA256 56ae4ed19fbf18926fcf270466b2136256e7f544f800350c4d48b445cf80df5b SHA512 db5383953281cd27584c17fc387b804874a106417caf969e6c648cf76b800ad7a3d769a124d8e8faee5c7bf802f5a90f561e370a7a4829290a0835831dc48563 WHIRLPOOL 453a8066f0bc2db4420c3a80c3b95887d368ee689287fb9fd46d182b6b63159900a02811df07f341f82cc6404b37ba56dccfca0776b53ed4314c89f51d012ccf
+EBUILD valgrind-3.10.1.ebuild 3555 SHA256 7986e930381568ba629a04ca59b444129dc27d5fb30256c59e7faf4526d04e15 SHA512 154cfdbd243810c75bac55b1c4623d8a2b3ae5b147a56282b8724b0ce18f7312d3e367d5cd4d99906b50e1d45b8e412df0b3a987f1ec4d4fc9c91d55637870b9 WHIRLPOOL 426a0215387b760f158cbfc0489f3a897e988934d999a816e154d9997834aaa53fa39bdfad4fbbce513985202586a19ea0cd2030917d0f1ff0ee93758145c1e2
 EBUILD valgrind-3.7.0-r4.ebuild 3577 SHA256 f95fa83714c79d8c05f5c6f43b93ab91eb47c0a50e37faed055eab2cf5fd30ed SHA512 a4e2586606ab100d16cf3bad564aae5012796826a016c18fb85def0d8b72177ad8a4fa11bde322a8f8e9543f16ae874dc237d83c7efbb88db4a5676fb00d1364 WHIRLPOOL 16885e75e7383ee040ec825fa22bd68bf99fe8062d81e5ea008f84e573b0552d3514182c3c570b75cfa19313147de49e7557ba8d78687d875756b1c9c1251777
 EBUILD valgrind-3.8.1.ebuild 3418 SHA256 9244f56a4e98ab7cc6738f98012aa30192535e4a0011e8b75eeadb6515da94e9 SHA512 5edfb5cd3fc18b6afe2476b753762ac806cb1968cac8ceb4d1a3552e046bd078aa9974f38bad61c24104b1997fb69197244d4404982f1cfbd815a284a82cf085 WHIRLPOOL d66919af12d551d1102a43ac1c9d5643304791a876e1f1bdb81bf4784640b0c7dffa2b6867e59aa6873a0736581ccc96bf7a962348cdd9358c23a615338a641b
 EBUILD valgrind-3.9.0.ebuild 3402 SHA256 27e1d9fbdfe4e1c29665f314fc370e55aec9973d8961bf7ac46b11c8ed7b4b36 SHA512 8dec3dcbaf96f48d1ab9720637de33ebaad944e6424e94c1215cb4470beacb7f62c909a6debc1f5c245d359a701a5e7597e5c1eb7b6e9a2dd38ba255a4d58b84 WHIRLPOOL 1414c2e457ceb831e6146c0477e70930ab5621564f79803a2a1236e8f7c19e0d8a358d3ddfc8d05eedd15f462c4fcbd78cb109d94183e57084e15eaec93f62f0
-MISC ChangeLog 30667 SHA256 2ef743f3efd620c944905dc2a50eaec934831014788d137226a18895ff982e17 SHA512 3e3698799cfb2c4e7c59819e6fef61e1982c608ee9c90f1c2fd6cf1d04576823effc3dac149fcb9f1a24194ffb167c1afdb3102a6c532ece7721684a4f291eee WHIRLPOOL 6817f563b190eb2fc7b22cc4fd4939931fa51fd1632f835bf0d7340aabe5a645c6edf0004b26c12559bd395d92b486f2ac753e3865074fa52adfb3b6ef5327ac
+MISC ChangeLog 30891 SHA256 a1de9488695dcda80721cde35d2373539a23caa49e42ef967c3397a6493e8c16 SHA512 bbf97cab5ce9a01dd5432f79c64c89d112e0d9fb98e9f8a6f5a73dea3ab3751ef93846ec4fcdd9b90b9f4f9d7506af50b04f6a09ec2556094c2fe7be9b63496c WHIRLPOOL fa5737991499efde0496846a9311f8eb6282d85355e6fa1cc20ba8903d6ed8702316a13ab1a46f1429d63b90ca6ab48e4c0a1a38c200931db4cbf2b941bf2ea8
 MISC metadata.xml 1013 SHA256 69a104cb454bfa145365c6eb7740c8331851c1b1cf9c507a3a787995e5a47aa6 SHA512 8ed29082b4adbdde40d277f465d7e2faa404b537c5bd7d7812ef9632648750763f66506596d392d090286f5681047a60541c483195e3756d8ec7725f66de3457 WHIRLPOOL 93c2f17dfeb55910707e3789e028dc75b5efe7786dd8c785432c8cf50044d4b3b97975ed57f6cc26e8a6a259b462a0ad2784707e0969f02ff9b3614b78fc0536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVAWTyAAoJELp701BxlEWfSEkP/0731dPTRxMRZJdEPqSqoO8W
-PqUiINjo/fmGB38+W0Wck86caPBPWmT3rgnmDTJc+Ns+ntX6QQfIMIpwaYP7q/Hj
-gGCjj2HfAGH5aycMsjyA2qH0l0rLlQqCte1y4qNZI7OL8wduAqY087uJnhZBuT52
-N31pe6RCzZ4ER9KbEKELAj8ZbjDpe8qYeB1DI9v9+621MJx/Mp4AlGK4zwhFi0a9
-sMTMTJoLmkD70AmiuZHjhO31HvnQL0wM82jA8qWVTEPWKpyKm6Tq+PwK02+3U7sk
-Oycd+hOrNN3E2Un3wHq+AaEyX3Jkuiz4ZWi2oHNY/M9Nz0JYTjDjEQnfKD1Z9HDV
-DLgGXhI+rNB8NQls6B61upXH4YdXW/rST2Y4s8Wsx8XZ0f8bT03BX+gbonIioP9r
-NwyiuKI/vlR4rZXKJbBy4xdJhP9Bclu6ngHWPk+iWao1mPcpq7dnEXbv7F0ICOl3
-ogJFXw1c4fW9gD4X3xv3lX2hEowFARgt9PNh4oSGfN6nSH04qXlZyv+5FhSYq5jS
-m5at7EvDUGjEfSAi54oYJKF+4X660wzdMjMnQVCAb5EaZ3dgPDddL3GGqTazCAGy
-PUkUiSavEofhEKU/PFOa8wLCj0iVo7mg/TFbSah7exV03HEV0GVfvBR/Jn05eItz
-48o4mq/6iAFQBVV2X0wI
-=n0wH
+iQIcBAEBCAAGBQJVC2KvAAoJEJOE+m71LUu6lLAQAKIR5kLrPlXVPMQ0mHPFPVrK
+w/KTxHtRWM2NcMij45rFW78Gi76GbIyd1FsBJfmt9iIiDBvhwt7B5TPavXJ+6xN+
++af087jSPirG/PqUk/xI6LdK6Aqpep4n2zk//B8ma+0NL2SxVy0jAam4nA0iy0Et
+4QituGNtEaVXDGYRN9fe81PRr/aUNeWdy5q3Fo4w4yD6Bqo9tSL+FoxNorv4UGGS
+qTv51I+Awot+gCFWcr/UeAvC0Xbdezdq6udVsjCubU9KxldgPzDj2nsGJeUCYer5
+NmlLYpuzx3eondvJEs7pR4YulyXd04/XoPY9uWl07DUn0PKtsd71wB8evLSvOKJT
+NLM71oGsv09VnBmg2TF6tl7CXGhExL/BGnJleddHtSazxpjcM64yauzhy5nj8EHT
+jxLqJrFW6Qr1YU2YWs2NHeUc2qQ9CmjOPw4iIP743WHzOAi9VHayVWCuOhEhhOfP
+ytN8T5Y8hbTsI8XnJZotrEk5rRaIY3Fbvmg7fuVfwY0qKmG+9OzwRTwoqkgjkEDc
+tu52YktpFowPnaN/6wJI1nDqxYPUf6JMthOEcxrTGRPlB+n/zy1lm7DZd3wEOM5l
+GG7o0/iX0K2rt8sRR3jRoFhdmPNH2MjCyo3cwWVtiMV6D6fMN4G999WUhqAc2coG
+0TwZe68G3gzjlCZD9M8Q
+=g4Xy
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch b/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
new file mode 100644
index 000000000000..63918c2c1d0e
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
@@ -0,0 +1,29 @@
+From ecb3746d69820905c076b89e1be7042f52ceaa5f Mon Sep 17 00:00:00 2001
+From: Janne Grunau <j@jannau.net>
+Date: Thu, 19 Mar 2015 22:44:51 +0100
+Subject: [PATCH 1/1] configure: support linux 4.*
+
+There is nothing special in linux 4.0. Handle it as another 3.* (or
+another 2.6.*) release. Compare changeset 14955 in valgrind's
+subversion repository. Valgrind trunk also drops support for linux 2.4
+but there is no need to do that for realeased software.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0fd2a41..33c7954 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -303,7 +303,7 @@ case "${host_os}" in
+         kernel=`uname -r`
+ 
+         case "${kernel}" in
+-             2.6.*|3.*) 
++             2.6.*|3.*|4.*)
+         	    AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
+         	    AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
+         	    ;;
+-- 
+2.3.3
+
diff --git a/dev-util/valgrind/valgrind-3.10.1.ebuild b/dev-util/valgrind/valgrind-3.10.1.ebuild
index 98865e225f25..638b04bff211 100644
--- a/dev-util/valgrind/valgrind-3.10.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.10.1.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/dev-util/valgrind/valgrind-3.10.1.ebuild,v 1.5 2015/03/12 10:05:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.10.1.ebuild,v 1.6 2015/03/19 23:57:01 blueness Exp $
 
 EAPI="4"
 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
@@ -40,6 +40,9 @@ src_prepare() {
 	# glibc 2.19 fix
 	epatch "${FILESDIR}"/${PN}-3.9.0-glibc-2.19.patch
 
+	# valgrind works fine on linux-4, bug #543648
+	epatch "${FILESDIR}"/${PN}-3.10.1-linux-4.patch
+
 	# Allow users to test their own patches
 	epatch_user