Rename USE="systemd" by USE="systemd-units" to avoid conflict with systemd vs. -systemd, package.use.mask and profiles.

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

4 files changed, 22 insertions, 17 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 96b1515ed97d..4928f0f0c8d9 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.163 2013/08/21 19:20:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.164 2013/08/21 19:29:03 ssuominen Exp $
+
+  21 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> consolekit-0.4.6.ebuild,
+  metadata.xml:
+  Rename USE="systemd" by USE="systemd-units" to avoid conflict with systemd vs.
+  -systemd, package.use.mask and profiles.
 
   21 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> consolekit-0.4.6.ebuild,
   metadata.xml:
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 3e2257053c83..0843b7ea7b08 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -12,17 +12,17 @@ DIST ConsoleKit-0.4.5_p20120320.tar.xz 103424 SHA256 f85abe0644f4e9314bd33411aeb
 DIST ConsoleKit-0.4.6.tar.xz 366572 SHA256 b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c SHA512 54955e3e83778a9216846104da8762fd50a37190e209127dd5d211e2227da617e14f6f5c1359905396d299656e526d14e1187b28eaff7d0ae1d7563dc8d9b46d WHIRLPOOL ebf36b109b4c646d0b874f6b8e2ae9e2d190022ee9b6feff6cbb6b9203c80401c538cc3ca674fa7bde4f07e658d5460864e9784c1e0249d49b4784725a4e05c7
 EBUILD consolekit-0.4.5_p20120320-r1.ebuild 3028 SHA256 baf3a0732cd9ee972f7fe52433adb62307f633c6de8c1322c8d7ae77ba56af53 SHA512 e19d166865b884fc33ea9ba851819104deb8e7d5fe729b5aa057f92b74e2c45ab7e438eb9f225bf12b93d21c599437b3a5e6a2c9531f9149572a9ae0a3e24a11 WHIRLPOOL e288da6cafd8f9a81f54539f94952aeab65b795c735231c305da2ececb59fcba08459178bf6493df8b05d8922e777abb90ebc4d5241e9ff22904421b230b0839
 EBUILD consolekit-0.4.5_p20120320-r2.ebuild 3127 SHA256 c87320f7cbff1d7a68e3482b9f123ab5bf7666a4a34d9c829f4d27e5d9b16f3c SHA512 c32841d24a6d98fbcf4f01749563c4aa7a2bae4e4a934afb8bd7edf14b55baf745f4fd6a0d253c295f2b31912497222881cf1febb58819fd99cf7eab2d825d14 WHIRLPOOL 9a2b900af378ba683d05bf2c7688b3e3004fc3924fa14a16bdd7803c78816015a0500280a9127b3735052778b480ac76e663e43769e9975af2de6e34f7a1ed4c
-EBUILD consolekit-0.4.6.ebuild 3245 SHA256 3dbdfcb7d344bf05544e900354831253280c8c88617aceb79ce937fbf500a2e6 SHA512 726d4ae3c2c4ca120f56dc5dd2b117769420a046f8606815d897b2dd36d368b42c869abe636c898f6bf46a9eb8d2780153fcd6332aaf05de0685fb7c528a2f62 WHIRLPOOL 681605bec64873b543fdff9274832b7ddc39dcc5b37d7adcdcade5256d708c3b3df7e05d790b1a3d485b7eacb007b35ab6795bd9e3d56713fd74efc7bc64ad95
-MISC ChangeLog 25197 SHA256 23484a2ea6e84efbfe2213c81836c2d3dcec9f7332be3fb235afa42485da8a84 SHA512 dc0bb50ab0e67ad862a5ccc2f8147781a359555b118d78eb6718268d259c901b209401b3ba970990ad474fe6d553eb7220628f8df85bdf4c02fe884587935960 WHIRLPOOL 8b4652ec72d5247f9cbc8fa37f77fde45de39eda8f8977d65416ac92856335ac5782cf7b658ab230528dd2a613380c7fa3f089bc076edca613b6c1656ad41a0b
-MISC metadata.xml 447 SHA256 5a2087ee57ef0060990c3f1f8ec0c9e6a73964a5acb5f66482443078c1ffa00d SHA512 dee57b53ed93af4c7da59500aa5c38b5c6d8df5934d72ba0f07c6174662c17ed3774129cf0a83ee89f10251e1eda3c590cf7ea2b660a1770822cdc8da4bcca63 WHIRLPOOL 43ca6494d870852ba2f9019336d9a66fd8dd3fed47ea6bf001eac03177dda54ebd4f53363b71565992986754e1af82feb6bc08b5b5597e04d5a352d4b8acc53b
+EBUILD consolekit-0.4.6.ebuild 3270 SHA256 16be4b160426802a5fbf3760f1ecc9a5ae2e30d468d0e23202ea4dc0efcea974 SHA512 cff49a27c409678492873d88626048e4b512f2d4c4963437864872fd0a0332b82b953ff14b031b0ee1b1ed8eeefed906ef881b209f85dfa10e99e41420c96d1f WHIRLPOOL b70b6ac2e9d13f39f576326b07ddf22a6ed8638de4fc1a72a7d8916558c177fb0c6b70e3a679a90fc845ff908610ce6bdf6f1070edf043e05f8502082eee0036
+MISC ChangeLog 25417 SHA256 527f5f43e9610b793f4f42b80e63fc1ae6e65097400bc9d4bb13df362f8f28a3 SHA512 96e97cd3cf4fc529132025c1db608626309a4fa7f6909f2409fc28f9b20a36c8bde2dcc1c857510e0af04dd3c13b646a08b7c46efa1600b958ec426c58bdb1fa WHIRLPOOL 239f5b1205dcc46e184a9b2fde8df75b4fb46575efcf85946fc772d5927567b71641063d8099b7fa196880493dfa0315e866c6dedf8b75584c18c5d657e5681d
+MISC metadata.xml 453 SHA256 f182dc5500ee9068f6ad0bfb82dbc1fdee940e554e48f7bbfc749664397d37eb SHA512 9e28b7ee7e9156d5b3f36890b48cadd692428acf271320d96c5c62af34f1792e4fba8c8334cac6d33524cfc5dad9a293862ff3711251de4359ddaedb7cfe8b87 WHIRLPOOL dd6e9d7fb59367161ccb27ee2f97adafddadf03f67dd4581ff29cd51deb0e9f4483af062e1c58677a5752f9b56bbc98ae773fdacde18764568b8d4d3033d00ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSFRJJAAoJEEdUh39IaPFNmI4H/0G7qryKnBwXELhogDI7UzDU
-ngljyChKim0mGWr84JQCcs5xhHh7IhHLDEl/pyo4hBCMjcvX5JifldwBgEiQfndL
-BeJnAWiwDg3E5h9uW5jQIsbqFnSRwrfVxv3V+8n+iq35ZoGbMKw6eWo0N7HNjvb1
-6x6Zb21CIhJ+6wq+8fsjvFD86ddEyznUOgEuvRhcTqYpfrIjnw8TKCnMlE1j2MtW
-eeZFCsqMQuDunjLb619xjDBuYTpGl/jPsOlsLEM2uYGjhLd/l2pnKAAvPu/nmSBT
-Ytmop09aPI6nNrgL6wNjQIMjbT02FNx6TeUHgdp/k8+DQTqeYQFcaPHNv9P1Lgs=
-=i41T
+iQEcBAEBCAAGBQJSFRRKAAoJEEdUh39IaPFNqIkH/i5P9bQPkflzsojfgvb3WF5K
+BZENelnQsL7dr5SL4N42cFVdpAIlyv7K4RNFLCwqRbcbqQ/9UyPsBVPPcGWDbtl4
+uexHYY7d1Ltoq+pPgnEOm3Cs5xWeRCAMmB8Q3TDdPw8hTDYvggTzUrHR2PnMp5jm
+lahi6FyJHHxrPmXiqO2AYm2aHdCkf28QylHH8GiA8uGh3oyERzZxFme19nVRnd8m
+It9TGE+vens0i6OTuOXYHtnP/K1+UpkZWhLJPiOv1dJ3sdJdulXvDtXQLQTgd1gt
+bg6LeYh3gJZndItkjvlXmz2Ty3Ih0MOvD3CXqV3a0P+w2GNKCklh+GW6IVgO2FQ=
+=SHsj
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.4.6.ebuild b/sys-auth/consolekit/consolekit-0.4.6.ebuild
index 5f506330b655..4b5a4f996a7a 100644
--- a/sys-auth/consolekit/consolekit-0.4.6.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.6.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-auth/consolekit/consolekit-0.4.6.ebuild,v 1.9 2013/08/21 19:20:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.6.ebuild,v 1.10 2013/08/21 19:29:03 ssuominen Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam systemd
@@ -15,7 +15,7 @@ SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="acl debug doc kernel_linux pam policykit selinux systemd test"
+IUSE="acl debug doc kernel_linux pam policykit selinux systemd-units test"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
 	>=dev-libs/glib-2.22:2=
@@ -60,7 +60,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-udev-acl-install_to_usr.patch \
 		"${FILESDIR}"/${PN}-0.4.5-polkit-automagic.patch
 
-	if ! use systemd; then
+	if ! use systemd-units; then
 		sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
 	fi
 
@@ -69,7 +69,7 @@ src_prepare() {
 
 src_configure() {
 	local myconf
-	if use systemd; then
+	if use systemd-units; then
 		myconf="$(systemd_with_unitdir)"
 	else
 		myconf="--with-systemdsystemunitdir=/tmp"
@@ -115,5 +115,5 @@ src_install() {
 
 	prune_libtool_files --all # --all for pam_ck_connector.la
 
-	use systemd || rm -rf "${ED}"/tmp
+	use systemd-units || rm -rf "${ED}"/tmp
 }
diff --git a/sys-auth/consolekit/metadata.xml b/sys-auth/consolekit/metadata.xml
index 2d5f0be57f55..328872e02991 100644
--- a/sys-auth/consolekit/metadata.xml
+++ b/sys-auth/consolekit/metadata.xml
@@ -7,7 +7,7 @@
 	Use the PolicyKit framework (<pkg>sys-auth/polkit</pkg>) to get
 	authorization for suspend/shutdown.
 	</flag>
-	<flag name='systemd'>
+	<flag name='systemd-units'>
 	Install systemd unit files despite <pkg>sys-apps/systemd</pkg>
 	and systemd-logind. Not recommended.
 	</flag>