Version bump.

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

3 files changed, 126 insertions, 10 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 611f12d548cf..3ee7cde3113b 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.154 2013/03/16 23:06:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.155 2013/07/20 05:58:28 ssuominen Exp $
+
+*consolekit-0.4.6 (20 Jul 2013)
+
+  20 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> +consolekit-0.4.6.ebuild:
+  Version bump. This time conflict with sys-apps/systemd in favour of systemd-logind,
+  the correct configuration is USE="-consolekit systemd" if you want systemd.
 
 *consolekit-0.4.5_p20120320-r2 (16 Mar 2013)
 
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 3b203a3b09f8..2df946fae180 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -9,18 +9,20 @@ AUX consolekit-shutdown-reboot-without-policies.patch 924 SHA256 cd9a2aa582644ad
 AUX consolekit-udev-acl-install_to_usr.patch 750 SHA256 823316f6898eaab0744e42fa11b1631f64187aebca35baa5aeab09279820bedd SHA512 d2d6fcedea5e72f5a1b387f411ac62a59fd3c9e90a318bd85c35d210b89b18f01511f6b05352c1a4a9508622f0b9242c1b9c15d5ae4f8adf2819b6c3a0ff5ac9 WHIRLPOOL a9b8f48c5dddabfa28c2a65ac99c10dd7cba41d8bdcdc1fac4a0932391a81d9ed87f34115d7a43611d2cd126d10a5378edb8e734c888d529eca4b0d20dd15ac1
 AUX pam-foreground-compat.ck 389 SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9 SHA512 3cabd23ff7dc5de0a86284c3a3d3ff923228969cc954a1036290d4f7f6d58646ea6ea1445f472476b6f319df4dcd22f71e5e0f5cc8c845cd7e0b148af689ce5a WHIRLPOOL a8e36292dc094e107492e65efd147b35e217c652c8bcc52c768942b15660ff7d251e55ee038ce326905f5dc8f17857b62725768d60c3d5c93927550c8ff47db2
 DIST ConsoleKit-0.4.5_p20120320.tar.xz 103424 SHA256 f85abe0644f4e9314bd33411aebceef662e482c02ab70635426996f743e2bbe3 SHA512 17ca572b49f175c3bb4e296927e8b2d5bb5c9af04c26175cc40b84ce8273aec2ff744df64089003ac79bf7a415b69a4fd7753a0bc65ff33bc99d6c79890e9fe3 WHIRLPOOL b8d66d91de932a0d9a6ca16d39bd1d301823531d55f0a9a98672408752458c5c55044eeed1ade37c58dfd67db61bcd30ab6919fd4fee878f949928feda8075ba
+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
-MISC ChangeLog 23681 SHA256 b2529d409e504e31e9d6c0beb7e446afe35b2179607cddcbf4116485861729e0 SHA512 b3aecf51567ddffb02703a984d2d4d6212a1a1116f98de400109020b4dce72297ccfe9ff18861fcdf120246dc64505f1f80025f92901c4451d3033e81f2e8c4c WHIRLPOOL 041bbbdf55e1ef9aad7ec896f8b3dd6b2514ee2e9f008b4988e04b3799f21bee523d42c91e176d212536a44deabc0f539d6bfd7f7a7f082e9b0fa56f5bc7b78e
+EBUILD consolekit-0.4.6.ebuild 3075 SHA256 9fc6f244e404c66608d65c6f100e12b22a425224053b6b0fe7cf9641fb20ae3c SHA512 23c49e5d43c3d452a73be11c655e8305b9fb07b4a32841fc6178e729d663615fe1ead99f22d3c6d7b4ac12fac1f64671936c3acc21fb4b52a0fe071d1f6b4061 WHIRLPOOL 9842994826dfa40072581d5ebd7df6db12b1dc55d810dca25915e4323be5e46abc9799033aa1f10750f1d67698cb1f510cf07eddf772dcef70f71a0ce24f05a2
+MISC ChangeLog 23959 SHA256 76fe240172ecf6e8e83117cf9660ebd808de1e49969c2c991410be2afc334c33 SHA512 fce0a39441b732ff440f9a38da4da93b48a8b24bfd52a7950ef7ad04e9648870dcb2fbe302f19878b0a14dc768a05fd666a648c2a48a7c271b38bb48a3a59109 WHIRLPOOL bbf319bca8ffaf649acefb782ad9498c163a5cf06253eb275de4ff3dc2001b7cf365302b761517de508c7e68b95e519b374fdea7f91a73fd38c2337b12d0e0c5
 MISC metadata.xml 313 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b SHA512 d948611c395f0d4144d937d0e2e9ddf6ec0eea5f2f70553ea58a40c7132bf3b6839a741508711ffecf480fef0b1905f703273184e6e51b27afe22e7f5c831346 WHIRLPOOL 5448720853d00b6b6b1edf6323d6b1240891be64667423c69068961e302eb7c816b3367b2c58d0fa37fc1289e0970d55bbc07be4e21116edc09f60ae3314ea2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRRPrzAAoJEEdUh39IaPFNmfwH/RdZKZ7bF1SXREytNmPmHaRa
-+v7KO8S3Ln/tBQi3O3a77Q83IImbynq4PWP6fCwke8Wl6oTuGufGPJxI1aBbv+w3
-nR70Y2u8F9O/cZP8/I/cNt0wLbv5GDDLU3Mbx5/gcRT82ZtfJ7seGINKsjBT+lgz
-yvbQjCnxvdCHNY331HFL1YUz6SXKAhyYAmA7Udb99kjdbl5ip3hCE3UWW/Y5aZTA
-8cxymF06Mzg31iXuU714jL1iH8X+RMfpqYecjf9xXkjZR7dgZ622rotClk3lvADM
-UUVROtWasOWDldVuUAJpk5sIDbPrWpU7tbvuCmz0bHBWduWwIECCN2t0jxYMt7A=
-=8pGD
+iQEcBAEBCAAGBQJR6ibpAAoJEEdUh39IaPFN4YoH/jfOOb3OY4lH4IQnPPLnC5DO
+ByrRWowCIft1dVxuy6jvgYLBWmu93FZJ/df+YQBg3Td1Wr2bQQbPtVpFAIK+7JU4
+MSuThJS21aBPnhn5pqVT81Kb++PRab5Bbrz9LjmgTfkOaZRDMKEm4X7VnHx1MQnw
+GaP/18RWqltILyAvTIpGWGZ1RiiC3lFtmzlxwegZK2xedBnOqBuZcv92y1Zh0X0g
+b9L60cmkh+PV3ngRkdZitJU5/TYV9lEZf0UKo/IwO9lWEuhur9N5TV6J1Pacfq0+
+X3suFq1/Sm3JxNGH0jCpF2bOM3RAT8J/qnYnLggYrTlY+xg9Dhgg3y3VNdwi0aQ=
+=sMuI
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.4.6.ebuild b/sys-auth/consolekit/consolekit-0.4.6.ebuild
new file mode 100644
index 000000000000..c36090900150
--- /dev/null
+++ b/sys-auth/consolekit/consolekit-0.4.6.ebuild
@@ -0,0 +1,108 @@
+# 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.1 2013/07/20 05:58:28 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils linux-info pam systemd
+
+MY_PN=ConsoleKit
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
+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"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
+	>=dev-libs/glib-2.22:2=
+	sys-libs/zlib:=
+	x11-libs/libX11:=
+	acl? (
+		sys-apps/acl:=
+		>=virtual/udev-200
+		)
+	pam? ( virtual/pam )
+	policykit? ( >=sys-auth/polkit-0.110 )
+	!sys-apps/systemd"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/coreutils[acl?] )
+	selinux? ( sec-policy/selinux-consolekit )"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+	test? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+		)"
+
+S=${WORKDIR}/${MY_P}
+
+QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
+
+pkg_setup() {
+	if use kernel_linux; then
+		# This is from http://bugs.gentoo.org/376939
+		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
+		# This is required to get login-session-id string with pam_ck_connector.so
+		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-cleanup_console_tags.patch \
+		"${FILESDIR}"/${PN}-shutdown-reboot-without-policies.patch \
+		"${FILESDIR}"/${PN}-udev-acl-install_to_usr.patch \
+		"${FILESDIR}"/${PN}-0.4.5-polkit-automagic.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		XMLTO_FLAGS='--skip-validation' \
+		--libexecdir="${EPREFIX}"/usr/lib/${MY_PN} \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable pam pam-module) \
+		$(use_enable doc docbook-docs) \
+		$(use_enable test docbook-docs) \
+		$(use_enable debug) \
+		$(use_enable policykit polkit) \
+		$(use_enable acl udev-acl) \
+		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
+		--with-pam-module-dir="$(getpam_mod_dir)" \
+		"$(systemd_with_unitdir)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	dosym /usr/lib/${MY_PN} /usr/lib/${PN}
+
+	dodoc AUTHORS HACKING NEWS README TODO
+
+	newinitd "${FILESDIR}"/${PN}-0.2.rc consolekit
+
+	keepdir /usr/lib/ConsoleKit/run-seat.d
+	keepdir /usr/lib/ConsoleKit/run-session.d
+	keepdir /etc/ConsoleKit/run-session.d
+	keepdir /var/log/ConsoleKit
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
+
+	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
+}