diff options
author | Manuel Rüger <mrueg@gentoo.org> | 2014-03-31 02:01:34 +0000 |
---|---|---|
committer | Manuel Rüger <mrueg@gentoo.org> | 2014-03-31 02:01:34 +0000 |
commit | ffc66104635213dd52091ea527299f4c4165b02e (patch) | |
tree | a178a8ed0f99b88fd4d3195e823b11e25cb3f113 /net-im/tkabber | |
parent | Cleanup old. (diff) | |
download | gentoo-2-ffc66104635213dd52091ea527299f4c4165b02e.tar.gz gentoo-2-ffc66104635213dd52091ea527299f4c4165b02e.tar.bz2 gentoo-2-ffc66104635213dd52091ea527299f4c4165b02e.zip |
Cleanup old.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'net-im/tkabber')
-rw-r--r-- | net-im/tkabber/ChangeLog | 6 | ||||
-rw-r--r-- | net-im/tkabber/files/NAT_HTTP_filetransfer.diff | 75 | ||||
-rw-r--r-- | net-im/tkabber/tkabber-0.9.9.ebuild | 84 |
3 files changed, 5 insertions, 160 deletions
diff --git a/net-im/tkabber/ChangeLog b/net-im/tkabber/ChangeLog index 89737689df61..9f97231ea69d 100644 --- a/net-im/tkabber/ChangeLog +++ b/net-im/tkabber/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/tkabber # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/ChangeLog,v 1.49 2014/03/29 06:08:58 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/ChangeLog,v 1.50 2014/03/31 02:01:33 mrueg Exp $ + + 31 Mar 2014; Manuel Rüger <mrueg@gentoo.org> + -files/NAT_HTTP_filetransfer.diff, -tkabber-0.9.9.ebuild: + Cleanup old. 29 Mar 2014; Agostino Sarubbo <ago@gentoo.org> tkabber-0.11.1-r1.ebuild: Stable for x86, wrt bug #503942 diff --git a/net-im/tkabber/files/NAT_HTTP_filetransfer.diff b/net-im/tkabber/files/NAT_HTTP_filetransfer.diff deleted file mode 100644 index 8d858a196975..000000000000 --- a/net-im/tkabber/files/NAT_HTTP_filetransfer.diff +++ /dev/null @@ -1,75 +0,0 @@ ---- 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/tkabber-0.9.9.ebuild b/net-im/tkabber/tkabber-0.9.9.ebuild deleted file mode 100644 index 99e38899a058..000000000000 --- a/net-im/tkabber/tkabber-0.9.9.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2012 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.11 2012/03/18 15:32:53 armin76 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="plugins ssl extras" - -DEPEND=">=dev-lang/tcl-8.3.3 - >=dev-lang/tk-8.3.3 - >=dev-tcltk/tclxml-3.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" -RDEPEND="${DEPEND}" - -# Disabled because it depends on gpgme 0.3.x -# crypt? ( >=dev-tcltk/tclgpgme-1.0 ) - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -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 --missing true 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 ChangeLog INSTALL README - dohtml README.html - cp -R doc examples contrib "${D}"/usr/share/doc/${PF} -} - -pkg_postinst() { - elog "There's no UI option to disable emoticons yet, however" - elog "you can put the following into your ~/.tkabber/config.tcl" - elog - elog "hook::add finload_hook {" - elog " array unset emoteicons::emoteicons" - elog "}" -} |