8 files changed, 62 insertions, 44 deletions
diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index e046299afa03..bd7fd13a8c35 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/acpid
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.119 2014/08/24 09:04:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.120 2014/11/02 10:16:59 swift Exp $
+
+  02 Nov 2014; Sven Vermeulen <swift@gentoo.org> acpid-2.0.22.ebuild,
+  acpid-2.0.23.ebuild:
+  Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
+  #527698)
 
 *acpid-2.0.23 (24 Aug 2014)
 
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 18bee23010f5..071c02942ed3 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -13,18 +13,24 @@ DIST acpid-2.0.22.tar.xz 153596 SHA256 3d11454f4283c8f771d8dbd5eb6b5f2bbd9d94d9f
 DIST acpid-2.0.23.tar.xz 154504 SHA256 4396aaec13510c3a1faa941a15a4b5335b6ae4fbec8438b9249b88c3b66187ee SHA512 b2f01f04a9c5370608016c16ecfbc5b503170c2686e6557ab1463e25d56a3ef1d2093d4701205ec1261564b1073653b404d0ae278c0bd8c8496606be1785963f WHIRLPOOL b9c7d4d64e663ffb9c58d2129b4f599453b4da0111b244269cf89ca50cc2de7ecdbea361825724963ee0b93294cadde12dee06c4816f5b709a23e7d443df0afd
 EBUILD acpid-2.0.20.ebuild 1679 SHA256 92b8d5833d4c36a39966290a16fcbf8672196d5a38266cec80b36c3b24d2873c SHA512 584ce4903c7b182c91583e75bd1d0b07c995e5314027db695f0ca574011d56c63f08e440c6b6022e553ab3920493b057feaae28e679e745e1cb367935da92a56 WHIRLPOOL 52deb877ae12d376203174972f5082ae63f3ae6535711fb37740f11b2c856339a17a1b88e798c3acc4ea766c9128fd5231f78227c912d61831d4e7976bedd5bd
 EBUILD acpid-2.0.21.ebuild 1685 SHA256 b16d7dcf69de928a76fa0bcff4f872b291d65218e5dc379ac69da1fb19893e23 SHA512 56f61ac595743340c7d993f7e6518deecbe59affdc4b0367e14b7cb4734a8e51cfc240b14f496fbf304e62c41bd9f958b01f592dfe71e92cf5ddef821b02292f WHIRLPOOL 62049c4d62761c3f1dcdc8e3c8e8ce12100d960d7c020a79f30d0e10fe19ddb3b2c71bf8d3df64abbcc1e0a7324b9e94acb8d97cab9074fd9039d5b52869b4fe
-EBUILD acpid-2.0.22.ebuild 1921 SHA256 573a49c806632d6510bdded4b987fc844ec98258fd8ebe39b1ae6c04063afd79 SHA512 2c1c9d5f4f0ab189a4cb0af61897dfb6622dab40cafd8deabd1f4d43dbb184b2c8547c3c8bd92c3e86a54916a2e3e0af5a2de6d7132082cb51f8b7745876d250 WHIRLPOOL c56ece90060ea641d386341625bc5df6363e818d285d3ae1f30c737ed1e669579931e450876584f42e061420bd09e37e967bd93c0f235cca253fceb42886cf4c
-EBUILD acpid-2.0.23.ebuild 1921 SHA256 7aaeab213411ae4a41ae9dc1e0f0d0d837200293ce43e0a566f83f23284684e1 SHA512 b7d0efdf6ad78e28fa29a847e6d430301f09bbd794eec8558ed9546a3c25cd2d2aa5c3401ddbe44f709bcad42b57902831713246c09265a1a2986386a37124a8 WHIRLPOOL 0ff2a3290f0803c207dec29e9a6706f3dd2fd4cbd2b23fa9d1165d79ffe27f49b090d1357a6b548495065c6de99222798bf123e194240b0f48338e09c5b0a6e4
-MISC ChangeLog 20349 SHA256 2dbb15c8926baa81468df9e4a8e68f0b4c42da2c8f1fa81863cffedc58d19102 SHA512 01aa94f0f65f2cc5dbb4b7170ba6bfc12bb7a3aca00aeac1b2f72476eb95df362b8133180696ae970b7063ed88146e21e9f8b6522c416944e37944d573d1ea22 WHIRLPOOL 1a4ddc41df2638fedfa960a5091670414a8fbca64d894d67628cad42eb5feb1c9985b9f49f1dd1ba3481624acc1a284b7a2d9f507cf54a57f1a3f00ffdad081b
+EBUILD acpid-2.0.22.ebuild 1901 SHA256 e47e3dc0bc3e71f00bab9c3434e58bfcac539849a800d45cd88131d8ab5d54c6 SHA512 d1582212beeeed117dfbb9cfa76bb8b349f0aa9d6fec49370223dd2c7b9ab1e0008b881a9ce72025aa5d1f876fbdeb57ebdeaa6570f3913fb17ff898efe20390 WHIRLPOOL c798033536671d1d3bb9a58e0774a60c091fe9bc555da9a5d69fbd9ee9284e957fdd5c944b396657d3adefe3d90f1fc9d3f3f20a8b3dc177f4443f44ebfc9cd3
+EBUILD acpid-2.0.23.ebuild 1901 SHA256 438ab5207989e14aea292fe866504ac50f1c705ec052da468fd3127a7eaaf104 SHA512 8df5c49457796c3356fbf8c2ed4a0e28b6b5a6cce2016cfa45a94fc073b45f5af3cc65ddcfeac28c4b1120d7ba5dd655e8d6f6ac7814ca8995df5e114e2f08f1 WHIRLPOOL 783ce21c56c4aa756cefd51283dd7d313bfc5a9edc669e86e772e85c98ba56053b75a616a598c967c91bc35b6251d80ea0b39392b51381e18936ac428765b9a3
+MISC ChangeLog 20528 SHA256 1962f7647fd1e662997a26405262e59b533c159ae55035018a6e6a193c7e542f SHA512 3dd4c189e2e98ac2f1efaf164e5a02c6db3b52129b8dd09084a7ce6ea6a1428ab07310b31076660f8003ccdeb68d3ebc8f5b212253dd90fd356665fd82bc3b01 WHIRLPOOL 6278947be1cd4e572b67cd2b1a3843ef572bf1c2366c233bc7c9a5ab6f1056a26ddf7347fa78d026b90d46aa55c128daef997482224a40e1039ae50a5fa44f0a
 MISC metadata.xml 229 SHA256 ccb1e65b60e77935a00570826b01889bcf78c35ad665ca6929dc6d0b23781701 SHA512 e0a06addeba32d0a5f0dd409309915e44f88aaf099d28545106ea86a7af2cb64a1bcfc082feb941266ad8ca05fcc568c5dd2ff20f881dac3c77a3b180834cb97 WHIRLPOOL d611cf1ad296b9f45c19027752846c4dd0deae8dfae59e22f0918b303c6ff04bd4fed5d285973f70aac73a52093836b20c8dc565b2535f0482ed93c67f5d2517
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJT+aonAAoJEEdUh39IaPFNV0sH/Aqvc0FEfErhgaakhXRdgakr
-wqe8oneAbIuVp8QgPXfAkgpiWjTbSh//+gp4OGlrOiNKoOoTZ2NcMUcwTkYs0vNt
-0CNfTHFyTC56TTmEuJ0oSgAuRbwpPKIq6y2T2Ya/Otu82s2d1GUOzzOzW01LsGxu
-A+2Xr9XieRRm+BzEjUO1WKM/YybDVf+lkVZlF+vvAAva/307WsMZeoq/HR4rYAna
-f4dziG7eyVcD42NcwJWiXfvMxGjxQdEGaAjJwCup5XLJU1WD5GhadH7KxaIxsgGc
-VtaAzfdfT+3EvYg57A3k3BcUZ21185vqKvl/XCYrqu90eUWkbpmKoM96g2TjNRE=
-=7qxs
+iQIcBAEBCAAGBQJUVgScAAoJEC7dUkA7aK9H4ZoP/0OTj4FKBCB4D3VJQz/+dusN
+qlPHM0QPNof0it3BYA0Sk//ZjQZEnPHpr2CfLLdJQ/S5os+zvGOLLnZb5QPgfkC3
+tKTqArDorBD7y+Wkg0NhQs5DqDYpIWD2KdIuShS6zGDVyYXRVGxdO6mfnmCw6xbO
+7kkuhhiKWfag2dUHd8KQqAnYso6cE2DLAzsQOzyzWDR89Cjqhds+Z8u1BS8ddvPx
+G8LmphsUGuoxlFkI7CK8oJUa+Gx1wyQi/8NQrX7Kcn/nN3+KIGTrzVL7guMqCR9c
+vcmpZYGEJzZneDW/ZavFCWb4zMijl0KM/u06TYLLOJbUwj5coDUEHrkT+1BK8j5E
+vJDRK1pEWl6LlJUmU/pO8jygKnSqE5RU40GN2rHhF7bgZYKxgeBEXymSy2/rx/9N
+Xi5TxQuCdBamM+dsDXCL6LvSSVFNoQEst1oFF6ccRl8Pis51DTphEhCg0vNZ0YU0
+z9PAauYid23F2uYmn2Ufbc2QAFZvYVKWvMbllZe/6edNEKOVsJTO5wIvnk1ORWfR
+D2uIw5Jl13qiwnOLHAPIkI8KJCz8NEILlE9GeqYRk9UYSD4YJKhl8+LR5q5GSRJ0
+9D/a+n1RB4oK63ZUlmQF/SSiTdf0wd3FsCAndN2GeiexKsnqEpdoPeqw7QjoxVcZ
+03CDmDEFx9oPl/Ji/aCL
+=ScqP
 -----END PGP SIGNATURE-----
diff --git a/sys-power/acpid/acpid-2.0.22.ebuild b/sys-power/acpid/acpid-2.0.22.ebuild
index df30b0f1a90b..171645bec612 100644
--- a/sys-power/acpid/acpid-2.0.22.ebuild
+++ b/sys-power/acpid/acpid-2.0.22.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/sys-power/acpid/acpid-2.0.22.ebuild,v 1.2 2014/07/21 19:38:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.22.ebuild,v 1.3 2014/11/02 10:16:59 swift Exp $
 
 EAPI=5
 inherit linux-info systemd
@@ -15,8 +15,7 @@ KEYWORDS="~amd64 ~ia64 -ppc ~x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND="${RDEPEND}
-	    >=sys-kernel/linux-headers-3"
+DEPEND=">=sys-kernel/linux-headers-3"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~INPUT_EVDEV"
diff --git a/sys-power/acpid/acpid-2.0.23.ebuild b/sys-power/acpid/acpid-2.0.23.ebuild
index 6af33bb2a576..0f1dcfb37ea4 100644
--- a/sys-power/acpid/acpid-2.0.23.ebuild
+++ b/sys-power/acpid/acpid-2.0.23.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/sys-power/acpid/acpid-2.0.23.ebuild,v 1.1 2014/08/24 09:04:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.23.ebuild,v 1.2 2014/11/02 10:16:59 swift Exp $
 
 EAPI=5
 inherit linux-info systemd
@@ -15,8 +15,7 @@ KEYWORDS="~amd64 ~ia64 -ppc ~x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND="${RDEPEND}
-	    >=sys-kernel/linux-headers-3"
+DEPEND=">=sys-kernel/linux-headers-3"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~INPUT_EVDEV"
diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index ad3b51097d09..1d7cd5351a15 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.117 2014/09/08 04:55:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.118 2014/11/02 10:18:14 swift Exp $
+
+  02 Nov 2014; Sven Vermeulen <swift@gentoo.org> nut-2.6.5-r1.ebuild,
+  nut-2.7.2-r2.ebuild:
+  Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
+  #527698)
 
 *nut-2.7.2-r2 (08 Sep 2014)
 
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index d4da9106ec14..3db1796fef45 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -23,24 +23,24 @@ DIST nut-2.6.5.tar.gz 2038832 SHA256 618df71cf1ca6e3700d1d3c282773a2dec85f9f2032
 DIST nut-2.7.2.tar.gz 2223307 SHA256 4d5365359b059d96dfcb77458f361a114d26c84f1297ffcd0c6c166f7200376d SHA512 7d6b44e8f2d03544d9825274f4f3039911e335eb51620ded3dc08d51aeb096281c2ec848831815c54eecd4f2a25bdb1e6e5f479422e5291f03c3055da7ba52e6 WHIRLPOOL 6e7c45ef09fc2e86f0b79787043a9bf9954b5ef57fb16f9d453734680ff947abd8fb6665c5da4dac09850f5ab6a414039aa067803ecdeb2efd8537b8909f1ff9
 EBUILD nut-2.6.0-r1.ebuild 6891 SHA256 26fdabf0a40cbd7e203d82f29aabbd9545ee169fb549660c542115dd57a4e01e SHA512 f69b29e6b087546ecc87631a016c7694bbd930e30506b117967557fa08e4684d47574d850e9b1a2a5175f12e693f430e4551dd977af7780fa6d124ba4c3fb938 WHIRLPOOL 9ac56244017d7aac89bebf33ed157b8c0a186892b9bc26f71c894ffd31db0fb0518e8bb2fa9f7fcb0f00d56f2c74b77f8566e957e61e09a608e6624cce1352ca
 EBUILD nut-2.6.3.ebuild 7001 SHA256 7219a213582b71dd10620131089569ee8a68ff2ed1767176f6b2a003a4e91aa4 SHA512 0236a4e9e40cadeeb487050dedc8fd2f30b282029f8e9a753241587f6b8c4735d8977069a5ed6a35a58e4e56097661480a5b967f19fdfe9e508fe2251917908f WHIRLPOOL 062d769275c3baa0b965ae4a86e27daf398c838f52a74650c6fead6ec968245c9da799229262d1186b79e64c539fe16a7d4606b9b7c948e23f411602c1cbaf02
-EBUILD nut-2.6.5-r1.ebuild 7318 SHA256 3d6f27977610dfb57f9e405c1deffe65b488de172c569209396dc9a8cc6a142d SHA512 c8f09bb8ed2cf87ca3eff082e0291cf149d7725d2773b204b03a78d03a0480f4b17079f164d23772f87ef2d11c591b9193ddc1480c1f71b247240c5d369d846e WHIRLPOOL 041ade53af07951ad0e146bb468ceaaa9999a4e58649d4525cc1771dd8a2596e6be5bf23d1733f7de302491ae430c749a5123fa33fb67189a4da34bbfc9b1f36
-EBUILD nut-2.7.2-r2.ebuild 9443 SHA256 d367c6ce26268a5c399c72707378d510b7b638e03f04ffef845efc0433bdc535 SHA512 bd2cb7dbfb729b88abc7ad901d25276ba6e50fe3f46b985273ba1936167ed3ec126f43c9eb61008adeb8f0048353075d1f40826f4526da6e5cbc75e4c6a00632 WHIRLPOOL 033b42f1c8187feca023c6012961d627323900702a12432b02e2d2cef68ea46e4e930cdfa73156e0983123f5ef91271b3a4de3c34189be6d519dce9993cca2cf
-MISC ChangeLog 24549 SHA256 12f23426ea46e89160396e2f28571199e1e9d19c8033ddea49e10dfdc44318b9 SHA512 9106712bfba2d3d5b49ac82e22d2986dfdf38101c6a1900032610c18f5e40f58b1668602072446de3f815e64390a1e9567fed5856f4477e7b085f4f0eab31dcf WHIRLPOOL 9b2f686ce5d20b15f4e473cdd6364b9564aac9b72fbdd1db25b659fa1089ee8b4437ad8ddb4d7d07cb9fea90ac372ef6879b35f09639a01beed99289ef1f49fc
+EBUILD nut-2.6.5-r1.ebuild 7340 SHA256 1133b4ff18018cbfef124370e4f529b4abd24fc43ebb58b7f261431573a9805d SHA512 f4c2d281d6e45d702814690ac003d795838b0069811c04fa2e5b31e81c4b0c36173be94656c2c311b588dd599816f59a7822858b495c8f4a8f99477d14beb327 WHIRLPOOL aa1ad9b1792b09ded0c449db1e6cd74d1bc33838a19effe45caac179c49b8ff024c3de9808704db46d642476878bac9dadd4db383e1384d2611eba2f8b768a2b
+EBUILD nut-2.7.2-r2.ebuild 9456 SHA256 c9f02f4fa3153a2f7c3f076481a9b12284118238ee75520d708c4ab546278bcb SHA512 8efabdb568aaaad44836117c75bab6003d1a01880757c44df511a2e6d66253a69ecdceaa2994bd94f3623add41b7f33b1b8fe73445c95d02f9c3b171ab3f7f07 WHIRLPOOL f77c7a68bf316af5ec2070f81d79b5481e5d1824f5c9122bb4874a63c4f38f73cc81b52b0c0394a3187b45c19ef263c851a010981dd88d7389e42a49b510f066
+MISC ChangeLog 24723 SHA256 a77af72ea51bf36842f8e427cf32d86e3c0176b56650eef5095ef71a1e9ef288 SHA512 18308b4319da778dd8b7b952e36f462fdce2a6935e3e6f7a7de4c94f3f1b302494007f8d9bd01716de80a6e7d6f53fc8ab1aadbc24914fb2525260b22efaf90f WHIRLPOOL c6ad62bc947fdc8c6610011ce68626ffadbf6cad8a89c4aec9e0aa0893d06ced8f8f507efd796f34a45e5927dced8038fe6f4286a73157f641d48a6d61c91e8a
 MISC metadata.xml 5153 SHA256 09e74956c734541540fdd23ca7cecc7915b3919e249d716a7728c97f4040275f SHA512 9eafcc590b4624cf96a88f192b1f4bf58cc99719d0859bb2b911d162379502d40aa31c1d24c2f7dd3862f9b7ec9878a7e41de5dee99542b47fa2c28c981b91d6 WHIRLPOOL 9238c15e4163ebe94234e2d78030af7b37f09ebeb9729610c8d8fc1adab4e0af05de45f7e498d041ee1052937fd517cdbc52144ffee9f0bd582fb8b9078b13ad
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUDTbcAAoJECRx6z5ArFrDslEQAI/n29NIiHctFNRmuxgW5JIR
-aAzGL72Y9FNLHhqdQqVTJjnBWkGxpikRK94sdJP4E/DvUKEkCXEAAp92YBT02xUy
-p7sBPrMEi7y9ThUecBheR9hZRgZkQfYV8qmhPt9EMQ4k07MJDMxonGPF3GuRMcxI
-i0Sh5G5kYRmUV48Tmbr8p3LXBoVgd6O+T1/SSq/iz+8fk4gtr533uOqpphgaYJ1J
-JwcWT/dOJa9zk5uIBBCy+amTr9eFSe0yl0fGtlC1Y7ixpQIUVzN0kPdunmCQS95I
-MWL+M8GkGTASdXxOgb0IJLa5/+nHUk6+SfY2PGYDMVQIRyIKEYdk5TutWIcRdUyj
-K1bfIHpCUWlB1AdxvFYRWd7owlZnyQwQx25z+yV01+D8Q+Hrd6VTOX6suupUq0Eg
-9TeuIw1jdim8y8i/QNI2U3pMXetpabihqDeFbFBfBqz7uJ/uZ5Xi4jahmCWs3txZ
-34VT5rwqTFpgxGbTtRLJCw9MvGu/TFD7nTekskISrOc+vazxArwvhccgFw9USMlU
-AI+LbYPa5oKAL2qx55Ly3qfjpFcPy8eDSndNIPClLhIY30oxmS9TOlukBQYjKpks
-eOZ7Xg/2eJMGj+19wXSb9nfFWj064NP3T84ETNV2JdBhbpRIIlHZqjEIq0tn99Pn
-PE7dcdBEnF5G+s78x8Of
-=KCg0
+iQIcBAEBCAAGBQJUVgTnAAoJEC7dUkA7aK9HoQQP+gIFn33yg70nVZEB4J1Hgg08
+gj1KwpVb0peTC8b9HPE6THhADA/F2fTZYLPktZqydr1jO0opTZtbOPZqn4DRdtu3
+SPDi80YhaNbG3HBp76uQ61vGvj/sKPj9a2rpaZp91mY8yMvbV1Kpb/Iu6X2AlcYX
+3lxBmcsTkb6xU6wMBpJDuPo/ZaRVJR7bqqwzTIzg5PyvGQceMeVo4QbTh5xeqAWB
+enCbH6E/1t75O6nUS55yMP6A1I3y2lh2Szou1i5Stx+ewEJEGjSqUp/BPpEgsNEy
+oK8ypQPw3ehC+jhhPbgDhj9Z5Kz5ZydW4nAgukw+DVt249962dJ0JhBB9J1FZ8AM
+X5PDK93uvWf+K1849cHajw7IKiBK1JzuUv/BEoN6czCm3I1QnjUzd1VYfAgdFL/5
+axOoZjcSNhZVPaWzngoOfG5mTc3KytbadoYe3M5ocbTmMX3ZMxMTzE+erh41xgha
+7Rsd2TLQT1xaDMDjVCIOO0vcoamx2373tHvJoRN5mzS2YfMm0DaNV1lvUlrbHPsw
+DLnRLnypD9Q4WICHQC8OaSiR1RRl6FhyTS0OeyAUMmaYpck9M21n2xOlb/YdXZDG
+ry7QkdWbVLEnv9lozl97zWd+KGPS71Kl7H9KYwCMYrFjoPoPzRyv4ugzFI6atTVy
+cTQYAWKV2/2zNxBYBvmt
+=hJPk
 -----END PGP SIGNATURE-----
diff --git a/sys-power/nut/nut-2.6.5-r1.ebuild b/sys-power/nut/nut-2.6.5-r1.ebuild
index 0bb944af89ad..5d99bd2e5e6a 100644
--- a/sys-power/nut/nut-2.6.5-r1.ebuild
+++ b/sys-power/nut/nut-2.6.5-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/sys-power/nut/nut-2.6.5-r1.ebuild,v 1.6 2014/06/29 08:28:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.6.5-r1.ebuild,v 1.7 2014/11/02 10:18:14 swift Exp $
 
 EAPI=5
 inherit autotools bash-completion-r1 eutils fixheadtails multilib user systemd
@@ -18,19 +18,21 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="avahi cgi ipmi snmp usb selinux ssl tcpd xml"
 
-RDEPEND="avahi? ( net-dns/avahi )
+CDEPEND="avahi? ( net-dns/avahi )
 	cgi? ( >=media-libs/gd-2[png] )
 	snmp? ( net-analyzer/net-snmp )
 	usb? ( virtual/libusb:0 )
-	selinux? ( sec-policy/selinux-nut )
 	ssl? ( >=dev-libs/openssl-1 )
 	tcpd? ( sys-apps/tcp-wrappers )
 	xml? ( >=net-libs/neon-0.25.0 )
 	ipmi? ( sys-libs/freeipmi )
 	virtual/udev"
-DEPEND="$RDEPEND
+DEPEND="$CDEPEND
 	>=sys-apps/sed-4
 	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nut )
+"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-power/nut/nut-2.7.2-r2.ebuild b/sys-power/nut/nut-2.7.2-r2.ebuild
index 9c5d5e0f91a7..981f05a0b70e 100644
--- a/sys-power/nut/nut-2.7.2-r2.ebuild
+++ b/sys-power/nut/nut-2.7.2-r2.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/sys-power/nut/nut-2.7.2-r2.ebuild,v 1.1 2014/09/08 04:55:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.7.2-r2.ebuild,v 1.2 2014/11/02 10:18:14 swift Exp $
 
 EAPI=5
 inherit autotools bash-completion-r1 eutils fixheadtails multilib user systemd flag-o-matic toolchain-funcs
@@ -18,19 +18,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 IUSE="avahi cgi ipmi snmp +usb selinux ssl tcpd xml"
-RDEPEND="avahi? ( net-dns/avahi )
+CDEPEND="avahi? ( net-dns/avahi )
 	cgi? ( >=media-libs/gd-2[png] )
 	snmp? ( net-analyzer/net-snmp )
 	usb? ( virtual/libusb:0 )
-	selinux? ( sec-policy/selinux-nut )
 	ssl? ( >=dev-libs/openssl-1 )
 	tcpd? ( sys-apps/tcp-wrappers )
 	xml? ( >=net-libs/neon-0.25.0 )
 	ipmi? ( sys-libs/freeipmi )
 	virtual/udev"
-DEPEND="$RDEPEND
+DEPEND="$CDEPEND
 	>=sys-apps/sed-4
 	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nut )
+"
 
 S=${WORKDIR}/${MY_P}