diff options
| author |   Don Seiler <rizzo@gentoo.org> | 2004-11-27 04:18:23 +0000 |
|---|---|---|
| committer | Don Seiler <rizzo@gentoo.org> | 2004-11-27 04:18:23 +0000 |
| commit | 9b9a99f9c5805a0c769a660b25854d198c073c93 (patch) | |
| tree | 27fadebbb87d164da953c3c99422eabd6a658bca /net-im | |
| parent | prepare init script for courier-authlib (diff) | |
| download | historical-9b9a99f9c5805a0c769a660b25854d198c073c93.tar.gz historical-9b9a99f9c5805a0c769a660b25854d198c073c93.tar.bz2 historical-9b9a99f9c5805a0c769a660b25854d198c073c93.zip | |
Change for Bug #72531, nss and nspr keep playing games with their install paths
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/gaim/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/gaim/Manifest | 4 | ||||
| -rw-r--r-- | net-im/gaim/gaim-1.0.3-r1.ebuild | 12 |
3 files changed, 9 insertions, 12 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog index 3a0b1ad4a2d1..a40ae6d78153 100644 --- a/net-im/gaim/ChangeLog +++ b/net-im/gaim/ChangeLog @@ -1,6 +1,9 @@ # 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.269 2004/11/17 17:17:01 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.270 2004/11/27 04:18:23 rizzo Exp $ + + 26 Nov 2004; Don Seiler <rizzo@gentoo.org> gaim-1.0.3-r1.ebuild: + Change for Bug #72531, nss and nspr keep playing games with their install paths 17 Nov 2004; Don Seiler <rizzo@gentoo.org> +files/gaim-1.0.3-gcc2.patch, gaim-1.0.3-r1.ebuild: diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest index 1f3252acc2f5..719ae78e5107 100644 --- a/net-im/gaim/Manifest +++ b/net-im/gaim/Manifest @@ -1,6 +1,6 @@ -MD5 fac17b68953fb4770714f3a47d4b50e8 ChangeLog 41782 +MD5 a448d1d065ef21d73fde21b4bbb225e6 ChangeLog 41932 MD5 fd54c70bd27573e820a717e82c593b04 gaim-1.0.2-r1.ebuild 3717 -MD5 c0764b9d13a022db163a8ea56ebb8993 gaim-1.0.3-r1.ebuild 3891 +MD5 c67c5f057e1520ba1bafdce5b4c96ba1 gaim-1.0.3-r1.ebuild 3744 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481 MD5 f9039f6cb5717109cf48a9f7e5d51a32 files/digest-gaim-1.0.2-r1 64 MD5 5a965d7dbdfe4f077deabcee9695526b files/gaim-1.0.3cvs-ircbuddylist.patch 4051 diff --git a/net-im/gaim/gaim-1.0.3-r1.ebuild b/net-im/gaim/gaim-1.0.3-r1.ebuild index 9a5bb6c13c3c..2a67081bc16c 100644 --- a/net-im/gaim/gaim-1.0.3-r1.ebuild +++ b/net-im/gaim/gaim-1.0.3-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/net-im/gaim/gaim-1.0.3-r1.ebuild,v 1.3 2004/11/17 17:17:01 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.3-r1.ebuild,v 1.4 2004/11/27 04:18:23 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-r1 ) + !gnutls? ( >=dev-libs/nss-3.9.2-r2 ) silc? ( >=net-im/silc-toolkit-0.9.12-r3 )" #eds? ( gnome-extra/evolution-data-server )" @@ -63,12 +63,6 @@ print_gaim_warning() { einfo einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS." einfo - if ! use gnutls ; then - ewarn - ewarn "If you receive errors due to NSS, please re-emerge" - ewarn "dev-libs/nss and then emerge gaim again." - ewarn - fi ebeep 5 epause 3 } @@ -111,7 +105,7 @@ src_compile() { 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" + myconf="${myconf} --with-nspr-libs=/usr/lib/nspr" myconf="${myconf} --with-nss-libs=/usr/lib/nss" fi |