add scrollkeeper to DEPEND to go with gnome-doc-utils, bug #216568.

(Portage version: 2.1.5_rc5)

5 files changed, 13 insertions, 96 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 3f13c4efa9c5..8c81b78c8f5c 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.88 2008/04/19 21:35:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.89 2008/04/19 21:59:22 eva Exp $
+
+  19 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-power-manager-2.20.0-r1.ebuild, gnome-power-manager-2.20.2.ebuild,
+  -gnome-power-manager-2.22.0.ebuild, gnome-power-manager-2.22.1.ebuild:
+  add scrollkeeper to DEPEND to go with gnome-doc-utils, bug #216568.
 
   19 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
   -gnome-power-manager-2.20.1.ebuild, gnome-power-manager-2.22.1.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 937cef71a4d3..5b31b6c2946b 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-2007 Gentoo Foundation
+# 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.0-r1.ebuild,v 1.8 2007/11/29 06:07:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.0-r1.ebuild,v 1.9 2008/04/19 21:59:22 eva Exp $
 
 inherit gnome2 eutils virtualx
 
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 	~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
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
index 5d564f89f722..1f404f4e9d3e 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.4 2008/03/02 14:32:07 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.20.2.ebuild,v 1.5 2008/04/19 21:59:22 eva Exp $
 
 inherit gnome2 eutils virtualx
 
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 		 ~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
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.0.ebuild
deleted file mode 100644
index f58244337b92..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.0.ebuild
+++ /dev/null
@@ -1,91 +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.22.0.ebuild,v 1.1 2008/03/26 22:35:51 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/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"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if has_version 'sys-libs/pam'; then
-		einfo "You will need the masked pam_console to be able to"
-		einfo "suspend/hibernate, or you will need to:"
-		einfo "touch /var/run/console/<USERNAME>"
-		einfo "after each boot"
-	fi
-}
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
index b3ef7779c50a..f6602f2fd369 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.22.1.ebuild,v 1.2 2008/04/19 21:35:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.1.ebuild,v 1.3 2008/04/19 21:59:22 eva Exp $
 
 inherit gnome2 eutils virtualx
 
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
 		 ~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