From: Don Seiler <rizzo@gentoo.org>
Date: Mon, 29 Nov 2004 20:01:50 +0000 (+0000)
Subject: Allowing dep on mozilla-firefox and/or mozilla if users doesn't like standalone NSS... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7517fce68cbd7228cc0de180b4bcfe6eec058574;p=gentoo.git

Allowing dep on mozilla-firefox and/or mozilla if users doesn't like standalone NSS package.  Closes Bug #69339
---

diff --git a/x11-plugins/gaim-encryption/ChangeLog b/x11-plugins/gaim-encryption/ChangeLog
index 11b65e456e42..b4a2403e2bb9 100644
--- a/x11-plugins/gaim-encryption/ChangeLog
+++ b/x11-plugins/gaim-encryption/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/gaim-encryption
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/ChangeLog,v 1.42 2004/11/27 02:07:26 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/ChangeLog,v 1.43 2004/11/29 20:01:50 rizzo Exp $
+
+  29 Nov 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.32-r1.ebuild:
+  Allowing dep on mozilla-firefox and/or mozilla if users doesn't like
+  standalone NSS package. Closes Bug #69339
 
 *gaim-encryption-2.32-r1 (26 Nov 2004)
 
diff --git a/x11-plugins/gaim-encryption/Manifest b/x11-plugins/gaim-encryption/Manifest
index 1bed1352d022..37a715d36c5d 100644
--- a/x11-plugins/gaim-encryption/Manifest
+++ b/x11-plugins/gaim-encryption/Manifest
@@ -1,6 +1,6 @@
-MD5 e566459fd5f9179e3c068c64f7062ca5 ChangeLog 9352
-MD5 0edaa1a5379f75c550625a7015de0841 gaim-encryption-2.32.ebuild 1125
+MD5 50ef32bf56470f58317daaca8c8f5a69 ChangeLog 9545
 MD5 ab7db4bf9ff48c8de9da14fd12f6c15c metadata.xml 344
-MD5 0fd9ee417642c45cbfe57a8eac7cc264 gaim-encryption-2.32-r1.ebuild 1127
+MD5 0edaa1a5379f75c550625a7015de0841 gaim-encryption-2.32.ebuild 1125
+MD5 303bc73c0ea8cc0ecbd8883110aa27ac gaim-encryption-2.32-r1.ebuild 893
 MD5 ff64a30a61d21ad47aab6594e4b1325b files/digest-gaim-encryption-2.32-r1 72
 MD5 ff64a30a61d21ad47aab6594e4b1325b files/digest-gaim-encryption-2.32 72
diff --git a/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild b/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild
index 4280b39fbddc..c6e39bb0e854 100644
--- a/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild
+++ b/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.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/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild,v 1.2 2004/11/27 04:20:08 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild,v 1.3 2004/11/29 20:01:50 rizzo Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -14,19 +14,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
 IUSE=""
 
 DEPEND=">=net-im/gaim-1.0.1
-	>=dev-libs/nss-3.9.2-r2"
+	|| ( >=dev-libs/nss-3.9.2-r2 net-www/mozilla-firefox net-www/mozilla )"
 
 src_compile() {
-	local myconf
 
-	NSS_LIB=/usr/lib
-	NSS_INC=/usr/include
-	myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"
-	myconf="${myconf} --with-nss-includes=${NSS_INC}/nss"
-	myconf="${myconf} --with-nspr-libs=${NSS_LIB}/nspr"
-	myconf="${myconf} --with-nss-libs=${NSS_LIB}/nss"
-
-	econf ${myconf} || die "Configuration failed"
+	econf || die "Configuration failed"
 	einfo "Replacing -Os CFLAG with -O2"
 	replace-flags -Os -O2