diff options
| author |   Don Seiler <rizzo@gentoo.org> | 2004-11-29 20:01:50 +0000 |
|---|---|---|
| committer | Don Seiler <rizzo@gentoo.org> | 2004-11-29 20:01:50 +0000 |
| commit | e293e3ab83c17368de4cf2b8673d100f298865e8 (patch) | |
| tree | b229f1ce47fb8ed42b200119b9c6dfa4712889f8 /x11-plugins | |
| parent | version bump (Manifest recommit) (diff) | |
| download | gentoo-2-e293e3ab83c17368de4cf2b8673d100f298865e8.tar.gz gentoo-2-e293e3ab83c17368de4cf2b8673d100f298865e8.tar.bz2 gentoo-2-e293e3ab83c17368de4cf2b8673d100f298865e8.zip | |
Allowing dep on mozilla-firefox and/or mozilla if users doesn't like standalone NSS package. Closes Bug #69339
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/gaim-encryption/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild | 14 |
2 files changed, 8 insertions, 12 deletions
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/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 |