Apply filldir patch really only from 3.11 on, bug 512830

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

5 files changed, 29 insertions, 26 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 9f9a13429bc9..b29433bf8194 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.121 2014/06/07 22:26:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.122 2014/06/09 15:24:07 dilfridge Exp $
+
+  09 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  vmware-modules-271.3.ebuild, vmware-modules-279.1-r1.ebuild,
+  vmware-modules-279.2.ebuild:
+  Apply filldir patch really only from 3.11 on, bug 512830
 
   07 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   -files/264-3.2.0.patch, -files/264-d-make-root.patch,
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index f0345d9ab93b..30288f3b5447 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -20,27 +20,25 @@ AUX 279-putname.patch 394 SHA256 b8103d3c72c24696e974e49dcdcdf2d5a2b2c2fdd5f6ca0
 AUX 279-vfsfollowlink.patch 1219 SHA256 b195f6492a172f682d55fb506ba02c473fd924bb47dc0d1359dd5de163b4da22 SHA512 b675f68175be0b7003d2f80c54dce05a064f8d5bd8744d40571d3d1e0153c01f909e37e0403e53f23a6d61383a9b054c40a2a9ffa95dd765eeffb0c7e739ff1d WHIRLPOOL 3e108ee29c2050029c6079f652e2670529a9f6b220524db214c7dadba3dcaef8fa1ab261f0e10ffa7506456d9f3cccc954bf6a82960e78ebd120c1eb2aac68e8
 AUX 279-vmblock.patch 1041 SHA256 217d27619ac782711686cffee44fbc4bbb40eb0657f335357ad1b0d064f30a35 SHA512 e8e565b677110090cb5bdb7c18d3e97c31049d846b82ee0406aa27dbfa9af8afc39512f1314d49edd6108ec576f3cbc565921de8dfdaaefe2822029ef98c303c WHIRLPOOL 769d0cffcb186d6110de049db963e20e049ef11d92b872c1a6ecfe262acad6c17f456376d219ce01e22839ddcb6a21a2d3e995d797f4c962a0838318dc6f56f9
 AUX hardened.patch 5052 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab49f3582c7ade5af6 SHA512 52dcca8d9f689f0a0d0ca369c0c7ce0d177de3529d2d1325330eb5a9e940a55e8930bbbe7374793bdf29cbdefac9727e9eb21d00f81ad4f5eddba3a51597b7a5 WHIRLPOOL 539731bc36f3e292403f55d74c353deeb28baa312f726b36d2a6060adf3483dfa2ed011baf93eff941fa754ef62f4d6da86868c40550ee2292c4a711e061bde0
-EBUILD vmware-modules-271.3.ebuild 2327 SHA256 03a2dc679b1e7e1e72fcf46c4b43a142abaaff183759a24f97d5e547722c1e39 SHA512 d72c2e798c3e9e8eff28f5986e5d82d896572a088ddf71f72510025e58d6b054c235c7217b24aa75ed4fedb2df8a0ece1bca698070ea8188fe1efa5a7d4d91ad WHIRLPOOL a95e8a7978f44331c8d3dd693508e1ce882af185c0bc0818644de4a7c408db2190f27c400e4864374732cea086183f629dbd510302e19aa5cbad6918e7436470
-EBUILD vmware-modules-279.1-r1.ebuild 2831 SHA256 86aacd4fcbad015b487565d0c21230927b05a5c4f1a223bbbec89b7288f95ef5 SHA512 e52be72e684c21128357631011c279dd6250d296df1ebb7c488e745827af17fa99e31945193f817278b41b1e2fc47460b5dae52004bf51e38822c4700a985c07 WHIRLPOOL 485b504c8c06e36423592fe10334a4975a146414171acdff250c29942adcdb66139eafbaa2f043b5a221479fbb27dcfeeecca2569ebaee19418144f610b19da4
-EBUILD vmware-modules-279.2.ebuild 2828 SHA256 e9b40f2e5e40512a98588976b1c7509e74882d81c6a6ce4cf282b7d8180a1567 SHA512 8e6943c5cbe1e63e1f71cf824c2b445abb7885abc8e0e68c1e75495a6491c3533f6fb5b06d37780ec7c9727224199a9a1080e6a62f3bba4b75b7d222a7464893 WHIRLPOOL d17a88c75719ac1b7b7da4a0cd525e7ab64f558e690d6ec6169f9c7b746277ccd298bd78ba951f5305a4f819984cb0291789cfe5cc2d74077d52814a026f7451
-MISC ChangeLog 26797 SHA256 0f15c9360a67284f338acb3b8417f4c5dedf78def3a46656269cf64f6107f308 SHA512 8f07e950f68aa80af467f8d176f226edaea4e5b2cc13a7488521a2462395bc412cd3bb8c5e5292eceb37ede0470e1c4c4819bbac37e04d0373bf740edb8ea90c WHIRLPOOL e6c0a989229a11db2e3f8be5d8f5f34fdbd3655f8cef4b3628fa6fa374af04f09b74109106542c59c8c8c1f930c21d255c57b4bdc0465e5c054ca13391888393
+EBUILD vmware-modules-271.3.ebuild 2326 SHA256 9d50fba55474113a5b185f3d0661065fff281eac1dae363d30972622af27a5b2 SHA512 44942c12745836b951ff9c1d0b52c920849ec624a9058a8e645b530d0eef3327bef1018a4a8569f65c6f7a62d8fc4c904c4b22b52fa303d7ac18bfd6c242daef WHIRLPOOL 0809eb2c3e18f3eceefb6db1b198093202ad41e3720955db79cf998f00793c0e6b489e779b1fa1264fcff6f5d6d0a5de6c2c5ef9b98aa32cf2f9f8d551193594
+EBUILD vmware-modules-279.1-r1.ebuild 2830 SHA256 7a39118cc3c5ecdf4f45fc101d64a73a4f5f1747484337276e0bcb2f47537d5d SHA512 a42130e592f38696df8d8f02eb40b230ddaad5833cc95c19535cdf7417016d4b8d4870f88c0bc65f8b430c0498d8c771412439d3f6bbcfd21147f6858eb4c0f7 WHIRLPOOL 39b0e5e39cc3534b4bb1f1295b26c03fc4436458bd7d21cae94e83e57ea3ce822777eef00319ebae935f87ba6529ebf4cae8a91cb6ccf2a4b389bda320afcc61
+EBUILD vmware-modules-279.2.ebuild 2827 SHA256 407d97fb75dcde69bfb495722c2fea0e052ac19d294bf88f3b4acd767c342cb1 SHA512 20bad58f294c1ee1487958024d0ebd6628df9f2d30577d9e2a5373a28de1514527ab9e1cac0c305511966348613baa20c044a8e4a08e0830bc6cdd7dcff9d58f WHIRLPOOL 8fdb2e052b079e286476f5c3af7d2d13f295a37fcab861f5734161fa61a9e86dd9c73489511cc55c75cccf0a92d6da8407e9ea5299637b05b809ff2c1ea89b09
+MISC ChangeLog 27008 SHA256 c801550eb2d8a030b56e1f9ae168696f2341cdcc3e5db9b36d3abd8b03e391e7 SHA512 4cd7584abf3f5fef8d8a5c0a83c6b598c3371de1cdecc8fb7e5d08f4716b5e8d25aa012884faa028023a94d425940cc9da6241b1d50416db810e53fdde7cd33a WHIRLPOOL 32b5696cf9b0a6113b896b4b1b0c03d9ad67510180dcfee7a4871bd1f8e6c7f17b6fbbf25fb8313dc35ff980504feb3127e83c8fe3b17a0fe06951f377afb6f4
 MISC metadata.xml 626 SHA256 df85fe94586e898742dda5a30bf95be1c66bded72b9b679b4bda9fb3113bb94a SHA512 5c16977fa1e95f123891324b24d20161bfbfa5f4a38371374290e635bba33cbbc933761f44b826503c37e4bb2295c4026356eddc6aef091c07dc17f773f538ec WHIRLPOOL f83d377fa941fbcfe25dfc83ad276f55782c1e9bdff6dc7ae147be667d7129ae55dae6c19c18544dc27123977d3aa6273f185b4cced70ab841e87a04a4fcae82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTk5GaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcj/cP/0UGl2GZGD6SHo/YituMwbQS
-tGXf9XGoiZ3ZXTA382T0WEfTHPli1wbLGvYFwyvhPwEbMsY0C/n1rsFw3vkaRLLd
-NXbZHWqtZeInASACeoC132MuHax52YNdcAcd5i2ki8GuIMlxdKWtLel4wUCT3XuC
-0Qdq7U1PmKMRj39RkC0fzvVsxmrCCvG2acFG8Tici3i+cwvEsxqAlfJNqbV0nzPk
-OdJDRZM+6jkgYBomsIqrfVASyVaJzc+le6p1KTkxLXeNXKk7s+yUJnHnhSXhiH+I
-w56smTBxtJHa7qWTuZy5RTwnzlq0yt1EVyGQhJ3KPKPDuJ5XMXTW4bhwjftX2gjX
-dhrw8aTpK8bgqas8BJHxo0JIk7Sd0BSRNhEsqx8Px3KLEhMKWijp99jVUe/sQ1NQ
-ffdkAeAjV65CdjK0OOkZ9dtQljVF9S6NIm5nQv/8LVeMhh0N6QoxvRExPkGB20rA
-JlU65mZwTbgV9RS6phKwsm05NHKSX1kISjiuewVOwCFZ0XCYfxHvzMUaJARXgdcN
-pXHvbKyi98B++nD9hDA+sQxHyrVitR1FQ8CLL2RDZuL54Epucn5OrMBpeZavk19J
-4Pu5GrKIpxJcyEId3E11tWuzUHbVn36ZPo2/3+vxBqeh4JNq/gPkSjLFH9ue6Zs9
-K26zdbMFD58fdTotEZ1l
-=AH/o
+iQIcBAEBCAAGBQJTldLFAAoJEJS/30SErRQvX/QP/1QXtZe7dG8bgRIsgCgs8K4/
+TAqTH35dATsIZG66u36ygom06kXAWGvko1qX05FJUP7yd+fy/7cGKXerfqOk6A9z
+kehwXwSELjDJQx9f3+1D52rzDnoXiNkIN1lGHypIPwAzY/MsehWhZ+9CiHvQNDRt
+3yW+jrg/GK8AxcfbozDwSSiY8ndtceizY5h13/R845Bmgyndp6+UBAr0+9MzQfOr
+Tk5hyRsuwTKY+pXqPsLpB2V8T4UhdA7khkNs4Lmz9+jYbP7QA4PJiCZCFOZoMfPV
+SS+VzGQoJbvRXfM0QXCJrHTXfqlYfFa9YSWnsDwmVm1d58WnWMS23wiVLYYiuR+c
+V/BQAPv3vUcK2xsW/TGgmWnE+9VRR5VhFVPYxdT0XUo1qpietr06bd0fDciB2JzE
+vY4wMobMy1JDnWZ1fVRbziAN1jqwHGIYbU8zNxsrymSpDjXFvpbNEXGT4lKqp/V8
+mfI+9exrqYEu9aS5WHJyvxaAVrveBC396oEaiyBOEeHrnU1xbWbTfQuTb4KnZpP6
+J57IBw3deK1DXtMF/zC5yp8yvUoZnEHiqt+h86D54fScizT46yxMgyiBF2lr7wm4
+PF88RiLUR1G6eyfDp80YK440/KLxNd0FxRlEYtBcOQ1OPl4Wre7IZ0mBpNMhDUGR
+2uPO8UukgNVka2/7Dt/i
+=sxBP
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/vmware-modules-271.3.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3.ebuild
index 17a7a0f22abb..6d7184b5e005 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-271.3.ebuild,v 1.4 2014/06/07 22:25:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-271.3.ebuild,v 1.5 2014/06/09 15:24:07 dilfridge Exp $
 
 EAPI="4"
 
@@ -66,7 +66,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10.0.patch"
-	kernel_is ge 3 10 25 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
 	kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vfsfollowlink.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
diff --git a/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild
index 26bbc484c0ad..e48cbcae36bf 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild,v 1.4 2014/06/07 22:25:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild,v 1.5 2014/06/09 15:24:07 dilfridge Exp $
 
 EAPI=5
 
@@ -80,7 +80,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
-	kernel_is ge 3 10 25 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
 	kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vfsfollowlink.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
diff --git a/app-emulation/vmware-modules/vmware-modules-279.2.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2.ebuild
index b4c35887f32d..61d71565f93e 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.2.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.2.ebuild,v 1.4 2014/06/07 22:25:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.2.ebuild,v 1.5 2014/06/09 15:24:07 dilfridge Exp $
 
 EAPI=5
 
@@ -80,7 +80,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
-	kernel_is ge 3 10 25 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
 	kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vfsfollowlink.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else