Dummy revision bump to let upstream ./configure determine udevdir from udev.pc pkg-config file.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 129 insertions, 10 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index ea4fcb05009c..50f0ca5dc2b6 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.133 2012/07/30 22:53:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.134 2012/08/08 14:42:09 ssuominen Exp $
+
+*consolekit-0.4.5_p20120320-r1 (08 Aug 2012)
+
+  08 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +consolekit-0.4.5_p20120320-r1.ebuild:
+  Dummy revision bump to let upstream ./configure determine udevdir from
+  udev.pc pkg-config file.
 
   30 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
   consolekit-0.4.5_p20120320.ebuild:
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index dcda90b0cc0e..5af6a20c4f7f 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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
@@ -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 3044 SHA256 e1ce899dcb07c6731700be8125790ed44b1dd73bd5b4f96e16e2a22d7b60c5a7 SHA512 e4fa8466db7bb3e4509c51b6d1805e90ab48f1e6a964b6c9e009f56d5acfc172d0646c76a1d57992a654e134eb7ef00267e3697b9a499b8f2c94a08d79e6005f WHIRLPOOL 8d6d4a2ce7e4c90ead592a3c2690176333ce88a6b06fcd4e8e2f0479719a42d4e831367f99c2239d614f037c455b192090fee66febccb795284497865f747bfc
 EBUILD consolekit-0.4.5_p20120320.ebuild 3049 SHA256 82dd70ba8644c0a7d2f3aba605f2dbc46b3cada95ae36b4f9784714ee42bf2d9 SHA512 ffc7b36d8778680345e23a1c4610748d3729494870da0ebda2c7846776a418b46a710da6293da42048f687bdf4f3655e657fe52f62b6e9e3762789dca28fa376 WHIRLPOOL 3c6aa35585f9409bdba2c2e1cf4c19f1b5706da0bebcaf4d7c6f660aa1e29eee9eeb034b1748503c3b1271ab00a08b0573778e4def61ffb85de110df75384356
-MISC ChangeLog 19942 SHA256 f2dcadbe75de564c1d6e6776d1c473a8a224eff1f934817e08046fecf0891790 SHA512 4310be5121015f1114db42c3e6bc5702be5ffd239fce60125837cc75b744d3a18b45ac0d27e77acd923b9ade1d6a6786a6f2adc47c29f488cc7c199a7499e293 WHIRLPOOL 8c12edd6c487cb9d54fc67d95c36c4e44f875bf8d7856dbf0c256822183496a60dda4e72c01d3213fff10995760f426477304789f9cb1d30433f4b34d71a3c72
+MISC ChangeLog 20184 SHA256 dbf31635b7ec8718953ed6014bda27c227c5cfca05cf1bd6d94f6c1a462bb750 SHA512 fb6af116c939fd101dd4f088ab36f2acdf74fd48d1317e1b0d8bead5a10562b15a5cb5d0957136c4f78bd06f0444af6e5f6181a9859d519d4d0f4115ded0127a WHIRLPOOL 9ecc2f29488809eec311eac4d0cacb09e7d0defc1712f8cfb564c7d8c7e6cf00b4b02f8cf70dc0e76385b6fe1c1130668068ef99d708030029232f74f6c6590f
 MISC metadata.xml 313 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b SHA512 d948611c395f0d4144d937d0e2e9ddf6ec0eea5f2f70553ea58a40c7132bf3b6839a741508711ffecf480fef0b1905f703273184e6e51b27afe22e7f5c831346 WHIRLPOOL 5448720853d00b6b6b1edf6323d6b1240891be64667423c69068961e302eb7c816b3367b2c58d0fa37fc1289e0970d55bbc07be4e21116edc09f60ae3314ea2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQFxGmAAoJEEdUh39IaPFN3mgIAIxxgN8QM3D1eYUt7Hr1EF2S
-mcn2OrZMhbrPK/Rl6cmAOrt9xmbInlt3z80vGP2Xxl3xZGkCeX544Cgz4iMV0GUD
-21gRgm6LxvBKKqvMPhlaton7ozub5dikSjk98VAKY//yW98EU1Ck0sxI5g045Y8M
-EP1tzhHBOOVQi5pftCaHVSTK9NfqPI43i5F76nmdETHSeF/8+tbd6LlqSIB/Iueo
-pZESfcV+RwPKza67EW1327U1rRqQp9y4YUnZ+KtJH+gDlzblh0TjyQJwsjhJyyMj
-c2YL4v/AHF0Bc0XJjfsuLXJ3T6afAEeLzdP1bibK9fJ0iy/VtzB7H7HZKILkkRQ=
-=7Vvh
+iQEcBAEBCAAGBQJQInq0AAoJEEdUh39IaPFNUk0H/2RPxGVDCrPjOO40X6WQVvY2
+LxwrC5VbDWzRgRH227RF0qD0KkAukm9vrbs0MJkY1YfgnaRMeFhdZ8A0S0bZbk5L
+1kmJVHGUz1mYySk4Yt/RVfYdksugRSc8aCrrirTU+XZg1OkYFt03Ezv1BumuqeXI
+mLkjscXvV+Hcu1j/Y9JlWLSXwuZOZ7/Ek4PFy6xwM1KfgaellWgxVJGeyGEXNRL6
+aoyp/3Z4tqzGsofovAublM65lPWraRQJwadMnsbgSrMCIPc62m3hCzztVcYztLSq
+mFoDMGBJbh2sXaREUVXKd2hjrxgGRGduxZPtx+T7s4BteBXJ+2Zywca7fVdvf9g=
+=YVRJ
 -----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
new file mode 100644
index 000000000000..d7ebf6867277
--- /dev/null
+++ b/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2012 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.1 2012/08/08 14:42:09 ssuominen Exp $
+
+EAPI=4
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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
+	acl? (
+		sys-apps/acl
+		>=sys-fs/udev-146-r1
+		!<sys-fs/udev-171-r6[extras]
+		)
+	pam? ( virtual/pam )
+	policykit? ( >=sys-auth/polkit-0.104-r1 )"
+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}
+
+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" \
+		--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
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}