Going back to standalone NSPR/NSS dependency. MozillaFirefox does not provide pkgcon...

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 88cd11d70cfcfaee9bd111df971d90a44353327f..1d9dd082fcde1d4d0693ba3235daa8ad94c3d9c4 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.272 2004/11/29 19:59:37 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.273 2004/12/02 15:03:41 rizzo Exp $
+
+  02 Dec 2004; Don Seiler <rizzo@gentoo.org> :
+  Going back to standalone NSPR/NSS dependency. MozillaFirefox does not
+  provide pkgconfig and Mozilla is not available on all arches.
 
   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

diff --git a/net-im/gaim/gaim-1.0.3-r2.ebuild b/net-im/gaim/gaim-1.0.3-r2.ebuild
index 219e16c37031eab0ee0e529d8dd97152645fce23..b94d12327a0253254278c01981c12ffff6a401ce 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.2 2004/11/29 19:59:37 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.3-r2.ebuild,v 1.3 2004/12/02 15:02:39 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 net-www/mozilla-firefox net-www/mozilla ) )
+       !gnutls? ( >=dev-libs/nss-3.9.2-r2 )
        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