The consolekit flag can be satisfied by new enough systemd as well.

Package-Manager: portage-2.2.0_alpha81_p1/cvs/Linux x86_64

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 3c9a09db9e8858af4934d4ef408fa4a9dd2937bd..1f199b5be0cccea38649f83a9bfdf3ee7f197156 100644 (file)
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.106 2011/10/25 18:32:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.107 2011/12/17 15:55:31 mgorny Exp $
+
+  17 Dec 2011; Michał Górny <mgorny@gentoo.org> bluez-4.96-r1.ebuild:
+  The consolekit flag can be satisfied by new enough systemd as well.
 
   25 Oct 2011; Pacho Ramos <pacho@gentoo.org> -bluez-4.93.ebuild:
   Drop old.

diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 960b0f3164acba3457a7218b693149d832c3b527..b3d06370214ac3c23c40ea1b22acb2d8489bef90 100644 (file)
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX bluetooth-conf.d 181 RMD160 287e1806e25a4f74b4a9f6fc401b78dac31d44ee SHA1 595f897553a6e99000b4a4757f8973b9f39ce11d SHA256 63a96c907996158f637abc3202235b81e7c8a998df487b3e83554062433dd2f8
 AUX bluetooth-init.d 767 RMD160 7afb50646e359ed1ede5abdc4e5e01319dc9e3c4 SHA1 3685d4dbbf56802cb03a483dad23825968dc57f8 SHA256 38efb9dffaab70477f7525dd6657dffc725c61e29c05b0649e95c31f589b31ce
@@ -12,14 +12,16 @@ AUX init.d-dund 551 RMD160 273a9fb1989b80f12dc9813e9fe9ca42bd010e33 SHA1 51a24ec
 AUX init.d-hidd 780 RMD160 46a761ad2e151c2e1d997a9455edf4e3e4d61df0 SHA1 7d2d80a91517d5fa2965c1ac6078d8cc4f382198 SHA256 b1878d70112fd8fa1b851aaa4caa5e2b4efb55bf8e2dda02c014b55ce93adedb
 DIST bluez-4.96.tar.gz 1164913 RMD160 7775a70c5cd86fc418547fae83621dab39196147 SHA1 c9327784cbcf1efc03cc547ceb18de90c8fb4c7c SHA256 c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99
 DIST oui-20110801.txt.xz 520980 RMD160 2f7c863825fa8ae35d9beebe6bbd49fddd32f32e SHA1 a210a711e4e8046627676e5adf56132c977b663c SHA256 47be96b0e7b4a3235260f94ad77445fbf5226832ede588d9ea67d61759ff32e3
-EBUILD bluez-4.96-r1.ebuild 4847 RMD160 9eeebb7537ae10093ae250305b7002d16da3dfa5 SHA1 8ccf949da2af769c5248479b99c33afa1262d688 SHA256 7914a8022e5fa9c3911232444462d4c2e6f556b951891da61f86148228585192
+EBUILD bluez-4.96-r1.ebuild 4883 RMD160 ef6cf476c7e7fd7d38a4681a59cd08321dbda55d SHA1 c8635a5be3c825770b180352ed691c0de0115192 SHA256 ab5a69de4701dc08cc6bd128f6102c0b6f1e2ea23a3900bef39517c0c45f17f1
 EBUILD bluez-4.96.ebuild 4830 RMD160 b16236cc76ee923fe5b263c675540fd6ddd4612e SHA1 3a56c6fbe2911b0b02e69c0b808351af3cf2ce8b SHA256 349ad45c64c56b196554ef31b46980914d5ecfb47badadd4e8d27ab1d04e5ccf
-MISC ChangeLog 19658 RMD160 5895d6007d1e376bf453febd16a0288927671ff3 SHA1 4aca982df5cde82dab84c292f6f045bb3f9a978b SHA256 12f1c6e5b5bf8e3e038544ac5182bb0c7f5ce02857545a9c49d37d86c322ef59
+MISC ChangeLog 19802 RMD160 7d76aece105a7da374f7738050e9bca2e2d39dbe SHA1 6ce114901e5500d7333a6662b6104587ca840f9d SHA256 81818188044e2cb16b22824b921d4934d559143cb9df9f808ed6fe07172c7ecd
 MISC metadata.xml 1002 RMD160 39cba3b507b69bcf58bb5561d8d6af1fd4a9aef4 SHA1 b7eaf92005d3a6f1a697f179f87a2b31e52cf50e SHA256 eefe2611dfa35dc04b39e2c7b36d9ebdfb3764bf945249bf994bd20606dfdeef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6nAM0ACgkQCaWpQKGI+9QyzACfXxWBwrRSkIHESgHQelGVEXrX
-+WEAnAkMG8rKWkgcL7SGmY8qeqInq1fT
-=CWzl
+iJwEAQEIAAYFAk7su7sACgkQfXuS5UK5QB1jMgP/fwxKsnhWBRF4kLS6ta9hulik
+kggcF2WOTRItCubIRmTP8hLH3Txct1dwE4iqz5371x7gLhFvLkHEchYRIr1anwPJ
+39J8UUtsX7W8xBerkNG+cUU+OYXc0k8iRDaj/GYz99UeHz8cBEJPZl+1iL18GI9p
+xGTlxQFK8pk8JhuQOTQ=
+=Hom6
 -----END PGP SIGNATURE-----

diff --git a/net-wireless/bluez/bluez-4.96-r1.ebuild b/net-wireless/bluez/bluez-4.96-r1.ebuild
index bc1f3af7cd1a0a27b969b290cf4e3cfac8853b39..839ff096734107de5a3a56cea89ecbe94fc4854d 100644 (file)
--- a/net-wireless/bluez/bluez-4.96-r1.ebuild
+++ b/net-wireless/bluez/bluez-4.96-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.96-r1.ebuild,v 1.1 2011/08/01 09:49:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.96-r1.ebuild,v 1.2 2011/12/17 15:55:31 mgorny Exp $
 
 EAPI="4"
 
@@ -44,7 +44,10 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
        !net-wireless/bluez-libs
        !net-wireless/bluez-utils
-       consolekit? ( sys-auth/consolekit )
+       consolekit? (
+               || ( sys-auth/consolekit
+                       >=sys-apps/systemd-37 )
+       )
        test-programs? (
                dev-python/dbus-python
                dev-python/pygobject:2