diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2005-12-04 23:48:51 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2005-12-04 23:48:51 +0000 |
| commit | a75c240a28c0c4e3647e3fef7a97cd99322c288a (patch) | |
| tree | 86d88ee14934474070a6ee17a17326af5deb5309 /gnome-extra | |
| parent | backport patch from cvs to solve parallel build issues, should fix #112129. ... (diff) | |
| download | gentoo-2-a75c240a28c0c4e3647e3fef7a97cd99322c288a.tar.gz gentoo-2-a75c240a28c0c4e3647e3fef7a97cd99322c288a.tar.bz2 gentoo-2-a75c240a28c0c4e3647e3fef7a97cd99322c288a.zip | |
Begin removing mozilla/firefox as sources for nspf/nss per mozilla herd
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/evolution-data-server/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-extra/evolution-data-server/Manifest | 2 | ||||
| -rw-r--r-- | gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild | 40 |
3 files changed, 14 insertions, 33 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index e9dee8841760..6fa879aa44e4 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,9 @@ # 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.66 2005/12/01 20:36:19 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.67 2005/12/04 23:48:51 dang Exp $ + + 04 Dec 2005; <dang@gentoo.org> evolution-data-server-1.4.2.1.ebuild: + Begin removing mozilla/firefox as sources for nspf/nss per mozilla herd *evolution-data-server-1.4.2.1 (01 Dec 2005) diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index dd60fdb7f04e..4a95f75432b1 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -4,7 +4,7 @@ MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983 MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985 MD5 e3a6586c651eb7025b3a7e6aec86c1b2 evolution-data-server-1.2.3.ebuild 2538 MD5 36265d101a2a38d3dd1d8c529614017b evolution-data-server-1.4.1.1.ebuild 3599 -MD5 1f8032a2ccea361f02e5a20199cbf5d9 evolution-data-server-1.4.2.1.ebuild 3628 +MD5 3fc1bcccb79cd6683e338818d001f330 evolution-data-server-1.4.2.1.ebuild 2715 MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81 MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81 MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81 diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild index 9b850047c87e..b4716540b4e2 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.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.2.1.ebuild,v 1.1 2005/12/01 20:36:19 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.4.2.1.ebuild,v 1.2 2005/12/04 23:48:51 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 ipv6 kerberos krb4 ldap mozilla nntp ssl" +IUSE="doc ipv6 kerberos krb4 ldap nntp ssl" RDEPEND=">=dev-libs/glib-2.4 >=gnome-base/libbonobo-2.4.2 @@ -25,17 +25,10 @@ RDEPEND=">=dev-libs/glib-2.4 >=net-libs/libsoup-2.2.2 sys-libs/zlib ldap? ( >=net-nds/openldap-2.0 ) - ssl? ( - mozilla? ( >=www-client/mozilla-1.7.3 ) - !mozilla? ( - >=dev-libs/nspr-4.4 - >=dev-libs/nss-3.9 ) ) + ssl? ( >=dev-libs/nspr-4.4 + >=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 @@ -87,27 +80,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} \ |