old

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

4 files changed, 29 insertions, 119 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index e703f0ef6cad..3ee93f255007 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,14 @@
 # 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.149 2012/12/30 14:18:06 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.150 2013/01/17 16:17:43 ssuominen Exp $
+
+  17 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -consolekit-0.4.5_p20120320.ebuild:
+  old
+
+  17 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  consolekit-0.4.5_p20120320-r1.ebuild:
+  sh stable wrt #436666
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org>
   consolekit-0.4.5_p20120320-r1.ebuild:
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index a645bc077d1b..0c00df3a0eb3 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 AUX consolekit-0.4.5-polkit-automagic.patch 870 SHA256 7cd8e4ecc868b0d2566cc0d0b7b3d13a006fe55ff425314d15ecff83e550d184 SHA512 50c2bafe2bf995bd5ef863557a1783211e172d77d819c8001c9007b4833b4e6b3ccfa7c04bf6811086dff6371be488411fdd23a49cecec3f545c388a0bbd61ab WHIRLPOOL 5611fdb8f17afd662ce0f745334dcbbb606fb8247ae18f914ae233cb7c024f418b94b4e353d6513c67c4346475af98d02d5551b4cb88e511df21eb765cbd1cb7
@@ -6,7 +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 3035 SHA256 a7bbf3672f4852377d096ed900dec8405d1b46f0304aec5b9e8cd93dc41a1e02 SHA512 088f81cb243198982b4a9247c8bc433b0007cbaa338848239d2460a3a248deee40541b2f2f564e0ee825e8bc2ceb0894054dacbc116c790f80062cb7a4368d1d WHIRLPOOL d62371dfd3974cb6d9a4e4ece7c9c65614f5eaf619d850e4450a50e2590ef0f331fd29ff0c90f9224caf7f668e078c542067375c01c40bf749297dfb95153b21
-EBUILD consolekit-0.4.5_p20120320.ebuild 3039 SHA256 97b9dc171228708dfb15d6c35e60dfca3f14689bd8b12482b622cdd67a1720dc SHA512 66f7b8e040190c0a0d896e414cabef1d3d1183b871a207789b5a8c5e4d8e448eb1ba8796814439cf08e16a56d2cd27ad07c7ec7e780359bea9588c4b70b2955b WHIRLPOOL 6341d1c900f89e6b33e9004b582baf6892892a13bb9daabb5319c37b3d72f98635ccf07588e651c203bd4c3d964981fbf39caf75080ce3764a3bb81ff5115518
-MISC ChangeLog 22786 SHA256 2d38a98d37ddaef51373d196d7bd59f1d0e8a1961f877821f95dca062305f466 SHA512 1a995205613c9e3f0d378493e10fe36cdfed61fb4b9911b7775383fa5404bada1a5558458466c539bb5dededced6662c82b461baa7dccde741c9a34588e4a10d WHIRLPOOL d055704c7fcf2a20143f892da1e159471ced1770e127a584ae4fdaa2cfdf8bb2aaa647da0c0900b604091c88d61f96b461bf7c85f3f719252fa57761261c7db1
+EBUILD consolekit-0.4.5_p20120320-r1.ebuild 3040 SHA256 1945fdfb1d48e201f51c8404183843973be013d2ec1abb8009e647825945d616 SHA512 e57acc4c14d9845e322752f4d57bee85634a935b8c14b959af36b07afd6056255a828e81f62327c29cab9d1224a5f61549406e44c8f5b71439aa04f804b8f8bd WHIRLPOOL f148292e28f771edea6cefcc4532aac3e3f32deb8db5516b2f62ceabee43a63cbb3d1229bac4e577b9ed605b759f83265618e7bc790a58271cb89145b39e0049
+MISC ChangeLog 23010 SHA256 ba7cb81f601a77978c0aaec57a76d499acf1d2768f5a3a7686746895ce18c2b1 SHA512 eb1aeedff60eef8857bb41e68f853a7bed11968537c5e9bee2f8f2650ddc7d402183f17ddb364d1ba123f91c27d4af768b114050137bdbf5aba07e2bdf0f83af WHIRLPOOL 21c384055322099accff64e01ba61a0e86a78d43b0cf8e090feebef38b9c79e205e99e8429ed069d94cf76f306c4b51f89ad4cc1c2b62937b71f6cf1c44fa154
 MISC metadata.xml 313 SHA256 a59fecba81d8bb5f8cc5d32815107f8087d3c1274c72dc42061bc0a720b0504b SHA512 d948611c395f0d4144d937d0e2e9ddf6ec0eea5f2f70553ea58a40c7132bf3b6839a741508711ffecf480fef0b1905f703273184e6e51b27afe22e7f5c831346 WHIRLPOOL 5448720853d00b6b6b1edf6323d6b1240891be64667423c69068961e302eb7c816b3367b2c58d0fa37fc1289e0970d55bbc07be4e21116edc09f60ae3314ea2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ+CPYAAoJEEdUh39IaPFNO+gH/0Fci85jJ9yNw6uJrz2upbX5
+0Q3GmvN4SSktr4eJo2ourtCKDoif1xW35ZYM0ZYNtLOe+4JM9Z7knr82MNVYWC9s
+ViFZ5/E+ttHtnDX2lp52Jbi2RvyPfASwWmDTPK6GYqQ7bzopCGPizzkQXaTABDO7
+XWKGvUmRELwlLXMZfADNg8QN6Lqo15xTDjX4bDr24VgAKs+BN9jFjfIn3L9efppH
+XLXqRSTtj9czReyggPT+x8jZD+suXKu4SZbesFESZriGgY9R9OBLhCEp/HfaKIQT
+bl3MMD5heuZarQxTfIUwvvXCl4KjkWSvnnHv3PF+NbfOEvjk6vRDSVOuFwUl+gs=
+=e9z3
+-----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 ffba094bdbde..69760f3e638a 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-2012 Gentoo Foundation
+# 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.15 2012/12/30 14:18:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild,v 1.16 2013/01/17 16:17:43 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils linux-info pam systemd
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm 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
diff --git a/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild b/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild
deleted file mode 100644
index 75ee6709e17a..000000000000
--- a/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.ebuild,v 1.19 2012/11/28 23:07:02 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="http://dev.gentoo.org/~ssuominen/${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 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
-		virtual/udev
-		!<sys-fs/udev-171-r9999[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 {} +
-}