fixing dependencies per bug #200493 and cleaning old revisions

(Portage version: 2.1.4_rc3)

6 files changed, 8 insertions, 103 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/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