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

Package-Manager: portage-2.1.5_rc5

6 files changed, 20 insertions, 105 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/Manifest b/gnome-extra/gnome-power-manager/Manifest
index db710eab65ba..66a3d88f6e33 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -5,19 +5,17 @@ AUX gnome-power-manager-2.16.3-doc.patch 3920 RMD160 a5afc7b63f52769f080d02d2f18
 DIST gnome-power-manager-2.16.3.tar.gz 2382038 RMD160 97a93de5904e9c01567ba8eed6080d452ca61317 SHA1 2d9a1391b97a10bfd03829a3ea60550403b66ec5 SHA256 2e2c5b06f6c75903e48a017f7a909ef37292ffc60a9dea4877f3c61624664126
 DIST gnome-power-manager-2.20.0.tar.bz2 2588839 RMD160 6f5cc9e9c57c1e913f0ef8a1d2d16784194bbd45 SHA1 117e8f5bc81ae81a110052df173eb75d87b08049 SHA256 bc1a3428bc98bfcab473e0f62387f32205c40693f6c6897931204ef4800aa1e5
 DIST gnome-power-manager-2.20.2.tar.bz2 3020529 RMD160 d798acf683c74901465caf4b144a3cf40dd33eab SHA1 7cda3b71ae8ccc5825f194b6865326b9727f0da9 SHA256 60c9f8e6893123d1837f3cd1fcf834e66bc6f69b9efea5e590b1a9a97e1850c2
-DIST gnome-power-manager-2.22.0.tar.bz2 2999358 RMD160 f29c630d1f8cd287cb49f09f72f30d065178a5cd SHA1 dc47ee5ab84a50dac307defc65635eff6cb3de10 SHA256 a28500e52844286ef85f7fc773151be62c9cf6ce10ad51eceec99aa57304e70b
 DIST gnome-power-manager-2.22.1.tar.bz2 3002440 RMD160 88522f58589ece86127a84ebf52f87c0c462aa91 SHA1 bba77f4403643f10a26d7abf5a4681cd50ff08d4 SHA256 967dc61382e85dd6d8a8da74e9847760bbb429a3fdb97ab2f4f69bf574b0c1c4
 EBUILD gnome-power-manager-2.16.3.ebuild 2200 RMD160 0bd2ff57cd7a102afe706cd633aed25a9e69f73d SHA1 64a8f083c6634e989e211e4963c94dda146e8730 SHA256 c4e73b46448b22e712173ad1ad019633ebc578dd831ff6d4ab03ae86126ff9a1
-EBUILD gnome-power-manager-2.20.0-r1.ebuild 2737 RMD160 582a0acf497ceedffb2a3d110a67e9b62dd2f581 SHA1 0f303f1ed03b7f271358c2c017a101c95cf777a0 SHA256 0c3158d15623ebee741f574478bc8278f0cb0ba8c6c3f7be0c048a4c21da6503
-EBUILD gnome-power-manager-2.20.2.ebuild 2473 RMD160 70d593078b9df3e8ae1a73a7389c452379cf9d72 SHA1 d3f5eb7271425deb769d1a2f4a11044e978b45c7 SHA256 f23f5b8b9022544512e0d568cb981626af9a642a8c705e43ec07fe0ac3e9d3b2
-EBUILD gnome-power-manager-2.22.0.ebuild 2474 RMD160 cccc385b70e8d8ce51cdfdc79f8eb90b698c3163 SHA1 657b10211b8bde3acbcd3d11dec0166fe6ab0162 SHA256 820b5772c72f99abc57029f20804d0342d5bebe87866d80661c14ff996c3c292
-EBUILD gnome-power-manager-2.22.1.ebuild 2551 RMD160 6f765a098fe44343f8295ae650497f771383a0ee SHA1 c2edcd6869f6afd4cb51c56859b18d4c79fef3f6 SHA256 23cfb229296d8a42c0a822836ef9e2424284508c96262c12deee51ea7636a15d
-MISC ChangeLog 13902 RMD160 78a804b703928c1eaa75c34be5a60748717e5a4a SHA1 f2814531373edb4730ad0e86f07b91b91dac44c0 SHA256 7ad2584a77f969d6b9413f3ba5c708c2eafe8e396729e59efb1a39a1969c4abe
+EBUILD gnome-power-manager-2.20.0-r1.ebuild 2762 RMD160 1205393a59d70c4593c068de5434fdf092d1d978 SHA1 d498ddf998162eaf4bf5971c5b0ecba90be10a5b SHA256 6cd62a47262f5c1c299983f93ad1c4457dd8688e7c0da2cd0ca8bdafcf1f89d6
+EBUILD gnome-power-manager-2.20.2.ebuild 2498 RMD160 a6789b8a215494c07fa0f3687a5716913376d6f0 SHA1 44e3014ae8eb4d07cfd032ab839de761da76ab74 SHA256 9e3ccdae813dfbcd7ef42ea502bd45b958276f5f5da11319abee48bf78ccd30a
+EBUILD gnome-power-manager-2.22.1.ebuild 2577 RMD160 41d8b1735e766a3e4343f2e3ff03d93039c22f4a SHA1 ce1158d5ad79a81e65820600d19f81d82d9c1eec SHA256 5b23e31540c5a0913f1df3f08ccbdea63a51f0b09f4cfa3582218d29d8b40283
+MISC ChangeLog 14175 RMD160 cce3107214d3b5e852dda3088761363307875149 SHA1 276dc39963f67468729f2534a892a49998ae1277 SHA256 cf87341d32316d3c604f53359f1f5eb4c19518cc6fee41e6c98533710f0a7b99
 MISC metadata.xml 328 RMD160 e83b5cef91422ece7e4991cc9f9422220d36b775 SHA1 c25df9c021e54eaf6c9add8db1c9954ac710b95e SHA256 2507b21284e65f9e7f5608d9865921192d0d6cdf46a35a705b0b2cb220583794
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgKZb8ACgkQ1fmVwcYIWAYENwCcCPJJMO/dfI2sJ0Jy2Zt19tp9
-54QAoIf5ErbusI3V9O5bP0EDFPCF7lme
-=ZO9Y
+iEYEARECAAYFAkgKa0cACgkQ1fmVwcYIWAYHqQCgkKWYMV4Mte7Wmme+LsqzdNez
+QgcAoI6yDxJDxzKclis6avVhAT9ElHWS
+=u3Q+
 -----END PGP SIGNATURE-----
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