ppc stable wrt #343155. drop old.

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)

3 files changed, 7 insertions, 56 deletions

diff --git a/gnome-extra/polkit-gnome/ChangeLog b/gnome-extra/polkit-gnome/ChangeLog
index 79901be15ba3..bfa3497afcca 100644
--- a/gnome-extra/polkit-gnome/ChangeLog
+++ b/gnome-extra/polkit-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/polkit-gnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/ChangeLog,v 1.21 2010/11/13 18:44:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/ChangeLog,v 1.22 2010/12/12 17:44:03 ssuominen Exp $
+
+  12 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  polkit-gnome-0.96-r1.ebuild:
+  ppc stable wrt #343155
 
   13 Nov 2010; Raúl Porcel <armin76@gentoo.org>
   polkit-gnome-0.96-r1.ebuild:
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.96-r1.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.96-r1.ebuild
index 2f754ee22c9c..1a362c664238 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.96-r1.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.96-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.96-r1.ebuild,v 1.4 2010/11/13 18:44:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.96-r1.ebuild,v 1.5 2010/12/12 17:44:03 ssuominen Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.bz2"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="doc examples" #introspection
 
 RDEPEND=">=x11-libs/gtk+-2.17.1
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.96.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.96.ebuild
deleted file mode 100644
index b6ca1cab4981..000000000000
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.96.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.96.ebuild,v 1.10 2010/10/09 09:50:06 ssuominen Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="PolicyKit policies and configurations for the GNOME desktop"
-HOMEPAGE="http://hal.freedesktop.org/docs/PolicyKit"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc examples" #introspection
-
-RDEPEND=">=x11-libs/gtk+-2.17.1
-	>=gnome-base/gconf-2.8
-	>=dev-libs/dbus-glib-0.71
-	>=sys-auth/polkit-0.95"
-	# Not ready for tree
-	#introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.19
-	>=dev-util/intltool-0.35.0
-	>=app-text/scrollkeeper-0.3.14
-	gnome-base/gnome-common
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.3 )"
-
-DOCS="AUTHORS HACKING NEWS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-introspection
-		$(use_enable examples)"
-		#$(use_enable introspection)"
-}
-
-src_prepare() {
-	# Fix make check, bug 298345
-	epatch "${FILESDIR}/${PN}-0.95-fix-make-check.patch"
-
-	if use doc; then
-		# Fix parallel build failure, bug 293247
-		epatch "${FILESDIR}/${PN}-0.95-parallel-build-failure.patch"
-
-		gtkdocize || die "gtkdocize failed"
-		eautoreconf
-	fi
-}