diff options
| author |   Don Seiler <rizzo@gentoo.org> | 2004-11-29 19:59:37 +0000 |
|---|---|---|
| committer | Don Seiler <rizzo@gentoo.org> | 2004-11-29 19:59:37 +0000 |
| commit | 81e7c4d5b733e62d7d2bd50850e1ad75e0e5888a (patch) | |
| tree | 12a92eedc6a09ac32d5f996c67aa8211df8a8c42 | |
| parent | Version bump. (diff) | |
| download | historical-81e7c4d5b733e62d7d2bd50850e1ad75e0e5888a.tar.gz historical-81e7c4d5b733e62d7d2bd50850e1ad75e0e5888a.tar.bz2 historical-81e7c4d5b733e62d7d2bd50850e1ad75e0e5888a.zip | |
Allowing dep on mozilla-firefox and/or mozilla if users doesn't like standalone NSS package. Closes Bug #69339
| -rw-r--r-- | net-im/gaim/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/gaim/Manifest | 4 | ||||
| -rw-r--r-- | net-im/gaim/gaim-1.0.3-r2.ebuild | 12 |
3 files changed, 13 insertions, 9 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog index 70b64cf2520d..88cd11d70cfc 100644 --- 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.271 2004/11/29 15:53:55 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.272 2004/11/29 19:59:37 rizzo Exp $ + + 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 + standalone NSS package. Closes Bug #69339 *gaim-1.0.3-r2 (29 Nov 2004) diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest index 0b1ae7119797..8ead9eb0ae21 100644 --- a/net-im/gaim/Manifest +++ b/net-im/gaim/Manifest @@ -1,6 +1,6 @@ -MD5 52a8acfd7b7ee504619eb4be2024fd20 ChangeLog 42101 +MD5 e87a6888eae26829319b9538f1730f1e ChangeLog 42284 MD5 fd54c70bd27573e820a717e82c593b04 gaim-1.0.2-r1.ebuild 3717 -MD5 edf69217e66be12a0826af3b977e9187 gaim-1.0.3-r2.ebuild 3747 +MD5 75e2765d76cf6d5cf169a435a10b6fba gaim-1.0.3-r2.ebuild 3798 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481 MD5 3c880530528d7d9a72baa22afc76736d files/digest-gaim-1.0.3-r2 64 MD5 f9039f6cb5717109cf48a9f7e5d51a32 files/digest-gaim-1.0.2-r1 64 diff --git a/net-im/gaim/gaim-1.0.3-r2.ebuild b/net-im/gaim/gaim-1.0.3-r2.ebuild index 1a82b920a038..219e16c37031 100644 --- 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.1 2004/11/29 15:53:56 rizzo Exp $ +# $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 $ 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 ) + !gnutls? ( || ( >=dev-libs/nss-3.9.2-r2 net-www/mozilla-firefox net-www/mozilla ) ) 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 |