diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2005-09-14 01:50:29 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2005-09-14 01:50:29 +0000 |
| commit | 5cfe1a84a2c8acceaebefde2a558c046305575fc (patch) | |
| tree | afa132e9581ea65bcc7f4cae937e6a89bfd969f8 /gnome-extra | |
| parent | Remove firefox flag for now, as evo can't be built against it yet and have wo... (diff) | |
| download | gentoo-2-5cfe1a84a2c8acceaebefde2a558c046305575fc.tar.gz gentoo-2-5cfe1a84a2c8acceaebefde2a558c046305575fc.tar.bz2 gentoo-2-5cfe1a84a2c8acceaebefde2a558c046305575fc.zip | |
Remove firefox flag for now, as evo can't be built against it yet and have working ssl
(Portage version: 2.0.52-r1)
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/evolution-data-server/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild | 27 |
2 files changed, 20 insertions, 13 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index 4dd4ef37a5a1..766f36a05631 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/evolution-data-server # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.60 2005/09/10 15:44:21 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.61 2005/09/14 01:50:29 dang Exp $ + + 14 Sep 2005; <dang@gentoo.org> evolution-data-server-1.4.0.ebuild: + Remove firefox flag for now, as evo can't be built against it yet and have + working ssl 10 Sep 2005; Leonardo Boshell <leonardop@gentoo.org> evolution-data-server-1.4.0.ebuild: diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild index 4e2cba6ed4a9..5c49c68d328e 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild,v 1.2 2005/09/10 15:44:21 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.4.0.ebuild,v 1.3 2005/09/14 01:50:29 dang Exp $ inherit eutils gnome2 @@ -10,7 +10,7 @@ HOMEPAGE="http://www.ximian.com/" LICENSE="LGPL-2 Sleepycat" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc firefox ipv6 kerberos krb4 ldap mozilla nntp ssl static" +IUSE="doc ipv6 kerberos krb4 ldap mozilla nntp ssl static" RDEPEND=">=dev-libs/glib-2.4 >=gnome-base/libbonobo-2.4.2 @@ -26,13 +26,15 @@ RDEPEND=">=dev-libs/glib-2.4 sys-libs/zlib ldap? ( >=net-nds/openldap-2.0 ) ssl? ( - mozilla? ( !firefox? ( >=www-client/mozilla-1.7.3 ) ) - firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 ) - !mozilla? ( !firefox? ( + mozilla? ( >=www-client/mozilla-1.7.3 ) + !mozilla? ( >=dev-libs/nspr-4.4 - >=dev-libs/nss-3.9 ) ) ) + >=dev-libs/nss-3.9 ) ) kerberos? ( virtual/krb5 ) krb4? ( virtual/krb5 )" +# mozilla? ( !firefox? ( >=www-client/mozilla-1.7.3 ) ) +# firefox? ( >=www-client/mozilla-firefox-1.0.6-r6 ) +# !mozilla? ( !firefox? ( DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.9 @@ -88,12 +90,13 @@ src_compile() { # mozilla/firefox if the relevant USE flags are enabled. 'firefox' take # precedence over 'mozilla'. if use ssl ; then - if use firefox; then - NSS_LIB=$(pkg-config --variable=libdir firefox-nss) - NSS_INC=$(pkg-config --variable=includedir firefox-nss)/nss - NSPR_LIB=$(pkg-config --variable=libdir firefox-nspr) - NSPR_INC=$(pkg-config --variable=includedir firefox-nspr)/nspr - elif use mozilla; then +# if use firefox; then +# NSS_LIB=$(pkg-config --variable=libdir firefox-nss) +# NSS_INC=$(pkg-config --variable=includedir firefox-nss)/nss +# NSPR_LIB=$(pkg-config --variable=libdir firefox-nspr) +# NSPR_INC=$(pkg-config --variable=includedir firefox-nspr)/nspr +# elif use mozilla; then + if use mozilla; then NSS_LIB=$(pkg-config --variable=libdir mozilla-nss) NSS_INC=$(pkg-config --variable=includedir mozilla-nss)/nss NSPR_LIB=$(pkg-config --variable=libdir mozilla-nspr) |