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

diff --git a/x11-plugins/gaim-encryption/ChangeLog b/x11-plugins/gaim-encryption/ChangeLog
index b4a2403e2bb9df20b9e32643084594c6c982d23d..552afbb1d34572d1be2c25da144f66e9e2e8d502 100644 (file)
--- 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.43 2004/11/29 20:01:50 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/ChangeLog,v 1.44 2004/12/02 15:05:25 rizzo Exp $
+
+  02 Dec 2004; Don Seiler <rizzo@gentoo.org> gaim-encryption-2.32-r1.ebuild:
+  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-encryption-2.32-r1.ebuild:
   Allowing dep on mozilla-firefox and/or mozilla if users doesn't like

diff --git a/x11-plugins/gaim-encryption/Manifest b/x11-plugins/gaim-encryption/Manifest
index 37a715d36c5dbc1c4e03db5ef3480c1e086b2eb0..27caaa061d252c6f336a8cf5ed74f7f269bcb8db 100644 (file)
--- a/x11-plugins/gaim-encryption/Manifest
+++ b/x11-plugins/gaim-encryption/Manifest
@@ -1,6 +1,6 @@
-MD5 50ef32bf56470f58317daaca8c8f5a69 ChangeLog 9545
+MD5 fbd524e2e502633c315b310d2117c0f2 ChangeLog 9759
 MD5 ab7db4bf9ff48c8de9da14fd12f6c15c metadata.xml 344
 MD5 0edaa1a5379f75c550625a7015de0841 gaim-encryption-2.32.ebuild 1125
-MD5 303bc73c0ea8cc0ecbd8883110aa27ac gaim-encryption-2.32-r1.ebuild 893
+MD5 679228f2e0a3e8a9914620928dc2f3fa gaim-encryption-2.32-r1.ebuild 1086
 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 c6e39bb0e854b0c1c47e971c6b9a6651118ccf5d..d9c1fb170e09e01d6bbb6825d6544148d862e2a6 100644 (file)
--- 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.3 2004/11/29 20:01:50 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild,v 1.4 2004/12/02 15:05:25 rizzo Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -14,15 +14,21 @@ 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 net-www/mozilla-firefox net-www/mozilla )"
+               >=dev-libs/nss-3.9.2-r2"
 
 src_compile() {
+       strip-flags
+       replace-flags -O? -O2
 
-       econf || die "Configuration failed"
-       einfo "Replacing -Os CFLAG with -O2"
-       replace-flags -Os -O2
+       local myconf
+       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"
 
-       emake || emake -j1 || die "Make failed"
+       econf ${myconf} || die "Configuration failed"
+
+       emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
 }
 
 src_install() {