Move udev-acl and other binaries out from /usr/libexec and move them over to /usr/lib/ConsoleKit and set QA_MULTILIB_PATHS.

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

3 files changed, 29 insertions, 28 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 294a937c972e..a6b2df781a74 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.151 2013/03/03 07:59:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.152 2013/03/14 02:56:28 ssuominen Exp $
+
+  14 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+  consolekit-0.4.5_p20120320-r1.ebuild:
+  Move udev-acl and other binaries out from /usr/libexec and move them over to
+  /usr/lib/ConsoleKit and set QA_MULTILIB_PATHS.
 
   03 Mar 2013; Mike Frysinger <vapier@gentoo.org>
   consolekit-0.4.5_p20120320-r1.ebuild:
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index ce9f2ded26cb..bac2c49af5ac 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -9,23 +9,17 @@ 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 3042 SHA256 c7f0cb5f7b39a9716ff771f8fba9d9b923905081dce7791f5365b9727c47e6f2 SHA512 1d11916958d8a11d6416b4541eea6db7b9ec9e8cb2e0cf2c59ebe11561390b54177dbffa84da4e54b50454232e59130233e398906ef2c830b1f8d3163fcae8a6 WHIRLPOOL 745977bcd934440fdb83dedc133c595c5f2f83950d679c91943f2768e12f144ec837d72a4d8dca5ae06dd0812b2e04946e35b6f3e7035d9e03c594b332b89757
-MISC ChangeLog 23147 SHA256 cb11ab8dc95cb27e7710b4191d8f82dd625994ffdac9eddf3eeb264162131e1a SHA512 e55a2c1b8c70bcbd25d0a2bc0fdaacd1953a4ca5935d3646505c3e0497dde4cdaa28e9d160c6a4250532c0d75a6dca1f9196c083e9bfe6fc744477e34b2b7d99 WHIRLPOOL b2af729567bc46054ee80236f241f42a48f501f66c1579e5b1a2ee0e235e529bb7a458ed41d8c16f6f16214c1bdea107587265f76ecd069753010637b3d1478c
+EBUILD consolekit-0.4.5_p20120320-r1.ebuild 3124 SHA256 2f3f4e29bbae961c2026e134e76a3c7d1a41ae344267e675d7ed6721a9583b59 SHA512 faf925871e95e9b3eeeed81b89b7774872660165386484375c4655d48a5aee36a749d5b24dc1a227c96724ed2ff2861a9ec60dc15677d4d4bc9aa00194e80fc8 WHIRLPOOL ad07cb0aa4fd9f389aecd52800cbf38e932d42306bfa3f32dfe7bcea393de3498690edbce89738d12cf5a7b6c30c34085ccfef90016aa4945cd72a7fc62e919c
+MISC ChangeLog 23373 SHA256 52b1930ebeb5c37c7f1e8fe5797638ba996961850d6ea2262d67fab07ad6962e SHA512 334b4f9c5f1a8ed113db7c56543c6dc32da01b38d03b837e1ba5a90db945395a4707db6828e85d6603668cee7738c3b45551966f51cdd211cc75b749107d26bb WHIRLPOOL 68f04f8319cabac1fc93eb88bd7c3307133ed7f7664068ff580509464ac9d4336b8e7a6c1d722c97838ffc91ccffde0c433f92a7ba51be92f31de33c0c1cd269
 MISC metadata.xml 313 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b SHA512 d948611c395f0d4144d937d0e2e9ddf6ec0eea5f2f70553ea58a40c7132bf3b6839a741508711ffecf480fef0b1905f703273184e6e51b27afe22e7f5c831346 WHIRLPOOL 5448720853d00b6b6b1edf6323d6b1240891be64667423c69068961e302eb7c816b3367b2c58d0fa37fc1289e0970d55bbc07be4e21116edc09f60ae3314ea2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRMwNJAAoJELEHsLL7fEFWeIsQAMfo6ZeXFesQLN5IvokNUVIw
-npFUUzNqgFzYQRhbS3vgQl56lPg3LicVn/PMyAaAF6GB5skn2AgJ/LY9vqa9ZDmD
-gwOGYG1hdAVfntB7lRojy8vH8N7GZextYlANKkjgzOegCFIPtVsyzHdiNvAZHM16
-Lbmg1Kxsl7hUraboBAfbxP1g4tgZ3uBv0joIrEvYyDcuuqEc/E7kYDN1+gVi0Ps6
-IFvuKwhlGpgBnANGsbIYjDRRp/RqmiW7MmVEXLrVf+/NHeLmsBXCnCzq8SD6yX6f
-sQVNzcvWvAfmUfv/KmyZcQ3YKnmHkD9ARj8UeVG7YzIGXhiaxMdDU2OS3OFZq/KF
-L5tKFszmn8cRznmgaqiaXjUsfYsUH8owFiOpZ/J2MCeChJw+Q88RK98X9FsQ4wOD
-MsS2scyxyepBDYken9jflXCRR300uPb6txAHw1DLqCZH2p9+q7LjzxpQwFj+nUIf
-JF2ceJJYB2OzDV6wIzzkzvIRXmSPtDRIGk0EjGDA3iMp7xxlUnqdnOmzRgSGNXWy
-Xc0wwEQ/BpKCaJsXNM8Mnf7wEp9lilLG2AgC4NFvUxI27T02c1kmRuFpdlZbvJRT
-GwKWgmcFTfAh9ZK6SLnSs1dztFwPOTdB+zvUSCNwLeOEZIgU80kgwOo+BYUULHZ9
-oRNU2FvVYO7ADZ1iKxm1
-=TYWd
+iQEcBAEBCAAGBQJRQTxXAAoJEEdUh39IaPFNNuMH/RAmAJ39SxD3pJb4S2+qx5va
+ZAWPYbRAnDKQ+jCeE1pIUVUl/AAljBhZRrNY0nOtlRtGbEga/qNTbivvbK4l0+kT
+iGhnh2+nKUeekJs8SbtTJdpinAbzMZAEfeBVRxVFKHLGNzdIbdDCyDbsSyFQiKfl
+DtyzrQjTS/+MQBdC8mSIoQEocOnnnP49ldUhFmX73S/oVku40Kds9pmVrdIg/Qmt
+AQCIKMf05Rw5bbEYo2KukYLaeD9qtkZ989P7znZkeO2EEBdczhJJperFzlZ6OLQa
+sCESweYdlFsJFwGuVotONagOoBdbs7Mk0EroxsW6RGDMKChfI2JGg09lKyqWpBo=
+=7AaZ
 -----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 b782ee626b1b..e6adc04f3a2e 100644
--- a/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.17 2013/03/03 07:59:35 vapier Exp $
+# $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 $
 
-EAPI=4
+EAPI=5
 inherit autotools eutils linux-info pam systemd
 
 MY_PN=ConsoleKit
@@ -22,17 +22,16 @@ 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.98
-	>=dev-libs/glib-2.22
-	sys-libs/zlib
-	x11-libs/libX11
+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
-		!<sys-fs/udev-171-r9999[extras]
+		sys-apps/acl:=
+		>=virtual/udev-171
 		)
 	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.104-r1 )"
+	policykit? ( >=sys-auth/polkit-0.110 )"
 RDEPEND="${COMMON_DEPEND}
 	kernel_linux? ( sys-apps/coreutils[acl?] )
 	selinux? ( sec-policy/selinux-consolekit )"
@@ -47,6 +46,8 @@ 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
@@ -72,7 +73,8 @@ src_configure() {
 	[[ ${PV} = *p20* ]] && myconf='--enable-maintainer-mode'
 
 	econf \
-		XMLTO_FLAGS="--skip-validation" \
+		XMLTO_FLAGS='--skip-validation' \
+		--libexecdir="${EPREFIX}"/usr/lib/${MY_PN} \
 		--localstatedir="${EPREFIX}"/var \
 		$(use_enable pam pam-module) \
 		$(use_enable doc docbook-docs) \
@@ -81,7 +83,7 @@ src_configure() {
 		$(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) \
+		--with-pam-module-dir="$(getpam_mod_dir)" \
 		"$(systemd_with_unitdir)" \
 		${myconf}
 }