sys-auth/consolekit: multilib-utize

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 31 insertions, 16 deletions

diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index f3d7b7a..c0b6e76 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,11 +1,12 @@
 AUX 90-consolekit-3 1027 SHA256 91e0900995f7db536220065959d236fb75ec2c77096981a142e2e948518d9761 SHA512 2a1273d775aeb69a3e0873d6a82868d909cdbc3d5003b7625ab12e76ef44f115b464514e7890f7e562c44a92383475e698c3679f6c9f1bf42b5199d03d8c604a WHIRLPOOL 85fd88509ab68a8cdc069e078f4f944c87688fc26b9414ca5556057c90c9ef96382e88f4df3ad1415547cb1abd1f2b4b50518984a314fe1430d4de5d3d63dbd2
 AUX consolekit-0.2.rc 627 SHA256 da849bae527a7a5c257301a99ac3fb5ec2ded48103ec114552ca7d2a24b12e49 SHA512 06e7469b379036255833cc9f411cc096013b236042abeae8acaf3c26f4b39f7537779014ab9751ec089bef34420b463553581e022ebf7c291015b509d1d4475c WHIRLPOOL 54d3a4b7eabf9fb35411739936b42d7f681bcaf5fa65f5540750d66f5ee6f07f7e2f0cdfa533d1574a9d5d4aea47dc5ef9c9dcf38b4d535d9c33d2269aea7309
 AUX consolekit-0.4.5-polkit-automagic.patch 870 SHA256 7cd8e4ecc868b0d2566cc0d0b7b3d13a006fe55ff425314d15ecff83e550d184 SHA512 50c2bafe2bf995bd5ef863557a1783211e172d77d819c8001c9007b4833b4e6b3ccfa7c04bf6811086dff6371be488411fdd23a49cecec3f545c388a0bbd61ab WHIRLPOOL 5611fdb8f17afd662ce0f745334dcbbb606fb8247ae18f914ae233cb7c024f418b94b4e353d6513c67c4346475af98d02d5551b4cb88e511df21eb765cbd1cb7
+AUX consolekit-0.4.6-pam-ck-connector-oot-build.patch 326 SHA256 a362fa59fb61814fde7d9e4287b50d0d1b6456ce8c5440d218de5dc55f36d418 SHA512 84d53dd0c2ddab0431b0f9f9b176fba05ff0969492c118ef5e0f20a81a6bd40f8c83d31b45872e0f11ca16d07a74c5c6126d1956aebd2c30715317d120a73985 WHIRLPOOL adeab1352d8d4c6a3eb872d9aa11e96e911d0decf7c509b46c9a941880f184f2cd3ee60726442cc49b822dc18c81dd3578b791afe22437465e26095f2a4f873a
 AUX consolekit-cleanup_console_tags.patch 1596 SHA256 178d25a93bc04b070840650b6f847b018796186d2a54a3be7b0a6df75e8f501c SHA512 8639c45baefc5fa4751654345225029b455e9a5ee5be5835c69ff0d6bf3532fc1ccf606fdb0cd29849071a26ab3defff8f7e31d19e83117dfe467b6209a37a77 WHIRLPOOL 2bf35176a05687402b333d74497dd3d2340ede2d55fe068926d3267d921adeef7f5333435f34d9eec1813c1fc0f8fcdc0b0ee979439f6f27ef86aeae620e96fb
 AUX consolekit-shutdown-reboot-without-policies.patch 924 SHA256 cd9a2aa582644ad50fb98e4580b9cf889c71a40f637eb0beb0eaab96d3ad9a47 SHA512 7bca0a448329cabbaa42028e212edc4ae242dcef9947cc2d49e66280cfae1193aedcac9921be90b9dd24265c17c3c53876bbea1ca223906a20252d94c4d65a9c WHIRLPOOL 56aa6327a226255ae01cc2c0298b658daf1f21dc8d54269b105aa6b490f815df0aac02604a82c01c2c4fd3d3f7899482df1596dffa10b6aa7b13b136fa3fcb3c
 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.6.tar.xz 366572 SHA256 b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c SHA512 54955e3e83778a9216846104da8762fd50a37190e209127dd5d211e2227da617e14f6f5c1359905396d299656e526d14e1187b28eaff7d0ae1d7563dc8d9b46d WHIRLPOOL ebf36b109b4c646d0b874f6b8e2ae9e2d190022ee9b6feff6cbb6b9203c80401c538cc3ca674fa7bde4f07e658d5460864e9784c1e0249d49b4784725a4e05c7
-EBUILD consolekit-0.4.6-r1.ebuild 3159 SHA256 bcb889f54191274defa092c9cef6605b2556b97346ea394b5fa9030fb067ec66 SHA512 0b831d80904a182c1b56605d59e3cc8dc02989dbaeb8cba829c82f0325dfead582318799044042606c65a17e5664ab5b6998096fc3d428362f2770b3a6149b58 WHIRLPOOL a339dac4f40a10b6b171aa7738de9bdefa02f3f21fc1566c43dfa52172794fe2f4ddf2afd0f106dd940361c66a2c3af035ecd30ab224a8b4eb9d089f80703ac5
+EBUILD consolekit-0.4.6-r1.ebuild 3376 SHA256 b6457ddfc09872750186dde8c359cf507d5d2a17ac6423e54ad686dce0d048a8 SHA512 6e45020833d84d8704dd3ab981f6ebe53ff075af428d65bdcecebddeebbacdd77881a0509fdbcccbe00e4693dca837fde12f17728f391d5e1d5eb1b50da150c0 WHIRLPOOL 55b49bcc374d23f8aa0d091af9addf58fadce4c738bd7517eda99175cb596bccaf28543b1611185d35055f809f0110c34d9f0a214b09defbccc7d34f456adbd7
 MISC ChangeLog 25632 SHA256 18c28087373b8af4ff74a4f34054af75df37e196359d7579deff616c445fb5b9 SHA512 963e88c24fb3dbbcd7230e54f69d99a4edfdf8c1d4703d8d1cffee14f48246b724ddad2521011d6067b4306a53f99fbc53c25b6d9fdea5166e43033a45640456 WHIRLPOOL 2b5608fda6352386e42ae36f5fa8352249e95c974e82841d771e58bf9e9b6bedd2fdcda34b00a01a4d477408a0afcc21617417c8236dc43cec189a9e23b2ed7f
 MISC metadata.xml 453 SHA256 f182dc5500ee9068f6ad0bfb82dbc1fdee940e554e48f7bbfc749664397d37eb SHA512 9e28b7ee7e9156d5b3f36890b48cadd692428acf271320d96c5c62af34f1792e4fba8c8334cac6d33524cfc5dad9a293862ff3711251de4359ddaedb7cfe8b87 WHIRLPOOL dd6e9d7fb59367161ccb27ee2f97adafddadf03f67dd4581ff29cd51deb0e9f4483af062e1c58677a5752f9b56bbc98ae773fdacde18764568b8d4d3033d00ee
diff --git a/sys-auth/consolekit/consolekit-0.4.6-r1.ebuild b/sys-auth/consolekit/consolekit-0.4.6-r1.ebuild
index f999d29..73eae5a 100644
--- a/sys-auth/consolekit/consolekit-0.4.6-r1.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.6-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-inherit autotools eutils linux-info pam systemd
+inherit autotools eutils linux-info pam-multilib systemd multilib-minimal
 
 MY_PN=ConsoleKit
 MY_P=${MY_PN}-${PV}
@@ -14,24 +14,24 @@ 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"
+KEYWORDS="~amd64"
 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=
-	sys-libs/zlib:=
-	x11-libs/libX11:=
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.22:2=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	x11-libs/libX11:=[${MULTILIB_USEDEP}]
 	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
+		sys-apps/acl:=[${MULTILIB_USEDEP}]
+		>=virtual/udev-200[${MULTILIB_USEDEP}]
 		)
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )"
+	pam? ( virtual/pam[${MULTILIB_USEDEP}] )
+	policykit? ( >=sys-auth/polkit-0.110[${MULTILIB_USEDEP}] )"
 RDEPEND="${COMMON_DEPEND}
 	kernel_linux? ( sys-apps/coreutils[acl?] )
 	selinux? ( sec-policy/selinux-consolekit )"
 DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
+	dev-libs/libxslt[${MULTILIB_USEDEP}]
 	virtual/pkgconfig
 	doc? ( app-text/xmlto )
 	test? (
@@ -58,7 +58,8 @@ src_prepare() {
 		"${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
+		"${FILESDIR}"/${PN}-0.4.5-polkit-automagic.patch \
+		"${FILESDIR}"/${PN}-0.4.6-pam-ck-connector-oot-build.patch
 
 	if ! use systemd-units; then
 		sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
@@ -67,7 +68,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myconf
 	if use systemd-units; then
 		myconf="$(systemd_with_unitdir)"
@@ -75,7 +76,7 @@ src_configure() {
 		myconf="--with-systemdsystemunitdir=/tmp"
 	fi
 
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		XMLTO_FLAGS='--skip-validation' \
 		--libexecdir="${EPREFIX}"/usr/lib/${MY_PN} \
 		--localstatedir="${EPREFIX}"/var \
@@ -90,12 +91,14 @@ src_configure() {
 		${myconf}
 }
 
-src_install() {
+multilib_src_install() {
 	emake \
 		DESTDIR="${D}" \
 		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		install
+}
 
+multilib_src_install_all() {
 	dosym /usr/lib/${MY_PN} /usr/lib/${PN}
 
 	dodoc AUTHORS HACKING NEWS README TODO
diff --git a/sys-auth/consolekit/files/consolekit-0.4.6-pam-ck-connector-oot-build.patch b/sys-auth/consolekit/files/consolekit-0.4.6-pam-ck-connector-oot-build.patch
new file mode 100644
index 0000000..464008c
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.4.6-pam-ck-connector-oot-build.patch
@@ -0,0 +1,11 @@
+--- a/pam-ck-connector/Makefile.am.orig	2013-12-21 02:43:09.620449521 -0800
++++ b/pam-ck-connector/Makefile.am	2013-12-21 02:43:11.955585606 -0800
+@@ -4,7 +4,7 @@
+ 
+ INCLUDES = 					\
+ 	$(LIBDBUS_CFLAGS)			\
+-	-I$(top_builddir)/libck-connector	\
++	-I$(top_srcdir)/libck-connector		\
+ 	$(NULL)
+ 
+ pamlibdir = $(PAM_MODULE_DIR)