Start removing deps on mozilla/firefox for nss/nspr per mozilla herd

Package-Manager: portage-2.0.53_rc7

3 files changed, 25 insertions, 32 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..c1db1e93479c 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,10 +1,13 @@
-MD5 fea4d6fae865658b389bf603c475e742 ChangeLog 30775
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6f692a217fdbb4cf7762f44204758e89 ChangeLog 30907
 MD5 3318548ad5a620ebd3b5405ef77100fd evolution-1.2.4.ebuild 6254
 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 4bdbcc2757f5a3eddb5a03bc170e3a4e evolution-2.4.2.ebuild 5662
 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
@@ -25,3 +28,10 @@ MD5 35dfdb3422f49ada8891285f5104d29c files/evolution-2.3.8-gentoo.patch 660
 MD5 56a0d793e598c8e0c91ec5ab0e2a4e4b files/evolution.formatstring.patch 2146
 MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
 MD5 f0750af493d9560f5faf50f39fd644c5 metadata.xml 285
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDk5VYomPajV0RnrERAsILAJ9wFABGo7Sdb2sHGu1dyeEVmVC05wCfYwn5
+xcXYxX+0r8PGb0O92359vfM=
+=Be6c
+-----END PGP SIGNATURE-----
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} \