Sort/fix incorrect/missing dependencies.

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

3 files changed, 17 insertions, 108 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 9fd9a89a3e7a..ee7f4ec35070 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.134 2010/08/14 18:43:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.135 2010/08/22 19:59:00 eva Exp $
+
+  22 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-power-manager-2.22.1.ebuild, gnome-power-manager-2.30.1.ebuild:
+  Sort/fix incorrect/missing dependencies.
 
   14 Aug 2010; Raúl Porcel <armin76@gentoo.org>
   gnome-power-manager-2.28.3.ebuild:
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.1.ebuild
deleted file mode 100644
index 3ec7ce3a832e..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.1.ebuild
+++ /dev/null
@@ -1,97 +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/gnome-power-manager/gnome-power-manager-2.22.1.ebuild,v 1.16 2010/07/20 15:35:24 jer 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 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc test"
-
-# See bug #196490
-RESTRICT="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() {
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog
-	elog "To enable frequency scaling interface, use the following command:"
-	elog "	gconftool-2 /apps/gnome-power-manager/ui/cpufreq_show -t bool -s true"
-	elog "Note that this will conflict with other power managment utility"
-	elog "like app-laptop/laptop-mode-tools."
-	elog
-	elog "Suspend/hibernate-on-idle will only work if gnome-extra/gnome-screensaver"
-	elog "is installed."
-	elog
-}
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.30.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.30.1.ebuild
index 785ae4424c0e..b9ba902de5e7 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.30.1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.30.1.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/gnome-power-manager/gnome-power-manager-2.30.1.ebuild,v 1.6 2010/08/11 16:11:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.30.1.ebuild,v 1.7 2010/08/22 19:59:00 eva Exp $
 
 EAPI="2"
 
@@ -12,6 +12,7 @@ HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+# TODO: handle optional applet build
 IUSE="doc +hal policykit test"
 
 # FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
@@ -20,21 +21,22 @@ RESTRICT="test"
 # HAL is used purely as a fallback for setting brightness if xrandr fail
 COMMON_DEPEND=">=dev-libs/glib-2.13.0
 	>=x11-libs/gtk+-2.17.7
-	>=gnome-base/gconf-2.10.0
+	>=gnome-base/gconf-2.10
 	>=gnome-base/gnome-keyring-0.6.0
-	>=dev-libs/dbus-glib-0.71
-	>=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.10
+	>=dev-libs/dbus-glib-0.71
+	>=dev-libs/libunique-1
 	>=media-libs/libcanberra-0.10[gtk]
 	|| ( sys-power/upower >=sys-apps/devicekit-power-008 )
-	>=dev-libs/libunique-1
-	>=x11-apps/xrandr-1.2
+	>=x11-apps/xrandr-1.3
+	>=x11-libs/cairo-1.0.0
+	>=x11-libs/libnotify-0.4.3
+	>=x11-libs/libwnck-2.10.0
 	x11-libs/libX11
 	x11-libs/libXext
-
+	>=x11-libs/libXrandr-1.3
+	x11-libs/libXrender
+	>=x11-proto/xproto-7.0.15
 	hal? ( >=sys-apps/hal-0.5.9 )
 "
 RDEPEND="${COMMON_DEPEND}