gentoo resync : 25.12.2017

3 files changed, 135 insertions, 2 deletions

diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index a38ae244b8da..8723387b5d12 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -11,10 +11,12 @@ DIST ConsoleKit-0.4.6.tar.xz 366572 BLAKE2B ab4c277fd47b8f99ce8c5a67de86e89b1bdd
 DIST ConsoleKit2-1.1.0.tar.bz2 630178 BLAKE2B 20d1994a19fbe03d411ac5437f77b75571fbdc19478100676e51e2a1232c643f4b0c86125b5bf1d42aeb5cfb7c8b34601221d674ac27d9bf3112fcd8a83afacb SHA512 14ded07d4140e7a31132de21e84c2878475676b8c98f72b42340708972ed384abb9ba9380d74719718fc220c001387c788cf709cd15f8b19d598467dfe8a57df
 DIST ConsoleKit2-1.1.2.tar.bz2 1125567 BLAKE2B 1b7c60d224ea4197687c566d324a302aa2f5ed92ed0cfc563ba4d42f78af2999d1693e4587208e5412d042fb0cff99919dfa02ca5b5a43bda3310c17b39ca5d6 SHA512 fadca85e05c176b06ead40fba5c068d497bf69bcc322287363d0c27cdd6627b758295db1ef534b908c0e6240486430d8cb36660b4d71216a60d19a52d6d0db39
 DIST ConsoleKit2-1.2.0.tar.bz2 1125402 BLAKE2B c2119287ff173783c377a1353f8ce59432f8aa3e64f654716c895fadb5d07462069e457aae7925a6c44bc48bfd4147fc10e9f488a39714386fb6c14bced09f36 SHA512 c0f6e629b7229c2ffaafe8da899970b48c8372402447af18560fffd8804d9ab91a4ad2eb82c8f648a14807f8ccc5fb1ab4366de14faa8a2d5fb3767a6a4253f7
+DIST ConsoleKit2-1.2.1.tar.bz2 1182946 BLAKE2B f76f99008c78bd3a318c918776129072944e4c3ac18348960e3a725179d3ce4dc2cfb4d04ec5c143bb998f23f63cf36c0f88d8296dc3d0a382a138f3a0a2fecc SHA512 31befe89f7fa604138bfb0722fc6cf12f0934bac004f98fc331004eb5a7f466ed7bd0dc9adc9869da739974208f9a3bc125068ff8a60d4b2badb58ef70a3eb10
 DIST consolekit_0.4.6-4.debian.tar.gz 12192 BLAKE2B e88ed907ea3ceecb9ac399618614b1aa5d7eb2c46a706451d78e4ec1598dee5a02d6c5a1b0dd678f6bed4c25277884ec6969a23f8181ef3d8ede94452b6570db SHA512 f7fc5965b1f495d16a8ca167940431bc2569e9bde9e4a356b9c9ed00c2825db61da7b6db3d434d977fff72b3aaef30c455a365b9eba282a887a523753613b58f
 EBUILD consolekit-0.4.6.ebuild 3396 BLAKE2B 6e271acbf554e69a9cf82886db1e30991a703cc859d993784f3aac83fb8c4ff8d9fcdc2b55861a141689a8d12241fbdc6c4279f2b04b9d5cc244d1393329a2db SHA512 2a0acd029eb9db8d3035d0fbdc52e5c0cf6a84779dfd41d7175970b8c4ff8600292302740d375eacf8fa0939714d82c3c602f285abf811fa36e29c3e41eb7e3a
 EBUILD consolekit-1.1.0-r1.ebuild 3238 BLAKE2B 98ff5d64cc793705bc1d8da4b7cc4ed17803de1ae0c9fb4bc9e974ecc500f544e4839b198b905f369ed4b2f7006d7b60f4c058f540bfd11e690780f0349c9ce6 SHA512 d124ec42562ab4bb87e34344dd165a70f5fb0116f016d901dd6f2cfa3123540f72ec1466c0c40406f9b1a7629c4a2854c8905ba24984851cf4acfdcd1a3226b8
 EBUILD consolekit-1.1.2.ebuild 3506 BLAKE2B 7fa5f544b6a719af936a6711efea152d2e9f6417e9c7ff5c553621b7e97dbd1fe296089ee2d0cadd3bbc278f22426230638e149759e06d39c6641ca07b81b13c SHA512 494dfef7daec6b1741d00286b73c2e50517be6611697111e1c454639b2ab92dda8e71085f515d08469170af4a174f302da27a8df5c914c84dcd0733d5a5dd118
-EBUILD consolekit-1.2.0.ebuild 3537 BLAKE2B 6173fd587df19d4b9a53fa1bc70be2ce2b6b612649a9f0c7df481caea07174c17b5aa6ebfc757ed50f00fced0cf91195519019cb4dc667cbe74b10a9ff17ea11 SHA512 55d97dc93baa40415c91ec047506dafe3a98c148ea121f64d5f3f2191ecd2aea5cb253bbc1189042525faff39e3123a990fdb764b65689fbae71aeee32eec67a
+EBUILD consolekit-1.2.0.ebuild 3536 BLAKE2B a81c924777247d150bd38a4eeff981cecce3c6f8b49049e09954ac3a7c618cd5aa0bd544ef00d96af5620330d093f7f4c409fa78823a0f79f4534e29958769d0 SHA512 01bb70d8482df358a9a0b67deb9eb347a6c93cca051388e521f056b81fc7c2aebd3eb56055f0f03e59efa583c6f7b94338e5ecb9d789b27d9cf5420c254fec00
+EBUILD consolekit-1.2.1.ebuild 3544 BLAKE2B edd3668f348028412d4ddad3767e32b3c32148be4d58297c8cd1fe3b7b04f57befc0ca8dece505030117ca4287a546601178b8ae4915aac620ec6c3abfde0fcc SHA512 03019491f7e0972f11e0af0f8430bd78537145b52f6ab23e8461fe620fc27d62cebce6781d1f11d0c85246945c71dbe21c86a4c78772eb8057cbbde454f42cda
 EBUILD consolekit-9999.ebuild 3311 BLAKE2B 7210f04e5d06c75375122a984ad04c47043811b83b2ff208e1e3dd2e8d3667a52c9db0fd3f3a82cb1a4dda9c8effa7b49495ee9f9a5bf0e4e89595b9dd73bb1b SHA512 d28c3a5da5ece93cf7e9f22746ffcbd53beee19b9106258c210b4ff937713cff650771cdfd4d2919d4122517f2e534d5e7861d3a8392d4fc4e691e92a25e4b69
 MISC metadata.xml 1053 BLAKE2B 221df4a94a8c48265cc70ab9fa60a409fdfaa0cf9662a3b89b3851e6aac9664e183e54bf09b957ee5f8f69dd3bdcb9d5c8493071d00dde7daf11378f0bed2fd7 SHA512 866958aa11b4410414886c8de76948212e356bb9784f241238aae0bb1b5cccc39731b660ec7affe88aff1095470c37ff076bd09a7546d202aa7a95acc5748014
diff --git a/sys-auth/consolekit/consolekit-1.2.0.ebuild b/sys-auth/consolekit/consolekit-1.2.0.ebuild
index 4c16532eb8d7..d844f7c615c9 100644
--- a/sys-auth/consolekit/consolekit-1.2.0.ebuild
+++ b/sys-auth/consolekit/consolekit-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
 
 COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
diff --git a/sys-auth/consolekit/consolekit-1.2.1.ebuild b/sys-auth/consolekit/consolekit-1.2.1.ebuild
new file mode 100644
index 000000000000..ad224d1d9a6a
--- /dev/null
+++ b/sys-auth/consolekit/consolekit-1.2.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools libtool linux-info pam xdg-utils
+
+MY_PN=ConsoleKit2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
+HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
+
+COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
+	>=sys-devel/gettext-0.19
+	sys-apps/dbus
+	sys-libs/zlib:=
+	x11-libs/libX11:=
+	acl? (
+		sys-apps/acl:=
+		>=virtual/udev-200
+		)
+	cgroups? (
+		app-admin/cgmanager
+		>=sys-libs/libnih-1.0.2[dbus]
+		)
+	evdev? ( dev-libs/libevdev:= )
+	udev? (
+		virtual/libudev
+		x11-libs/libdrm:=
+	)
+	pam? ( virtual/pam )
+	policykit? ( >=sys-auth/polkit-0.110 )
+	selinux? ( sys-libs/libselinux )"
+# pm-utils: bug 557432
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/coreutils[acl?] )
+	pm-utils? ( sys-power/pm-utils )
+	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 https://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() {
+	xdg_environment_reset
+
+	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
+
+	default
+	# patch needs autoreconf, so dont need libtoolize
+	eautoreconf
+	#elibtoolize # bug 593314
+}
+
+src_configure() {
+	econf \
+		XMLTO_FLAGS='--skip-validation' \
+		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
+		--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 evdev libevdev) \
+		$(use_enable acl udev-acl) \
+		$(use_enable cgroups libcgmanager) \
+		$(use_enable selinux libselinux) \
+		$(use_enable udev libdrm) \
+		$(use_enable udev libudev) \
+		$(use_enable test tests) \
+		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
+		--with-pam-module-dir="$(getpam_mod_dir)" \
+		--with-xinitrc-dir="${EPREFIX}"/etc/X11/xinit/xinitrc.d \
+		--without-systemdsystemunitdir
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
+
+	dodoc AUTHORS HACKING NEWS README TODO
+
+	newinitd "${FILESDIR}"/${PN}-1.0.0.initd 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
+
+	if use kernel_linux; then
+		# bug 571524
+		exeinto /usr/lib/ConsoleKit/run-session.d
+		doexe "${FILESDIR}"/pam-foreground-compat.ck
+	fi
+
+	prune_libtool_files --all # --all for pam_ck_connector.la
+
+	rm -rf "${ED}"/var/run || die # let the init script create the directory
+}