diff options
| -rw-r--r-- | net-im/gaim/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/gaim/gaim-1.0.3-r2.ebuild | 12 | ||||
| -rw-r--r-- | x11-plugins/gaim-encryption/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-plugins/gaim-encryption/gaim-encryption-2.32-r1.ebuild | 14 |
4 files changed, 19 insertions, 19 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/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 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 |