No seamonkey support anymore; remove firefox use flag

Package-Manager: portage-2.1.1_rc1-r6

3 files changed, 26 insertions, 32 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index a97bc82d66d4..d4659059994e 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.124 2006/09/08 16:58:54 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.125 2006/09/08 20:52:14 dang Exp $
+
+  08 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> yelp-2.16.0.ebuild:
+  No seamonkey support anymore; remove firefox use flag
 
   08 Sep 2006; Saleem Abdulrasool <compnerd@gentoo.org> yelp-2.16.0.ebuild:
   fix beagle dep atom
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 55b227b40f6c..b5a81b226c67 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX yelp-2.14.0-mozilla-include-fix.patch 276 RMD160 24d8144d6655617da708b7048536582bad257795 SHA1 2b66e08646e205fbae9d6fb4143c400c1b9ac1b7 SHA256 d8d44922f7710eeb7f80d57c68187fc138c318473f3c24455e53b9b2f2114356
 MD5 d3dd0a00ede7b453249075c979ddc6cc files/yelp-2.14.0-mozilla-include-fix.patch 276
 RMD160 24d8144d6655617da708b7048536582bad257795 files/yelp-2.14.0-mozilla-include-fix.patch 276
@@ -25,14 +28,14 @@ EBUILD yelp-2.14.2-r2.ebuild 1763 RMD160 f80442a5b7ea57964e0f1af1a9385bc1afe255b
 MD5 be06555dba34f3ad0698ef333f1064fc yelp-2.14.2-r2.ebuild 1763
 RMD160 f80442a5b7ea57964e0f1af1a9385bc1afe255bf yelp-2.14.2-r2.ebuild 1763
 SHA256 b65cfc95d52c514726e104b3110fef320eee09de0031eabd27f857d40e4c6e68 yelp-2.14.2-r2.ebuild 1763
-EBUILD yelp-2.16.0.ebuild 1565 RMD160 6aaa39a6d412c6d875f2034efa1188df4077a1c0 SHA1 520a20f787bb304d3dbb7b4a83949d9fd9c9311f SHA256 67bb75f47c06b3791c92795f746934461fe3131ae70d0d8cdc35eb2ba2b6ddf6
-MD5 7d976ef3db69214252823250c8cfd84e yelp-2.16.0.ebuild 1565
-RMD160 6aaa39a6d412c6d875f2034efa1188df4077a1c0 yelp-2.16.0.ebuild 1565
-SHA256 67bb75f47c06b3791c92795f746934461fe3131ae70d0d8cdc35eb2ba2b6ddf6 yelp-2.16.0.ebuild 1565
-MISC ChangeLog 14057 RMD160 bc56c9ae05a6b976155799e2332a4185ffad465b SHA1 97fe24a936a2e3f2548c9d90eb98a30b79f9564e SHA256 e64171e38e2046614f2431ac65e42b55374b625dc9742387e7a7c458ce6a1a9e
-MD5 06e8a940458840b550eeb14e2adf4f28 ChangeLog 14057
-RMD160 bc56c9ae05a6b976155799e2332a4185ffad465b ChangeLog 14057
-SHA256 e64171e38e2046614f2431ac65e42b55374b625dc9742387e7a7c458ce6a1a9e ChangeLog 14057
+EBUILD yelp-2.16.0.ebuild 1068 RMD160 88591a47db9eb5dcb88b66dfdc7ae8705d225b5c SHA1 f14e2c3b42525c9993829f9414eb40651214dc15 SHA256 032dcc937a32f576d3afc6a2c941e36c4a8126e6ac086a2c6d1fac511440646f
+MD5 2cdda0c9781dd00a78df3e251a52c45c yelp-2.16.0.ebuild 1068
+RMD160 88591a47db9eb5dcb88b66dfdc7ae8705d225b5c yelp-2.16.0.ebuild 1068
+SHA256 032dcc937a32f576d3afc6a2c941e36c4a8126e6ac086a2c6d1fac511440646f yelp-2.16.0.ebuild 1068
+MISC ChangeLog 14181 RMD160 b56af96265a84e388fb4928053bb7489a1e0d953 SHA1 1a4fddacc19c7bef81e9adb16ead9170ffa6bb13 SHA256 f07de3ee81a2fbd2ac0bf9c044469ca1e39afc63df2792ec12ac799bb9ef1459
+MD5 51c89593d49478293168198986778eca ChangeLog 14181
+RMD160 b56af96265a84e388fb4928053bb7489a1e0d953 ChangeLog 14181
+SHA256 f07de3ee81a2fbd2ac0bf9c044469ca1e39afc63df2792ec12ac799bb9ef1459 ChangeLog 14181
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -46,3 +49,10 @@ SHA256 8236663003b415d744ff56678b4d939f42f6dee9b7421d7f36fee070a683956f files/di
 MD5 a83cbca79a235324fb42a2a61186cc95 files/digest-yelp-2.16.0 238
 RMD160 441dc22920a7a101978f9b4b47975c2a2f7ce3a4 files/digest-yelp-2.16.0 238
 SHA256 10e957c4e0d38ad5cd42f7322e7e94980e2b42e794c0a443d91f36814625a7bc files/digest-yelp-2.16.0 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFAdgFomPajV0RnrERAhjVAJ9izfbLi1p1G6cj/8dCc/qvOFEVegCfbVPa
+EDSRvvhTJ6Svdzkb7fWmwEE=
+=xRjn
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/yelp-2.16.0.ebuild b/gnome-extra/yelp/yelp-2.16.0.ebuild
index 45b12e3f619e..b58c5abb0988 100644
--- a/gnome-extra/yelp/yelp-2.16.0.ebuild
+++ b/gnome-extra/yelp/yelp-2.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.16.0.ebuild,v 1.2 2006/09/08 16:58:54 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.16.0.ebuild,v 1.3 2006/09/08 20:52:14 dang Exp $
 
 inherit eutils gnome2 autotools
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="beagle firefox"
+IUSE="beagle"
 
 RDEPEND=">=gnome-base/gconf-2
 	>=app-text/gnome-doc-utils-0.3.1
@@ -25,11 +25,7 @@ RDEPEND=">=gnome-base/gconf-2
 	>=dev-libs/glib-2
 	sys-apps/dbus
 	beagle? ( >=app-misc/beagle-0.2.4 )
-	sparc? ( >=www-client/mozilla-firefox-1.0.2-r1 )
-	ia64? ( >=www-client/mozilla-firefox-1.0.2-r1 )
-	ppc64? ( www-client/seamonkey )
-	!sparc? ( !ia64? ( !firefox? ( www-client/seamonkey ) ) )
-	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
+	>=www-client/mozilla-firefox-1.0.2-r1
 	sys-libs/zlib
 	app-arch/bzip2"
 
@@ -42,20 +38,5 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 
 pkg_setup() {
-	G2CONF="${G2CONF} --enable-man --enable-info"
-
-	if use firefox || use sparc || use ia64; then
-		G2CONF="${G2CONF} --with-mozilla=firefox"
-	else
-		G2CONF="${G2CONF} --with-mozilla=seamonkey"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch ${FILESDIR}/${PN}-2.15.1-mozilla-include-fix.patch
-
-	mv aclocal.m4 old_macros.m4
-	AT_M4DIR="m4 ." eautoreconf
+	G2CONF="${G2CONF} --enable-man --enable-info --with-mozilla=firefox"
 }