Bump to 0.3.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 161 insertions, 3 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index b0e436741f6c..6a75c79bc207 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.41 2009/02/17 15:54:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.42 2009/02/18 22:16:04 eva Exp $
+
+*consolekit-0.3.0 (18 Feb 2009)
+
+  18 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/consolekit-0.3.0-shutdown.patch, metadata.xml,
+  +consolekit-0.3.0.ebuild:
+  Bump to 0.3.
 
   17 Feb 2009; Raúl Porcel <armin76@gentoo.org> consolekit-0.2.10.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #242270
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index c734d8f556f0..2222f71de1be 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 90-consolekit 272 RMD160 63bfb8c8320ce5590013848632f4d03bbeecdb90 SHA1 094f29f3efc6523db9d464f1d67e64a87214abbe SHA256 7a133beda59eace7572849ffaff305c3627860d26735bbbd0352620f626f0cb9
 AUX consolekit-0.1.rc 540 RMD160 0db24125d14b177ac54819f4d57fcac589a86bf3 SHA1 e1001914190b644d1557034f5534ba412e4ead57 SHA256 53510ed5f365af2f5fc760fb9462aea660ba54cbbd5f4c6be8d3bc75c4c399c8
 AUX consolekit-0.2.10-cleanup_console_tags.patch 1680 RMD160 1fccda3d4da3197ba9416b12177d05dd4a2e9705 SHA1 a7c0a267ce9950e8e3887abbe7a778e70f24a26b SHA256 1bc8323346d3a58c23d3790a317b7965dbd964b2307ef9bc6a8374f45a34f0f7
@@ -5,11 +8,21 @@ AUX consolekit-0.2.10-directory-leak.patch 270 RMD160 b0fadcdbeb020d31a294f67b1e
 AUX consolekit-0.2.10-pam-add-nox11.patch 2258 RMD160 23b77cc0397e08bfc367bbe6683d44d67b9e5a22 SHA1 051973327b7a629d84ecb938980c7bf110c6f8fc SHA256 1e96db20c78b4b983ac89f98ebaeeb5ef08239916ada6e7ecfff3e9c12c8f1ef
 AUX consolekit-0.2.10-polkit-automagic.patch 988 RMD160 1146e1c30b327191a5429e54eb7d42d600f4e1b1 SHA1 ada8d56ab096dc49d609f1d9f44679971936c0df SHA256 9e31ae84ec3d838aaaddaa1fee1b68f7bf02e6c16935ca2a7a3cc086ff868433
 AUX consolekit-0.2.3-freebsd.patch 2945 RMD160 e1193ba4010daa33c9646ed8a78a374944ea73dc SHA1 10af67cab72a184fbe89ba36330a20020ae60206 SHA256 f17aa9f3229a24d6bd4291c9f249396864eceb9c01ed00e5c97172c1c57932c5
+AUX consolekit-0.3.0-shutdown.patch 924 RMD160 d0ad31aed472df41f94327c0625b64aee31fc6ed SHA1 f02205b3273047afdfe4438fac4f71f50655112b SHA256 7016cf51e86a5e87104ce960524fa4c75a1f7362d7b3d8d8e0e3e5f8469132ab
 AUX pam-foreground-compat.ck 389 RMD160 b72a66d5fde612a825fb60f0f1402a0665cc6d81 SHA1 25c3e54e326606e6c476e0dbb9637e2e551a6ccc SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9
 DIST ConsoleKit-0.2.10.tar.gz 521473 RMD160 fa75c371a28803c990c9293732229e2c67625ff6 SHA1 ac4107f2239b072156f4a815609ea1c6fbb5f6cf SHA256 02b9510f65256db33a5e079736bb7234cd5599bf02dc77399d81d50cf5183bcb
 DIST ConsoleKit-0.2.3.tar.gz 468591 RMD160 457c1a08e9d2fc789537127c9d069088588c035b SHA1 009f731aa4331125ef052e587d7b0583e07ee8aa SHA256 1b9571f958d3c3be464a6261947c6f817948e878166bca4616f4ac3ac9f02e47
+DIST ConsoleKit-0.3.0.tar.bz2 393694 RMD160 7a1ebd2f4bfb65690e70138c9923c3fd2fcaf671 SHA1 e3b6156622cc14ebca7382a55b8ed15f2f2bad98 SHA256 cbcfbb3df2dc76855c99c1cdff04a257ec5270fa62e1d21b0d057b08d88c0fd4
 EBUILD consolekit-0.2.10-r1.ebuild 2768 RMD160 c44a62b09b231287ffc72fec96c84e56bd42f3df SHA1 8406b5d935849435bd67bcce0b4444897775f1f3 SHA256 404af122ffd8e4c379305bd9c3c281416314443b929dbc1578d4b1c6f88eda86
 EBUILD consolekit-0.2.10.ebuild 1832 RMD160 2c5431cbf1e3f8d14e6ac7153683740c8eff0e6a SHA1 a7e5a4d0c3125c433f879a8dc02930411ebfc563 SHA256 c49b222cd801d191159e396a58fc1ff350e1c4497b9d0494dc9c41c192ee1467
 EBUILD consolekit-0.2.3.ebuild 1974 RMD160 dc7a31ad67bb006431223c6db2904be818d0cd18 SHA1 d28953c9196c2c21c497169a586a89b5a2595d70 SHA256 86a16b9373650a8b41e45c9187d8007300c86fb3a7f9ed034fcc39d758eb7672
-MISC ChangeLog 6010 RMD160 cde4e8c3e1c7d21ce6892630e148eb924e49fe33 SHA1 030497a8cedb87b73e9a7534e631e0039b1777bd SHA256 7a5631cff64bad6d0ece7c1f3c7e064c0080d3e43bcd25074e72211fc2df9658
-MISC metadata.xml 164 RMD160 7d567afe05ca87a772eedf19f5b1fd1e2a9798a7 SHA1 e7b1ab05868d9feb1fa1677c052836fd7dd6a171 SHA256 66cdaff449660e99dfaee8d19b47413fc8ced6d5a1eccd3c842a48e9d9668d48
+EBUILD consolekit-0.3.0.ebuild 2995 RMD160 70a7d30b0c63c3960ec2c6d20ecafea486bfc1d8 SHA1 be6a0257c1e0eac63fbccdb59754cc741ae9401c SHA256 165b9112b7d2f8bd2454c3ef2bf486042f99eb8758aed811e443eb0c0edeaf1a
+MISC ChangeLog 6193 RMD160 2e02a2d8fc840fdf3c96e1340c3977637ab17b49 SHA1 ec847d46a12c5abe740bf7c9c48ce36b68c48bdb SHA256 822ec85c020def6a2e643bbdf78a6f7d9c57c2fadc26d2a96af8204edc48f6ec
+MISC metadata.xml 316 RMD160 0d18a4fee930a899bcd1eeff6fc7fe4de491f71b SHA1 0643d12b32e383861623f4f257f9d5b1446a90da SHA256 d026b12ac11b38e175987871769588146cf0c587a1462559cd1581ae05aaa83d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmciK4ACgkQ1fmVwcYIWAZWzwCfR+abBssqVBIs77ORHk6jq77d
+tMwAn1LGMWReft6raJkeRaaWRn9YET86
+=t4uL
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.3.0.ebuild b/sys-auth/consolekit/consolekit-0.3.0.ebuild
new file mode 100644
index 000000000000..c595a3aac06e
--- /dev/null
+++ b/sys-auth/consolekit/consolekit-0.3.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.3.0.ebuild,v 1.1 2009/02/18 22:16:04 eva Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib pam
+
+MY_PN="ConsoleKit"
+MY_PV="${PV//_pre*/}"
+
+DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
+SRC_URI="http://people.freedesktop.org/~mccann/dist/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc pam policykit"
+
+RDEPEND=">=dev-libs/glib-2.7
+	>=dev-libs/dbus-glib-0.61
+	>=x11-libs/libX11-1.0.0
+	pam? ( virtual/pam )
+	policykit? ( >=sys-auth/policykit-0.7 )
+	elibc_glibc? ( !=sys-libs/glibc-2.4* )
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-libs/libxslt
+	doc? ( app-text/xmlto )"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+	# Fix directory leaks, bug #258685
+	epatch "${FILESDIR}/${PN}-0.2.10-directory-leak.patch"
+
+	# Clean up at_console compat files, bug #257761
+	epatch "${FILESDIR}/${PN}-0.2.10-cleanup_console_tags.patch"
+
+	# Add nox11 option to no interfere with Xsession script, bug #257763
+	epatch "${FILESDIR}/${PN}-0.2.10-pam-add-nox11.patch"
+
+	# Fix automagic dependency on policykit
+	epatch "${FILESDIR}/${PN}-0.2.10-polkit-automagic.patch"
+
+	# Fix inability to shutdown/restart
+	epatch "${FILESDIR}/${P}-shutdown.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable doc docbook-docs) \
+		$(use_enable pam pam-module) \
+		$(use_enable policykit polkit) \
+		--with-pam-module-dir=/$(getpam_mod_dir) \
+		--with-dbus-services=/usr/share/dbus-1/services/ \
+		--localstatedir=/var
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# crappy Redhat init script
+	rm -f "${D}/etc/rc.d/init.d/ConsoleKit"
+
+	# Portage barfs on .la files
+	rm -f "${D}/$(get_libdir)/security/pam_ck_connector.la"
+
+	# Gentoo style init script
+	newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
+
+	# Some PM drop empty dirs, bug #257164
+	keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d
+	keepdir /etc/ConsoleKit/run-session.d
+	keepdir /var/run/ConsoleKit
+	keepdir /var/log/ConsoleKit
+
+	insinto /etc/X11/xinit/xinitrc.d/
+	doins "${FILESDIR}/90-consolekit" || die "doins failed"
+
+	exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d/
+	doexe "${FILESDIR}/pam-foreground-compat.ck" || die "doexe failed"
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "You need to restart ConsoleKit to get the new features."
+	ewarn "This can be done with /etc/init.d/consolekit restart"
+	ewarn "but make sure you do this and then restart your session"
+	ewarn "otherwise you will get access denied for certain actions"
+
+	ewarn
+	ewarn "You need to chmod +x /etc/X11/xinit/xinitrc.d/90-consolekit"
+	ewarn "to benefit of consolekit if you are not using gdm or pam integration."
+}
diff --git a/sys-auth/consolekit/files/consolekit-0.3.0-shutdown.patch b/sys-auth/consolekit/files/consolekit-0.3.0-shutdown.patch
new file mode 100644
index 000000000000..682f8208c6d5
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.3.0-shutdown.patch
@@ -0,0 +1,32 @@
+From b09ddd0f5c9de463ad0d1ebd329a9d16b084e192 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 1 Oct 2008 22:27:24 +0200
+Subject: [PATCH] allow shutdown without policykit or RBAC intervention.
+
+---
+ src/ck-manager.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/src/ck-manager.c b/src/ck-manager.c
+index bcb9350..54a78e6 100644
+--- a/src/ck-manager.c
++++ b/src/ck-manager.c
+@@ -1349,7 +1349,6 @@ ck_manager_restart (CkManager             *manager,
+         }
+ #else
+         g_warning ("Compiled without PolicyKit or RBAC support!");
+-        goto out;
+ #endif
+ 
+         g_debug ("ConsoleKit preforming Restart: %s", action);
+@@ -1409,7 +1408,6 @@ ck_manager_stop (CkManager             *manager,
+         }
+ #else
+         g_warning ("Compiled without PolicyKit or RBAC support!");
+-        goto out;
+ #endif
+ 
+         g_debug ("Stopping system");
+-- 
+1.6.0.2
+
diff --git a/sys-auth/consolekit/metadata.xml b/sys-auth/consolekit/metadata.xml
index 941d094fcec5..552f3cfb6b3f 100644
--- a/sys-auth/consolekit/metadata.xml
+++ b/sys-auth/consolekit/metadata.xml
@@ -2,4 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>freedesktop</herd>
+<use>
+	<flag name="policykit">
+	Use the PolicyKit framework (<pkg>sys-auth/policykit</pkg>) to get
+	authorization for suspend/shutdown.
+	</flag>
+</use>
 </pkgmetadata>