gaim-encryption 2.19 released and folded in

4 files changed, 125 insertions, 3 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 1a62d0b51ef8..41149987ac67 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.111 2004/01/10 06:41:58 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.112 2004/01/10 19:31:17 rizzo Exp $
+
+*gaim-0.75-r1 (10 Jan 2004)
+
+  10 Jan 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.75-r1.ebuild:
+  Revision bump to add gaim-encryption-2.19 back into the mix. SSL use
+  re-enabled
 
 *gaim-0.75 (10 Jan 2004)
 
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 481120f70711..6924c11e3a99 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -5,8 +5,8 @@ MD5 4a8680f8755cca3c465dc0e05bca0c23 gaim-0.75.ebuild 3918
 MD5 78be5b331aa107c0ef01b5252eb8c87e gaim-0.72-r1.ebuild 2890
 MD5 cecb719b31af4ea5759fffa397de52be gaim-0.72.ebuild 2508
 MD5 9b0c0eb504517576c7d18406c8c52324 gaim-0.74-r2.ebuild 3858
-MD5 17565b8ad05b79e48a47898a23b77734 gaim-0.75-r1.ebuild 3502
-MD5 973657924636761aed27d9857a81cf9e ChangeLog 18505
+MD5 456550d7203f82316e7e598a7655c2fa gaim-0.75-r1.ebuild 3505
+MD5 8b6dcca9020fa9d7a82681b85f3321b4 ChangeLog 18686
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
 MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
diff --git a/net-im/gaim/files/digest-gaim-0.75-r1 b/net-im/gaim/files/digest-gaim-0.75-r1
new file mode 100644
index 000000000000..5deb1ab966cc
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.75-r1
@@ -0,0 +1,2 @@
+MD5 227653b2987315f53f43b64aa3ba7216 gaim-0.75.tar.bz2 3368862
+MD5 82f93af65311f9118fc9af808fe00571 gaim-encryption-2.19.tar.gz 321909
diff --git a/net-im/gaim/gaim-0.75-r1.ebuild b/net-im/gaim/gaim-0.75-r1.ebuild
new file mode 100644
index 000000000000..a8a50359e4fe
--- /dev/null
+++ b/net-im/gaim/gaim-0.75-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r1.ebuild,v 1.1 2004/01/10 19:31:17 rizzo Exp $
+
+IUSE="nls perl spell nas mozilla cjk debug ssl"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+EV=2.19
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
+	ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
+RESTRICT="nomirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+
+DEPEND="=sys-libs/db-1*
+	>=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	nas? ( >=media-libs/nas-1.4.1-r1 )
+	sys-devel/gettext
+	media-libs/libao
+	>=media-libs/audiofile-0.2.0
+	perl? ( >=dev-lang/perl-5.6.1
+		>=sys-apps/sed-4.0.0 )
+	mozilla? ( net-www/mozilla )
+	!mozilla? ( dev-libs/nss )
+	spell? ( >=app-text/gtkspell-2.0.2 )"
+
+src_unpack() {
+	unpack ${P}.tar.bz2 || die
+	cd ${S}
+	use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
+
+	use ssl && {
+		cd ${S}/plugins
+		unpack gaim-encryption-${EV}.tar.gz
+	}
+}
+
+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"
+	use debug  && myconf="${myconf} --enable-debug"
+
+	NSS_LIB=/usr/lib
+	NSS_INC=/usr/include
+	use mozilla || {
+		# Only need to specify this if no pkgconfig from mozilla
+		myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"
+		myconf="${myconf} --with-nss-includes=${NSS_INC}/nss"
+		myconf="${myconf} --with-nspr-libs=${NSS_LIB}"
+		myconf="${myconf} --with-nss-libs=${NSS_LIB}"
+	}
+
+	econf ${myconf} || die "Configuration failed"
+	use perl && sed -i -e 's:^\(PERL_MM_PARAMS =.*PREFIX=\)\(.*\):\1'${D}'\2:' plugins/perl/Makefile
+
+	einfo "Replacing -Os CFLAG with -O2"
+	replace-flags -Os -O2
+
+	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+
+	use ssl && {
+		local myencconf
+		cd ${S}/plugins/gaim-encryption-${EV}
+
+		use mozilla || {
+			# Only need to specify this if no pkgconfig from mozilla
+			myencconf="${myencconf} --with-nspr-includes=${NSS_INC}/nspr"
+			myencconf="${myencconf} --with-nss-includes=${NSS_INC}/nss"
+			myencconf="${myencconf} --with-nspr-libs=${NSS_LIB}"
+			myencconf="${myencconf} --with-nss-libs=${NSS_LIB}"
+		}
+		econf ${myencconf} || die "Configuration failed for encryption"
+		emake || die "Make failed for encryption"
+	}
+}
+
+src_install() {
+	einstall || die "Install failed"
+	use ssl && {
+		cd ${S}/plugins/gaim-encryption-${EV}
+		einstall || die "Install failed for encryption"
+		cd ${S}
+	}
+	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
+}
+
+pkg_postinst() {
+	if [ `use cjk` ]; then
+		ewarn
+		ewarn "You have chosen (by selecting 'USE=cjk') to compile with"
+		ewarn "a patch for CJK support.  Please be aware that this patch"
+		ewarn "causes problems with skkinput.  kinput2 works fine.  Details"
+		ewarn "can be found at http://bugs.gentoo.org/show_bug.cgi?id=24657#c23"
+		ewarn
+	fi
+
+	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
+}