Add policykit optional dependencies, bug #267100. Clean up old ebuilds.

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

4 files changed, 13 insertions, 86 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 9b06efa25ca7..0adeba0f01c2 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.105 2009/04/09 20:38:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.106 2009/04/22 22:15:29 eva Exp $
+
+  22 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-power-manager-2.20.0-r1.ebuild, -gnome-power-manager-2.20.2.ebuild,
+  gnome-power-manager-2.24.4-r1.ebuild:
+  Add policykit optional dependencies, bug #267100.
 
   09 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-power-manager-2.24.4-r1.ebuild:
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.0-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.0-r1.ebuild
index f177e7f08dd3..46f503c84855 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.0-r1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.0-r1.ebuild,v 1.10 2008/05/14 21:50:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.0-r1.ebuild,v 1.11 2009/04/22 22:15:29 eva Exp $
 
 inherit gnome2 eutils virtualx
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="~x86-fbsd"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/glib-2.6.0
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.2.ebuild
deleted file mode 100644
index 22f9c5adf7c6..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.2.ebuild,v 1.6 2008/05/14 21:50:16 eva Exp $
-
-inherit gnome2 eutils virtualx
-
-DESCRIPTION="Gnome Power Manager"
-HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~sparc x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/glib-2.6.0
-		 >=x11-libs/gtk+-2.11.0
-		 >=gnome-base/gnome-keyring-0.6.0
-		 >=gnome-base/libgnome-2.14.0
-		 >=gnome-base/libgnomeui-2.14.0
-		 >=sys-apps/hal-0.5.9
-		 >=dev-libs/dbus-glib-0.71
-		 >=gnome-base/libglade-2.5.0
-		 >=x11-libs/libnotify-0.4.3
-		 >=x11-libs/libwnck-2.10.0
-		 >=x11-libs/cairo-1.0.0
-		 >=gnome-base/gnome-panel-2
-		 >=gnome-base/gconf-2
-		  =media-libs/gstreamer-0.10*
-		   x11-libs/libX11
-		   x11-libs/libXext"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		 ~app-text/docbook-xml-dtd-4.3
-		>=dev-util/pkgconfig-0.9
-		>=dev-util/intltool-0.35
-		  app-text/scrollkeeper
-		>=app-text/gnome-doc-utils-0.3.2
-		doc?	(
-					 app-text/xmlto
-					 app-text/docbook-sgml-utils
-					~app-text/docbook-xml-dtd-4.4
-					~app-text/docbook-sgml-dtd-4.1
-					~app-text/docbook-xml-dtd-4.1.2
-				)"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable test tests)
-		$(use_enable doc docbook-docs)
-		--with-dpms-ext
-		--disable-policykit
-		--enable-xevents
-		--enable-applets"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	if use doc; then
-		# Actually install all html files, not just the index
-		sed -i -e 's:\(htmldoc_DATA = \).*:\1$(SPEC_HTML_FILES):' \
-			"${S}/docs/Makefile.in"
-	else
-		# Remove the docbook2man rules here since it's not handled by a proper
-		# parameter in configure.in.
-		sed -i -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' "${S}/man/Makefile.in"
-	fi
-
-	# glibc splits this out, whereas other libc's do not tend to
-	use elibc_glibc || sed -i -e 's/-lresolv//' configure
-}
-
-src_test() {
-	Xmake check || die "Test phase failed"
-}
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild
index 44c0fc188635..c064b5e9d31f 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild,v 1.4 2009/04/09 20:38:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild,v 1.5 2009/04/22 22:15:29 eva Exp $
 
 inherit autotools eutils gnome2 virtualx
 
@@ -30,6 +30,9 @@ RDEPEND=">=dev-libs/glib-2.6.0
 	>=gnome-base/gnome-panel-2
 	>=gnome-base/gconf-2
 	=media-libs/gstreamer-0.10*
+	policykit? (
+		>=sys-auth/policykit-0.8
+		>=gnome-extra/policykit-gnome-0.8 )
 
 	>=x11-apps/xrandr-1.2