Add experimental shadow support, bug 291116 . Patch thanks to the slackware folks.

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

3 files changed, 30 insertions, 12 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index cf23e3f382ab..48a1594c68d8 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2010/02/28 18:45:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.9 2010/03/07 00:07:51 nirbheek Exp $
+
+  07 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org> polkit-0.96.ebuild:
+  Add experimental shadow support, bug 291116 . Patch thanks to the
+  slackware folks.
 
   28 Feb 2010; Raúl Porcel <armin76@gentoo.org> polkit-0.96.ebuild:
   Add ~alpha/~arm/~ia64/~sparc
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 034e5d10d382..de083b18e85b 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,9 +1,10 @@
 AUX polkit-0.93-fix-daemon-name.patch 6486 RMD160 14e28fb6eb71b02f28cc93965c9d6e5130e54d31 SHA1 a2e96d69cbc4e82f74af58604dedb793f29500e8 SHA256 5cb26b2e469795ba7aee7b2c5f74bc7b29452427a22bf8c5566e6eb7495bf180
 DIST polkit-0.94.tar.gz 1009990 RMD160 379d067b837769710d2c3f9b236f01f454962a7a SHA1 581635f4ab1d7d37465e3bd481026c58408a54dc SHA256 8fd1dc321a700d78b43a62b1987f321b428bd2d8065468982069cb86bc8ef44f
 DIST polkit-0.95.tar.gz 1025805 RMD160 006cb41e52034166c789aae010047169588af600 SHA1 f851df141d66de9d1cbf49511d345ab318bdc416 SHA256 b484248ed8fa7419170cf98d7cba51d68290783c3c7cac7c5dab7605dfe3c79c
+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.94.ebuild 2101 RMD160 aee8fe6b883335ee0bdf6f6f3cd37af10934c695 SHA1 4680924ae7909d68086289ae2ccd8737e35b03a4 SHA256 cbbf5991482e0f03555f24d3b9f1a3c0b19350a39a3c059c778900a6479cc334
 EBUILD polkit-0.95.ebuild 2312 RMD160 6a78f6212b81362a6577873eb5673919c2592b6d SHA1 07eb1f4f6859548292620a818930e522dea9891b SHA256 cf3b90153f5ab7cfd716999c368c89009aaf845da409a8eef8669afe0b29d887
-EBUILD polkit-0.96.ebuild 2265 RMD160 8f827ca3ecbde4f3fb049a0353672533f4b15d9b SHA1 1ce6a212b33dc41b5382e66bbe6a533ca3bd9d7e SHA256 7bc29dacf673010baad6974d82d80808f3936c27aa1a57c5930412f497731562
-MISC ChangeLog 1472 RMD160 59d141a28a504f50540049483929aec2ae249d3f SHA1 e1cc58a8a87aceca604b27759e0a34258538ad19 SHA256 230e5d6c6a5de4889fddb5ac0f81fae859bac2ce9c648756f40ed93bb7dec106
+EBUILD polkit-0.96.ebuild 2525 RMD160 62c2f6341a1e4bfa1cc3d252b87adccb33c798e0 SHA1 1d36ef6fbaf1ceab3f7184448f15d1e5274b1d21 SHA256 2bcc0d3a401e30e6c15824251fbd8dd77a64257cbb6d8d7eac94bbff20763a85
+MISC ChangeLog 1635 RMD160 65ebe8796d0549aacebfcf49e263c73c98fc3069 SHA1 ba75b8a1746720280daac00d668953df5573e1bc SHA256 e201d1f671aaf2344babbfa26064d4ea4ff2d846ba2685758530f2f376ff5375
 MISC metadata.xml 264 RMD160 f7bfc23d1c5e228cd950c1fa06e082cadd2ee9d9 SHA1 b4cdbdd94b4b8458da59d172dc5236e9258470b6 SHA256 732b5a3d20630082ef289dbde0c57aaa9cec42c19982ce6c735a02aa89ed113b
diff --git a/sys-auth/polkit/polkit-0.96.ebuild b/sys-auth/polkit/polkit-0.96.ebuild
index 86e1e88f9134..85d971f080f4 100644
--- a/sys-auth/polkit/polkit-0.96.ebuild
+++ b/sys-auth/polkit/polkit-0.96.ebuild
@@ -1,27 +1,27 @@
 # 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.ebuild,v 1.3 2010/02/28 18:45:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.96.ebuild,v 1.4 2010/03/07 00:07:51 nirbheek Exp $
 
 EAPI="2"
 
-inherit eutils multilib pam
+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"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz
+mirror://gentoo/polkit-0.96-shadow-support.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc examples expat nls"
-# building w/o pam is broken, bug 291116
-# introspection pam
+IUSE="debug doc examples expat nls pam"
+# introspection
 
 # not mature enough
 #	introspection? ( dev-libs/gobject-introspection )
 RDEPEND=">=dev-libs/glib-2.21.4
 	>=dev-libs/eggdbus-0.6
-	virtual/pam
+	pam? ( virtual/pam )
 	expat? ( dev-libs/expat )"
 DEPEND="${RDEPEND}
 	!!>=sys-auth/policykit-0.92
@@ -38,6 +38,14 @@ pkg_setup() {
 	enewuser polkituser -1 "-1" /dev/null polkituser
 }
 
+src_prepare() {
+	if ! use pam; then
+		# Experimental shadow support, bug 291116
+		epatch "${WORKDIR}/${P}-shadow-support.patch"
+		eautoreconf
+	fi
+}
+
 src_configure() {
 	local conf
 
@@ -45,6 +53,13 @@ src_configure() {
 		conf="${conf} --with-expat=/usr"
 	fi
 
+	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} \
@@ -58,8 +73,6 @@ src_configure() {
 		--with-os-type=gentoo \
 		--localstatedir=/var \
 		--libexecdir='${exec_prefix}/libexec/polkit-1' \
-		--with-authfw=pam \
-		--with-pam-module-dir=$(getpam_mod_dir) \
 		$(use_enable debug verbose-mode) \
 		$(use_enable doc gtk-doc) \
 		$(use_enable nls)