Remove firefox flag for now, as evo can't be built against it yet and have working ssl

Package-Manager: portage-2.0.52-r1

3 files changed, 31 insertions, 24 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/Manifest b/gnome-extra/evolution-data-server/Manifest
index ba0e42b291fe..e6cbafdcc886 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,19 +1,19 @@
-MD5 2e9211dbaffd190c9a2a45ad5e9388c0 ChangeLog 8646
-MD5 c958e8f11e169273587f1c902b347dd2 evolution-data-server-1.4.0.ebuild 3517
-MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
 MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
+MD5 5c6f004c99bb5ae4a3cbb29974536ee4 evolution-data-server-1.4.0.ebuild 3590
 MD5 5539f8894a986955933492390ddfcf4d evolution-data-server-1.2.1-r1.ebuild 2435
+MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
 MD5 0b3c1730fda1bca5e6b717b5a300a45f evolution-data-server-1.2.3.ebuild 2538
-MD5 e9b5448428c0594682f11bd985ed2d23 files/digest-evolution-data-server-1.4.0 82
+MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
+MD5 b4b80eee37f35d75649d61140e5432f9 ChangeLog 8802
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 31de33250de9b6fe2dba0deae946db46 files/evolution-data-server-no_lazy_bindings.patch 551
+MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1-r1 81
+MD5 9301f93589ecd825aa39e32465a707a3 files/evolution-data-server-1.2.3-gcc4.patch 558
 MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
 MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
-MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
 MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
-MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
-MD5 31de33250de9b6fe2dba0deae946db46 files/evolution-data-server-no_lazy_bindings.patch 551
-MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1-r1 81
 MD5 035a24e01dccf6365e41d4544b019f03 files/digest-evolution-data-server-1.2.3 82
+MD5 e9b5448428c0594682f11bd985ed2d23 files/digest-evolution-data-server-1.4.0 82
+MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
+MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
 MD5 f198c2b5ab564c7e450ae07be5b1efc5 files/evolution-data-server-1.2.1-local-provider.patch 892
-MD5 9301f93589ecd825aa39e32465a707a3 files/evolution-data-server-1.2.3-gcc4.patch 558
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)