fixing dependencies per bug #200493 and cleaning old revisions

Package-Manager: portage-2.1.4_rc3

7 files changed, 26 insertions, 127 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index fb3b760fc343..2a71a4cdfd5d 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.66 2007/11/24 23:12:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.67 2007/11/27 11:11:23 eva Exp $
+
+  27 Nov 2007; Gilles Dartiguelongue <eva@gentoo.org> -devhelp-0.14.ebuild,
+  -devhelp-0.16.ebuild, devhelp-0.16.1.ebuild:
+  pruning old revisions and fixing dependencies per bug #200493
 
   24 Nov 2007; Brent Baude <ranger@gentoo.org> devhelp-0.16.1.ebuild:
   Marking devhelp-0.16.1 ppc stable for bug 199740
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index c3cea93e3a23..5d9c4ff0b63b 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,32 +1,26 @@
-DIST devhelp-0.14.tar.bz2 456438 RMD160 4ba8f04ef1af745b354e524b5ae47b1b62f8cf72 SHA1 ad22330d5e1125b51362308d570f6febba2d6fce SHA256 d250dba6e50b23f3037ff261fc4a8be4628f1120971b569a9df08ceb97d01d1a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST devhelp-0.16.1.tar.bz2 470329 RMD160 3dd68e129d760193500ab8fc052826df954eaeeb SHA1 fe62dcde16b54229f1b89827b37a9e2db99be05e SHA256 efd3f42e2ad7c789414917506f619e4b4029beac4fef915181d11f33e38914e0
-DIST devhelp-0.16.tar.bz2 466655 RMD160 5aa8c8f8c42e85b01d4e3ad3b38351c28eb8e95f SHA1 9bd44f0ee83727a8ce6277351b2ae0f79e6de7c6 SHA256 5faa6cd9e8daa95158f63d1d14e95b2027f31da4e4a107ceb1f6d510234a9c2f
-EBUILD devhelp-0.14.ebuild 1110 RMD160 15cc5ec0330cbc8e89c5a969fcdb608ba998d8e8 SHA1 148d85cc1d4b800a40f4d9aed73d57b334142095 SHA256 570e30f25962e6dda13b257530b7ea4bc722db431bddbfb208ac8787b40d0183
-MD5 455742ec2083cad99e243fbed492de20 devhelp-0.14.ebuild 1110
-RMD160 15cc5ec0330cbc8e89c5a969fcdb608ba998d8e8 devhelp-0.14.ebuild 1110
-SHA256 570e30f25962e6dda13b257530b7ea4bc722db431bddbfb208ac8787b40d0183 devhelp-0.14.ebuild 1110
-EBUILD devhelp-0.16.1.ebuild 1117 RMD160 458a72689e1d710a61519ec030f393ee666cabd5 SHA1 d5089b50244f2bb025874810c41b2e5a8291127f SHA256 9984703ec081aa629f4e4e05a168f8badcd8b457cea3c43f6decc463eeab3940
-MD5 3b659efd8baf40ea474a9dae90312e07 devhelp-0.16.1.ebuild 1117
-RMD160 458a72689e1d710a61519ec030f393ee666cabd5 devhelp-0.16.1.ebuild 1117
-SHA256 9984703ec081aa629f4e4e05a168f8badcd8b457cea3c43f6decc463eeab3940 devhelp-0.16.1.ebuild 1117
-EBUILD devhelp-0.16.ebuild 1116 RMD160 b64e1d99f12cd456e536e570625c7429a226efb7 SHA1 facd2c01bd6594622494f505b50c30f5701bbf03 SHA256 fb245ad480e18b1952740de560f212b40c0501a330442115d0958d30e3a5a1e2
-MD5 5be88dfa1f3732e9090131e8c3cef891 devhelp-0.16.ebuild 1116
-RMD160 b64e1d99f12cd456e536e570625c7429a226efb7 devhelp-0.16.ebuild 1116
-SHA256 fb245ad480e18b1952740de560f212b40c0501a330442115d0958d30e3a5a1e2 devhelp-0.16.ebuild 1116
-MISC ChangeLog 8271 RMD160 68ccd2f28f39c9a55c87e21fcb4dba4f7eb1bea6 SHA1 1c953983ce8d927f92fd97c82f10fb2d35b22a4b SHA256 8e4bc80b9d320aef35488929543af8b208ded157d46f3a091393d61ba63d8a7d
-MD5 f11f9095b120dd2671d5104834e8328d ChangeLog 8271
-RMD160 68ccd2f28f39c9a55c87e21fcb4dba4f7eb1bea6 ChangeLog 8271
-SHA256 8e4bc80b9d320aef35488929543af8b208ded157d46f3a091393d61ba63d8a7d ChangeLog 8271
+EBUILD devhelp-0.16.1.ebuild 1116 RMD160 8320aa6625cf683a3d06e797492f942901f0e10f SHA1 875523abd5b94d1cf19c8910e76f4e64538bdc02 SHA256 3f5a0f037b175821ee074b6cc1eb09aeeae6d847d0f1f64471bafe18121a4b6f
+MD5 79fc1bfbc8d25e05e86f97b94fb89cf5 devhelp-0.16.1.ebuild 1116
+RMD160 8320aa6625cf683a3d06e797492f942901f0e10f devhelp-0.16.1.ebuild 1116
+SHA256 3f5a0f037b175821ee074b6cc1eb09aeeae6d847d0f1f64471bafe18121a4b6f devhelp-0.16.1.ebuild 1116
+MISC ChangeLog 8456 RMD160 be9e049d1ae9f0c92289929c728febf656b1dc2e SHA1 a403c2c6b1d84fd96bb555c2d610978711eb8409 SHA256 6832db3ec91d232319dacfe67579b0370963aa918e20946741ff1aef10c91573
+MD5 5f17159024a5abc35549a78f2f5acf16 ChangeLog 8456
+RMD160 be9e049d1ae9f0c92289929c728febf656b1dc2e ChangeLog 8456
+SHA256 6832db3ec91d232319dacfe67579b0370963aa918e20946741ff1aef10c91573 ChangeLog 8456
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 24158bafebdfd2cbf7f2012bcb6e23aa files/digest-devhelp-0.14 241
-RMD160 f9c79419f9e2bd0f1eea475bc033c8129378664a files/digest-devhelp-0.14 241
-SHA256 c9cf5e182582af5f4a1b1e73589d53b14ff63e73329b4fcdd0f3921aac9299a7 files/digest-devhelp-0.14 241
-MD5 cc2bf048d3146ba94cea45c8f9f9cd27 files/digest-devhelp-0.16 241
-RMD160 05e07ca147ec67cf7bf9174057ecd54711253fdd files/digest-devhelp-0.16 241
-SHA256 d47c68eceb046547c7b1cb2c272da993076c69bb398ee9931cc0e5baa574d2e2 files/digest-devhelp-0.16 241
 MD5 93e37f80630bf5bfee5676b96f1a6cf6 files/digest-devhelp-0.16.1 247
 RMD160 0ad7f031ed54922c3ed5c0d5bbd3094a026abde2 files/digest-devhelp-0.16.1 247
 SHA256 bb0a75efcbf4960ca56fca6dfd6c419ec91c1b223650d0273da177586e328de3 files/digest-devhelp-0.16.1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHS/th1fmVwcYIWAYRAjpDAKChb5c9oKzZIVX/0Xny1VgV/gWQOACfebk5
+emgJyNvk7nT5AqRd9Oz/OXQ=
+=vGCJ
+-----END PGP SIGNATURE-----
diff --git a/dev-util/devhelp/devhelp-0.14.ebuild b/dev-util/devhelp/devhelp-0.14.ebuild
deleted file mode 100644
index 147a329c016b..000000000000
--- a/dev-util/devhelp/devhelp-0.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.14.ebuild,v 1.8 2007/10/08 22:24:27 eva Exp $
-
-inherit toolchain-funcs gnome2
-
-DESCRIPTION="An API documentation browser for GNOME 2"
-HOMEPAGE="http://developer.imendio.com/wiki/Devhelp"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="xulrunner zlib"
-
-RDEPEND=">=gnome-base/gconf-2.6
-	>=x11-libs/gtk+-2.8
-	>=dev-libs/glib-2.8
-	>=gnome-base/libglade-2.4
-	>=x11-libs/libwnck-2.10
-	|| (
-		xulrunner? ( net-libs/xulrunner )
-		>=www-client/mozilla-firefox-1.0.2-r1
-	)
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="$(use_with zlib)"
-
-	if use xulrunner ; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
-	else
-		G2CONF="${G2CONF} --with-gecko=firefox"
-	fi
-
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		G2CONF="${G2CONF} --with-compile-warnings=no"
-	fi
-}
diff --git a/dev-util/devhelp/devhelp-0.16.1.ebuild b/dev-util/devhelp/devhelp-0.16.1.ebuild
index feb5fb85b9a0..1925ac9937ee 100644
--- a/dev-util/devhelp/devhelp-0.16.1.ebuild
+++ b/dev-util/devhelp/devhelp-0.16.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.16.1.ebuild,v 1.6 2007/11/24 23:12:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.16.1.ebuild,v 1.7 2007/11/27 11:11:23 eva Exp $
 
 inherit toolchain-funcs gnome2
 
@@ -17,10 +17,8 @@ RDEPEND=">=gnome-base/gconf-2.6
 	>=dev-libs/glib-2.8
 	>=gnome-base/libglade-2.4
 	>=x11-libs/libwnck-2.10
-	||	(
-			xulrunner? ( net-libs/xulrunner )
-			>=www-client/mozilla-firefox-1.0.2-r1
-		)
+	xulrunner? ( net-libs/xulrunner )
+	!xulrunner? ( >=www-client/mozilla-firefox-1.0.2-r1 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	  sys-devel/gettext
diff --git a/dev-util/devhelp/devhelp-0.16.ebuild b/dev-util/devhelp/devhelp-0.16.ebuild
deleted file mode 100644
index 36cfe621bb6d..000000000000
--- a/dev-util/devhelp/devhelp-0.16.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.16.ebuild,v 1.2 2007/10/08 22:24:27 eva Exp $
-
-inherit toolchain-funcs gnome2
-
-DESCRIPTION="An API documentation browser for GNOME 2"
-HOMEPAGE="http://developer.imendio.com/wiki/Devhelp"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="xulrunner zlib"
-
-RDEPEND=">=gnome-base/gconf-2.6
-	>=x11-libs/gtk+-2.8
-	>=dev-libs/glib-2.8
-	>=gnome-base/libglade-2.4
-	>=x11-libs/libwnck-2.10
-	||	(
-			xulrunner? ( net-libs/xulrunner )
-			>=www-client/mozilla-firefox-1.0.2-r1
-		)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="$(use_with zlib)"
-
-	if use xulrunner ; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
-	else
-		G2CONF="${G2CONF} --with-gecko=firefox"
-	fi
-
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		G2CONF="${G2CONF} --with-compile-warnings=no"
-	fi
-}
diff --git a/dev-util/devhelp/files/digest-devhelp-0.14 b/dev-util/devhelp/files/digest-devhelp-0.14
deleted file mode 100644
index 6830c73f5263..000000000000
--- a/dev-util/devhelp/files/digest-devhelp-0.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 56dd99412ae3df14a0daf293a9cd398c devhelp-0.14.tar.bz2 456438
-RMD160 4ba8f04ef1af745b354e524b5ae47b1b62f8cf72 devhelp-0.14.tar.bz2 456438
-SHA256 d250dba6e50b23f3037ff261fc4a8be4628f1120971b569a9df08ceb97d01d1a devhelp-0.14.tar.bz2 456438
diff --git a/dev-util/devhelp/files/digest-devhelp-0.16 b/dev-util/devhelp/files/digest-devhelp-0.16
deleted file mode 100644
index a980c58a5594..000000000000
--- a/dev-util/devhelp/files/digest-devhelp-0.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 61d2300ab657ab63c65a49311916a6d2 devhelp-0.16.tar.bz2 466655
-RMD160 5aa8c8f8c42e85b01d4e3ad3b38351c28eb8e95f devhelp-0.16.tar.bz2 466655
-SHA256 5faa6cd9e8daa95158f63d1d14e95b2027f31da4e4a107ceb1f6d510234a9c2f devhelp-0.16.tar.bz2 466655