minor fixes and cleanup

9 files changed, 11 insertions, 97 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 48f42358e3ad..be9757770b28 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.27 2003/06/07 13:04:32 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.28 2003/06/07 15:47:41 foser Exp $
 
 *yelp-2.2.2 (07 Jun 2003)
 
+  07 Jun 2003; foser <foser@gentoo.org> yelp-2.2.2.ebuild :
+  Minor dep fixes
+
   07 Jun 2003; Alastair Tse <liquidx@gentoo.org> yelp-2.2.2.ebuild:
   version bump
 
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 595e81fe7b78..c6282bc0287b 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,13 +1,7 @@
-MD5 69101c1bcd3feff503850f9f6efe42de ChangeLog 2956
-MD5 389a024c14b5c20fe27a79d8848a1c9e yelp-0.10.ebuild 807
-MD5 64e6952f3a4023beefc1725425222155 yelp-1.0.3.ebuild 794
+MD5 29d8c3587ca747b01518bd1fb60b9963 yelp-2.2.2.ebuild 728
 MD5 8c2a438407ab9cdb31a9766592220cd5 yelp-1.0.6.ebuild 793
-MD5 36596d6571cb60548c212b2332221d54 yelp-1.0.7.ebuild 728
 MD5 f781cf368de1cb6cfe1748e5d62e957f yelp-2.2.0.ebuild 747
-MD5 d69d477640667a3cf66a64e61913c614 yelp-2.2.2.ebuild 775
-MD5 ad31d2af959b044a9a442a9c4f76cfc3 files/digest-yelp-0.10 62
-MD5 42141996781dbfda887a040abd4072a7 files/digest-yelp-1.0.3 63
+MD5 62cbaabc04d29dba924f69a237e23ba6 ChangeLog 3033
 MD5 e05bf09aba7c62d076ee7b3bf23b5c62 files/digest-yelp-1.0.6 63
-MD5 d37391a73d568b79764c3570ac83f33b files/digest-yelp-1.0.7 63
 MD5 8419eadd0bd13b4b812ed33d93b503dd files/digest-yelp-2.2.0 63
 MD5 ad9ace3f0641b0f9e67be340fe3c2532 files/digest-yelp-2.2.2 63
diff --git a/gnome-extra/yelp/files/digest-yelp-0.10 b/gnome-extra/yelp/files/digest-yelp-0.10
deleted file mode 100644
index bb302caca2d8..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1aac304ad5792f340e132a1fdd8b36e yelp-0.10.tar.bz2 449204
diff --git a/gnome-extra/yelp/files/digest-yelp-1.0.3 b/gnome-extra/yelp/files/digest-yelp-1.0.3
deleted file mode 100644
index 5c5574b6c903..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9744ed641e9b02deb1b606a0a7a830b8 yelp-1.0.3.tar.bz2 453877
diff --git a/gnome-extra/yelp/files/digest-yelp-1.0.7 b/gnome-extra/yelp/files/digest-yelp-1.0.7
deleted file mode 100644
index 9ed53e70fb4d..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-1.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc487e4368588155271ce9272f906da0 yelp-1.0.7.tar.bz2 466164
diff --git a/gnome-extra/yelp/yelp-0.10.ebuild b/gnome-extra/yelp/yelp-0.10.ebuild
deleted file mode 100644
index 62bb78dbfb00..000000000000
--- a/gnome-extra/yelp/yelp-0.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-0.10.ebuild,v 1.11 2003/05/29 14:36:10 liquidx Exp $
-
-inherit gnome2 
-
-DESCRIPTION="Help browser for Gnome2"
-SRC_URI="mirror://gnome/2.0.0/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-
-RDEPEND=">=gnome-base/ORBit2-2.4.0
-	>=gnome-base/libgnomeui-1.117.2
-	>=gnome-base/libgnome-1.117.2
-	>=gnome-base/gnome-vfs-1.9.10
-	>=gnome-base/libbonobo-1.112.0
-	=gnome-extra/libgtkhtml-2*
-	>=dev-libs/libxslt-1.0.15"
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-LIBTOOL_FIX="1"
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
diff --git a/gnome-extra/yelp/yelp-1.0.3.ebuild b/gnome-extra/yelp/yelp-1.0.3.ebuild
deleted file mode 100644
index df2a7503372c..000000000000
--- a/gnome-extra/yelp/yelp-1.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-1.0.3.ebuild,v 1.11 2003/05/29 14:36:10 liquidx Exp $
-
-inherit gnome2
-
-DESCRIPTION="Help browser for Gnome2"
-SRC_URI="mirror://gnome/2.0.0/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-
-RDEPEND=">=gnome-base/ORBit2-2.4.1
-	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/gnome-vfs-2.0.2
-	>=gnome-base/libbonobo-2.0.0
-	=gnome-extra/libgtkhtml-2*
-	>=dev-libs/libxslt-1.0.15"
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
diff --git a/gnome-extra/yelp/yelp-1.0.7.ebuild b/gnome-extra/yelp/yelp-1.0.7.ebuild
deleted file mode 100644
index 308e77079a72..000000000000
--- a/gnome-extra/yelp/yelp-1.0.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-1.0.7.ebuild,v 1.8 2003/05/29 14:36:10 liquidx Exp $
-
-inherit gnome2
-
-DESCRIPTION="Help browser for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc alpha"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=gnome-base/ORBit2-2.4.1
-	>=gnome-base/libgnomeui-2.0.2
-	>=gnome-base/libgnome-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	=gnome-extra/libgtkhtml-2*
-	>=gnome-base/gconf-1.2
-	>=dev-libs/libxslt-1.0.15"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
diff --git a/gnome-extra/yelp/yelp-2.2.2.ebuild b/gnome-extra/yelp/yelp-2.2.2.ebuild
index b1cdfde688c2..76dae7c25e9f 100644
--- a/gnome-extra/yelp/yelp-2.2.2.ebuild
+++ b/gnome-extra/yelp/yelp-2.2.2.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/gnome-extra/yelp/yelp-2.2.2.ebuild,v 1.1 2003/06/07 13:04:32 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.2.2.ebuild,v 1.2 2003/06/07 15:47:41 foser Exp $
 
 inherit gnome2
 
@@ -12,9 +12,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
-RDEPEND="gnome-base/ORBit2
-	>=dev-libs/glib-2.0.6
-	>=x11-libs/gtk+-2
+RDEPEND=">=dev-libs/glib-2.0.6
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libgnome-2.0.2
 	>=gnome-base/gnome-vfs-2
@@ -22,8 +20,9 @@ RDEPEND="gnome-base/ORBit2
 	=gnome-extra/libgtkhtml-2.2*
 	>=dev-libs/libxslt-1.0.15
 	>=gnome-base/libglade-2"
-DEPEND="${DEPEND}
-	>=gnome-base/gconf-1.2
+
+DEPEND="${RDEPEND}
+	dev-libs/popt
 	>=dev-util/pkgconfig-0.12.0"
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"