dep fix 'n cleanup, move 0.7 to x86

6 files changed, 12 insertions, 48 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index e476e0097ee7..f043dddd69c6 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.14 2003/06/29 16:28:03 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.15 2003/09/14 11:23:55 foser Exp $
 
 *devhelp-0.7 (29 Jun 2003)
 
+  14 Sep 2003; foser <foser@gentoo.org> devhelp-0.7.ebuild :
+  Fix libgtkhtml dep to be more forgiving (#28600)
+
   29 Jun 2003; foser <foser@gentoo.org> devhelp-0.7.ebuild :
   new version, minor dep fixes
 
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 5b0bccb0da4f..8cb650533ecc 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,10 +1,8 @@
-MD5 da1dc2091ba3fc5ba15120cc1051bbda ChangeLog 2115
+MD5 3d9cf06027caf0bd27efebb573c01b2e devhelp-0.7.ebuild 726
 MD5 5d85ed94bfd91f5cba8d2c0065b82c03 devhelp-0.4-r1.ebuild 1472
-MD5 6fb93df35c8ac974ca03654bfce541f0 devhelp-0.5.0.ebuild 889
-MD5 19a4beaeb9c0b27dbeb35f5de9e6c0b7 devhelp-0.6.0.ebuild 748
-MD5 271158f302eb002c4d4990a8fbea0ace devhelp-0.7.ebuild 729
+MD5 7710509437bcf371af522ad704be6048 devhelp-0.6.0.ebuild 746
+MD5 cb794c85df35d00a15539fb161142b47 ChangeLog 2228
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 5d90dbc2df84cde18de2c06dc5ae551c files/digest-devhelp-0.4-r1 63
-MD5 bc834fb9318c92f5d7c173db6e8c90ae files/digest-devhelp-0.5.0 65
 MD5 7f0a1f022f0336946b60d6d450646775 files/digest-devhelp-0.6.0 66
 MD5 4d7c33ffd1bbabc83f7d822eac2faf6e files/digest-devhelp-0.7 64
diff --git a/dev-util/devhelp/devhelp-0.5.0.ebuild b/dev-util/devhelp/devhelp-0.5.0.ebuild
deleted file mode 100644
index ac29cc7ac42d..000000000000
--- a/dev-util/devhelp/devhelp-0.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.5.0.ebuild,v 1.3 2003/06/10 12:55:55 liquidx Exp $
-
-inherit gnome2
-
-IUSE=""
-
-DESCRIPTION="Developer help browser"
-SRC_URI="http://devhelp.codefactory.se/download/${P}.tar.gz"
-HOMEPAGE="http://devhelp.codefactory.se/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~ppc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/gnome-vfs-2.2
-	=gnome-extra/libgtkhtml-2*"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool"
-
-DOCS="AUTHORS COPYING ChangeLog README NEWS TODO"
-
-src_unpack() {
-	unpack ${A}
-
-	# fix the desktop item
-	cd ${S}
-	mv devhelp.desktop.in devhelp.desktop.in.old
-	sed -e "s:Exec=devhelp-2:Exec=devhelp:" devhelp.desktop.in.old > devhelp.desktop.in
-}
diff --git a/dev-util/devhelp/devhelp-0.6.0.ebuild b/dev-util/devhelp/devhelp-0.6.0.ebuild
index 79a421f02c11..0e060118a573 100644
--- a/dev-util/devhelp/devhelp-0.6.0.ebuild
+++ b/dev-util/devhelp/devhelp-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.6.0.ebuild,v 1.2 2003/06/29 16:28:03 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.6.0.ebuild,v 1.3 2003/09/14 11:23:55 foser Exp $
 
 inherit gnome2
 
@@ -17,7 +17,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2.2
 	>=gnome-base/libgnomeui-2.2
 	>=gnome-base/gnome-vfs-2.2
-	=gnome-extra/libgtkhtml-2.2*
+	=gnome-extra/libgtkhtml-2*
 	zlib? ( sys-libs/zlib )"
 
 DEPEND="${RDEPEND}
diff --git a/dev-util/devhelp/devhelp-0.7.ebuild b/dev-util/devhelp/devhelp-0.7.ebuild
index 79b25cbea36e..29e0525559fd 100644
--- a/dev-util/devhelp/devhelp-0.7.ebuild
+++ b/dev-util/devhelp/devhelp-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.7.ebuild,v 1.1 2003/06/29 16:28:03 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.7.ebuild,v 1.2 2003/09/14 11:23:55 foser Exp $
 
 inherit gnome2
 
@@ -11,13 +11,13 @@ HOMEPAGE="http://devhelp.codefactory.se/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 ~sparc ~ppc"
 
 RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2.2
 	>=gnome-base/libgnomeui-2.2
 	>=gnome-base/gnome-vfs-2.2
-	=gnome-extra/libgtkhtml-2.2*
+	=gnome-extra/libgtkhtml-2*
 	zlib? ( sys-libs/zlib )"
 
 DEPEND="${RDEPEND}
diff --git a/dev-util/devhelp/files/digest-devhelp-0.5.0 b/dev-util/devhelp/files/digest-devhelp-0.5.0
deleted file mode 100644
index b1f9ba929c22..000000000000
--- a/dev-util/devhelp/files/digest-devhelp-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d96586804b44a60f9c2dc7e8c89edf06 devhelp-0.5.0.tar.gz 368386