Check for CONFIG_USB_SUSPEND only if the kernel version is below 3.10 wrt #477278 by "Coacher"

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 20 insertions, 15 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 1e2f0de39952..36ac32a8f9c4 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.144 2013/07/18 10:36:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.145 2013/07/18 16:07:15 ssuominen Exp $
+
+  18 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udisks-1.0.4-r5.ebuild,
+  udisks-2.1.0.ebuild:
+  Check for CONFIG_USB_SUSPEND only if the kernel version is below 3.10 wrt
+  #477278 by "Coacher"
 
   18 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udisks-2.1.0.ebuild,
   metadata.xml:
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 556fce8ec113..f599c2c17a5d 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -9,18 +9,18 @@ AUX udisks-2.1.0-W_define.patch 501 SHA256 98cfdc960e206e24c4daea9d37a371b9cd9ee
 AUX udisks-2.1.0-ieee1394.patch 1094 SHA256 603e30c8f6c632385a7b77d609a55805a998ba9ac9f2cd8edc80513616c62e90 SHA512 60b54b5f171b7bce9497d0c2592d76b18922ddd757e8a40d96ab609eb40eea03d419dee10bcf2c48600f1e172420e758d5fb5a644f6d6d3bd82bc1eca07631bb WHIRLPOOL 5cd0597efb5b13a11bd65ddff841a84da2364df57e1e6d005f6c7025dbc9e183feee91c3343f5e0dddcd8270289e45fd095eea2a883bd944d17825d340f1d46b
 DIST udisks-1.0.4.tar.gz 719889 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 SHA512 8c9ac4e234cd7680ab1b024dfa9786ec127961c6bbcef352f7bac09972a39632b824587718177ed35bf036702d716bc893a8f71a374bf99de79342a46907a8ac WHIRLPOOL 9fcbb7112258aec4f0fb4926246521b54805ca850e6ad9d951fda819945c2c15ced1798463da8ba49729ea525e2710c58e4180107b50ab0f1e07af2e494cc421
 DIST udisks-2.1.0.tar.bz2 823805 SHA256 310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8 SHA512 dffbceda998aee62f56819111db7c33fd65b8295d14885f28f8209be332ab319353116d51e2c006e434865ac515db04c7d8f5d2639ab9870247cf49136747811 WHIRLPOOL a891e1fed94b6c516a31b291ae4bfcfb8764df51f93781a6da4b1aa4051b7164ddb5ba7d28067dd4418c756af3056dddabc952f531c4d78c8ff60e7ce305835a
-EBUILD udisks-1.0.4-r5.ebuild 2684 SHA256 b2b33fbe2af220d225672cde8be87a5fff54529cc5f2b2beaab019d2a3729ef5 SHA512 aac6e2010a6773024abf33da2dc64e373c2ca652c42794e983695b9f709bf827dd820e6f7bb91b5a84fc37599c0a42cf2e89cce04794a6fb7a75115925f7e07a WHIRLPOOL 448d9e260beaadfc929059b93273a8035e5777425e7ee87a976e4f959d835a2865ce0edda4cbc1853356b8cdd887f3af8da490c91b9c13f0e3f5aedb106bcb09
-EBUILD udisks-2.1.0.ebuild 3037 SHA256 1845ae66b10d9cb604e7bb2cd640090034518672e25f7a437d9f964d0e15c1ea SHA512 24f9673bac5366625ed887673232bd6f42f1c84e157ad45a1deaad8a59c7b68df7225a274d4593a0af766ef41851ec6ff4a69a2e1dd950ec4100193ca54c97df WHIRLPOOL 24644687fcc149701294e535e82de02589bff5cab66491dc63580431c260321994349a6b4ad2d96467c323710b24a14b3c8cd6bd5c392c9c1c847fd67e0c2ea0
-MISC ChangeLog 20788 SHA256 a497296ddd8d8f4e48bcee2ce9f22107159b2d751565828ad37dd1280cf1fe11 SHA512 20c1a62a50ada3a5751096ca63e66a3266bae3276ba33912ad4b3e540bfaff5d7b3740241a685e32f185fc0231efab5ae29615e17efc085281b641aa3677917b WHIRLPOOL 10706d46bf64d7d059c5e651dc0af0a16e8fc459068849cf2b661850ef0d97ab767e59442774b9908fe997d7252cc55eae83de3f707a572e78297d7a74741675
+EBUILD udisks-1.0.4-r5.ebuild 2720 SHA256 be32cecce1b6bb3eed7f4bab435e33162ff5c8b1174622768624a2df4e99f5fe SHA512 7c2ef097da6705d7d74eb1ff1590e6ade29bd9d2ca556aa26f24391e17e2515c727d74ebcccf78506909060910e1a50c9a5ec9883fa79f79224e2d1281b01d38 WHIRLPOOL 063eaa0e165a0364916d2656f135d638239e05f5eeda111a63e75663f68657724c23af96cb516080bb6b4746a41dee0636a52855f3b354c33c9ba223f53847d6
+EBUILD udisks-2.1.0.ebuild 3067 SHA256 649745e8e0981f8f167e5aee88d95986414e3515462faea1b1a29d674cc337d7 SHA512 d7016c4834629cef12efa118bf0646613c19d79494ddc2179e5510d147041fc5e0c903663ce5efd429153d9fef9f60eb79331693b24012062542d87f6e22d5d8 WHIRLPOOL 145f326c0c04990ab88e9ce95b24f90c11cc7ae3254571f54b9ad745d87eea4f7fb4d498a410e235e7b194bc80b2f0b874ca7542de37f3e50f668803f4aeba9f
+MISC ChangeLog 20989 SHA256 f0ae1765aae678521efcc968727dd90f1a1ea90fb259aa6a852ab3798e5271eb SHA512 89e7b1fedd3a68e99cc6981b38921a22faae33b1acd5aa1f3970afc9d0361020eb462f48045fce864bf97223be5e593abde99f2167c19e4d264878f48f71f874 WHIRLPOOL e05db13b99d6c01483b8c4ffbb703e547dd7e9e52c1d9e5c816c2d91f4c6ddbddcb79020eeb781df49e066cb9caea35c1230e617da0d4a6966402901d3e8771c
 MISC metadata.xml 735 SHA256 372e32cc56ba43aafbed3fd11af19e74b7b50ea70886d6f10440c7f8ae477c26 SHA512 f55fbe68bfb02178b310b5d455cb04527b255237771809457cea65ca0a8249415e59ff76d5bdac9f402cbb0707ea8cf4d711abb6fc874878ac2107ac070cdccb WHIRLPOOL aea1509c3f0a0d22b803d2382ebf382402c8573d9580abf0598283155b95ad8537a6c5735595db262f8036a73447e642226e26bcea0b826456f6cd396845e6f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR58UnAAoJEEdUh39IaPFNEKcH/i2cYo8cf4CizRoWQmO0Sju9
-IOoOdO7oJr+PmUiQTk6IWCNc5SnXcwpP5X7c0bFEyXYGphSkk3iajoYkVdCyMkIt
-uBEFFkSRx2CV/98PD7o42h5m/6adUPEG2lHAX7MpKXygwuEmyJdRzGizyhEnhIHg
-6OxWMZ6J4O7pDlahVo3+cNryIH+cqy5voKls8ficVyCIxzKNfqhT2d3oVoHtTAfE
-deZkbv17FnHBDz324yqj4n52z3x33+cOr3DNHzln6KkpCnKjjZ1k6hcryHWX2cZu
-PI9HNBLlX/S6gNofcizV+VJPCHzCr401MtbupdDZoBEabFt1WSzNFTsMesKD0rs=
-=0UaT
+iQEcBAEBCAAGBQJR6BKfAAoJEEdUh39IaPFNgGYH/3q+5ss7B1TO1bsmIBMyEp9V
+7/ljRyzMGYXsSO3S3NHwriIMaqTUJRyJssNHTcSnRufP7SoavP2HAPpOggfdb3oG
+FY3BY3GKwOPdkUZbUiSOxuTpTyOHv3mJ+khpFFKaLeyvU4Vk+vlkofL8BfqutYpe
+9mb+wEQwjX1niPwIVnvZrzlNMZWlirP502HrBQzCpbTR+pldwE1quUzVX2QYJEG6
+7KFLaiOrJ/Wkr2bQpqV2Da21ftbhcQOjFuoWb8s+AjjiMUy8xSLYsxN/NqQ13LHa
+hf7i9tHrKM0/h8iYJpwCoyj9sPX+8MD15C6gV3qoTqi1UvbKkiHZs/Jb3+CWfkA=
+=RnPd
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udisks/udisks-1.0.4-r5.ebuild b/sys-fs/udisks/udisks-1.0.4-r5.ebuild
index d5cf417a606f..6c5e4df78160 100644
--- a/sys-fs/udisks/udisks-1.0.4-r5.ebuild
+++ b/sys-fs/udisks/udisks-1.0.4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.4-r5.ebuild,v 1.10 2013/05/01 11:11:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.4-r5.ebuild,v 1.11 2013/07/18 16:07:15 ssuominen Exp $
 
 EAPI=5
 inherit eutils bash-completion-r1 linux-info udev
@@ -39,8 +39,8 @@ pkg_setup() {
 	# Listing only major arch's here to avoid tracking kernel's defconfig
 	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
 		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~USB_SUSPEND" #331065
 		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
 		linux-info_pkg_setup
 	fi
 }
diff --git a/sys-fs/udisks/udisks-2.1.0.ebuild b/sys-fs/udisks/udisks-2.1.0.ebuild
index c8b4af35cb90..229465dad7fc 100644
--- a/sys-fs/udisks/udisks-2.1.0.ebuild
+++ b/sys-fs/udisks/udisks-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.0.ebuild,v 1.13 2013/07/18 10:36:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.0.ebuild,v 1.14 2013/07/18 16:07:15 ssuominen Exp $
 
 EAPI=5
 inherit bash-completion-r1 eutils linux-info systemd udev
@@ -51,9 +51,9 @@ pkg_setup() {
 	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
 		CONFIG_CHECK="~!IDE" #319829
 		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~USB_SUSPEND" #331065
 		CONFIG_CHECK+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
 		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
 		linux-info_pkg_setup
 	fi
 }