new improved version

Package-Manager: portage-2.1.1-r1

5 files changed, 206 insertions, 14 deletions

diff --git a/net-im/tkabber/ChangeLog b/net-im/tkabber/ChangeLog
index 64460203c1c4..9630e950a1ee 100644
--- a/net-im/tkabber/ChangeLog
+++ b/net-im/tkabber/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/tkabber
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/ChangeLog,v 1.25 2006/04/27 21:51:15 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/ChangeLog,v 1.26 2006/10/28 22:33:52 humpback Exp $
+
+*tkabber-0.9.9 (28 Oct 2006)
+
+  28 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/NAT_HTTP_filetransfer.diff, +tkabber-0.9.9.ebuild:
+  Adding new version. Credits must go to Antek Grzymala for his work in in bug
+  #143953.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-tkabber-0.9.5b,
   files/digest-tkabber-0.9.6_beta, files/digest-tkabber-0.9.7, Manifest:
diff --git a/net-im/tkabber/Manifest b/net-im/tkabber/Manifest
index f3989192f64e..941496a7685e 100644
--- a/net-im/tkabber/Manifest
+++ b/net-im/tkabber/Manifest
@@ -1,28 +1,41 @@
-DIST tkabber-0.9.5beta.tar.gz 472760 RMD160 ff05f197d1631efcf8a63f4a2b58933a21418562 SHA256 c83725be4fb2f9710c5b2ce0dfa5aecd0d92fd4b9776a660efb122e6c87ff1ad size 472760
-DIST tkabber-0.9.6beta.tar.gz 611677 RMD160 9f35be0f97248aeeb61e206a18496fc9f1b179dd SHA256 140ed2dd4f679766efb98cc078220141b939bdbca51609a50e10779bec5d8600 size 611677
-DIST tkabber-0.9.7.tar.gz 714184 RMD160 f179d0107e8cccceacbdf89a2be14f1e3026b034 SHA256 1ebe0c8fceec0ec3bf6e5d14238ea6f8a23c997d700feab1e5fbe95f4d8cb6d8 size 714184
-DIST tkabber-0.9.8.tar.gz 719377 RMD160 8960fb68c12c02c351b5c7cc9955773676c9ed99 SHA256 79529e2859820ae404b469148899561ee493ffe45cd093446c4b6242f7c73143 size 719377
-EBUILD tkabber-0.9.5b.ebuild 951 RMD160 3024739a2e1eaa80b96274039f0a37ee241fbd41 SHA1 91d1a37012e89a05ef539980e57d5b933580691e SHA256 d3bfffc593e01f8a05021b9b1b88475a77103790ecd5f4d900233d8625ff172c size 951
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX NAT_HTTP_filetransfer.diff 2252 RMD160 66b6798cc37ed00fd37f7822a969919383c0d4c1 SHA1 524eb4fe1db51f7a46491bd5aad14991fe546664 SHA256 bda2f2668cf3bd24b978c2e4ec5cb6c78b9db1257fcfe48a78ecda0be7d74abf
+MD5 568f36937312cabf6949faf6a3e5336f files/NAT_HTTP_filetransfer.diff 2252
+RMD160 66b6798cc37ed00fd37f7822a969919383c0d4c1 files/NAT_HTTP_filetransfer.diff 2252
+SHA256 bda2f2668cf3bd24b978c2e4ec5cb6c78b9db1257fcfe48a78ecda0be7d74abf files/NAT_HTTP_filetransfer.diff 2252
+DIST tkabber-0.9.5beta.tar.gz 472760 RMD160 ff05f197d1631efcf8a63f4a2b58933a21418562 SHA256 c83725be4fb2f9710c5b2ce0dfa5aecd0d92fd4b9776a660efb122e6c87ff1ad
+DIST tkabber-0.9.6beta.tar.gz 611677 RMD160 9f35be0f97248aeeb61e206a18496fc9f1b179dd SHA256 140ed2dd4f679766efb98cc078220141b939bdbca51609a50e10779bec5d8600
+DIST tkabber-0.9.7.tar.gz 714184 RMD160 f179d0107e8cccceacbdf89a2be14f1e3026b034 SHA256 1ebe0c8fceec0ec3bf6e5d14238ea6f8a23c997d700feab1e5fbe95f4d8cb6d8
+DIST tkabber-0.9.8.tar.gz 719377 RMD160 8960fb68c12c02c351b5c7cc9955773676c9ed99 SHA256 79529e2859820ae404b469148899561ee493ffe45cd093446c4b6242f7c73143
+DIST tkabber-0.9.9.tar.gz 785288 RMD160 ecaed256760caa30b97654c67852257dec770ba6 SHA1 ad5187dc164e238ae7fcc62c97bb9e54cf3ecfe0 SHA256 a5d3f38654a480d1ea2df60be3a5d9180d867fe400424ff09f8154fc86fc067a
+DIST tkabber-plugins-0.9.9.tar.gz 366148 RMD160 920595ba427758d13be4398078a0d1bb400ac602 SHA1 35cc4571a4dab1febcf1fc536a594fe2517f0168 SHA256 03435ab0e890d2ed7cee55e727c9a16136bbf89a12af28cf8a72f16080c5e96a
+EBUILD tkabber-0.9.5b.ebuild 951 RMD160 3024739a2e1eaa80b96274039f0a37ee241fbd41 SHA1 91d1a37012e89a05ef539980e57d5b933580691e SHA256 d3bfffc593e01f8a05021b9b1b88475a77103790ecd5f4d900233d8625ff172c
 MD5 47df4821ffc2d976d42388e14f9014dc tkabber-0.9.5b.ebuild 951
 RMD160 3024739a2e1eaa80b96274039f0a37ee241fbd41 tkabber-0.9.5b.ebuild 951
 SHA256 d3bfffc593e01f8a05021b9b1b88475a77103790ecd5f4d900233d8625ff172c tkabber-0.9.5b.ebuild 951
-EBUILD tkabber-0.9.6_beta.ebuild 1044 RMD160 f5b307e3568e5ce8dcb45022ec4cd02ab50a95a9 SHA1 5dd690a639cd893b10794a219e78170b4f8113bd SHA256 ff3946bfdf0d7e0190234079b188aa7981133b7a11c0302b16bcd0c4d91006da size 1044
+EBUILD tkabber-0.9.6_beta.ebuild 1044 RMD160 f5b307e3568e5ce8dcb45022ec4cd02ab50a95a9 SHA1 5dd690a639cd893b10794a219e78170b4f8113bd SHA256 ff3946bfdf0d7e0190234079b188aa7981133b7a11c0302b16bcd0c4d91006da
 MD5 f0fb04c55c05309573c6d626ce1ccdd4 tkabber-0.9.6_beta.ebuild 1044
 RMD160 f5b307e3568e5ce8dcb45022ec4cd02ab50a95a9 tkabber-0.9.6_beta.ebuild 1044
 SHA256 ff3946bfdf0d7e0190234079b188aa7981133b7a11c0302b16bcd0c4d91006da tkabber-0.9.6_beta.ebuild 1044
-EBUILD tkabber-0.9.7.ebuild 988 RMD160 bc6eac2e0c1c0ba465304022acda7492d41706d8 SHA1 96ef576884535ca73ae2b6c9a17ce13875628799 SHA256 605fcb43010f80181b8e99737709ff7dfdde7e0046ad989946d3695880dc46eb size 988
+EBUILD tkabber-0.9.7.ebuild 988 RMD160 bc6eac2e0c1c0ba465304022acda7492d41706d8 SHA1 96ef576884535ca73ae2b6c9a17ce13875628799 SHA256 605fcb43010f80181b8e99737709ff7dfdde7e0046ad989946d3695880dc46eb
 MD5 99349637a2bdcf708eb1d84c6741604e tkabber-0.9.7.ebuild 988
 RMD160 bc6eac2e0c1c0ba465304022acda7492d41706d8 tkabber-0.9.7.ebuild 988
 SHA256 605fcb43010f80181b8e99737709ff7dfdde7e0046ad989946d3695880dc46eb tkabber-0.9.7.ebuild 988
-EBUILD tkabber-0.9.8.ebuild 1602 RMD160 f3ea6492e53d52fdc0647f61d837460be9e14a3e SHA1 ccbb05d068f359fa3d4ecbb5dba2d16f41cbb026 SHA256 88a9a14601aa2dbdedef08da9e47c6de68a9855a4eeaf86d21e070328b8d3768 size 1602
+EBUILD tkabber-0.9.8.ebuild 1602 RMD160 f3ea6492e53d52fdc0647f61d837460be9e14a3e SHA1 ccbb05d068f359fa3d4ecbb5dba2d16f41cbb026 SHA256 88a9a14601aa2dbdedef08da9e47c6de68a9855a4eeaf86d21e070328b8d3768
 MD5 eea7268f40bfd9921a07e3b7c91449de tkabber-0.9.8.ebuild 1602
 RMD160 f3ea6492e53d52fdc0647f61d837460be9e14a3e tkabber-0.9.8.ebuild 1602
 SHA256 88a9a14601aa2dbdedef08da9e47c6de68a9855a4eeaf86d21e070328b8d3768 tkabber-0.9.8.ebuild 1602
-MISC ChangeLog 3461 RMD160 c550efbe76dd41c722d226eee194ab77593bdaa4 SHA1 fba0651b5b7788081136dcb17a509af0e107529d SHA256 b0596f24bbcdb0050f5e00236627d432d62fa1786eecd00d1483d327c69f5be6 size 3461
-MD5 a9605269a14bbf646de8ab4ae6b85530 ChangeLog 3461
-RMD160 c550efbe76dd41c722d226eee194ab77593bdaa4 ChangeLog 3461
-SHA256 b0596f24bbcdb0050f5e00236627d432d62fa1786eecd00d1483d327c69f5be6 ChangeLog 3461
-MISC metadata.xml 328 RMD160 b5060e2fedfc631212b9caa91f6a03038a2a6483 SHA1 248cbcbb875592a40b3f5f64eb689c817953eaa1 SHA256 36a582e2e60e10e38aea6ac729445310a48c73d2f24572bfc514e56b05800feb size 328
+EBUILD tkabber-0.9.9.ebuild 2483 RMD160 c56bc102bfefff8bd0731209e5678bcfbf1628b1 SHA1 97e04b3659830fa4fa0d5c8ba5e9940ebaec1114 SHA256 5119b0a0b362bd3a5a63fd8a2fe7514a342dc7ceb904756a938921c51743bea8
+MD5 e16098d80b12687df3ec3b271f6acdcb tkabber-0.9.9.ebuild 2483
+RMD160 c56bc102bfefff8bd0731209e5678bcfbf1628b1 tkabber-0.9.9.ebuild 2483
+SHA256 5119b0a0b362bd3a5a63fd8a2fe7514a342dc7ceb904756a938921c51743bea8 tkabber-0.9.9.ebuild 2483
+MISC ChangeLog 3700 RMD160 6cac70e7962e2f30a53228fc75ae0678d6db6588 SHA1 4329fda0a677ff70f4dbbb4822ccdc1e5a0cf5a8 SHA256 f10ea5510b06089c7c06944b62f860314257f9c03f8518a0f0760cb99fa8aa28
+MD5 bc5c813fa72629f6cfafb2c9944ec598 ChangeLog 3700
+RMD160 6cac70e7962e2f30a53228fc75ae0678d6db6588 ChangeLog 3700
+SHA256 f10ea5510b06089c7c06944b62f860314257f9c03f8518a0f0760cb99fa8aa28 ChangeLog 3700
+MISC metadata.xml 328 RMD160 b5060e2fedfc631212b9caa91f6a03038a2a6483 SHA1 248cbcbb875592a40b3f5f64eb689c817953eaa1 SHA256 36a582e2e60e10e38aea6ac729445310a48c73d2f24572bfc514e56b05800feb
 MD5 cd9273bd69fcf81aa554c63b904726df metadata.xml 328
 RMD160 b5060e2fedfc631212b9caa91f6a03038a2a6483 metadata.xml 328
 SHA256 36a582e2e60e10e38aea6ac729445310a48c73d2f24572bfc514e56b05800feb metadata.xml 328
@@ -38,3 +51,13 @@ SHA256 ea4d71038de9d3598e7d44b0ab30bb4fe50850ee5a7681cdeaeddb28a1f1bc60 files/di
 MD5 845c77fe2076160694f94a3cf3a4e00c files/digest-tkabber-0.9.8 241
 RMD160 4f2944881d2bf2c4b69431c129bdbf658aaeb9b2 files/digest-tkabber-0.9.8 241
 SHA256 e3d91c7cf8f3e2a3e7513f55d6a5347d2c4d148b8ab6ab8fe89cc83989f92c27 files/digest-tkabber-0.9.8 241
+MD5 3ee0fe123578a006477784e430d9da8a files/digest-tkabber-0.9.9 506
+RMD160 3f6d891fbf53815d567faa4812a1c09061943f02 files/digest-tkabber-0.9.9 506
+SHA256 811f471974354772fd107f41f7ca679f5488b40cb58c42fc23bcc9e36ccac21a files/digest-tkabber-0.9.9 506
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFQ9rf8zY1VwezZiERAoJnAJ9sKupFEvsxG9AHxS6D8wvfcLVcMgCfRn2+
+8D5e1g2Q6MsOUws7nSWKD5I=
+=nOAC
+-----END PGP SIGNATURE-----
diff --git a/net-im/tkabber/files/NAT_HTTP_filetransfer.diff b/net-im/tkabber/files/NAT_HTTP_filetransfer.diff
new file mode 100644
index 000000000000..8d858a196975
--- /dev/null
+++ b/net-im/tkabber/files/NAT_HTTP_filetransfer.diff
@@ -0,0 +1,75 @@
+--- plugins/filetransfer/http.tcl.orig	2006-09-25 14:59:45.000000000 +0200
++++ plugins/filetransfer/http.tcl	2006-09-25 15:03:41.000000000 +0200
+@@ -5,6 +5,8 @@
+     variable chunk_size 4096
+ 
+     variable options
++    variable defport 0
++    variable defip ""
+ 
+     custom::defgroup HTTP \
+ 	[::msgcat::mc "HTTP options."] \
+@@ -13,10 +15,22 @@
+     custom::defvar options(enable) 1 \
+ 	[::msgcat::mc "Enable HTTP transport for outgoing file transfers."] \
+ 	-group HTTP -type boolean
++
++    custom::defvar defport 0 \
++        [::msgcat::mc "Port for outgoing HTTP file transfers (0 for assigned automatically).\
++	This is useful when sending files from behind a NAT with a forwarded port."] \
++	-group HTTP -type integer
++
++    custom::defvar defip "" \
++        [::msgcat::mc "Force advertising this IP address for outgoing HTTP file transfers."] \
++	-group HTTP -type string
++
+ }
+ 
+ proc http::send_file_dialog {user args} {
+     variable winid
++    variable defport
++    variable defip
+ 
+     foreach {opt val} $args {
+ 	switch -- $opt {
+@@ -51,13 +65,17 @@
+     label $f.lip -text [::msgcat::mc "IP address:"]
+     entry $f.ip -textvariable [list [namespace current]::ip$winid]
+     variable ip$winid 127.0.0.1
+-    catch {
+-        set ip$winid [info hostname]
+-	set ip$winid [lindex [host_info addresses [set ip$winid]] 0]
+-    }
+ 
+-    catch {
+-	set ip$winid [lindex [fconfigure $jlib::lib($connid,sck) -sockname] 0]
++    if { [string compare $defip ""] != 0 } {
++        set ip$winid [set defip]
++    } else {
++        catch {
++            set ip$winid [info hostname]
++	    set ip$winid [lindex [host_info addresses [set ip$winid]] 0]
++        }
++        catch {
++       	    set ip$winid [lindex [fconfigure $jlib::lib($connid,sck) -sockname] 0]
++        }
+     }
+ 
+     ProgressBar $f.pb \
+@@ -136,6 +154,7 @@
+ }
+ 
+ proc http::send_file_offer {winid user filename desc ip args} {
++    variable defport
+ 
+     foreach {opt val} $args {
+ 	switch -- $opt {
+@@ -148,7 +167,7 @@
+ 
+     set servsock \
+ 	[socket -server \
+-	     [list [namespace current]::send_file_accept $winid $filename] 0]
++	     [list [namespace current]::send_file_accept $winid $filename] $defport]
+ 
+     lassign [fconfigure $servsock -sockname] addr hostname port
+ 
diff --git a/net-im/tkabber/files/digest-tkabber-0.9.9 b/net-im/tkabber/files/digest-tkabber-0.9.9
new file mode 100644
index 000000000000..264a82ddfab5
--- /dev/null
+++ b/net-im/tkabber/files/digest-tkabber-0.9.9
@@ -0,0 +1,6 @@
+MD5 72adb238e77018cee7ee5ac6358bdc51 tkabber-0.9.9.tar.gz 785288
+RMD160 ecaed256760caa30b97654c67852257dec770ba6 tkabber-0.9.9.tar.gz 785288
+SHA256 a5d3f38654a480d1ea2df60be3a5d9180d867fe400424ff09f8154fc86fc067a tkabber-0.9.9.tar.gz 785288
+MD5 2b0b8a7b15b80eb35b902d83f0e5626f tkabber-plugins-0.9.9.tar.gz 366148
+RMD160 920595ba427758d13be4398078a0d1bb400ac602 tkabber-plugins-0.9.9.tar.gz 366148
+SHA256 03435ab0e890d2ed7cee55e727c9a16136bbf89a12af28cf8a72f16080c5e96a tkabber-plugins-0.9.9.tar.gz 366148
diff --git a/net-im/tkabber/tkabber-0.9.9.ebuild b/net-im/tkabber/tkabber-0.9.9.ebuild
new file mode 100644
index 000000000000..66cdace07b31
--- /dev/null
+++ b/net-im/tkabber/tkabber-0.9.9.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.9.ebuild,v 1.1 2006/10/28 22:33:52 humpback Exp $
+
+inherit eutils
+
+DESCRIPTION="Tkabber is a Free and Open Source client for the Jabber instant messaging system, written in Tcl/Tk."
+HOMEPAGE="http://tkabber.jabber.ru/"
+SRC_URI="http://files.jabberstudio.org/tkabber/${P}.tar.gz
+	plugins? ( http://files.jabberstudio.org/tkabber/tkabber-plugins-${PV}.tar.gz )"
+IUSE="crypt plugins ssl extras"
+
+DEPEND=">=dev-lang/tcl-8.3.3
+	>=dev-lang/tk-8.3.3
+	|| ( >=dev-tcltk/tclxml-3.0 dev-tcltk/tclxml-expat )
+	crypt? ( >=dev-tcltk/tclgpgme-1.0 )
+	>=dev-tcltk/tcllib-1.3
+	>=dev-tcltk/bwidget-1.3
+	ssl? ( >=dev-tcltk/tls-1.4.1 )
+	>=dev-tcltk/tkXwin-1.0
+	>=dev-tcltk/tkTheme-1.0"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~alpha ~sparc ~amd64"
+SLOT="0"
+
+pkg_setup() {
+	if ! use extras; then
+		ewarn "You have the extras use flag off. That means that proxy file transfers will not work"
+		ewarn "If you need that press Contrl-C now and activate it!"
+	fi
+	if has_version '>=dev-tcltk/tclxml-3.0' \
+		&& ! built_with_use dev-tcltk/tclxml expat ; then
+		eerror "tclxml is missing expat support."
+		eerror "Please add 'expat' to your USE flags, and re-emerge tclxml."
+		die "tclxml needs expat support"
+	fi
+}
+
+src_compile() {
+	# dont run make, because the Makefile is broken with all=install
+	echo -n
+	if use extras; then
+		epatch ${FILESDIR}/NAT_HTTP_filetransfer.diff
+	fi
+}
+
+src_install() {
+	dodir /usr/share/tkabber
+	cp -R *.tcl plugins pixmaps textundo aniemoteicons ifacetk \
+	emoticons-tkabber msgs mclistbox-1.02 \
+	jabberlib-tclxml sounds ${D}/usr/share/tkabber
+
+	if use plugins; then
+		mkdir ${D}/usr/share/tkabber/site-plugins
+		cp -R ${WORKDIR}/tkabber-plugins-${PV}/* \
+		${D}/usr/share/tkabber/site-plugins
+		newdoc ${WORKDIR}/tkabber-plugins-${PV}/README README.plugins
+	fi
+
+	cat <<-EOF > tkabber
+	#!/bin/sh
+	TKABBER_SITE_PLUGINS=/usr/share/tkabber/site-plugins \
+	exec wish /usr/share/tkabber/tkabber.tcl -name tkabber
+	EOF
+
+	chmod +x tkabber
+	dobin tkabber
+	dodoc AUTHORS COPYING ChangeLog INSTALL README
+	dohtml README.html
+	cp -R doc examples contrib ${D}/usr/share/doc/${PF}
+}
+
+pkg_postinst() {
+	einfo "There's no UI option to disable emoticons yet, however"
+	einfo "you can put the following into your ~/.tkabber/config.tcl"
+	einfo
+	einfo "hook::add finload_hook {"
+	einfo " array unset emoteicons::emoteicons"
+	einfo "}"
+}