Introduce USE="systemd" to force installation of systemd unit files despite of systemd-logind making it more or less obsolete (and remove SystemdService= line from the .service file when required) wrt #478258

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

4 files changed, 39 insertions, 23 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 0db5348eec3e..96b1515ed97d 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,12 @@
 # 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.162 2013/08/18 13:44:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.163 2013/08/21 19:20:30 ssuominen Exp $
+
+  21 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> consolekit-0.4.6.ebuild,
+  metadata.xml:
+  Introduce USE="systemd" to force installation of systemd unit files despite of
+  systemd-logind making it more or less obsolete (and remove SystemdService=
+  line from the .service file when required) wrt #478258
 
   18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> consolekit-0.4.6.ebuild:
   Stable for x86, wrt bug #480028
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 8217df494c42..3e2257053c83 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 90-consolekit-3 1027 SHA256 91e0900995f7db536220065959d236fb75ec2c77096981a142e2e948518d9761 SHA512 2a1273d775aeb69a3e0873d6a82868d909cdbc3d5003b7625ab12e76ef44f115b464514e7890f7e562c44a92383475e698c3679f6c9f1bf42b5199d03d8c604a WHIRLPOOL 85fd88509ab68a8cdc069e078f4f944c87688fc26b9414ca5556057c90c9ef96382e88f4df3ad1415547cb1abd1f2b4b50518984a314fe1430d4de5d3d63dbd2
 AUX consolekit-0.2.rc 627 SHA256 da849bae527a7a5c257301a99ac3fb5ec2ded48103ec114552ca7d2a24b12e49 SHA512 06e7469b379036255833cc9f411cc096013b236042abeae8acaf3c26f4b39f7537779014ab9751ec089bef34420b463553581e022ebf7c291015b509d1d4475c WHIRLPOOL 54d3a4b7eabf9fb35411739936b42d7f681bcaf5fa65f5540750d66f5ee6f07f7e2f0cdfa533d1574a9d5d4aea47dc5ef9c9dcf38b4d535d9c33d2269aea7309
@@ -12,23 +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 3044 SHA256 15db460827a129d0c0de154db0d4dd7d91b5754c56a5647eac0b4f2196a8b21a SHA512 b0aa70908eaf639382609633d87957270563cb1ae2ad2f36bd2525a5b9e8a323508ad50c740d75c1434eb2dba6db0216b72b62596a09ad4257a49a0fa0f7d8a0 WHIRLPOOL feec0dd03a1b9d761483adfcc1d9be05df321086d98713d7a900c29ceca36516c078c09c7992731cd1186796082fb6be281d917efe4a36dc4706c2f59c8cd52a
-MISC ChangeLog 24880 SHA256 89f00f0e7a048d1180f8d1c20e215c171e70ee959d739707df3a7dc157cc4666 SHA512 0e820e0182f5a39c7bba01d403597941bdd3302cfbc7851adf54c733d7aacde449d544432a2b2feeee036bc1514b6dbfe8bf9c818f9a200c434d280f4d2cd5a9 WHIRLPOOL c573785756de394e3087a6f16d40c9cf8d6509188432a30925809488589d84eb5337bebd8d821c34f01036dd6652edabfe07f1ad4b93a383218b769ff6e27e23
-MISC metadata.xml 313 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b SHA512 d948611c395f0d4144d937d0e2e9ddf6ec0eea5f2f70553ea58a40c7132bf3b6839a741508711ffecf480fef0b1905f703273184e6e51b27afe22e7f5c831346 WHIRLPOOL 5448720853d00b6b6b1edf6323d6b1240891be64667423c69068961e302eb7c816b3367b2c58d0fa37fc1289e0970d55bbc07be4e21116edc09f60ae3314ea2f
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSEM/FAAoJELp701BxlEWffIUQAJZZFiwWjd8cTcSM0oFn/pms
-CPH3wweqeyMEAQbXwu37kGsLyDpMjHcbd34QB3QuQ6CHiLu3qn/xq6F5+z2Lb17M
-FONg/JWYMRavtbBJ8sOBxWTKN+scEEEq6m5aIiuCo7FI5Kc/OI/7dSQcidX3dvs+
-pkBcUaZYhMCd4Mt92sSeWi87SYdMc948z/QCSRFcMBlouqLj6JUDwDP3MY2CllQu
-HvENpuZ6Mr9ivbSAFj5AqFGovFYMWdvaAtPXhKzEC6uhCr7mJoP2EOwkWlXiL71a
-d/OaYWDU7qMyCvTkPKAqmGdsWz5ty9WLCJGc5mP50UzM7JFE1aULyaSyPCNXnugv
-Lwe3aW1ttz7uBNDEEkTXLXtyFmMV0qXHmUZOyXIskbs+v1yMXhZ8DMk/yliXkfz4
-86yD7z6xcYayWHCGAdQvuUtTKD5Dj0R7U53OdTa7hzr5EJoxIfiyAtIt+dFx80/K
-k9qfpwoQS2OhvdlyzqtckA1fN7buPtA5XcAocvm3EtH0EjELqv56qWsPxBkaoVoZ
-iBpPcPlEvPEsbimy7NupjDlVPznR2VbbS1A6MZqjm41ba5bisuBKuB8RbMMstGwW
-oZFGF/2RGYss6QwuRNuVI9KN/6LxSmU6ohU+umNlclOGkQl+0icAqaI5QB9JTboI
-bt/pNr1NPcB9f+QFkwCS
-=mAks
+iQEcBAEBCAAGBQJSFRJJAAoJEEdUh39IaPFNmI4H/0G7qryKnBwXELhogDI7UzDU
+ngljyChKim0mGWr84JQCcs5xhHh7IhHLDEl/pyo4hBCMjcvX5JifldwBgEiQfndL
+BeJnAWiwDg3E5h9uW5jQIsbqFnSRwrfVxv3V+8n+iq35ZoGbMKw6eWo0N7HNjvb1
+6x6Zb21CIhJ+6wq+8fsjvFD86ddEyznUOgEuvRhcTqYpfrIjnw8TKCnMlE1j2MtW
+eeZFCsqMQuDunjLb619xjDBuYTpGl/jPsOlsLEM2uYGjhLd/l2pnKAAvPu/nmSBT
+Ytmop09aPI6nNrgL6wNjQIMjbT02FNx6TeUHgdp/k8+DQTqeYQFcaPHNv9P1Lgs=
+=i41T
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.4.6.ebuild b/sys-auth/consolekit/consolekit-0.4.6.ebuild
index bf590b5628c6..5f506330b655 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.8 2013/08/18 13:44:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.6.ebuild,v 1.9 2013/08/21 19:20:30 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 test"
+IUSE="acl debug doc kernel_linux pam policykit selinux systemd test"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
 	>=dev-libs/glib-2.22:2=
@@ -60,10 +60,21 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-udev-acl-install_to_usr.patch \
 		"${FILESDIR}"/${PN}-0.4.5-polkit-automagic.patch
 
+	if ! use systemd; then
+		sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
+	fi
+
 	eautoreconf
 }
 
 src_configure() {
+	local myconf
+	if use systemd; then
+		myconf="$(systemd_with_unitdir)"
+	else
+		myconf="--with-systemdsystemunitdir=/tmp"
+	fi
+
 	econf \
 		XMLTO_FLAGS='--skip-validation' \
 		--libexecdir="${EPREFIX}"/usr/lib/${MY_PN} \
@@ -76,7 +87,7 @@ src_configure() {
 		$(use_enable acl udev-acl) \
 		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
 		--with-pam-module-dir="$(getpam_mod_dir)" \
-		"$(systemd_with_unitdir)"
+		${myconf}
 }
 
 src_install() {
@@ -102,6 +113,7 @@ src_install() {
 	exeinto /usr/lib/ConsoleKit/run-session.d
 	doexe "${FILESDIR}"/pam-foreground-compat.ck
 
-	rm -rf "${ED}"/usr/lib/systemd # avoid collision with systemd-logind
 	prune_libtool_files --all # --all for pam_ck_connector.la
+
+	use systemd || rm -rf "${ED}"/tmp
 }
diff --git a/sys-auth/consolekit/metadata.xml b/sys-auth/consolekit/metadata.xml
index 0271f0b98d50..2d5f0be57f55 100644
--- a/sys-auth/consolekit/metadata.xml
+++ b/sys-auth/consolekit/metadata.xml
@@ -3,9 +3,13 @@
 <pkgmetadata>
 <herd>freedesktop</herd>
 <use>
-	<flag name="policykit">
+	<flag name='policykit'>
 	Use the PolicyKit framework (<pkg>sys-auth/polkit</pkg>) to get
 	authorization for suspend/shutdown.
 	</flag>
+	<flag name='systemd'>
+	Install systemd unit files despite <pkg>sys-apps/systemd</pkg>
+	and systemd-logind. Not recommended.
+	</flag>
 </use>
 </pkgmetadata>