Reverse the version numbers so that users will see an upgrade instead of a downgrade, fixes Bug 533334 - sys-firmware/iwl7260-ucode-23.11.10.0 version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

18 files changed, 329 insertions, 219 deletions

diff --git a/sys-firmware/iwl3160-ucode/ChangeLog b/sys-firmware/iwl3160-ucode/ChangeLog
index effc89a3dc8c..214d5a8cc672 100644
--- a/sys-firmware/iwl3160-ucode/ChangeLog
+++ b/sys-firmware/iwl3160-ucode/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sys-firmware/iwl3160-ucode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/ChangeLog,v 1.4 2014/11/17 13:52:01 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/ChangeLog,v 1.5 2015/01/14 12:14:50 gienah Exp $
+
+*iwl3160-ucode-0.10.11.23 (14 Jan 2015)
+*iwl3160-ucode-0.8.15.22 (14 Jan 2015)
+*iwl3160-ucode-0.7.1.22 (14 Jan 2015)
+*iwl3160-ucode-0.8.24.22 (14 Jan 2015)
+*iwl3160-ucode-0.9.228.25 (14 Jan 2015)
+*iwl3160-ucode-0.9.214.23 (14 Jan 2015)
+
+  14 Jan 2015; Mark Wright <gienah@gentoo.org> +iwl3160-ucode-0.10.11.23.ebuild,
+  +iwl3160-ucode-0.7.1.22.ebuild, +iwl3160-ucode-0.8.15.22.ebuild,
+  +iwl3160-ucode-0.8.24.22.ebuild, +iwl3160-ucode-0.9.214.23.ebuild,
+  +iwl3160-ucode-0.9.228.25.ebuild, -iwl3160-ucode-22.1.7.0.ebuild,
+  -iwl3160-ucode-22.15.8.0.ebuild, -iwl3160-ucode-22.24.8.0.ebuild,
+  -iwl3160-ucode-23.214.9.0.ebuild, -iwl3160-ucode-25.228.9.0.ebuild:
+  Reverse the version numbers so that users will see an upgrade instead of a
+  downgrade, fixes Bug 533334 - sys-firmware/iwl7260-ucode-23.11.10.0 version
+  bump.
 
 *iwl3160-ucode-25.228.9.0 (17 Nov 2014)
 
diff --git a/sys-firmware/iwl3160-ucode/Manifest b/sys-firmware/iwl3160-ucode/Manifest
index abcab4d6bc8f..a5823cc349de 100644
--- a/sys-firmware/iwl3160-ucode/Manifest
+++ b/sys-firmware/iwl3160-ucode/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST iwl3160-ucode-22.1.7.0.tgz 332285 SHA256 6350d23db66e7f5346a716fb74bb853ae798b70ad56f20f134ac99dd4941d561 SHA512 5f379edc87d0cb743bd91cecd5a1879edfd18033c02d29269ea55e046663fa47c3363a19441d0edb52ea99c58e757c81872545c8ece634459675d927f46a4392 WHIRLPOOL 35d80a4f6901bdce4ec1c34fcc3ad38a0f869f5fddebcd4c29866e5eb0fd65cebbc37fce966400d15eb3053a4f7902cd9c2397a8eaf8a857ad444a0ebc115bd2
-DIST iwl3160-ucode-22.15.8.0.tgz 328351 SHA256 101a0466a4411f5e1492dd8e559f549f1196de045b084718354ece3896c7b370 SHA512 33e8842068c285bd62cd58629855c4be82a5b19129bcaefc4ac622245562085ec4ae155dba719937f71767d3f26e0d309553c9362fe7995943f2e95a9bc5d1fd WHIRLPOOL 5c6be623389b28c585f89e370a3202874d364d7daf9b61b7c95c7824c5b4243280a723b94848c47a1b449545162e8cb6cd073a1a4f748a100310e472ec911e10
-DIST iwl3160-ucode-22.24.8.0.tgz 334306 SHA256 44082d3b70e3101343702d614e4785e498c5596117bb144e167ea8a11b5c63cb SHA512 afa9d1c081f21ec8cb3d427be79475853c9f078fb4f3d60ada154df0c58fe3dec4655dc2f54095dc395cf064563e0de9f69d55478b28ee07b7f19c0b93fb6097 WHIRLPOOL 8a18b409e5211d69d0df80498caa7b572d0d9f462417e6101c159185194db203627019fa6caea9ba3cb3c478c2975e362e3011be21d58f4f572c5c6bee77ca1b
-DIST iwl3160-ucode-23.214.9.0.tgz 335384 SHA256 37e3c7b0ef26ad1d7e3089dc100f0451045caccaab6a503e2bae98ec75befb95 SHA512 93812c6de01ba97da7192f53b33e6c4dca94a5ea2e29b519b47af3bf1f19b41cc1638b6ba92015c4faf840bf4abe8a2abfd6cff1a76557ff93024e095d246f16 WHIRLPOOL b45af6873c74887a6557a43c802e6117db0bd2bc180ba5559c0dd28b62056d0112f398385e252b2ee542623549544469d812974e5680c7ac1aa587bcba8db1c8
-DIST iwl3160-ucode-25.228.9.0.tgz 337144 SHA256 797b5a2dfd51642c56224b588985cd6030f1795f6b7a712824d0547e73fbc263 SHA512 3032980346a6a36f8e8b99d29cffcf8fca2eed9ac69a2786b19841894c9be5ce658b137cca1d95e47881193008c7ef30fd7d4e4321e6162cc8512a27c06af47c WHIRLPOOL 90abf241fd61ea298142f336d87dd2891b1e7a602c0d34dcfd1245a25b82fd5bbfb0399317376b200bfc652c9f958b1558ad9c1bbbb7fbec831400849c375f3b
-EBUILD iwl3160-ucode-22.1.7.0.ebuild 1223 SHA256 4e2594eb7bbf056b2bbe246b99525f16db2e236146f0467d83babba977a84b51 SHA512 e34a19decfe703fd05730e7ed02e8f478f89e1f1e6cb8d021f88f86c0c2071c0a29eef17e8ec31db8d71bb6ec136a74f36843659c84c1194d7e050288111f5bf WHIRLPOOL 507b33abbbdeb1be837a7480d1c4124ebc3d97b650c95dbd6f5a873bcd645197de662160c6a1aa1c8d5839f4c4d1dc4e0a627c0d195375015823b15171f8c484
-EBUILD iwl3160-ucode-22.15.8.0.ebuild 1292 SHA256 4f4c58e45b521b8a677ae4b748d8484626a95b45348c186b6538ca8a9efec874 SHA512 e47108758d44f52dd964a4360ef2809a235ca54254153f484f9236d3f73bdfcf64265a0036d3e6617a5f8ac76fb81ba4a8375adf983f63885b1cb4f6ef1b7ab7 WHIRLPOOL 47d6fd556761e70b624ffb453dd8f8f44c24166fb209ecf46752151aaa145448d561bffa13eeea1eb1fb54315e31cb58906b51c1a89923a8a168e60aeaf5f2fb
-EBUILD iwl3160-ucode-22.24.8.0.ebuild 1292 SHA256 3c8476a722b8cbe59b77711e45c0c69f94d0e653de67d575fb4867752bd8d58d SHA512 5ce6af96a3ca172ad9e4c9e9879d7ed18ece7e08c22b5875ec8fb75c58738e06924883241d93c1b171913d8516f52c2ee461d598fdedcb220f651a58f34b04ca WHIRLPOOL 279c256885de4e5090ac9b9e73cb7f832f853ca6d89e6dae62bc67521f66b366df0ea28fceefbc130da80127932c7d254b9521a2af36b43a6cf03d5ff91c0902
-EBUILD iwl3160-ucode-23.214.9.0.ebuild 1293 SHA256 536c29b8faefb772af338338638b367d9bdecde4f9de40ff8751ae43a4ae1afd SHA512 ab9c9afad949dd50186273502913178e8eb868304b1e0612b4286c9f1c364884cc259feca4f134b0025058aa24a8176bade678c1153e056fa0ca68c28593f4bf WHIRLPOOL dc8ef70ad272844730773543b3c1a452b3e9a8a2330da8cd803454d24da563581da9318266a57f6a3669348743c36088d0962ac47684a7c624f0c92c0c199c5a
-EBUILD iwl3160-ucode-25.228.9.0.ebuild 1293 SHA256 b8b0f2aa3e62454bbe9d775230295de0631ad6ed0295d817da6275975f3f29e8 SHA512 5963716f4c94941513c1ae925f36d1dbbf295a61ed912f68a394368135ca89f9f087fcd5c8e64357df0ee05045306cd259128e818d9a80299714a596a08d9c64 WHIRLPOOL e68836b3e37718decced1ad13e6cb204074c65da35646e66626b4a735de0638d757e2128219217ddd7d112583f0a1bad58979299382bc5bfdc7f8233e9ad5f8b
-MISC ChangeLog 1365 SHA256 abeb1a8a45e36eba0b56b293cc80d607b077d1268eaf836821e0ea8bda73987f SHA512 ca89821cb464acafbf41d877b99739f47bec4fd6dbed60c6a653872144330bc9ce7f72a67574bb2ab28f89c88efdbadca6f5fc74df35b2a3689d293d7f11bca1 WHIRLPOOL f4deec135c7478598094b4d3eb182d11b22b12aae5e1b63efa08e3e36fd9dad97310ec8fd1755403e029a5e51629e91e020f4800f9c83c60390ebb2c6930df67
+DIST iwl3160-ucode-0.10.11.23.tgz 334243 SHA256 b5adfb05dc81fdfa773a34f8d752ce690777f898bb1a3697ce651cf4bf7b5746 SHA512 14aeedd0e7069d5f65d388f36b7d30bb0e3f90c2c721a582e761aa2a27402f6ad8616dd07c44812b8e62bfa0c6eabb57adae71aa2a48053cf85757fbb6548432 WHIRLPOOL 8cefd369781f015bc7763d777b61e8c0e8276027602e6a706a8679627af62113d4e64753f0a01b38809bcf38ab45d34d3cfb623ecce98071651bb260cc199548
+DIST iwl3160-ucode-0.7.1.22.tgz 332285 SHA256 6350d23db66e7f5346a716fb74bb853ae798b70ad56f20f134ac99dd4941d561 SHA512 5f379edc87d0cb743bd91cecd5a1879edfd18033c02d29269ea55e046663fa47c3363a19441d0edb52ea99c58e757c81872545c8ece634459675d927f46a4392 WHIRLPOOL 35d80a4f6901bdce4ec1c34fcc3ad38a0f869f5fddebcd4c29866e5eb0fd65cebbc37fce966400d15eb3053a4f7902cd9c2397a8eaf8a857ad444a0ebc115bd2
+DIST iwl3160-ucode-0.8.15.22.tgz 328351 SHA256 101a0466a4411f5e1492dd8e559f549f1196de045b084718354ece3896c7b370 SHA512 33e8842068c285bd62cd58629855c4be82a5b19129bcaefc4ac622245562085ec4ae155dba719937f71767d3f26e0d309553c9362fe7995943f2e95a9bc5d1fd WHIRLPOOL 5c6be623389b28c585f89e370a3202874d364d7daf9b61b7c95c7824c5b4243280a723b94848c47a1b449545162e8cb6cd073a1a4f748a100310e472ec911e10
+DIST iwl3160-ucode-0.8.24.22.tgz 334306 SHA256 44082d3b70e3101343702d614e4785e498c5596117bb144e167ea8a11b5c63cb SHA512 afa9d1c081f21ec8cb3d427be79475853c9f078fb4f3d60ada154df0c58fe3dec4655dc2f54095dc395cf064563e0de9f69d55478b28ee07b7f19c0b93fb6097 WHIRLPOOL 8a18b409e5211d69d0df80498caa7b572d0d9f462417e6101c159185194db203627019fa6caea9ba3cb3c478c2975e362e3011be21d58f4f572c5c6bee77ca1b
+DIST iwl3160-ucode-0.9.214.23.tgz 335384 SHA256 37e3c7b0ef26ad1d7e3089dc100f0451045caccaab6a503e2bae98ec75befb95 SHA512 93812c6de01ba97da7192f53b33e6c4dca94a5ea2e29b519b47af3bf1f19b41cc1638b6ba92015c4faf840bf4abe8a2abfd6cff1a76557ff93024e095d246f16 WHIRLPOOL b45af6873c74887a6557a43c802e6117db0bd2bc180ba5559c0dd28b62056d0112f398385e252b2ee542623549544469d812974e5680c7ac1aa587bcba8db1c8
+DIST iwl3160-ucode-0.9.228.25.tgz 337276 SHA256 6856a994b8f92785ab220eb2a04233690cf3824a1b51252802a8af206e81b388 SHA512 95f1d3bddbb05d32a66250c6e714d74b17902b8f6d9451a5107cf2d061f1cdf90dfb3cf8b0375f6104dfb2fe1bc201dab8baa1c6bdffda944aa5fe8aad568a16 WHIRLPOOL 15838747dd6e7daa646489be95e8213c4e35fe44caad26ebeb35636796feb74da0c88ec5e1970c4a5a5384770783cad0ba583996fa63e08ae2ea411bac733f85
+EBUILD iwl3160-ucode-0.10.11.23.ebuild 1547 SHA256 dcd0881835b4cdd7c8eeb1fa0ce4ef6f5e7f9daf316b6710037f8ac306a34e1e SHA512 fde9d83a1df43fd4957a855a08cd36a005e770d31268c6de9cfc74b6b0e29e326a6314188520ab97eea8d741f6fc27bc0b9beb574cb797733e9d88cf5dd6c7ac WHIRLPOOL 5964450a3fd4c6eee3fccf04cf7ba764bac70430f07a40329166479c8529e0bcbebb71a48c605146641db0cec53a351492947b4f04f43611b39c5863cbdb7e69
+EBUILD iwl3160-ucode-0.7.1.22.ebuild 1447 SHA256 658e95a4b7e5a7fcb7e22cb5fb9fceb4bf723ea499148905186e038b95d0f717 SHA512 aa7ad6972cba8fec5806e8b52175e086b74c93779bf5bb2e08ce00617ce95f1ee5bc84c6960394482ab2eb394009c8089c9fc974c72b5afe5ab1f75658b5ee30 WHIRLPOOL e523bb7dcad4e09e6523de1f75b88209e4b17854671b84ba76633f0c14498354d543e6a8ca313ec92578259ec8db9d4a988a9dd5aa13c7884127c9db94744fa2
+EBUILD iwl3160-ucode-0.8.15.22.ebuild 1545 SHA256 3119e2bd85723793871a9791a668f53f794a31ffdf379c40fb47340c7b39748f SHA512 aeea838dde44574881af92e2c33f794a8fbe648f7ff23ab2f8db2770dbe9c4357848f066e0ae906bfe7218991cbcd4ab208bbde6fb1bd35513f10d993dc616ef WHIRLPOOL 17eed2ffcbb8121613f4669cfdd79d0f6259133b9edd105ab11a8a1a3e3a4b84c294bfd13eb28c5d2ab33caac06b6141fa890879c615aeab537c5ee180440c63
+EBUILD iwl3160-ucode-0.8.24.22.ebuild 1546 SHA256 ae8bf55b58c1b26c1537f6497944563967ba323300941633ed6ddd6c5785da44 SHA512 75f835dc45b180577a63af2b27402682b2f4291a8030850411e2dd94cad2d28b42f523b07257a422e9f580cd558b3c3174700d8fb42a29a623f3b2293fb49226 WHIRLPOOL 948d97b4186aa02ba647ba3227d43654977773a338230c750f0d5f02db0083f38bc003de07a1cb456bddca9d6866da81fc333d8ec26f8da3cc2a4310a8005b6a
+EBUILD iwl3160-ucode-0.9.214.23.ebuild 1546 SHA256 07204c6f48121ba15ac547f9e85f05d8b66cfbbf76f01cce526bba0c27e4eda2 SHA512 5ce327f07929cb34fde6b2f323651166616c91ec2456e0f8acf1a94c807e2c4bcaee1ea0f474657723ec68523caa1a41196275a6e7b9a3a016be2996fb8678fd WHIRLPOOL 7a580a512e72c6c9b72166e7c56ffe392a881e2f8f0643411f2c7b958cc3aa28923c7778b32c9f6456bd67fdbd11b55985a1ed6d94fd5c7233aaf1227b06393b
+EBUILD iwl3160-ucode-0.9.228.25.ebuild 1547 SHA256 b9ff91d7dbd8fd24472989596349c3df999b325fcac481eceabd08a1a4d16e84 SHA512 af9935425b2e270cf000d9cdc513f73614bd6ea9ea32d40ed80d367974167bc8dab1e5e762ff0ddbcefcd4e14ce25f07d726248792a71285300d3990c48d8c98 WHIRLPOOL ed7d431db653ed169ae50182d62c833ec292fbad2731e89e75862c1cc8d1e860d022e401a04fcb60a0c858e2bec3ba04c8a63548e590aab0b815242552f7468d
+MISC ChangeLog 2189 SHA256 a35fe89031dd51c4dc04535c672d8f36cb693263acfee2e9999a3c842182fd23 SHA512 41bfe252df3a486d4e10ca257a383c99cd0a77577cef9ec70677f2e0f5dbedbbaba2d81ef5075753ab80b40a508625ae4c2746a0e6673bee075186d3d23aeb85 WHIRLPOOL 93452bdcc39bce2b49dd54629823112ded018244caba67a96dbd2b683014be81b3dab2a649e7ee9625afbe8c6ad7e27da26effa9b0f436baf09da185f11ce9ab
 MISC metadata.xml 398 SHA256 ce5f055304078592060573948d02234c9b40b7e41d12bad3e29f65abeec7e51d SHA512 c6b16b131788258a8ea1e00d7ed94ab280682ebf95fe68b6b5281d5c30c07941464f9ca7ba4d1727669a30af46e5a3235c982c7f12cd690123d125f36053ad39 WHIRLPOOL 6a709112db6bea5a1c7e814286b26a2035ccee6d550f3caf5a6ccd835fad933785615857eff7ee7e39bc2a786b76f033fd15bf50fc9c31db13e06f9f358f48c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRp/YYACgkQoBEVQmGOlx/tsQD/Si6Ub1gOUV1+Y4kZP90KY+pG
-mSwa057TK3d4Q4O/xqsA/Ru7mgSekHqedFQSR7IvbJtuuwV5D33eyhvEm5DokEQ6
-=qlfV
+iF4EAREIAAYFAlS2XcAACgkQoBEVQmGOlx95cwEAmROolAHsv17NLijycSeluo1m
+O0WQP0NbX4OIZQPEmhUBAJKATQEZCjAiGT76YW14cBtJWzPe0GANYU7P/B5jBpJ5
+=iPib
 -----END PGP SIGNATURE-----
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-23.214.9.0.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.11.23.ebuild
index de2e8fc472c4..83f3876b903f 100644
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-23.214.9.0.ebuild
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.11.23.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/iwl3160-ucode-23.214.9.0.ebuild,v 1.1 2014/06/16 14:05:55 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.11.23.ebuild,v 1.1 2015/01/14 12:14:50 gienah Exp $
 
 EAPI=5
-inherit linux-info
+inherit linux-info versionator
 
 DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
+DV_MAJOR="3"
+DV_MINOR="17"
+DV_PATCH="0"
+
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="ipw3945"
-SLOT="2"
+SLOT="${vc[2]}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
@@ -21,21 +27,21 @@ DEPEND=""
 RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-CONFIG_CHECK="IWLMVM"
+CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
 pkg_pretend() {
-	if kernel_is lt 3 14 7; then
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
 		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.14.7."
-		ewarn "For kernel versions < 3.14.7, you may install older SLOTS"
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
 	fi
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-9.ucode"
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
 	dodoc README*
 }
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-22.1.7.0.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.7.1.22.ebuild
index 753e9413f89f..677ac95a3efb 100644
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-22.1.7.0.ebuild
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.7.1.22.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/iwl3160-ucode-22.1.7.0.ebuild,v 1.1 2014/01/25 03:35:32 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.7.1.22.ebuild,v 1.1 2015/01/14 12:14:50 gienah Exp $
 
 EAPI=5
-inherit linux-info
+inherit linux-info versionator
 
 DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
+DV_MAJOR="3"
+DV_MINOR="10"
+DV_PATH="0"
+
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="ipw3945"
-SLOT="0"
+SLOT="${vc[2]}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
@@ -21,20 +27,20 @@ DEPEND=""
 RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-CONFIG_CHECK="IWLMVM"
+CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
 pkg_pretend() {
-	if kernel_is lt 3 10 0; then
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
 		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.10.0."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
 	fi
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-7.ucode"
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
 	dodoc README*
 }
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-22.15.8.0.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.15.22.ebuild
index 08de19062697..ef3cef561c7b 100644
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-22.15.8.0.ebuild
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.15.22.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/iwl3160-ucode-22.15.8.0.ebuild,v 1.2 2014/06/16 14:05:55 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.15.22.ebuild,v 1.1 2015/01/14 12:14:50 gienah Exp $
 
 EAPI=5
-inherit linux-info
+inherit linux-info versionator
 
 DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
+DV_MAJOR="3"
+DV_MINOR="13"
+DV_PATH="0"
+
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="ipw3945"
-SLOT="1"
+SLOT="${vc[2]}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
@@ -21,21 +27,21 @@ DEPEND=""
 RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-CONFIG_CHECK="IWLMVM"
+CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
 pkg_pretend() {
-	if kernel_is lt 3 13 0; then
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
 		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.13.0."
-		ewarn "For kernel versions < 3.13.0, you may install older SLOTS"
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
 	fi
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-8.ucode"
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
 	dodoc README*
 }
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-22.24.8.0.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.24.22.ebuild
index a04e7a2ed21f..b1b1ab42e949 100644
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-22.24.8.0.ebuild
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.24.22.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/iwl3160-ucode-22.24.8.0.ebuild,v 1.2 2014/06/16 14:05:55 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.24.22.ebuild,v 1.1 2015/01/14 12:14:50 gienah Exp $
 
 EAPI=5
-inherit linux-info
+inherit linux-info versionator
 
 DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
+DV_MAJOR="3"
+DV_MINOR="13"
+DV_PATCH="0"
+
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="ipw3945"
-SLOT="1"
+SLOT="${vc[2]}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
@@ -21,21 +27,21 @@ DEPEND=""
 RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-CONFIG_CHECK="IWLMVM"
+CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
 pkg_pretend() {
-	if kernel_is lt 3 13 0; then
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
 		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.13.0."
-		ewarn "For kernel versions < 3.13.0, you may install older SLOTS"
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
 	fi
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-8.ucode"
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
 	dodoc README*
 }
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-25.228.9.0.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.214.23.ebuild
index e7ed6e39c841..85ea9e640fa2 100644
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-25.228.9.0.ebuild
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.214.23.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/iwl3160-ucode-25.228.9.0.ebuild,v 1.1 2014/11/17 13:52:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.214.23.ebuild,v 1.1 2015/01/14 12:14:50 gienah Exp $
 
 EAPI=5
-inherit linux-info
+inherit linux-info versionator
 
 DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
+DV_MAJOR="3"
+DV_MINOR="14"
+DV_PATH="7"
+
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="ipw3945"
-SLOT="2"
+SLOT="${vc[2]}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
@@ -21,21 +27,21 @@ DEPEND=""
 RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-CONFIG_CHECK="IWLMVM"
+CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
 pkg_pretend() {
-	if kernel_is lt 3 14 9; then
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
 		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.14.9."
-		ewarn "For kernel versions < 3.14.9, you may install older SLOTS"
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
 	fi
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-9.ucode"
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
 	dodoc README*
 }
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.228.25.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.228.25.ebuild
new file mode 100644
index 000000000000..f50cb50467b0
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.228.25.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.228.25.ebuild,v 1.1 2015/01/14 12:14:50 gienah Exp $
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="14"
+DV_PATCH="9"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/ChangeLog b/sys-firmware/iwl7260-ucode/ChangeLog
index a6de5429ac7e..f66eab5db3a8 100644
--- a/sys-firmware/iwl7260-ucode/ChangeLog
+++ b/sys-firmware/iwl7260-ucode/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for sys-firmware/iwl7260-ucode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/ChangeLog,v 1.7 2014/11/17 13:47:19 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/ChangeLog,v 1.8 2015/01/14 12:15:50 gienah Exp $
+
+*iwl7260-ucode-0.10.11.23 (14 Jan 2015)
+*iwl7260-ucode-0.7.1.22 (14 Jan 2015)
+*iwl7260-ucode-0.8.15.22 (14 Jan 2015)
+*iwl7260-ucode-0.8.24.22 (14 Jan 2015)
+*iwl7260-ucode-0.9.214.23 (14 Jan 2015)
+*iwl7260-ucode-0.9.228.25 (14 Jan 2015)
+
+  14 Jan 2015; Mark Wright <gienah@gentoo.org> +iwl7260-ucode-0.10.11.23.ebuild,
+  +iwl7260-ucode-0.7.1.22.ebuild, +iwl7260-ucode-0.8.15.22.ebuild,
+  +iwl7260-ucode-0.8.24.22.ebuild, +iwl7260-ucode-0.9.214.23.ebuild,
+  +iwl7260-ucode-0.9.228.25.ebuild, -iwl7260-ucode-22.1.7.0-r1.ebuild,
+  -iwl7260-ucode-22.1.7.0.ebuild, -iwl7260-ucode-22.15.8.0-r1.ebuild,
+  -iwl7260-ucode-22.15.8.0.ebuild, -iwl7260-ucode-22.24.8.0.ebuild,
+  -iwl7260-ucode-23.214.9.0.ebuild, -iwl7260-ucode-25.228.9.0.ebuild:
+  Reverse the version numbers so that users will see an upgrade instead of a
+  downgrade, fixes Bug 533334 - sys-firmware/iwl7260-ucode-23.11.10.0 version
+  bump.
 
 *iwl7260-ucode-25.228.9.0 (17 Nov 2014)
 
diff --git a/sys-firmware/iwl7260-ucode/Manifest b/sys-firmware/iwl7260-ucode/Manifest
index c27bdc2b8ea1..702a03c372b3 100644
--- a/sys-firmware/iwl7260-ucode/Manifest
+++ b/sys-firmware/iwl7260-ucode/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST iwl7260-ucode-22.1.7.0.tgz 341956 SHA256 1ecc335e2a81a4f6d19422a5e707a93ef56351030a4e95d698e064fe51ba6154 SHA512 c6ae43ec84e5d0df85b6fc1962c5d6052be9352e453b53807a3c45eebc334892dae51c84a053fd197afa66a77bac5b5c349de8d566c071f15f2e76c370a36880 WHIRLPOOL 91ed3469604377462701ac921f06bd0269e032f04a1523ecc9e550d94cfd0fc1fee5caa484f0d46cd5d41ad25bc041fe953a7cd6c2dc0b8e3cbd39705b08119d
-DIST iwl7260-ucode-22.15.8.0.tgz 342953 SHA256 7ef7010705b26ab182c45f3810243cc814c0bec7a0c3dad21f0cdd22019ee7ec SHA512 7f6105c547dde559280444e1d729928c33d55ca4f5df1036d40ced735d7863277f2291a27c36ac544bb0c4278883b345be087268124d22af85155b0b4a57bb96 WHIRLPOOL 2ceea1c21749af78748652c8ce12df520621e0f54eff3c80307f0e038b23f730c9eccbadd1a4152276b8e99a447e7f1e38641d161334c197a5e86c5ce9e9e37e
-DIST iwl7260-ucode-22.24.8.0.tgz 346691 SHA256 11ef671652ade65fc6c7c843f56d19873b5a91b2e65676bd6df9ec39642b7cff SHA512 a8a81030bdec074b6370a6bb7f3b22fd8389b76c00b9b27902acfb34be2263662adf5b7eee6e8817c22dead54528607ccb93194073bd509191561a15ce88a3e8 WHIRLPOOL 205af365e22f9f28a95a5e3bef0cff59d301d03f60a21daac79a0f039c35fadfcbaca97b68082ecebead3396576d93bd372655c730cef87524a1dc382331a8d5
-DIST iwl7260-ucode-23.214.9.0.tgz 347695 SHA256 a3124e3c03405dacae6782ce7bc5b71c38c20e3528413a9ab571a0ce4e2418ad SHA512 d3ffaacc2827d088cbc1086b4d736e158dafde981e10a01442ede3003f8ccc66bb7ca6ca62c4f3c03fce4cc3cba56141c9144024ecfdaaf52ea3c7cdfbdbf074 WHIRLPOOL 81af9b1967a7f30da7bb60d068fe0c0242bffaf6ff80b00f6c7691f2c9e27243cde0f70b10581d3fbacd814ed369b9c39ca3ba30c677fed552496cc51f56dd6d
-DIST iwl7260-ucode-25.228.9.0.tgz 348246 SHA256 86b4c923c7000e386ea4ae24bdcb92795fd00250b081a02593e2f46131d89103 SHA512 75ff2dc3a3f8323a69c53a536f080b7317e52af0e65843b3dfbf87aa6ec25ab7adeeb3d18ff25c1afab4a1cb3481f88275281d60fcd23d81875c7de0f2519eb8 WHIRLPOOL 361e337dc6b5c96c4c2dde74c10f3c23f449c0e2bb96516bee6ac6cad4da7822a1430fee1b965f93a4596ab0ebbbe98f42e7b2c94d7ea2ed1ce383b4a93f3e8a
-EBUILD iwl7260-ucode-22.1.7.0-r1.ebuild 1226 SHA256 9e7eb9b1b87a877903db20f2b732f1622f222f9529b929ae247a2aaacf7bfdf3 SHA512 134fbdeb7e4fa2c1850ab3d0b9701349c1af1427ed59a7f7bbb6a0f6f4db25ac430957ec57174702fc60400fd78917419434429b77b6e7295618aeebadb3d3a5 WHIRLPOOL ed5a7c97f754f57da18a2f061433e666e7db7a30b01f3780227c12f87a19eeca16feab98abe7dcf091389befd00556214be16b0c27a3ec4e98dffbe9b6485daf
-EBUILD iwl7260-ucode-22.1.7.0.ebuild 1129 SHA256 934f50cc000b0575b350cd845ab4b3a314aa04f3cc58e8391b23b1fd0d6820b0 SHA512 21336cc9e84fe0323739de62587eec749ef1c15ee635625fe943f8d2e73c7f1c3cf698839c21ca01d78435fc107805544abd5e7bf1b5d1dd116e399f524a5e0e WHIRLPOOL dd00a2549a280003289bb76a703d8672bb15ddbd360bb5de7a2f665febde1bba3498e4edc8215425497197d62c26f6f83e86b5bd4807ade31c9ea931b4c62035
-EBUILD iwl7260-ucode-22.15.8.0-r1.ebuild 1295 SHA256 0d56b15e1b5bec0b70ed8bebe86b75b36dbfa438fad9a32022c0cae8efc67ac3 SHA512 59ec47dad7ed6086e7b80d817a728559020f9f7e13bfb7f081479d4acb8e4616fd53843be2ed6f9d8a8eb470fb7e52438e146f5dbf26c4d632a3495813281204 WHIRLPOOL aad3234c07cb591de2f2d8f8a01b722eddfccd83314403a04469d467cf2ab25ab7f98e232221383eb637d6d18000ba45996dea4709e6f149aac51b488ef14301
-EBUILD iwl7260-ucode-22.15.8.0.ebuild 1198 SHA256 afad6e2f5db587d60d8f994d063fe4f398a9403aeddd5eb229b6ffd84c89364f SHA512 84c584b91b438bb581a5c89668a7f647d7ed80d06bc8713e20bcff6ce20178128b6b26e78b7527a59870dd342720916b3e31a0b10b180d19c8a28860d63478e4 WHIRLPOOL 9e98aa0e6715cbcbbc0e5be42e0e6026db657c43c9dbb05f645bab6eb519501a11dce3917367292db730f666a89cdfe2ee0aedb9ca1fa48ab9b51c515789f458
-EBUILD iwl7260-ucode-22.24.8.0.ebuild 1292 SHA256 789c68bf8b6e788f478ec08d0a7104b42e11fcaac8ad61e20e9d9402ecddbc36 SHA512 8608b194bb7ef2247f39949731477381c69d8bb8c6baf8d3c8838ae1e3f5cebc005a47a843ae40ea2eb8aaa9c694a3fb1f8fa656265fc5b389fcecd46d38626d WHIRLPOOL 4c8308f9d597d74785cca908b2f766fbef8b89564b70d8268dce7e4d8b16fa17d35fe8cdca0d4d60e88ac7f2fb6c2f23894ce3e000217842b3f06a32d64d5881
-EBUILD iwl7260-ucode-23.214.9.0.ebuild 1293 SHA256 92f3224cb856124f0a3488dd8640404269f584fb2c73fa5c350e140bc6b9184a SHA512 be8b8dd2c4b88c742df521f766e5bd2223c26a152c6a1819501782456b62f3929b3fdf99c75381b940cac7c02deaefa7324bfdfb84938ef4add6b36b533ed99f WHIRLPOOL accc8233c8121a6f730d3eb6b25fcf931ed0b6877377fadbbf707779f367c7b0a2ef338a93c81872b51661111f7b04762b744b533018e983475c075245a1a129
-EBUILD iwl7260-ucode-25.228.9.0.ebuild 1293 SHA256 de583dfdcc5dded15a994444261931e78d79d5c00297aa13a4cebbbd238e238b SHA512 7ef4a1b9e7482349679b3f57be35e1c3737d61eaa520180496406eed28af5b2c07967b77b2612bffd5aaa9fe014ac4e77f8a1db2084eeeac4c8d89cf436e876b WHIRLPOOL 0dfbb295f6472278d398539ff2517ae5b721450817a51e765be61c5b842322a5256e107bee4ad0726922c44d1cf8bcc4ef2d35ba5786e15cbd9f42229026636d
-MISC ChangeLog 2425 SHA256 2f60db0d639d58acaee525f7197909313ec251bbecec49258e008c561116e3f3 SHA512 6bcbdb5f4a1cc0c6782f9bc919f7dee5b0615eb90699bb9e4a6b74fe62ad14c0b16d77e4a4caab6d6bd80279ea734850d9cc4ffda6bab7f0e7de3462a4a38ab3 WHIRLPOOL 7bb4bde2fc0e8476614640b90b1b0f9844860488f04b1cd0208f06fea7b44311d9d1a82967c81fdd9eaba3ca83711fc0017617f6dc8b9c0d8d339808915a6a2d
+DIST iwl7260-ucode-0.10.11.23.tgz 347295 SHA256 4a1feba4436bc48c77e3494114e3b0d2a9d6e9208990c52b16c30c38da3c3cb5 SHA512 8e8e14be7e2f3f97a40bcfa16065d55418e42c10d7e4987b956a55775a8b0dfe75127296b97e6bcb9becf53133cd3f052e2691c05421804b6d3e11fc951d1a6f WHIRLPOOL cf55616de4653029bc3b178d24720d9ddfea3fa08342d0d80ac6602e3fd328cbb3540e4dffa22df243f600e214e0c6f206d5d63569ecafc48028a33ab4587319
+DIST iwl7260-ucode-0.7.1.22.tgz 341956 SHA256 1ecc335e2a81a4f6d19422a5e707a93ef56351030a4e95d698e064fe51ba6154 SHA512 c6ae43ec84e5d0df85b6fc1962c5d6052be9352e453b53807a3c45eebc334892dae51c84a053fd197afa66a77bac5b5c349de8d566c071f15f2e76c370a36880 WHIRLPOOL 91ed3469604377462701ac921f06bd0269e032f04a1523ecc9e550d94cfd0fc1fee5caa484f0d46cd5d41ad25bc041fe953a7cd6c2dc0b8e3cbd39705b08119d
+DIST iwl7260-ucode-0.8.15.22.tgz 342953 SHA256 7ef7010705b26ab182c45f3810243cc814c0bec7a0c3dad21f0cdd22019ee7ec SHA512 7f6105c547dde559280444e1d729928c33d55ca4f5df1036d40ced735d7863277f2291a27c36ac544bb0c4278883b345be087268124d22af85155b0b4a57bb96 WHIRLPOOL 2ceea1c21749af78748652c8ce12df520621e0f54eff3c80307f0e038b23f730c9eccbadd1a4152276b8e99a447e7f1e38641d161334c197a5e86c5ce9e9e37e
+DIST iwl7260-ucode-0.8.24.22.tgz 346691 SHA256 11ef671652ade65fc6c7c843f56d19873b5a91b2e65676bd6df9ec39642b7cff SHA512 a8a81030bdec074b6370a6bb7f3b22fd8389b76c00b9b27902acfb34be2263662adf5b7eee6e8817c22dead54528607ccb93194073bd509191561a15ce88a3e8 WHIRLPOOL 205af365e22f9f28a95a5e3bef0cff59d301d03f60a21daac79a0f039c35fadfcbaca97b68082ecebead3396576d93bd372655c730cef87524a1dc382331a8d5
+DIST iwl7260-ucode-0.9.214.23.tgz 347695 SHA256 a3124e3c03405dacae6782ce7bc5b71c38c20e3528413a9ab571a0ce4e2418ad SHA512 d3ffaacc2827d088cbc1086b4d736e158dafde981e10a01442ede3003f8ccc66bb7ca6ca62c4f3c03fce4cc3cba56141c9144024ecfdaaf52ea3c7cdfbdbf074 WHIRLPOOL 81af9b1967a7f30da7bb60d068fe0c0242bffaf6ff80b00f6c7691f2c9e27243cde0f70b10581d3fbacd814ed369b9c39ca3ba30c677fed552496cc51f56dd6d
+DIST iwl7260-ucode-0.9.228.25.tgz 348138 SHA256 66781ba55a121889c3a2f0433d99c7bffc7699f08437d5de53890a362f4dfd5e SHA512 f2d6d5fa859e0f7680f695e6ae4fe2c2a56eb7dd26430b61520f7ab95322601bceafff33038945bbf07c8e6691b9a19cd5a5e7ae3e349bd89b72d11d09a9bfdc WHIRLPOOL 261edbed0edffaa78fb64515d1ae0f7fdf43a9f859e57e1a35120c8bda2f273b1be60f8ac4b4fc41b242cf1fa8771ae9e63f35c0be2049b506ae7da491c2a0d4
+EBUILD iwl7260-ucode-0.10.11.23.ebuild 1547 SHA256 acb39bd4dd2bfd8c93f322d2f230800fad05c76edae42fa1f06e9aaf3208bc71 SHA512 33145f03769a17f46ef6bccb03f5105dee969af856fafe0929ddd65de3cbca0b50845cde0b37a32bf53d79b6072e352cabd7fb55a6a3b5d25cc5913b2f633c8f WHIRLPOOL 9310b198800da22ae38eb6f81996461550945721bca2690b48ad46043a9991b573ad8b72f871fde83da7f8d2de978ab03c3aec8667a8538ab8717f707503083d
+EBUILD iwl7260-ucode-0.7.1.22.ebuild 1448 SHA256 9e0118761817f522a6a280408c47a4635f2b057c9f99dee05ee386ad667a6940 SHA512 4a142ee0fe7ff9df18a1ba5f7b4bd1450ee745fdeed371c89b3a05853c7030fd72c91e6e57a9094b5d1dc165def49ac253f70d65671c7b6e865b79420df7dbc8 WHIRLPOOL be72726461f2acb4e48250c276735e7091675db0704df08d7b8d4174dffcb7696e0a1db8a81b191d2da256ca005a25bebfb29a618ce3c9fff6b0925cdd56d9b4
+EBUILD iwl7260-ucode-0.8.15.22.ebuild 1546 SHA256 942440e2946daf13d669a8cceb73d55c29b6470de19196e4eb8a9e56955753f5 SHA512 465a615b4511157d2f7e081f6216489635dab9b93a70307fed1f590da0fee6c9f2513734417fba7397d67185212e2dc19d4dfba1e3085a89ff4d9d4cc5bb982c WHIRLPOOL 8347f1f79955912f9e09b77f6ec396f33df4ee492efa2c9a41532ebfebf47c61c07e56c43b40b1d46858d52b2bffb76e905c23f8b5743bb1b1e2969c4847e90e
+EBUILD iwl7260-ucode-0.8.24.22.ebuild 1546 SHA256 c5bcef1729fb08b72b61cd4d5640ba7605b23650eacfa88ebfe106d4ab4c13e0 SHA512 a859f362eecd1deec3cbd8f35489310d21bdd6ec24c969d5757196547c1d463436f8901593b6f9ecc911a3afa129da5afb29d0ab4f7495bf87399ba33343cba1 WHIRLPOOL dabf5461936fa90815e3490a81d3b776b7dfa2464b6c91045379bd0166b533ad86ebd936688e319f5b4378c8a228b66b3ae374019a4ef27956bb6d7dd40c6fd5
+EBUILD iwl7260-ucode-0.9.214.23.ebuild 1547 SHA256 f3e359a550d0c2fc0433eedb27c1a360d937ec86e05ab8a3e9d5ef3844a16acf SHA512 05d29fe514215eb7770f86fa537e906362640bb4ef0eadffbf58f2fa4b15ae85c974155f1457fc67258c7824d052baf359ea4123df9ac5f57d426fb834d8dad6 WHIRLPOOL 864dacb21c1f6cc5d02c4bd3e93384ed6ac3f2ac803a34b977b1975ebb4d1d04b937a90e3490d3715377615dc3c477cd6e13ef430974c44ef05c3ee00c76a43b
+EBUILD iwl7260-ucode-0.9.228.25.ebuild 1506 SHA256 1a3b6d198ddf8dec140b4245eb9fac4ae4a435a0efe88f45baf5d21b7fcee5d4 SHA512 7830054ef855e6b486f32b3d19008e8d7d7a3144e2216e3c0ba847433b7b66d87b43f96576ed0a273acbe0a7b65fe5fa58b2453e4f586af142d55ec222bdfbd8 WHIRLPOOL 109042572cb1bd2c75c2a9fa0ac66139800d134420bfd6588b55827fa597b8222941ecc2478c9fc977ae629671167dd7790f436b46f67ce566117496b090e843
+MISC ChangeLog 3322 SHA256 048f42d3c5825b744dd0e1871f2e481b278c5b332386f88925789da29bdbc9e1 SHA512 48358d0a5fa324eeeb597a3594e00dbf0a59c73f3bf66918746545d5a6ebc3dd7998f52f457e1b43e040bdcc9e56bd383a96a0cd887daebb23de358a6537229b WHIRLPOOL 67697c4f5c41ce7ff981dfd9cd61835cda7ec49fedf017d1f288886cd1ee43ccd4a3f9c7d52cb7344fab963fde760821d061f3824310b07354acba025ed38910
 MISC metadata.xml 398 SHA256 81a62e5e24503efa7492ceb936b873540ff5ffc3eb56ca64644adc3f6009ace2 SHA512 7fdd10f2f284b66d121a38fb9eec94e03c58816f90ba4633cc595e2098a3eb9e93062c80751bbc72d8bf4433e5f34b0aaee4b1efd1554a354153e973ebfadb22 WHIRLPOOL a205605aa7c313201f313b460449d6fac3c6da20e371cdad662bebd74267c23ba988211e52762980a1c24fa2a20047f9fc4062660534d84e11bb38a3f48ee380
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRp/G8ACgkQoBEVQmGOlx+gKQEApFyEzhyVrf51joJ8GrR1TBlB
-5uls2ISKe2qz7npYnTAA/Az60xQFzSjjbxu9PLKgMYLWMSE92I1KjBQ8T5je5BiP
-=ekMN
+iF4EAREIAAYFAlS2XfwACgkQoBEVQmGOlx+TRgEA3scbqDzZotVqqR3qKYV4Vp2w
+odWUiWeoI9kPkjYFAGgBAJVNjWgDwxb6jTZwLCunHWCqSmNlQU8//3FNwqMwO7pl
+=zoqN
 -----END PGP SIGNATURE-----
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.15.8.0-r1.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.11.23.ebuild
index 7af587329b08..63cce1f033af 100644
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.15.8.0-r1.ebuild
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.11.23.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.15.8.0-r1.ebuild,v 1.2 2014/06/16 14:07:54 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.11.23.ebuild,v 1.1 2015/01/14 12:15:50 gienah Exp $
 
 EAPI=5
-inherit linux-info
+inherit linux-info versionator
 
 DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
+DV_MAJOR="3"
+DV_MINOR="17"
+DV_PATCH="0"
+
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="ipw3945"
-SLOT="1"
+SLOT="${vc[2]}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
@@ -21,21 +27,21 @@ DEPEND=""
 RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-CONFIG_CHECK="IWLMVM"
+CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
 pkg_pretend() {
-	if kernel_is lt 3 13 0; then
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
 		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.13.0."
-		ewarn "For kernel versions < 3.13.0, you may install older SLOTS"
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
 	fi
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-8.ucode"
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
 	dodoc README*
 }
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-23.214.9.0.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.7.1.22.ebuild
index a3ed6401cf37..d86b675f3ad7 100644
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-23.214.9.0.ebuild
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.7.1.22.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-23.214.9.0.ebuild,v 1.1 2014/06/16 14:07:54 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.7.1.22.ebuild,v 1.1 2015/01/14 12:15:50 gienah Exp $
 
 EAPI=5
-inherit linux-info
+inherit linux-info versionator
 
 DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
+DV_MAJOR="3"
+DV_MINOR="10"
+DV_PATCH="0"
+
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="ipw3945"
-SLOT="2"
+SLOT="${vc[2]}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
@@ -21,21 +27,20 @@ DEPEND=""
 RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-CONFIG_CHECK="IWLMVM"
+CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
 pkg_pretend() {
-	if kernel_is lt 3 14 7; then
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
 		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.14.7."
-		ewarn "For kernel versions < 3.14.7, you may install older SLOTS"
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
 	fi
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-9.ucode"
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
 	dodoc README*
 }
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.24.8.0.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.15.22.ebuild
index af86ae7db95c..d18e22899e1e 100644
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.24.8.0.ebuild
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.15.22.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.24.8.0.ebuild,v 1.2 2014/06/16 14:07:54 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.15.22.ebuild,v 1.1 2015/01/14 12:15:50 gienah Exp $
 
 EAPI=5
-inherit linux-info
+inherit linux-info versionator
 
 DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
+DV_MAJOR="3"
+DV_MINOR="13"
+DV_PATCH="0"
+
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="ipw3945"
-SLOT="1"
+SLOT="${vc[2]}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
@@ -21,21 +27,21 @@ DEPEND=""
 RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-CONFIG_CHECK="IWLMVM"
+CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
 pkg_pretend() {
-	if kernel_is lt 3 13 0; then
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
 		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.13.0."
-		ewarn "For kernel versions < 3.13.0, you may install older SLOTS"
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
 	fi
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-8.ucode"
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
 	dodoc README*
 }
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.1.7.0-r1.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.24.22.ebuild
index e5db5a2f202d..ad9d3ffe9c3f 100644
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.1.7.0-r1.ebuild
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.24.22.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.1.7.0-r1.ebuild,v 1.1 2014/01/25 04:48:53 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.24.22.ebuild,v 1.1 2015/01/14 12:15:50 gienah Exp $
 
 EAPI=5
-inherit linux-info
+inherit linux-info versionator
 
 DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
+DV_MAJOR="3"
+DV_MINOR="13"
+DV_PATCH="0"
+
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="ipw3945"
-SLOT="0"
+SLOT="${vc[2]}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
@@ -21,20 +27,21 @@ DEPEND=""
 RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-CONFIG_CHECK="IWLMVM"
+CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
 pkg_pretend() {
-	if kernel_is lt 3 10 0; then
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
 		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.10.0."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
 	fi
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-7.ucode"
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
 	dodoc README*
 }
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.214.23.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.214.23.ebuild
new file mode 100644
index 000000000000..7791564a1f0d
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.214.23.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.214.23.ebuild,v 1.1 2015/01/14 12:15:50 gienah Exp $
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="14"
+DV_PATCH="7"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-25.228.9.0.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.228.25.ebuild
index ab45bd925703..5297d1878f08 100644
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-25.228.9.0.ebuild
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.228.25.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-25.228.9.0.ebuild,v 1.1 2014/11/17 13:47:19 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.228.25.ebuild,v 1.1 2015/01/14 12:15:50 gienah Exp $
 
 EAPI=5
-inherit linux-info
+inherit linux-info versionator
 
 DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
 MY_PN="iwlwifi-${DEV_N}-ucode"
 
 DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
 HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
+SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="ipw3945"
-SLOT="2"
+SLOT="${vc[2]}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth"
 
@@ -21,21 +23,21 @@ DEPEND=""
 RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
 	!sys-kernel/linux-firmware[-savedconfig]"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-CONFIG_CHECK="IWLMVM"
+CONFIG_CHECK="~IWLMVM"
 ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
 
 pkg_pretend() {
-	if kernel_is lt 3 14 9; then
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
 		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.14.9."
-		ewarn "For kernel versions < 3.14.9, you may install older SLOTS"
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
 	fi
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-9.ucode"
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
 	dodoc README*
 }
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.1.7.0.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.1.7.0.ebuild
deleted file mode 100644
index ff9788f660c2..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.1.7.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.1.7.0.ebuild,v 1.2 2014/01/23 08:19:11 gienah Exp $
-
-EAPI=5
-inherit linux-info
-
-MY_PN="iwlwifi-7260-ucode"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC 7260"
-HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-CONFIG_CHECK="IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the 7260 firmware"
-
-pkg_pretend() {
-	if kernel_is lt 3 10 0; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.10.0."
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-7260-7.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.15.8.0.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.15.8.0.ebuild
deleted file mode 100644
index 41420ad7939d..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.15.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-22.15.8.0.ebuild,v 1.4 2014/06/16 14:07:54 gienah Exp $
-
-EAPI=5
-inherit linux-info
-
-MY_PN="iwlwifi-7260-ucode"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC 7260"
-HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-CONFIG_CHECK="IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the 7260 firmware"
-
-pkg_pretend() {
-	if kernel_is lt 3 13 0; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.13.0."
-		ewarn "For kernel versions < 3.13.0, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-7260-8.ucode"
-	dodoc README*
-}