Several fixes, including bug 24657, and a bunch of cruft removal

11 files changed, 28 insertions, 430 deletions

diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 8b95cb83b294..1a22c13cdb59 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,14 +1,8 @@
 MD5 63f5d5add45a34870e61e2e39d70b919 gaim-0.63-r1.ebuild 1835
-MD5 28b86e85d913fa061b0d2bf34114005f gaim-0.64.ebuild 1838
-MD5 dc6610f1c7799c10089ef9ae943c7361 gaim-0.64-r2.ebuild 1974
 MD5 c312c7f2f86088e2cbae1c306fb009ee gaim-0.59.9-r1.ebuild 2173
-MD5 68f4e5b6ce0da5df67c464b4a14c9c93 gaim-0.65-r1.ebuild 2127
-MD5 cb431e1d46092971644a45b1602c1045 ChangeLog 9699
-MD5 da59f6eb541857fcedc6ecf8a9141a5a gaim-0.64-r1.ebuild 1973
+MD5 dd397892a7adb7308bc65ef1a4e07d50 gaim-0.65-r1.ebuild 2130
+MD5 9ac84f28ba0790e9d615812662fe16f0 ChangeLog 10247
 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
-MD5 f86c8c4debfba63a1dde1aace36c68d0 files/digest-gaim-0.64-r1 208
-MD5 c3718788dbb34f9074d3fab5454d602a files/digest-gaim-0.64-r2 213
 MD5 a2bf73fbf71ac31dc9de320d2f7c2649 files/digest-gaim-0.65-r1 126
 MD5 5af2a36dc5b0547e24f8b0654dd201b7 files/gaim_gtkimcontext_patch.diff 529
diff --git a/net-im/gaim/files/digest-gaim-0.64 b/net-im/gaim/files/digest-gaim-0.64
deleted file mode 100644
index 8a3820f0c994..000000000000
--- a/net-im/gaim/files/digest-gaim-0.64
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8876251a650a8341ca6969a4f5334082 gaim-0.64.tar.bz2 2559531
-MD5 c008810b46ba1ea4ea581615acdc68b6 encrypt-1.20.tar.gz 38074
diff --git a/net-im/gaim/files/digest-gaim-0.64-r1 b/net-im/gaim/files/digest-gaim-0.64-r1
deleted file mode 100644
index 83ca12cade3a..000000000000
--- a/net-im/gaim/files/digest-gaim-0.64-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8876251a650a8341ca6969a4f5334082 gaim-0.64.tar.bz2 2559531
-MD5 e486c7a8cf2dc79d03a0a08c6aeaab64 gaim-0.64-msncrashes-20030705-0044.diff 8987
-MD5 c008810b46ba1ea4ea581615acdc68b6 encrypt-1.20.tar.gz 38074
diff --git a/net-im/gaim/files/digest-gaim-0.64-r2 b/net-im/gaim/files/digest-gaim-0.64-r2
deleted file mode 100644
index 2c30374458a8..000000000000
--- a/net-im/gaim/files/digest-gaim-0.64-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-gaim-0.65 b/net-im/gaim/files/digest-gaim-0.65-r1
index 8746ee5b6f01..8746ee5b6f01 100644
--- a/net-im/gaim/files/digest-gaim-0.65
+++ b/net-im/gaim/files/digest-gaim-0.65-r1
diff --git a/net-im/gaim/files/gaim_gtkimcontext_patch.diff b/net-im/gaim/files/gaim_gtkimcontext_patch.diff
new file mode 100644
index 000000000000..a39795283e32
--- /dev/null
+++ b/net-im/gaim/files/gaim_gtkimcontext_patch.diff
@@ -0,0 +1,12 @@
+--- gtkconv.c	Sat May 31 08:08:44 2003
++++ gtkconv.new.c	Thu Jun 26 23:04:46 2003
+@@ -981,6 +981,9 @@
+ 	win     = gaim_conversation_get_window(conv);
+ 	gtkwin  = GAIM_GTK_WINDOW(win);
+ 
++	/* check if the input method handles this keyevent or we can use it */
++	if (gtk_im_context_filter_keypress(GTK_TEXT_VIEW(gtkconv->entry)->im_context, event) == TRUE) return TRUE;
++
+ 	if (event->keyval == GDK_Escape) {
+ 		if (convo_options & OPT_CONVO_ESC_CAN_CLOSE) {
+ 			g_signal_stop_emission_by_name(G_OBJECT(entry), "key_press_event");
diff --git a/net-im/gaim/files/patchfile.0.65 b/net-im/gaim/files/patchfile.0.65
deleted file mode 100644
index 398d7ddbadb4..000000000000
--- a/net-im/gaim/files/patchfile.0.65
+++ /dev/null
@@ -1,207 +0,0 @@
---- ../../configure.orig	Fri May 30 19:10:35 2003
-+++ ../../configure	Mon Jul  7 23:48:42 2003
-@@ -18441,6 +18441,168 @@
-    fi
- 
- 
-+echo Gaim-Encryption configuration block
-+# Check whether --with-nspr-includes or --without-nspr-includes was given.
-+if test "${with_nspr_includes+set}" = set; then
-+  withval="$with_nspr_includes"
-+  with_nspr_includes="$withval"
-+fi
-+
-+
-+# Check whether --with-nspr-libs or --without-nspr-libs was given.
-+if test "${with_nspr_libs+set}" = set; then
-+  withval="$with_nspr_libs"
-+  with_nspr_libs="$withval"
-+fi
-+
-+
-+# Check whether --with-nss-includes or --without-nss-includes was given.
-+if test "${with_nss_includes+set}" = set; then
-+  withval="$with_nss_includes"
-+  with_nss_includes="$withval"
-+fi
-+
-+
-+# Check whether --with-nss-libs or --without-nss-libs was given.
-+if test "${with_nss_libs+set}" = set; then
-+  withval="$with_nss_libs"
-+  with_nss_libs="$withval"
-+fi
-+
-+
-+
-+includeplaces="$prefix/include
-+               /usr/include
-+               /usr/local/include"
-+
-+
-+echo $ECHO_N "checking for NSPR includes""... $ac_c" 1>&6
-+echo "configure:11964: checking for NSPR includes" >&5
-+
-+if test -z "${with_nspr_includes}" ; then
-+   for nsprdir in $includeplaces; do
-+       if test -r $nsprdir/nspr.h ; then break; fi
-+       nsprdir=$nsprdir/nspr
-+       if test -r $nsprdir/nspr.h ; then break; fi
-+   done
-+else
-+   nsprdir=$with_nspr_includes
-+fi
-+
-+echo "$ac_t""${nsprdir}" 1>&6
-+
-+CPPFLAGS="$CPPFLAGS -I$nsprdir"
-+
-+
-+echo $ECHO_N "checking for NSS includes""... $ac_c" 1>&6
-+echo "configure:11982: checking for NSS includes" >&5
-+
-+if test -z "${with_nss_includes}" ; then
-+   for nssdir in $includeplaces; do
-+       if test -r $nssdir/nssbase.h ; then break; fi
-+       nssdir=$nssdir/nss
-+       if test -r $nssdir/nssbase.h ; then break; fi
-+   done
-+else
-+   nssdir=$with_nss_includes
-+fi
-+
-+echo "$ac_t""${nssdir}" 1>&6
-+
-+CPPFLAGS="$CPPFLAGS -I$nssdir"
-+
-+for ac_hdr in nss.h nssbase.h keyhi.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ECHO_N "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:12002: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ECHO_N "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 12007 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:12012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ includes_good="yes"
-+else
-+  echo "$ac_t""no" 1>&6
-+includes_good="no"
-+fi
-+done
-+
-+
-+if test "x${includes_good}" != "xyes" ; then 
-+   { echo "configure: error: Need to specify location of NSS and NSPR includes" 1>&2; exit 1; }
-+fi
-+
-+echo $ECHO_N "checking for PK11_GenerateKeyPair in -lnss3""... $ECHO_C" 1>&6
-+echo "configure:12045: checking for PK11_GenerateKeyPair in -lnss3" >&5
-+ac_lib_var=`echo nss3'_'PK11_GenerateKeyPair | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lnss3  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 12053 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char PK11_GenerateKeyPair();
-+
-+int main() {
-+PK11_GenerateKeyPair()
-+; return 0; }
-+EOF
-+if { (eval echo configure:12064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  libsgood="yes"
-+else
-+  echo "$ac_t""no" 1>&6
-+libsgood="no"
-+fi
-+
-+
-+if test "x${libs_good}" == "xno" ; then 
-+   { echo "configure: error: Need to specify location of NSS library" 1>&2; exit 1; }
-+fi
-+
--                                                                                                                                                                                                                                                                                                  ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile intl/Makefile pixmaps/Makefile pixmaps/smileys/Makefile pixmaps/smileys/default/Makefile pixmaps/status/Makefile pixmaps/status/default/Makefile plugins/Makefile plugins/docklet/Makefile plugins/gaim-remote/Makefile plugins/gestures/Makefile plugins/perl/Makefile plugins/ticker/Makefile po/Makefile.in sounds/Makefile src/Makefile src/protocols/Makefile src/protocols/gg/Makefile src/protocols/irc/Makefile src/protocols/jabber/Makefile src/protocols/msn/Makefile src/protocols/napster/Makefile src/protocols/oscar/Makefile src/protocols/toc/Makefile src/protocols/yahoo/Makefile src/protocols/zephyr/Makefile gaim.spec"
-+                                                                                                                                                                                                                                                                                                  ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile intl/Makefile pixmaps/Makefile pixmaps/smileys/Makefile pixmaps/smileys/default/Makefile pixmaps/status/Makefile pixmaps/status/default/Makefile plugins/Makefile plugins/docklet/Makefile plugins/encrypt/Makefile plugins/gaim-remote/Makefile plugins/gestures/Makefile plugins/perl/Makefile plugins/ticker/Makefile po/Makefile.in sounds/Makefile src/Makefile src/protocols/Makefile src/protocols/gg/Makefile src/protocols/irc/Makefile src/protocols/jabber/Makefile src/protocols/msn/Makefile src/protocols/napster/Makefile src/protocols/oscar/Makefile src/protocols/toc/Makefile src/protocols/yahoo/Makefile src/protocols/zephyr/Makefile gaim.spec"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -19004,7 +19166,9 @@
-   "plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
-   "plugins/docklet/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/docklet/Makefile" ;;
-+  "plugins/encrypt/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/encrypt/Makefile" ;;
-   "plugins/gestures/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/gestures/Makefile" ;;
-   "plugins/perl/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/perl/Makefile" ;;
-   "plugins/ticker/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/ticker/Makefile" ;;
-+  "plugins/encrypt/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/encrypt/Makefile" ;;
-   "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-
-diff -ur ../../../stock/gaim-0.63/plugins/Makefile.am ../../plugins/Makefile.am
---- ../../../stock/gaim-0.63/plugins/Makefile.am	Fri May  2 20:32:24 2003
-+++ ../../plugins/Makefile.am	Mon May 26 05:56:00 2003
-@@ -4,7 +4,7 @@
- PERL_DIR = perl
- endif
- 
--SUBDIRS = docklet gaim-remote gestures $(PERL_DIR) ticker
-+SUBDIRS = docklet gaim-remote gestures $(PERL_DIR) ticker encrypt
- 
- plugindir = $(libdir)/gaim
- 
-diff -ur ../../../stock/gaim-0.63/plugins/Makefile.in ../../plugins/Makefile.in
---- ../../../stock/gaim-0.63/plugins/Makefile.in	Sat May 17 19:12:05 2003
-+++ ../../plugins/Makefile.in	Mon May 26 05:56:34 2003
-@@ -131,7 +131,7 @@
- 
- @USE_PERL_TRUE@PERL_DIR = perl
- 
--SUBDIRS = docklet gaim-remote gestures $(PERL_DIR) ticker
-+SUBDIRS = docklet gaim-remote gestures $(PERL_DIR) ticker encrypt
- 
- plugindir = $(libdir)/gaim
- 
-
diff --git a/net-im/gaim/gaim-0.64-r1.ebuild b/net-im/gaim/gaim-0.64-r1.ebuild
deleted file mode 100644
index fa4a7d979439..000000000000
--- a/net-im/gaim/gaim-0.64-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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-r1.ebuild,v 1.2 2003/07/10 16:05:48 lostlogic Exp $
-
-IUSE="nls perl spell ssl nas"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-EV=1.20
-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/openssl )
-	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.63
-	}
-}
-
-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
-}
diff --git a/net-im/gaim/gaim-0.64-r2.ebuild b/net-im/gaim/gaim-0.64-r2.ebuild
deleted file mode 100644
index 7306af3fdb61..000000000000
--- a/net-im/gaim/gaim-0.64-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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
-}
diff --git a/net-im/gaim/gaim-0.64.ebuild b/net-im/gaim/gaim-0.64.ebuild
deleted file mode 100644
index 053e6606c7b2..000000000000
--- a/net-im/gaim/gaim-0.64.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.ebuild,v 1.5 2003/07/09 14:11:56 lostlogic Exp $
-
-IUSE="nls perl spell ssl nas"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-EV=1.20
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-        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/openssl )
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use ssl && {
-		cd ${S}/plugins
-		unpack encrypt-${EV}.tar.gz
-		cd encrypt
-		epatch patchfile.0.63
-	}
-}
-
-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
-}
diff --git a/net-im/gaim/gaim-0.65.ebuild b/net-im/gaim/gaim-0.65-r1.ebuild
index 7064115c77aa..6459a6212cde 100644
--- a/net-im/gaim/gaim-0.65.ebuild
+++ b/net-im/gaim/gaim-0.65-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.65.ebuild,v 1.1 2003/07/17 14:51:16 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.65-r1.ebuild,v 1.1 2003/07/17 15:33:21 lostlogic Exp $
 
-IUSE="nls perl spell nas ssl"
+IUSE="nls perl spell nas ssl cjk"
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
@@ -32,7 +32,18 @@ src_unpack() {
 		cd ${S}/plugins
 		unpack encrypt-${EV}.tar.gz
 		cd encrypt
-		patch -p0 -l < ${FILESDIR}/patchfile.${PV} || die "Encryption patch failed"
+		patch -p0 < patchfile.${PV} || die "Encryption patch failed"
+		touch aclocal.m4 \
+		      config.h.in \
+		      Makefile.in \
+		      */Makefile.in \
+		      */*/Makefile.in \
+		      */*/*/Makefile.in \
+		      configure
+	}
+	use cjk && {
+		cd ${S}/src
+		epatch ${FILESDIR}/gaim_gtkimcontext_patch.diff
 	}
 }