Upgrade encryption to use NSS instead of OpenSSL

4 files changed, 81 insertions, 3 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index a9491a98d9cb..c278bc3ee052 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.55 2003/07/10 16:05:47 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.56 2003/07/11 17:48:36 lostlogic Exp $
+
+*gaim-0.64-r2 (11 Jul 2003)
+
+  11 Jul 2003; Brandon Low <lostlogic@gentoo.org> gaim-0.64-r2.ebuild:
+  Move to new BETA encryption plugin that is fully GPL compliant
 
   10 Jul 2003; Brandon Low <lostlogic@gentoo.org> gaim-0.64-r1.ebuild:
   Mark ~arch, and fix the stuff that was recently fixed in -r0 in -r1
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 3ccb2c808198..be3e85db96f8 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,8 +1,9 @@
 MD5 63f5d5add45a34870e61e2e39d70b919 gaim-0.63-r1.ebuild 1835
 MD5 28b86e85d913fa061b0d2bf34114005f gaim-0.64.ebuild 1838
-MD5 3dcd738b4645d594cb3d8c3eea9aacf2 gaim-0.64-r2.ebuild 1974
+MD5 dc6610f1c7799c10089ef9ae943c7361 gaim-0.64-r2.ebuild 1974
 MD5 c312c7f2f86088e2cbae1c306fb009ee gaim-0.59.9-r1.ebuild 2173
-MD5 9d02fd63a76111e24eb34515523456a8 ChangeLog 9108
+MD5 b7f4cd014d18177581df46377bf330be ChangeLog 9274
+MD5 da59f6eb541857fcedc6ecf8a9141a5a gaim-0.64-r1.ebuild 1973
 MD5 07beb4e67f5dd8cafed146e45b919144 files/digest-gaim-0.59.9-r1 128
 MD5 3596d39a9cfe7e4cf9ed5aefc703417c files/digest-gaim-0.64 126
 MD5 908f7feabba8c8b1d74510f1f2b7706d files/digest-gaim-0.63-r1 126
diff --git a/net-im/gaim/files/digest-gaim-0.64-r2 b/net-im/gaim/files/digest-gaim-0.64-r2
new file mode 100644
index 000000000000..2c30374458a8
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.64-r2
@@ -0,0 +1,3 @@
+MD5 8876251a650a8341ca6969a4f5334082 gaim-0.64.tar.bz2 2559531
+MD5 e486c7a8cf2dc79d03a0a08c6aeaab64 gaim-0.64-msncrashes-20030705-0044.diff 8987
+MD5 ac1a422ce9502ffa1209153005ec80ba encrypt-2.00beta1.tar.gz 91363
diff --git a/net-im/gaim/gaim-0.64-r2.ebuild b/net-im/gaim/gaim-0.64-r2.ebuild
new file mode 100644
index 000000000000..7306af3fdb61
--- /dev/null
+++ b/net-im/gaim/gaim-0.64-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.64-r2.ebuild,v 1.1 2003/07/11 17:48:36 lostlogic Exp $
+
+IUSE="nls perl spell ssl nas"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+EV=2.00beta1
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
+	http://www.chipx86.com/gaim-0.64-msncrashes-20030705-0044.diff
+        ssl? ( mirror://sourceforge/gaim-encryption/encrypt-${EV}.tar.gz )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+
+DEPEND="=sys-libs/db-1*
+	>=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	nas? ( >=media-libs/nas-1.4.1-r1 )
+	nls? ( sys-devel/gettext )
+	media-libs/libao
+	>=media-libs/audiofile-0.2.0
+	perl? ( >=dev-lang/perl-5.6.1 )
+	ssl? ( dev-libs/nss )
+	spell? ( >=app-text/gtkspell-2.0.2 )"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd ${P}
+	epatch ${DISTDIR}/gaim-0.64-msncrashes-20030705-0044.diff
+
+	use ssl && {
+		cd ${S}/plugins
+		unpack encrypt-${EV}.tar.gz
+		cd encrypt
+		epatch patchfile.0.64
+	}
+}
+
+src_compile() {
+
+	local myconf
+        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"
+
+	econf ${myconf} || die "Configuration failed"
+	emake || die "Make failed"
+}
+
+src_install() {
+	einstall || die "Install failed"
+	dodoc ABOUT-NLS AUTHORS HACKING INSTALL NEWS README TODO ChangeLog
+}
+
+pkg_postinst() {
+	if [ `use ssl` ]; then
+		ewarn
+		ewarn "You have chosen (by selecting 'USE=ssl') to install"
+		ewarn "the gaim-encryption plugin ( http://gaim-encryption.sf.net/ )"
+		ewarn "this plugin is NOT supported by the Gaim project, and if you"
+		ewarn "expierence problems related to it, contact the Gentoo project"
+		ewarn "via http://bugs.gentoo.org/ or the gaim-encryption project."
+		ewarn
+	fi
+}