diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2005-12-05 01:18:28 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2005-12-05 01:18:28 +0000 |
| commit | c30c092374e43cfef938b87629a4081e8a3cd7e8 (patch) | |
| tree | 57cc1c707154cb5e8ad567905d2e2029491716f5 /mail-client/evolution | |
| parent | Force commit again for repoman blip. (diff) | |
| download | gentoo-2-c30c092374e43cfef938b87629a4081e8a3cd7e8.tar.gz gentoo-2-c30c092374e43cfef938b87629a4081e8a3cd7e8.tar.bz2 gentoo-2-c30c092374e43cfef938b87629a4081e8a3cd7e8.zip | |
Start removing deps on mozilla/firefox for nss/nspr per mozilla herd
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'mail-client/evolution')
| -rw-r--r-- | mail-client/evolution/ChangeLog | 5 | ||||
| -rw-r--r-- | mail-client/evolution/Manifest | 2 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-2.4.2.ebuild | 38 |
3 files changed, 14 insertions, 31 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index 6faf4ad1a935..34275f9839fd 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for mail-client/evolution # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.101 2005/10/04 12:54:33 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.102 2005/12/05 01:18:28 dang Exp $ + + 05 Dec 2005; <dang@gentoo.org> evolution-2.4.2.ebuild: + -m Start removing deps on mozilla/firefox for nss/nspr per mozilla herd *evolution-2.4.1 (04 Oct 2005) diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest index 9f411c6a36c9..550f258f774e 100644 --- a/mail-client/evolution/Manifest +++ b/mail-client/evolution/Manifest @@ -4,7 +4,7 @@ MD5 b2bf22eca079cbb39f39c374cb306715 evolution-2.0.3-r2.ebuild 4206 MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093 MD5 3c3a045e22357b7bbb98e000ebf161c1 evolution-2.2.3-r3.ebuild 6063 MD5 b8b6e85957f1c53b8c75270fd6c9987b evolution-2.4.1.ebuild 6384 -MD5 14c1891bf6f2ebb5fdf4cb7ec4cc9c87 evolution-2.4.2.ebuild 6573 +MD5 e4a3f0712d93f3b6487889e5c9116646 evolution-2.4.2.ebuild 5667 MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131 MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70 MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70 diff --git a/mail-client/evolution/evolution-2.4.2.ebuild b/mail-client/evolution/evolution-2.4.2.ebuild index a43dce40aaed..dbc0c940c7dc 100644 --- a/mail-client/evolution/evolution-2.4.2.ebuild +++ b/mail-client/evolution/evolution-2.4.2.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/mail-client/evolution/evolution-2.4.2.ebuild,v 1.1 2005/12/04 09:09:52 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.4.2.ebuild,v 1.2 2005/12/05 01:18:28 dang Exp $ inherit eutils flag-o-matic alternatives gnome2 @@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/" LICENSE="GPL-2 FDL-1.1" SLOT="2.0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp pda profile spell ssl" +IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono nntp pda profile spell ssl" # Pango dependency required to avoid font rendering problems RDEPEND=">=x11-themes/gnome-icon-theme-1.2 @@ -40,10 +40,8 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1.2 spell? ( >=app-text/gnome-spell-1.0.5 ) crypt? ( >=app-crypt/gnupg-1.2.2 ) ssl? ( - mozilla? ( >=www-client/mozilla-1.7.3 ) - !mozilla? ( - >=dev-libs/nspr-4.4.1 - >=dev-libs/nss-3.9.2 ) ) + >=dev-libs/nspr-4.4.1 + >=dev-libs/nss-3.9.2 ) ldap? ( >=net-nds/openldap-2 ) kerberos? ( virtual/krb5 ) krb4? ( virtual/krb5 ) @@ -52,9 +50,6 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1.2 =media-libs/gst-plugins-0.8* ) dbus? ( sys-apps/dbus ) mono? ( >=dev-lang/mono-1 )" -# mozilla? ( !firefox? ( >=www-client/mozilla-1.7.3 ) ) -# firefox? ( >=www-client/mozilla-firefox-1.0.7-r3 ) -# !mozilla? ( !firefox? ( DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.9 @@ -162,27 +157,12 @@ src_unpack() { } src_compile() { - # Use NSS/NSPR only if 'ssl' is enabled. They can be used from - # mozilla/firefox if the relevant USE flags are enabled. 'firefox' take - # precedence over 'mozilla'. + # Use NSS/NSPR only if 'ssl' is enabled. 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 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) - NSPR_INC=$(pkg-config --variable=includedir mozilla-nspr)/nspr - else - NSS_LIB=/usr/$(get_libdir)/nss - NSS_INC=/usr/include/nss - NSPR_LIB=/usr/$(get_libdir)/nspr - NSPR_INC=/usr/include/nspr - fi + NSS_LIB=/usr/$(get_libdir)/nss + NSS_INC=/usr/include/nss + NSPR_LIB=/usr/$(get_libdir)/nspr + NSPR_INC=/usr/include/nspr G2CONF="${G2CONF} \ --with-nspr-includes=${NSPR_INC} \ |