revbump fox bug 461866

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

4 files changed, 132 insertions, 14 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index a6b2df781a74..86c63a6ec8ea 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,13 @@
 # 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.152 2013/03/14 02:56:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.153 2013/03/16 17:11:49 ssuominen Exp $
+
+*consolekit-0.4.5_p20120320-r2 (16 Mar 2013)
+
+  16 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+  consolekit-0.4.5_p20120320-r1.ebuild, +consolekit-0.4.5_p20120320-r2.ebuild:
+  Fix use of QA_MULTILIB_PATHS and revision bump because the helpers are also
+  used by gnome-base/gdm moved wrt #461866 by Alphat-PC
 
   14 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
   consolekit-0.4.5_p20120320-r1.ebuild:
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index bac2c49af5ac..bf5b43e2e464 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -9,17 +9,18 @@ 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
-EBUILD consolekit-0.4.5_p20120320-r1.ebuild 3124 SHA256 2f3f4e29bbae961c2026e134e76a3c7d1a41ae344267e675d7ed6721a9583b59 SHA512 faf925871e95e9b3eeeed81b89b7774872660165386484375c4655d48a5aee36a749d5b24dc1a227c96724ed2ff2861a9ec60dc15677d4d4bc9aa00194e80fc8 WHIRLPOOL ad07cb0aa4fd9f389aecd52800cbf38e932d42306bfa3f32dfe7bcea393de3498690edbce89738d12cf5a7b6c30c34085ccfef90016aa4945cd72a7fc62e919c
-MISC ChangeLog 23373 SHA256 52b1930ebeb5c37c7f1e8fe5797638ba996961850d6ea2262d67fab07ad6962e SHA512 334b4f9c5f1a8ed113db7c56543c6dc32da01b38d03b837e1ba5a90db945395a4707db6828e85d6603668cee7738c3b45551966f51cdd211cc75b749107d26bb WHIRLPOOL 68f04f8319cabac1fc93eb88bd7c3307133ed7f7664068ff580509464ac9d4336b8e7a6c1d722c97838ffc91ccffde0c433f92a7ba51be92f31de33c0c1cd269
+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 23687 SHA256 26aef2271a27f6a8423264bc616a480fbd9c743630ac3a800838df1e47c653bb SHA512 57d3ed8ffdbfc1fd3fbf3a9b022b10c5d368c27181e2af2b68f7a8f7e731441344c2f73fd466b6a5a562e5d8b3240ecb5e6466cb63617de667f9cf8fad8acc6e WHIRLPOOL df049bb09635a46deee6729203a8ecead2fe6880587767396e0761ee2e36dad14dba75c9d9c47618879d400d13720d90fa63555e50cd9f611e2e1944db734837
 MISC metadata.xml 313 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b SHA512 d948611c395f0d4144d937d0e2e9ddf6ec0eea5f2f70553ea58a40c7132bf3b6839a741508711ffecf480fef0b1905f703273184e6e51b27afe22e7f5c831346 WHIRLPOOL 5448720853d00b6b6b1edf6323d6b1240891be64667423c69068961e302eb7c816b3367b2c58d0fa37fc1289e0970d55bbc07be4e21116edc09f60ae3314ea2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRQTxXAAoJEEdUh39IaPFNNuMH/RAmAJ39SxD3pJb4S2+qx5va
-ZAWPYbRAnDKQ+jCeE1pIUVUl/AAljBhZRrNY0nOtlRtGbEga/qNTbivvbK4l0+kT
-iGhnh2+nKUeekJs8SbtTJdpinAbzMZAEfeBVRxVFKHLGNzdIbdDCyDbsSyFQiKfl
-DtyzrQjTS/+MQBdC8mSIoQEocOnnnP49ldUhFmX73S/oVku40Kds9pmVrdIg/Qmt
-AQCIKMf05Rw5bbEYo2KukYLaeD9qtkZ989P7znZkeO2EEBdczhJJperFzlZ6OLQa
-sCESweYdlFsJFwGuVotONagOoBdbs7Mk0EroxsW6RGDMKChfI2JGg09lKyqWpBo=
-=7AaZ
+iQEcBAEBCAAGBQJRRKfEAAoJEEdUh39IaPFN4ZcH/jeoXJHxQPRYETjOUC7BMW6A
+xS0Dui9sm3t5FZMGaFHo8sLzJ5xtBDuzOYGpLseaP7wnHZrH7pnJkjmSeTz81SSS
+Aq4rrY6XrAMmPUAzDWpzL6QH+MK2glYUiqlx6n42ynsSDO3iyjyfuk+mB+rj00h+
+Xb0g3ydh54O3+8lyOOJn93dAk4aMhD9WDMqVWWYPjv+Jg8eltBUn4YSCJSZShVPV
+lVUcqBjYXffmWt0FdjMoW0OYLr/MezJYfjYrxffQSbud9sRiWw9SCScyTnYkm71N
+iVjlx4CrFnqHEZBCfoyEiVNvuglhj+pIhF0B0R+FY2P3rw2kK6VraY6pEH0eQvU=
+=8TyZ
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild b/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild
index e6adc04f3a2e..8e8673d32aa4 100644
--- a/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.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.5_p20120320-r1.ebuild,v 1.18 2013/03/14 02:56:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild,v 1.19 2013/03/16 17:11:49 ssuominen Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam systemd
@@ -46,8 +46,6 @@ DEPEND="${COMMON_DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/udev-acl"
-
 pkg_setup() {
 	if use kernel_linux; then
 		# This is from http://bugs.gentoo.org/376939
@@ -74,7 +72,6 @@ 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) \
diff --git a/sys-auth/consolekit/consolekit-0.4.5_p20120320-r2.ebuild b/sys-auth/consolekit/consolekit-0.4.5_p20120320-r2.ebuild
new file mode 100644
index 000000000000..2b123e516712
--- /dev/null
+++ b/sys-auth/consolekit/consolekit-0.4.5_p20120320-r2.ebuild
@@ -0,0 +1,113 @@
+# 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.5_p20120320-r2.ebuild,v 1.1 2013/03/16 17:11:49 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"
+
+if [[ ${PV} = *p20* ]]; then
+	SRC_URI="mirror://gentoo/${MY_P}.tar.xz"
+else
+	SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.bz2"
+fi
+
+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-171
+		)
+	pam? ( virtual/pam )
+	policykit? ( >=sys-auth/polkit-0.110 )"
+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() {
+	local myconf
+	[[ ${PV} = *p20* ]] && myconf='--enable-maintainer-mode'
+
+	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)" \
+		${myconf}
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	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
+
+	prune_libtool_files --all # --all for pam_ck_connector.la
+}