diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2004-11-11 14:57:52 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2004-11-11 14:57:52 +0000 |
| commit | 928e346944c81d6f27c9e2fe4422c53d05d6225b (patch) | |
| tree | a4c4f1b3ec385945ae078cc0ff1bd3462945f336 /mail-client | |
| parent | Added app-shells/dash:diet (diff) | |
| download | gentoo-2-928e346944c81d6f27c9e2fe4422c53d05d6225b.tar.gz gentoo-2-928e346944c81d6f27c9e2fe4422c53d05d6225b.tar.bz2 gentoo-2-928e346944c81d6f27c9e2fe4422c53d05d6225b.zip | |
backported nss/nspr fix to 1.4.6
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/evolution/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-1.4.6.ebuild | 18 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-2.0.2.ebuild | 4 |
3 files changed, 18 insertions, 10 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index 1276a6ca3f00..a34c757a6ada 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-client/evolution # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.28 2004/11/04 00:13:23 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.29 2004/11/11 14:57:52 liquidx Exp $ + + 31 Oct 2004; Alastair Tse <liquidx@gentoo.org> evolution-1.4.6.ebuild, + evolution-2.0.2.ebuild: + backported nss/nspr fix to 1.4.6 03 Nov 2004; Stephen P. Becker <geoman@gentoo.org> evolution-2.0.2.ebuild: added ~mips keyword diff --git a/mail-client/evolution/evolution-1.4.6.ebuild b/mail-client/evolution/evolution-1.4.6.ebuild index 5dbd37324403..6949150556bb 100644 --- a/mail-client/evolution/evolution-1.4.6.ebuild +++ b/mail-client/evolution/evolution-1.4.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.15 2004/10/05 19:32:41 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.16 2004/11/11 14:57:52 liquidx Exp $ inherit flag-o-matic virtualx gnome2 eutils alternatives @@ -143,20 +143,24 @@ src_compile() { # Use Mozilla NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE if use ssl && use mozilla; then if has_version "dev-libs/nspr"; then - NSS_LIB=/usr/lib - NSS_INC=/usr/include + NSS_LIB=/usr/lib/nss + NSPR_LIB=/usr/lib/nspr + NSS_INC=/usr/include/nss + NSPR_INC=/usr/include/nspr elif has_version "net-www/mozilla"; then NSS_LIB=/usr/lib/mozilla - NSS_INC=/usr/lib/mozilla/include + NSPR_LIB=/usr/lib/mozilla + NSS_INC=/usr/lib/mozilla/include/nss + NSPR_INC=/usr/lib/mozilla/include/nspr else eerror "Neither net-www/mozilla nor dev-libs/nspr found." die "unexpected error. unable to find nss/nspr" fi myconf="${myconf} --enable-nss=yes \ - --with-nspr-includes=${NSS_INC}/nspr \ - --with-nspr-libs=${NSS_LIB} \ - --with-nss-includes=${NSS_INC}/nss \ + --with-nspr-includes=${NSPR_INC} \ + --with-nspr-libs=${NSPR_LIB} \ + --with-nss-includes=${NSS_INC} \ --with-nss-libs=${NSS_LIB}" else myconf="${myconf} --without-nspr-libs --without-nspr-includes \ diff --git a/mail-client/evolution/evolution-2.0.2.ebuild b/mail-client/evolution/evolution-2.0.2.ebuild index 0069c22bdf2b..d008631537a4 100644 --- a/mail-client/evolution/evolution-2.0.2.ebuild +++ b/mail-client/evolution/evolution-2.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.2.ebuild,v 1.7 2004/11/11 01:34:42 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.2.ebuild,v 1.8 2004/11/11 14:57:52 liquidx Exp $ inherit eutils virtualx gnome2 flag-o-matic alternatives @@ -113,7 +113,7 @@ src_compile() { --with-nspr-includes=${NSPR_INC} \ --with-nspr-libs=${NSPR_LIB} \ --with-nss-includes=${NSS_INC} \ - --with-nss-libs=${NSS_LIB}" + --with-nss-libs=${NSS_LIB}"s else myconf="${myconf} --without-nspr-libs --without-nspr-includes \ --without-nss-libs --without-nss-includes" |