NSS not needed when GnuTLS is there. Fixes bug #70883

4 files changed, 145 insertions, 7 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index ab3b9a1057ee..9fc8b921afa7 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.266 2004/11/15 20:01:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.267 2004/11/15 20:45:08 rizzo Exp $
+
+*gaim-1.0.3-r1 (15 Nov 2004)
+
+  15 Nov 2004; Don Seiler <rizzo@gentoo.org> +gaim-1.0.3-r1.ebuild:
+  NSS not needed when GnuTLS is there.  Fixes bug #70883
 
   15 Nov 2004; Markus Rothe <corsair@gentoo.org> gaim-1.0.3.ebuild:
   Marked ~ppc64; bug #58170
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 61d2ea5efbc9..19d9302e3abf 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,10 +1,12 @@
-MD5 4fb208be3e43328c2b5d009a78521cfa ChangeLog 41326
-MD5 0cdd9d3f2035687340e6360264fda0e3 gaim-1.0.2.ebuild 3662
-MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
+MD5 3405075cb3a940ab871e2cb03c62ca55 ChangeLog 41480
 MD5 fd54c70bd27573e820a717e82c593b04 gaim-1.0.2-r1.ebuild 3717
 MD5 264bb3eece5dad32364c45ab5c50ced3 gaim-1.0.3.ebuild 3679
-MD5 f9039f6cb5717109cf48a9f7e5d51a32 files/digest-gaim-1.0.2 64
-MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
-MD5 f9039f6cb5717109cf48a9f7e5d51a32 files/digest-gaim-1.0.2-r1 64
+MD5 c00eb4f897be27e52fb29538d94240c5 gaim-1.0.3-r1.ebuild 3838
+MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
+MD5 0cdd9d3f2035687340e6360264fda0e3 gaim-1.0.2.ebuild 3662
 MD5 5a965d7dbdfe4f077deabcee9695526b files/gaim-1.0.3cvs-ircbuddylist.patch 4051
+MD5 f9039f6cb5717109cf48a9f7e5d51a32 files/digest-gaim-1.0.2-r1 64
 MD5 3c880530528d7d9a72baa22afc76736d files/digest-gaim-1.0.3 64
+MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
+MD5 3c880530528d7d9a72baa22afc76736d files/digest-gaim-1.0.3-r1 64
+MD5 f9039f6cb5717109cf48a9f7e5d51a32 files/digest-gaim-1.0.2 64
diff --git a/net-im/gaim/files/digest-gaim-1.0.3-r1 b/net-im/gaim/files/digest-gaim-1.0.3-r1
new file mode 100644
index 000000000000..4698ff1ad2c8
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-1.0.3-r1
@@ -0,0 +1 @@
+MD5 d0c40cbb57a80813fd495d3ffc6259df gaim-1.0.3.tar.bz2 4810182
diff --git a/net-im/gaim/gaim-1.0.3-r1.ebuild b/net-im/gaim/gaim-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..d4d4e437b691
--- /dev/null
+++ b/net-im/gaim/gaim-1.0.3-r1.ebuild
@@ -0,0 +1,130 @@
+# 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.1 2004/11/15 20:45:08 rizzo Exp $
+
+inherit flag-o-matic eutils gcc debug
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
+#IUSE="nls perl spell nas crypt cjk gnutls silc eds debug"
+IUSE="nls perl spell nas crypt cjk gnutls silc debug"
+
+DEPEND=">=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	nas? ( >=media-libs/nas-1.4.1-r1 )
+	dev-util/pkgconfig
+	sys-devel/gettext
+	media-libs/libao
+	>=media-libs/audiofile-0.2.0
+	perl? ( >=dev-lang/perl-5.8.2-r1
+			!<dev-perl/ExtUtils-MakeMaker-6.17 )
+	spell? ( >=app-text/gtkspell-2.0.2 )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/nss )
+	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )"
+	#eds? ( gnome-extra/evolution-data-server )"
+
+PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.32 )"
+
+# List of plugins
+#	net-im/gaim-blogger
+#	net-im/gaim-meanwhile
+#	net-im/gaim-snpp
+#	x11-plugins/autoprofile
+#	x11-plugins/gaim-encryption
+#	x11-plugins/gaim-extprefs
+#	x11-plugins/gaim-rhythmbox
+#	x11-plugins/gaim-xmms-remote
+#	x11-plugins/gaimosd
+#	x11-plugins/guifications
+
+
+print_gaim_warning() {
+	ewarn
+	ewarn "If you are merging ${P} from an earlier version, you will need"
+	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
+	ewarn
+	ewarn "If you experience problems with gaim, file them as bugs with"
+	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
+	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
+	ewarn "seek help in #gaim."
+	ewarn
+	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
+	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
+	ewarn "backtraces."
+	ewarn
+	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
+	ewarn
+	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
+}
+
+pkg_setup() {
+	print_gaim_warning
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
+}
+
+src_compile() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+
+	# -msse2 doesn't play nice on gcc 3.2
+	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
+
+	local myconf
+	use debug && myconf="${myconf} --enable-debug"
+	use perl || myconf="${myconf} --disable-perl"
+	use spell || myconf="${myconf} --disable-gtkspell"
+	use nls  || myconf="${myconf} --disable-nls"
+	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
+	myconf="${myconf} --disable-gevolution"
+	#use eds || myconf="${myconf} --disable-gevolution"
+
+	if use gnutls ; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf="${myconf} --enable-nss=no"
+		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
+		myconf="${myconf} --with-gnutls-libs=/usr/lib"
+	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"
+		myconf="${myconf} --with-nss-libs=/usr/lib/nss"
+	fi
+
+
+	econf ${myconf} || die "Configuration failed"
+
+	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "Install failed"
+	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
+}
+
+pkg_postinst() {
+	print_gaim_warning
+}