diff options
Diffstat (limited to 'net-mail')
| -rw-r--r-- | net-mail/evolution/ChangeLog | 5 | ||||
| -rw-r--r-- | net-mail/evolution/evolution-1.2.2.ebuild | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog index 7244b05945a6..1e26d493611d 100644 --- a/net-mail/evolution/ChangeLog +++ b/net-mail/evolution/ChangeLog @@ -1,12 +1,15 @@ # ChangeLog for net-mail/evolution # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.41 2003/02/17 22:02:51 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.42 2003/03/02 21:27:22 liquidx Exp $ 17 Feb 2003; foser <foser@gentoo.org> evolution-1.[2.0-r1,0.8,2.1,2.2].ebuild : Fixed db source uri (#15839) *evolution-1.2.2 (16 Feb 2003) + 02 Mar 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.2.ebuild : + USE="-mozilla" will actually remove mozilla from dependencies (#12821) + 16 Feb 2003; Daniel Robbins <drobbins@gentoo.org> evolution-1.2.2.ebuild: added latest version ~masked for all arches previously in KEYWORDS. "It works for me..." and your mileage may vary. Needs testing. diff --git a/net-mail/evolution/evolution-1.2.2.ebuild b/net-mail/evolution/evolution-1.2.2.ebuild index f2376fb54055..9c10f4d66d70 100644 --- a/net-mail/evolution/evolution-1.2.2.ebuild +++ b/net-mail/evolution/evolution-1.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.2.2.ebuild,v 1.2 2003/02/17 22:02:51 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.2.2.ebuild,v 1.3 2003/03/02 21:27:22 liquidx Exp $ IUSE="ssl nls mozilla ldap doc spell pda ipv6" @@ -36,10 +36,8 @@ RDEPEND="app-text/scrollkeeper =dev-util/gob-1* >=net-libs/soup-0.7.4-r1 doc? ( >=app-text/scrollkeeper-0.3.10-r1 ) - ssl? ( >=net-www/mozilla-0.9.9 ) - ssl? ( >=dev-libs/openssl-0.9.5 ) + ssl? ( mozilla? ( >=net-www/mozilla-0.9.9 ) : ( >=dev-libs/openssl-0.9.5 ) ) ldap? ( >=net-nds/openldap-2.0 ) - mozilla? ( >=net-www/mozilla-0.9.9 ) pda? ( >=gnome-extra/gnome-pilot-0.1.61-r2 >=dev-libs/pilot-link-0.11.5 ) spell? ( >=app-text/gnome-spell-0.5 )" @@ -47,10 +45,6 @@ RDEPEND="app-text/scrollkeeper # the pilot-link dep is normally covered by gnome-pilot, but evo # requires an higher version then gnome-pilot (bug #10307) -# ssl? ( mozilla? ( >=net-www/mozilla-0.9.9 ) ) -# ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) ) -# This is how the deps should be, but portage cannot handle it - # Added dependency on "dev-util/gob" this should fix a configure bug DEPEND="${RDEPEND} @@ -149,7 +143,7 @@ src_compile() { fi # Else use OpenSSL if 'mozilla' not in USE ... - if [ -n "`use ssl`" ] && [ -z "`use mozilla`" ] ; then + if [ -n "`use ssl`" -a -z "`use mozilla`" ] ; then myconf="${myconf} --enable-openssl=yes" fi |