Allowing dep on mozilla-firefox and/or mozilla if users doesn't like standalone NSS...

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 70b64cf2520d4a7162536e683d8c2b77da66fbd2..88cd11d70cfcfaee9bd111df971d90a44353327f 100644 (file)
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.271 2004/11/29 15:53:55 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.272 2004/11/29 19:59:37 rizzo Exp $
+
+  29 Nov 2004; Don Seiler <rizzo@gentoo.org> gaim-1.0.3-r2.ebuild:
+  Allowing dep on mozilla-firefox and/or mozilla if users doesn't like
+  standalone NSS package. Closes Bug #69339
 
 *gaim-1.0.3-r2 (29 Nov 2004)
 

diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 0b1ae7119797400241a70a2def1b80954d9f8906..8ead9eb0ae214bf57c3f5658c01ce6ef6aa6f6da 100644 (file)
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,6 +1,6 @@
-MD5 52a8acfd7b7ee504619eb4be2024fd20 ChangeLog 42101
+MD5 e87a6888eae26829319b9538f1730f1e ChangeLog 42284
 MD5 fd54c70bd27573e820a717e82c593b04 gaim-1.0.2-r1.ebuild 3717
-MD5 edf69217e66be12a0826af3b977e9187 gaim-1.0.3-r2.ebuild 3747
+MD5 75e2765d76cf6d5cf169a435a10b6fba gaim-1.0.3-r2.ebuild 3798
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
 MD5 3c880530528d7d9a72baa22afc76736d files/digest-gaim-1.0.3-r2 64
 MD5 f9039f6cb5717109cf48a9f7e5d51a32 files/digest-gaim-1.0.2-r1 64

diff --git a/net-im/gaim/gaim-1.0.3-r2.ebuild b/net-im/gaim/gaim-1.0.3-r2.ebuild
index 1a82b920a038b80bc9a60de62d635c59f32d8129..219e16c37031eab0ee0e529d8dd97152645fce23 100644 (file)
--- a/net-im/gaim/gaim-1.0.3-r2.ebuild
+++ b/net-im/gaim/gaim-1.0.3-r2.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/net-im/gaim/gaim-1.0.3-r2.ebuild,v 1.1 2004/11/29 15:53:56 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.3-r2.ebuild,v 1.2 2004/11/29 19:59:37 rizzo Exp $
 
 inherit flag-o-matic eutils gcc debug
 
@@ -25,7 +25,7 @@ DEPEND=">=x11-libs/gtk+-2.0
                        !<dev-perl/ExtUtils-MakeMaker-6.17 )
        spell? ( >=app-text/gtkspell-2.0.2 )
        gnutls? ( net-libs/gnutls )
-       !gnutls? ( >=dev-libs/nss-3.9.2-r2 )
+       !gnutls? ( || ( >=dev-libs/nss-3.9.2-r2 net-www/mozilla-firefox net-www/mozilla ) )
        silc? ( >=net-im/silc-toolkit-0.9.12-r3 )"
        #eds? ( gnome-extra/evolution-data-server )"
 
@@ -103,10 +103,10 @@ src_compile() {
        else
                einfo "Disabling GnuTLS, using NSS"
                myconf="${myconf} --enable-gnutls=no"
-               myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-               myconf="${myconf} --with-nss-includes=/usr/include/nss"
-               myconf="${myconf} --with-nspr-libs=/usr/lib/nspr"
-               myconf="${myconf} --with-nss-libs=/usr/lib/nss"
+               #myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
+               #myconf="${myconf} --with-nss-includes=/usr/include/nss"
+               #myconf="${myconf} --with-nspr-libs=/usr/lib/nspr"
+               #myconf="${myconf} --with-nss-libs=/usr/lib/nss"
        fi