Using mozilla USE flag for nss/mozilla decision

3 files changed, 23 insertions, 26 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index fa0c1fb45957..7ebf337c5567 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.97 2003/11/21 20:27:38 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.98 2003/11/21 22:42:27 rizzo Exp $
+
+  21 Nov 2003; Don Seiler <rizzo@gentoo.org>; gaim-0.72-r2.ebuild:
+  Using mozilla USE flag for nss/mozilla logic.  Thanks to Eric again.
 
   21 Nov 2003; Jason Wever <weeve@gentoo.org> gaim-0.72-r1.ebuild:
   Marked stable on sparc.
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index a9bad012070f..989ef66bd5ae 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,24 +1,24 @@
-MD5 9319539d29d9fb3908789ccf6026d7db gaim-0.66-r3.ebuild 1991
-MD5 a2560a9321cb7f81575f168d31442aa9 ChangeLog 16263
-MD5 9c060fe66488650173c0a493e8744b0a gaim-0.72.ebuild 2508
 MD5 bed467c3e7077888cf4fd615c5f47678 gaim-0.67.ebuild 2185
+MD5 3dc9c94c6beb41d2314814297ff004ea gaim-0.72-r2.ebuild 3331
+MD5 7f89f602fb6fe4954a39c6909cbf3333 gaim-0.71-r2.ebuild 2658
 MD5 00da5062575561e913be722ee23a1982 gaim-0.72-r1.ebuild 2890
-MD5 560eff6430643ec34fd5c857086df72f gaim-0.72-r2.ebuild 3543
+MD5 9319539d29d9fb3908789ccf6026d7db gaim-0.66-r3.ebuild 1991
+MD5 9c060fe66488650173c0a493e8744b0a gaim-0.72.ebuild 2508
 MD5 1a9b1940485519f26cffa675c833ca7d gaim-0.70-r2.ebuild 2506
+MD5 72ee43f865fd8deb06ddb0d90558e95e ChangeLog 16402
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
-MD5 7f89f602fb6fe4954a39c6909cbf3333 gaim-0.71-r2.ebuild 2658
-MD5 ac8c28584ee56def0cea65e38e235f0b files/digest-gaim-0.66-r3 126
-MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
+MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
+MD5 1ade161b6a07868398812aa91ac7115d files/gaim_cjk_gtkconv.patch 1126
+MD5 eaec78ac2e19b5e10a20a2c86bf65a34 files/gaim-0.66-prefs.c.diff 598
+MD5 ac8c28584ee56def0cea65e38e235f0b files/digest-gaim-0.66-r3 126
+MD5 964ed187fa4d6e26816bf39aeb5cd8f1 files/digest-gaim-0.70-r2 135
+MD5 7b98aff453d6189397e4a822c69389f0 files/digest-gaim-0.71-r2 135
 MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r1 135
 MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r2 135
-MD5 1ade161b6a07868398812aa91ac7115d files/gaim_cjk_gtkconv.patch 1126
 MD5 3eb868476154d28a1123ee91e41fef95 files/gaim-0.72-msn-fixes.patch 1671
-MD5 964ed187fa4d6e26816bf39aeb5cd8f1 files/digest-gaim-0.70-r2 135
-MD5 eaec78ac2e19b5e10a20a2c86bf65a34 files/gaim-0.66-prefs.c.diff 598
-MD5 8a38e88937de7dd9b0bd1cd18afd8164 files/gaim-encryption-2.10-keys.patch 476
+MD5 0b625a0ccaa6c9ec3b7cde1b806fa87d files/gaim-0.71-icq-crash-hack.patch 1584
 MD5 97fa7a76f6bc96c363844ccc57b2bec4 files/gaim_gtkimcontext_patch.diff 1106
+MD5 8a38e88937de7dd9b0bd1cd18afd8164 files/gaim-encryption-2.10-keys.patch 476
 MD5 9854f11fcca9236626b451eb183e6b00 files/gaim-0.71-ipv6.patch 1499
 MD5 8207ea359084982a599aa71679eac261 files/gaim-0.71-jabber-strip.patch 844
-MD5 7b98aff453d6189397e4a822c69389f0 files/digest-gaim-0.71-r2 135
-MD5 0b625a0ccaa6c9ec3b7cde1b806fa87d files/gaim-0.71-icq-crash-hack.patch 1584
diff --git a/net-im/gaim/gaim-0.72-r2.ebuild b/net-im/gaim/gaim-0.72-r2.ebuild
index 319961ddf3b1..1a819cea2438 100644
--- a/net-im/gaim/gaim-0.72-r2.ebuild
+++ b/net-im/gaim/gaim-0.72-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.72-r2.ebuild,v 1.4 2003/11/21 15:11:19 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.72-r2.ebuild,v 1.5 2003/11/21 22:42:27 rizzo Exp $
 
-IUSE="nls perl spell nas ssl cjk"
+IUSE="nls perl spell nas ssl cjk mozilla"
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
@@ -24,10 +24,8 @@ DEPEND="=sys-libs/db-1*
 	>=media-libs/audiofile-0.2.0
 	perl? ( >=dev-lang/perl-5.6.1
 		>=sys-apps/sed-4.0.0 )
-	( || ( dev-libs/nss
-			( net-www/mozilla )
-		)
-	)
+	mozilla? ( net-www/mozilla )
+	!mozilla? ( dev-libs/nss )
 	spell? ( >=app-text/gtkspell-2.0.2 )"
 
 src_unpack() {
@@ -50,16 +48,12 @@ src_compile() {
 	use nls  || myconf="${myconf} --disable-nls"
 	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
 
-	if has_version "net-www/mozilla"; then
+	if [ `use mozilla` ]; then
 		NSS_LIB=/usr/lib/mozilla
 		NSS_INC=/usr/lib/mozilla/include
-	elif has_version "dev-libs/nspr"; then
+	else
 		NSS_LIB=/usr/lib
 		NSS_INC=/usr/include
-	else
-		# Not sure how this would happen with our current DEPEND setup
-		eerror "Neither net-www/mozilla nor dev-libs/nspr found."
-		die "Unexpected error. Unable to find nss/nspr"
 	fi
 
 	myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"