Version bump

4 files changed, 136 insertions, 2 deletions

diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index d5a8b5e107ad..f37a0206c80a 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,13 +1,14 @@
 MD5 bed467c3e7077888cf4fd615c5f47678 gaim-0.67.ebuild 2185
 MD5 3dc9c94c6beb41d2314814297ff004ea gaim-0.72-r2.ebuild 3331
-MD5 0b48ca16d816401086c08f3fd364b200 gaim-0.73.ebuild 3284
+MD5 fab79b2ce10b79dec1849c7e899ee07f gaim-0.73.ebuild 2968
 MD5 7f89f602fb6fe4954a39c6909cbf3333 gaim-0.71-r2.ebuild 2658
 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 72ee43f865fd8deb06ddb0d90558e95e ChangeLog 16402
+MD5 c1a5079d22bd313e5693a49835dadd24 ChangeLog 16508
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
+MD5 0eed93c71111c6031e5f35e10c54e125 files/gaim-0.73_cjk_gtkconv.patch 1128
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
 MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
 MD5 51bfe20915c99dba9b26a92e463b956b files/digest-gaim-0.73 135
diff --git a/net-im/gaim/files/digest-gaim-0.73 b/net-im/gaim/files/digest-gaim-0.73
new file mode 100644
index 000000000000..dcf26064b0bf
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.73
@@ -0,0 +1,2 @@
+MD5 b8c9a2c37d13e72badf28f1fa478f4bb gaim-0.73.tar.bz2 3242306
+MD5 c7cea5b99b2e05f083db77032b0457d5 gaim-encryption-2.17.tar.gz 316928
diff --git a/net-im/gaim/files/gaim-0.73_cjk_gtkconv.patch b/net-im/gaim/files/gaim-0.73_cjk_gtkconv.patch
new file mode 100644
index 000000000000..d09930da7fff
--- /dev/null
+++ b/net-im/gaim/files/gaim-0.73_cjk_gtkconv.patch
@@ -0,0 +1,32 @@
+diff -ruN gaim-0.73.orig/src/gtkconv.c gaim-0.73/src/gtkconv.c
+--- gaim-0.73.orig/src/gtkconv.c	2003-11-21 12:12:55.000000000 -0600
++++ gaim-0.73/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.73.ebuild b/net-im/gaim/gaim-0.73.ebuild
new file mode 100644
index 000000000000..cff0ac44d99e
--- /dev/null
+++ b/net-im/gaim/gaim-0.73.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.73.ebuild,v 1.1 2003/11/22 16:19:34 rizzo Exp $
+
+IUSE="nls perl spell nas ssl mozilla cjk"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+EV=2.17
+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.73_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
+}