Fix HOMEPAGE for older ebuilds too. Resolves bug #50996.

7 files changed, 17 insertions, 77 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index 59fd8218e5c9..1f1be16db480 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.20 2004/05/14 14:30:15 khai Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.21 2004/05/18 22:58:59 leonardop Exp $
+
+  18 May 2004; L. Boshell <leonardop@gentoo.org> devhelp-0.6.0.ebuild,
+  devhelp-0.7.ebuild, devhelp-0.8.1.ebuild:
+  Fixed HOMEPAGE for older ebuilds too. Resolves bug #50996. Use
+  `use_with'.
 
   14 May 2004; Yi Qiang <khai@gentoo.org> devhelp-0.8.1.ebuild:
   Fixed homepage url.
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 9fbe21584a60..4fcac8c7cf6a 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,10 +1,8 @@
-MD5 8df94535e5bf0f0002800e236d5fcaac devhelp-0.7.ebuild 725
-MD5 d8d4aac9bb71dcd685b7d599213407af devhelp-0.4-r1.ebuild 1467
-MD5 8c2c8144ef3f13534fa02645bcf3fbe0 devhelp-0.8.1.ebuild 739
-MD5 98556149f4cb202d2a1c39832a95b4f6 devhelp-0.6.0.ebuild 745
+MD5 487014bedcfc433371cd80ee65afc441 ChangeLog 2913
+MD5 dcca39e6858a90bc86636a8b8d156573 devhelp-0.8.1.ebuild 694
+MD5 a2a621003ed18320b9f171d46e2c7494 devhelp-0.6.0.ebuild 760
+MD5 3a794b5da0837963effed4599e0a0408 devhelp-0.7.ebuild 739
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 9bc5caf8795ef94dd6f00126af6ac970 ChangeLog 2713
-MD5 7f0a1f022f0336946b60d6d450646775 files/digest-devhelp-0.6.0 66
-MD5 5d90dbc2df84cde18de2c06dc5ae551c files/digest-devhelp-0.4-r1 63
 MD5 b702e5473f9ff9d6e43bd00bf0ce4ff5 files/digest-devhelp-0.8.1 66
+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.4-r1.ebuild b/dev-util/devhelp/devhelp-0.4-r1.ebuild
deleted file mode 100644
index b93da5b46c6e..000000000000
--- a/dev-util/devhelp/devhelp-0.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.4-r1.ebuild,v 1.15 2004/05/14 14:30:15 khai Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${P}
-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"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.7
-	 >=gnome-base/ORBit-0.5.10-r1
-	 >=gnome-base/bonobo-1.0.19
-	 =gnome-base/libglade-0*
-	 >=dev-libs/libxml-1.8.17
-	 <gnome-extra/gtkhtml-3.0
-	 =gnome-base/gconf-1.0*
-	 =gnome-base/gnome-vfs-1*
-	 >=gnome-base/oaf-0.6.8-r1
-	 >=gnome-base/gnome-print-0.30"
-
-RDEPEND="nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.11 )"
-
-src_compile() {
-	local myconf
-
-	use nls || myconf="--disable-nls"
-
-	econf \
-		--disable-more-warnings \
-		--disable-install-schemas \
-		--without-python \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-}
-
-pkg_postinst() {
-	# This is directly from the rpm specfile for devhelp...
-	# Fix gconf permissions
-	killall gconfd-1 2>/dev/null >/dev/null
-	chmod o+rX /etc/gconf -R
-	# Install schemas
-	gconftool-1 --shutdown
-	SOURCE=xml::/etc/gconf/gconf.xml.defaults
-	GCONF_CONFIG_SOURCE=$SOURCE \
-		gconftool-1 --makefile-install-rule \
-		/etc/gconf/schemas/devhelp.schemas
-}
diff --git a/dev-util/devhelp/devhelp-0.6.0.ebuild b/dev-util/devhelp/devhelp-0.6.0.ebuild
index a87083721db2..e6123c2e0009 100644
--- a/dev-util/devhelp/devhelp-0.6.0.ebuild
+++ b/dev-util/devhelp/devhelp-0.6.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 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.4 2004/05/14 14:30:15 khai Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.6.0.ebuild,v 1.5 2004/05/18 22:59:00 leonardop Exp $
 
 inherit gnome2
 
 IUSE="zlib"
 
 DESCRIPTION="Developer help browser"
-HOMEPAGE="http://devhelp.codefactory.se/"
+HOMEPAGE="http://www.imendio.com/projects/devhelp/"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/dev-util/devhelp/devhelp-0.7.ebuild b/dev-util/devhelp/devhelp-0.7.ebuild
index 6f6b05d21700..ea6d6c5be1d4 100644
--- a/dev-util/devhelp/devhelp-0.7.ebuild
+++ b/dev-util/devhelp/devhelp-0.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 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.3 2004/02/26 03:52:14 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.7.ebuild,v 1.4 2004/05/18 22:59:00 leonardop Exp $
 
 inherit gnome2
 
 IUSE="zlib"
 
 DESCRIPTION="Developer help browser"
-HOMEPAGE="http://devhelp.codefactory.se/"
+HOMEPAGE="http://www.imendio.com/projects/devhelp/"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/dev-util/devhelp/devhelp-0.8.1.ebuild b/dev-util/devhelp/devhelp-0.8.1.ebuild
index 78c3995a0f00..b4fd7e4199ac 100644
--- a/dev-util/devhelp/devhelp-0.8.1.ebuild
+++ b/dev-util/devhelp/devhelp-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.8.1.ebuild,v 1.8 2004/05/14 14:30:15 khai Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.8.1.ebuild,v 1.9 2004/05/18 22:59:00 leonardop Exp $
 
 inherit gnome2
 
@@ -23,6 +23,4 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS COPYING ChangeLog README NEWS TODO"
 
-use zlib \
-	&& G2CONF="${G2CONF} --with-zlib" \
-	|| G2CONF="${G2CONF} --without-zlib"
+G2CONF="${G2CONF} $(use_with zlib)"
diff --git a/dev-util/devhelp/files/digest-devhelp-0.4-r1 b/dev-util/devhelp/files/digest-devhelp-0.4-r1
deleted file mode 100644
index b851b8dd107c..000000000000
--- a/dev-util/devhelp/files/digest-devhelp-0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0475b6a225d76173702d26dc05fba278 devhelp-0.4.tar.gz 363429