Version bump

5 files changed, 143 insertions, 3 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index fe913726e17c..bc9ceeb834ad 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.100 2003/11/23 03:30:42 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.101 2003/11/26 16:56:28 rizzo Exp $
+
+*gaim-0.74 (26 Nov 2003)
+
+  26 Nov 2003; Don Seiler <rizzo@gentoo.org>; gaim-0.74.ebuild,
+  files/gaim-0.74_cjk_gtkconv.patch:
+  Version bump
 
 *gaim-0.73-r1 (22 Nov 2003)
 
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 76107a59d1cf..59291cfd9588 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -7,8 +7,8 @@ MD5 00da5062575561e913be722ee23a1982 gaim-0.72-r1.ebuild 2890
 MD5 9319539d29d9fb3908789ccf6026d7db gaim-0.66-r3.ebuild 1991
 MD5 9c060fe66488650173c0a493e8744b0a gaim-0.72.ebuild 2508
 MD5 1a9b1940485519f26cffa675c833ca7d gaim-0.70-r2.ebuild 2506
-MD5 294ca46bf6894543e47b699cc2f35033 gaim-0.74.ebuild 2971
-MD5 567dbc247d0917429645064f5b05b296 ChangeLog 16647
+MD5 4beaf08eaf3ecc6b4943e80cf332cd6f gaim-0.74.ebuild 2968
+MD5 9051613101c04f92e7e03bd8d6b0ed79 ChangeLog 16790
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
 MD5 0eed93c71111c6031e5f35e10c54e125 files/gaim-0.73_cjk_gtkconv.patch 1128
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
@@ -24,6 +24,7 @@ MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r1 135
 MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r2 135
 MD5 7ad79542886f9c53682956d6ff2d4c75 files/digest-gaim-0.73-r1 135
 MD5 3eb868476154d28a1123ee91e41fef95 files/gaim-0.72-msn-fixes.patch 1671
+MD5 53302cc68bb7bef9803723e977010339 files/gaim-0.74_cjk_gtkconv.patch 1128
 MD5 0b625a0ccaa6c9ec3b7cde1b806fa87d files/gaim-0.71-icq-crash-hack.patch 1584
 MD5 97fa7a76f6bc96c363844ccc57b2bec4 files/gaim_gtkimcontext_patch.diff 1106
 MD5 8a38e88937de7dd9b0bd1cd18afd8164 files/gaim-encryption-2.10-keys.patch 476
diff --git a/net-im/gaim/files/digest-gaim-0.74 b/net-im/gaim/files/digest-gaim-0.74
new file mode 100644
index 000000000000..4ececc879fff
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.74
@@ -0,0 +1,2 @@
+MD5 9af9287a96acea2b8a8937cfc9122412 gaim-0.74.tar.bz2 3285757
+MD5 89bd43aac89b2358f0445ee8844cf955 gaim-encryption-2.18.tar.gz 320321
diff --git a/net-im/gaim/files/gaim-0.74_cjk_gtkconv.patch b/net-im/gaim/files/gaim-0.74_cjk_gtkconv.patch
new file mode 100644
index 000000000000..206a193b6ce1
--- /dev/null
+++ b/net-im/gaim/files/gaim-0.74_cjk_gtkconv.patch
@@ -0,0 +1,32 @@
+diff -ruN gaim-0.74.orig/src/gtkconv.c gaim-0.74/src/gtkconv.c
+--- gaim-0.74.orig/src/gtkconv.c	2003-11-21 12:12:55.000000000 -0600
++++ gaim-0.74/src/gtkconv.c	2003-11-22 10:04:46.000000000 -0600
+@@ -1279,12 +1279,28 @@
+ 	GaimConversation *conv;
+ 	GaimGtkConversation *gtkconv;
+ 	GaimGtkWindow *gtkwin;
++	gboolean im_context_retval = FALSE;
++	static guint32 last_event_time;
+ 
+ 	conv    = (GaimConversation *)data;
+ 	gtkconv = GAIM_GTK_CONVERSATION(conv);
+ 	win     = gaim_conversation_get_window(conv);
+ 	gtkwin  = GAIM_GTK_WINDOW(win);
+ 
++	/*
++	 * Check if the input method handles this keyevent or we can use it.
++	 * We need to check the event time, otherwise the gtk xim module gets into an event loop (bug?)
++	 * Maybe this is not the best solution, but it works.
++	 */
++
++	if (last_event_time != event->time) {
++		im_context_retval = gtk_im_context_filter_keypress(GTK_TEXT_VIEW(gtkconv->entry)->im_context, event);
++	}
++	last_event_time = event->time;
++	if (im_context_retval == TRUE) {
++		return TRUE;
++	}
++
+ 	if (event->keyval == GDK_Page_Up) {
+ 		g_signal_stop_emission_by_name(G_OBJECT(entry), "key_press_event");
+ 
diff --git a/net-im/gaim/gaim-0.74.ebuild b/net-im/gaim/gaim-0.74.ebuild
new file mode 100644
index 000000000000..3cdbd896ca92
--- /dev/null
+++ b/net-im/gaim/gaim-0.74.ebuild
@@ -0,0 +1,99 @@
+# 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.74.ebuild,v 1.1 2003/11/26 16:56:28 rizzo Exp $
+
+IUSE="nls perl spell nas ssl mozilla cjk"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+EV=2.18
+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"
+
+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 ${A} || die
+	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"
+
+	if [ `use mozilla` ]; then
+		NSS_LIB=/usr/lib/mozilla
+		NSS_INC=/usr/lib/mozilla/include
+	else
+		NSS_LIB=/usr/lib
+		NSS_INC=/usr/include
+	fi
+
+	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
+	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+
+	use ssl && {
+		local myencconf
+		cd ${S}/plugins/gaim-encryption-${EV}
+
+		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 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
+}