USE=expat was quite useless, expat is mandatory in polkit. Don't create user 'polkituser', it was used by policykit, but isn't by polkit. Also, add introspection support

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 104 insertions, 13 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 5101e1203167..d5eecb14ec97 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.17 2010/06/04 19:50:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.18 2010/07/02 10:02:24 nirbheek Exp $
+
+*polkit-0.96-r2 (02 Jul 2010)
+
+  02 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +polkit-0.96-r2.ebuild, metadata.xml:
+  USE=expat was quite useless, expat is mandatory in polkit. Don't create
+  user 'polkituser', it was used by policykit, but isn't by polkit. Also,
+  add introspection support
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> polkit-0.96-r1.ebuild:
   x86 stable, bug #314899
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index df0e4beb28d3..58618e952ea6 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX polkit-0.96-getcwd.patch 652 RMD160 400afc6333cebf50dcdc0c5167cb6bd4dbaf8ea4 SHA1 9d2e3bfb472477ce3e58ab0259349f5acd4a00a4 SHA256 21cda125a62cf1c26f1cecbac223e9a6b00400486087be818243ee3ee4a93f7b
 DIST polkit-0.96-r1-shadow-support.patch.lzma 4970 RMD160 51c53d8be68bfdfa0b5a3eb2a4d8ddbba10c94b6 SHA1 bd4d3446aea77e3c84ad94a28f9644307921a086 SHA256 c7c323be29362816abd08463b962cd38a97c24f61d5f8b6da635e2bb329fa52a
 DIST polkit-0.96-shadow-support.patch.bz2 6138 RMD160 97ed7fc118e1f52f8182f872992eb068f5c98584 SHA1 83b53931a9cfe47a4e4b9501c0f75164dfa9ed11 SHA256 dde65f3795a2d1bef8f009a2f9bc0c3ee0130037bf012cf66b874128a76ef4e6
 DIST polkit-0.96.tar.gz 1034210 RMD160 19847f0835a3041446523066e6db58dfb60d3aae SHA1 0815b2ee2ffc2ebf2b6fc73491018a898fc73930 SHA256 3426ca917210b2a5525732559368c18f983a4c39a6a55c5dddba26071bd8054a
 EBUILD polkit-0.96-r1.ebuild 2636 RMD160 b32e6d0fda723ef942ddf46810f6a58db0a95f3e SHA1 574bc5a51a3000a091fb1291aa82131053ab4233 SHA256 0f25a5f3c0b0dbfcc53247ef92d151e7c5255a9121b1b3a0f3ca385269b4c030
+EBUILD polkit-0.96-r2.ebuild 2439 RMD160 aec40a2184b464f93f073da837ba99c11c1c4f11 SHA1 d8ec2256b0e8be47a0f2690ce7b8023809856471 SHA256 b84ce82d58299d3745a791ed4c40673ffe62396625c79258b6e49aed6b58cc50
 EBUILD polkit-0.96.ebuild 2579 RMD160 9dda733a60bf639e5003d3f69ae31f0457b0453b SHA1 5f7664e81c13651b41b71037a922844d50962f19 SHA256 cdafcfbd66e61b07c2aaef98ce19cfbb1049056948ad92bae5ca69d2e8184e4e
-MISC ChangeLog 2675 RMD160 11d2c9b98ba868815bc0f50b9674e4b45898d5bc SHA1 166b24a366378788408b02262ebfbf94f1bb3b90 SHA256 967ce605bfaeb283a901626c3bbb178b29f1dd5f9b12a051be8937ea470e3c19
-MISC metadata.xml 264 RMD160 f7bfc23d1c5e228cd950c1fa06e082cadd2ee9d9 SHA1 b4cdbdd94b4b8458da59d172dc5236e9258470b6 SHA256 732b5a3d20630082ef289dbde0c57aaa9cec42c19982ce6c735a02aa89ed113b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwJWLEACgkQkKaRLQcq0GLk4wCggdKjxlQOYnXnylzyzCKTRqgU
-tPMAn1883gM8cKI5p8Ki0B8gzf0PE0TY
-=uKOs
------END PGP SIGNATURE-----
+MISC ChangeLog 2979 RMD160 35dbcdb36d9140337c68ef452c2dbcdb385a8d00 SHA1 d571d8668f149b19018d3e5e70832cfb62d7d8b8 SHA256 1067051c1e44532e04864d73b8741417773edb450ba06a8b04bfd74272cc8f26
+MISC metadata.xml 382 RMD160 a1de2f0bbe45fa2eae8bccbb2c52abc3c360563b SHA1 6e874e8a2b69027d778ec2c556bc4a3c347505d8 SHA256 c9e19b020dccea9a19e76721c47195e9973c751c0a10cd7e9e3d941c6947ba10
diff --git a/sys-auth/polkit/metadata.xml b/sys-auth/polkit/metadata.xml
index 5f2c7e524af6..b98292dece09 100644
--- a/sys-auth/polkit/metadata.xml
+++ b/sys-auth/polkit/metadata.xml
@@ -6,5 +6,9 @@
 		<name>Nirbheek Chauhan</name>
 	</maintainer>
 	<herd>freedesktop</herd>
+	<use>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
+			introspection</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/sys-auth/polkit/polkit-0.96-r2.ebuild b/sys-auth/polkit/polkit-0.96-r2.ebuild
new file mode 100644
index 000000000000..bed7a4e62702
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.96-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.96-r2.ebuild,v 1.1 2010/07/02 10:02:24 nirbheek Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib pam
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="http://hal.freedesktop.org/docs/PolicyKit"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz
+!pam? ( mirror://gentoo/${P}-r1-shadow-support.patch.lzma )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc examples +introspection nls pam"
+
+# not mature enough
+RDEPEND=">=dev-libs/glib-2.21.4
+	>=dev-libs/eggdbus-0.6
+	dev-libs/expat
+	introspection? ( dev-libs/gobject-introspection )
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	!!>=sys-auth/policykit-0.92
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	>=dev-util/pkgconfig-0.18
+	>=dev-util/intltool-0.36
+	>=dev-util/gtk-doc-am-1.13
+	doc? ( >=dev-util/gtk-doc-1.13 )"
+PDEPEND=">=sys-auth/consolekit-0.4[policykit]"
+# gtk-doc-am-1.13 needed for eautoreconf
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-getcwd.patch"
+	if ! use pam; then
+		# Experimental shadow support, bug 291116
+		epatch "${WORKDIR}/${P}-r1-shadow-support.patch"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local conf
+
+	if use pam; then
+		conf="${conf} --with-authfw=pam
+			--with-pam-module-dir=$(getpam_mod_dir)"
+	else
+		conf="${conf} --with-authfw=shadow"
+	fi
+
+	# We define libexecdir due to fdo bug #22951
+	# easier to maintain than patching everything
+	econf ${conf} \
+		--disable-ansi \
+		--disable-examples \
+		--enable-fast-install \
+		--enable-libtool-lock \
+		--enable-man-pages \
+		--disable-dependency-tracking \
+		--with-os-type=gentoo \
+		--localstatedir=/var \
+		--libexecdir='${exec_prefix}/libexec/polkit-1' \
+		$(use_enable debug verbose-mode) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc NEWS README AUTHORS ChangeLog || die "dodoc failed"
+
+	# We disable example compilation above, and handle it here
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/examples/{*.c,*.policy*}
+	fi
+
+	# Need to keep a few directories around...
+	diropts -m0700 -o root -g root
+	keepdir /var/run/polkit-1
+	keepdir /var/lib/polkit-1
+}