summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2006-09-08 20:52:14 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2006-09-08 20:52:14 +0000
commit3051a36da0395b3ebb7b439194333be88fea4c98 (patch)
tree6b9aad6edff4ce7187d9271b668ba9be64f0442e /gnome-extra
parentRemoved unnecessary ${RDEPEND} in RDEPEND. (diff)
downloadgentoo-2-3051a36da0395b3ebb7b439194333be88fea4c98.tar.gz
gentoo-2-3051a36da0395b3ebb7b439194333be88fea4c98.tar.bz2
gentoo-2-3051a36da0395b3ebb7b439194333be88fea4c98.zip
No seamonkey support anymore; remove firefox use flag
(Portage version: 2.1.1_rc1-r6)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/yelp/ChangeLog5
-rw-r--r--gnome-extra/yelp/yelp-2.16.0.ebuild27
2 files changed, 8 insertions, 24 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/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"
}