clean up

(Portage version: 2.2_rc90/cvs/Linux x86_64)

4 files changed, 12 insertions, 114 deletions

diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 6a6636e3af1d..2eec4ca7c0e7 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,11 +1,9 @@
-AUX polkit-0.96-getcwd.patch 652 RMD160 400afc6333cebf50dcdc0c5167cb6bd4dbaf8ea4 SHA1 9d2e3bfb472477ce3e58ab0259349f5acd4a00a4 SHA256 21cda125a62cf1c26f1cecbac223e9a6b00400486087be818243ee3ee4a93f7b
+AUX polkit-0.96-getcwd.patch 576 RMD160 107abc47650cfe9dadaa2180a20a389a693a9e77 SHA1 68a9f2b46ab902e67c29576802e20e6b89624fbe SHA256 175a6e80a2563721e060f321ec152310e90c48ab62c5b3fd092e177222a1a9d2
 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
 DIST polkit-0.99.tar.gz 1042461 RMD160 bb3556732e658b1a3ca51129d05ae96aec734ec9 SHA1 4c1fcabfa51bb3f716258a855a22366e7ed1ee22 SHA256 f612c7c26ec822f67751420057a4ae113fc50ab51070758faacf2ad30bb3583f
 EBUILD polkit-0.96-r1.ebuild 3916 RMD160 10eb7e31ee770f5a4278ee2a4194619bd5525ccd SHA1 9bb0256cff9804179a0b246d1577fe194b3599cd SHA256 f5a79eaf2ffffd56c2cdefe85446a3d453122362b0d163aae3aeef43adfd28bc
 EBUILD polkit-0.96-r2.ebuild 3725 RMD160 2b4e130e3f8f3081a5dc2390733b9aa93627a56b SHA1 71a9a9b89aabe4fc6bb3927e958d6c7a2b90b7ff SHA256 a9579f8faecc68d3b34efe1e9f5de9bf6926d57a7b5ddcaeba2e2afb7ed0cc72
-EBUILD polkit-0.96.ebuild 2575 RMD160 8421542a509097dbfae11341172516526798782e SHA1 77b2d3dff42f601917dd97389aa804c5735837c1 SHA256 b2f84797d1f422d60e71c5f2e2427a164a91a0d23c45dc547a55413a5f3e47fb
 EBUILD polkit-0.99.ebuild 3485 RMD160 a89c30c838248e2d9f07aa8edb18cda640f7e2db SHA1 68f3a2e353e25d86d6d4aa835a4233d55a235160 SHA256 f04fdb76efb3d5318c5dade22e0e0e4fef861996c2396b42f3da77824430b670
 MISC ChangeLog 4186 RMD160 a4b27d5e649f7fa6e6dd615b7663ce39e7905ee4 SHA1 508d28c006740590ab205b459affa44cb72012c1 SHA256 0e0e517f8c7163a8a0f93f66feee728177daaf1234f50f32f9348f837b32b276
-MISC metadata.xml 382 RMD160 a1de2f0bbe45fa2eae8bccbb2c52abc3c360563b SHA1 6e874e8a2b69027d778ec2c556bc4a3c347505d8 SHA256 c9e19b020dccea9a19e76721c47195e9973c751c0a10cd7e9e3d941c6947ba10
+MISC metadata.xml 389 RMD160 3a54b59d35cd9c5b920de1b6d07447a95c7c7de0 SHA1 4a94516eb92b02ed46d9da1ab420a4fe3832211e SHA256 cfd3de2aafbe1b3e663e793170c36caf8c8ba8a48d75e581af69962e6cdc2815
diff --git a/sys-auth/polkit/files/polkit-0.96-getcwd.patch b/sys-auth/polkit/files/polkit-0.96-getcwd.patch
index cca8a2bd10f2..64e888a74c5b 100644
--- a/sys-auth/polkit/files/polkit-0.96-getcwd.patch
+++ b/sys-auth/polkit/files/polkit-0.96-getcwd.patch
@@ -1,8 +1,8 @@
 https://bugs.gentoo.org/show_bug.cgi?id=309457
 https://bugs.freedesktop.org/show_bug.cgi?id=27081
 
---- src/programs/pkexec.c.old	2010-03-15 08:49:30.000000000 +0100
-+++ src/programs/pkexec.c	2010-03-15 08:54:16.000000000 +0100
+--- src/programs/pkexec.c
++++ src/programs/pkexec.c
 @@ -375,6 +375,7 @@
    gchar *path;
    struct passwd pwstruct;
diff --git a/sys-auth/polkit/metadata.xml b/sys-auth/polkit/metadata.xml
index b98292dece09..f2f1f7f9b41e 100644
--- a/sys-auth/polkit/metadata.xml
+++ b/sys-auth/polkit/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>nirbheek@gentoo.org</email>
-		<name>Nirbheek Chauhan</name>
-	</maintainer>
-	<herd>freedesktop</herd>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-			introspection</flag>
-	</use>
+  <herd>freedesktop</herd>
+  <maintainer>
+    <email>nirbheek@gentoo.org</email>
+    <name>Nirbheek Chauhan</name>
+  </maintainer>
+  <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.ebuild b/sys-auth/polkit/polkit-0.96.ebuild
deleted file mode 100644
index 26e3ca6c4e2e..000000000000
--- a/sys-auth/polkit/polkit-0.96.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.9 2010/07/20 15:08:26 jer 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}-shadow-support.patch.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-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
-	pam? ( virtual/pam )
-	expat? ( dev-libs/expat )"
-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
-
-pkg_setup() {
-	enewgroup polkituser
-	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
-
-	if use expat; then
-		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} \
-		--disable-introspection \
-		--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 nls)
-		#$(use_enable introspection)
-}
-
-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 polkituser
-	keepdir /var/run/polkit-1
-	keepdir /var/lib/polkit-1
-}