[gentoo-commits] repo/gentoo:master commit in: net-p2p/bittorrent/, net-p2p/bittorrent/files/

[Pacho Ramos]

commit:     bb55175d5ed9a22c9bed3bb687a4927ccc80c7ad
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 12:06:34 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 12:06:34 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb55175d

Remove hardmasked package

 net-p2p/bittorrent/Manifest                        |   1 -
 net-p2p/bittorrent/bittorrent-4.4.0-r2.ebuild      |  87 -------------
 net-p2p/bittorrent/bittorrent-4.4.0-r3.ebuild      |  86 -------------
 .../files/bittorrent-4.4.0-bencode-float.patch     |  75 -----------
 .../files/bittorrent-4.4.0-fastresume.patch        |  23 ----
 .../files/bittorrent-4.4.0-hashlib.patch           | 142 ---------------------
 .../files/bittorrent-4.4.0-keyerror.patch          |  15 ---
 .../files/bittorrent-4.4.0-no-version-check.patch  |  14 --
 .../bittorrent/files/bittorrent-4.4.0-pkidir.patch |  13 --
 .../bittorrent-4.4.0-pygtk-thread-warnings.patch   |  81 ------------
 .../files/bittorrent-4.4.0-python26-syntax.patch   |  45 -------
 net-p2p/bittorrent/files/bittorrent-tracker.confd  |  15 ---
 net-p2p/bittorrent/files/bittorrent-tracker.initd  |  23 ----
 net-p2p/bittorrent/files/bittorrent.desktop        |  10 --
 net-p2p/bittorrent/metadata.xml                    |   9 --
 15 files changed, 639 deletions(-)

diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
deleted file mode 100644
index 693530b..0000000
--- a/net-p2p/bittorrent/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BitTorrent-4.4.0.tar.gz 1255281 SHA256 1c9338ed384240258b5733a814670e2dee8ca2fb65babf3f0ca07978707301e0 SHA512 04ac6690fe11225c182c10dd3e7a84b53d84fd795efdc8a8d502835bc1c728a95c6cb12cc42173aadc483eff39bfaaba3df418fc86114c240748631e91d6ddd8 WHIRLPOOL 99e38f8da90e9eadaa0e3d14cc4bf102964443e951da98a423383d5d428b253a736bbee4ed6c4475e8a0ba5456f515e28346c1ea2328b5ed8c642cf50a13b15c

diff --git a/net-p2p/bittorrent/bittorrent-4.4.0-r2.ebuild b/net-p2p/bittorrent/bittorrent-4.4.0-r2.ebuild
deleted file mode 100644
index bda46fc..0000000
--- a/net-p2p/bittorrent/bittorrent-4.4.0-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="threads"
-
-# Maintainer note:
-#  keep this package at 4.4.0.
-#    5.x - requires wxpython-2.6 which we don't carry
-#    6.x - binary-only non-free crap
-# Fedora has also frozen bittorrent at 4.4.0 and is a good source of patches
-# http://pkgs.fedoraproject.org/gitweb/?p=bittorrent.git
-
-inherit distutils eutils fdo-mime python
-
-MY_P="${P/bittorrent/BitTorrent}"
-
-DESCRIPTION="Tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://www.bittorrent.com/"
-SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
-
-LICENSE="BitTorrent"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="aqua gtk"
-
-RDEPEND=">=dev-python/pycrypto-2.0
-	gtk? (	>=x11-libs/gtk+-2.6:2
-			>=dev-python/pygtk-2.6:2 )"
-DEPEND="${RDEPEND}"
-#	dev-python/dnspython"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="README.txt TRACKERLESS.txt"
-PYTHON_MODNAME="BitTorrent khashmir"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	distutils_src_prepare
-
-	epatch "${FILESDIR}"/${P}-no-version-check.patch
-	epatch "${FILESDIR}"/${P}-pkidir.patch
-	epatch "${FILESDIR}"/${P}-fastresume.patch
-	epatch "${FILESDIR}"/${P}-pygtk-thread-warnings.patch
-	epatch "${FILESDIR}"/${P}-python26-syntax.patch
-	epatch "${FILESDIR}"/${P}-bencode-float.patch
-	epatch "${FILESDIR}"/${P}-keyerror.patch
-	epatch "${FILESDIR}"/${P}-hashlib.patch
-
-	# fix doc path #109743
-	sed -i -e "/dp.*appdir/ s:appdir:'${PF}':" BitTorrent/platform.py
-}
-
-src_install() {
-	distutils_src_install
-
-	if use gtk; then
-		doicon images/bittorrent.ico
-		domenu "${FILESDIR}"/${PN}.desktop
-	elif use !aqua; then
-		rm -f "${ED}"usr/bin/{bit,make}torrent
-	fi
-
-	insinto /etc/pki/bittorrent/
-	doins public.key
-
-	newinitd "${FILESDIR}"/bittorrent-tracker.initd bittorrent-tracker
-	newconfd "${FILESDIR}"/bittorrent-tracker.confd bittorrent-tracker
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use gtk && fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use gtk && fdo-mime_desktop_database_update
-}

diff --git a/net-p2p/bittorrent/bittorrent-4.4.0-r3.ebuild b/net-p2p/bittorrent/bittorrent-4.4.0-r3.ebuild
deleted file mode 100644
index 2652019..0000000
--- a/net-p2p/bittorrent/bittorrent-4.4.0-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads'
-
-# Maintainer note:
-#  keep this package at 4.4.0.
-#    5.x - requires wxpython-2.6 which we don't carry
-#    6.x - binary-only non-free crap
-# Fedora has also frozen bittorrent at 4.4.0 and is a good source of patches
-# http://pkgs.fedoraproject.org/gitweb/?p=bittorrent.git
-
-inherit distutils-r1 eutils fdo-mime
-
-MY_P="${P/bittorrent/BitTorrent}"
-
-DESCRIPTION="Tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://www.bittorrent.com/"
-SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
-
-LICENSE="BitTorrent"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="aqua gtk"
-
-RDEPEND=">=dev-python/pycrypto-2.0[${PYTHON_USEDEP}]
-	gtk? (	>=x11-libs/gtk+-2.6:2
-			>=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-#	dev-python/dnspython"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( credits.txt credits-l10n.txt README.txt TRACKERLESS.txt )
-
-python_prepare_all() {
-	epatch "${FILESDIR}"/${P}-no-version-check.patch
-	epatch "${FILESDIR}"/${P}-pkidir.patch
-	epatch "${FILESDIR}"/${P}-fastresume.patch
-	epatch "${FILESDIR}"/${P}-pygtk-thread-warnings.patch
-	epatch "${FILESDIR}"/${P}-python26-syntax.patch
-	epatch "${FILESDIR}"/${P}-bencode-float.patch
-	epatch "${FILESDIR}"/${P}-keyerror.patch
-	epatch "${FILESDIR}"/${P}-hashlib.patch
-
-	# fix doc path #109743
-	sed -i -e "/dp.*appdir/ s:appdir:'${PF}':" BitTorrent/platform.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if ! use gtk && ! use aqua; then
-		rm -f "${ED}"usr/bn/{bit,make}torrent || die
-		rm -f "${D}$(python_get_scriptdir)"/{bit,make}torrent || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use gtk; then
-		doicon images/bittorrent.ico
-		domenu "${FILESDIR}"/${PN}.desktop
-	fi
-
-	insinto /etc/pki/bittorrent/
-	doins public.key
-
-	newinitd "${FILESDIR}"/bittorrent-tracker.initd bittorrent-tracker
-	newconfd "${FILESDIR}"/bittorrent-tracker.confd bittorrent-tracker
-}
-
-pkg_postinst() {
-	use gtk && fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	use gtk && fdo-mime_desktop_database_update
-}

diff --git a/net-p2p/bittorrent/files/bittorrent-4.4.0-bencode-float.patch b/net-p2p/bittorrent/files/bittorrent-4.4.0-bencode-float.patch
deleted file mode 100644
index c14a7b6..0000000
--- a/net-p2p/bittorrent/files/bittorrent-4.4.0-bencode-float.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Add bencode support for floating point values.
-
-https://bugzilla.redhat.com/451496
-
---- a/BitTorrent/bencode.py
-+++ b/BitTorrent/bencode.py
-@@ -14,6 +14,8 @@ from BitTorrent.obsoletepythonsupport import *
- 
- from BitTorrent import BTFailure
- 
-+import string
-+
- def decode_int(x, f):
-     f += 1
-     newf = x.index('e', f)
-@@ -25,6 +27,23 @@ def decode_int(x, f):
-         raise ValueError
-     return (n, newf+1)
- 
-+def assert_finite(n):
-+  """Raises ValueError if n is NaN or infinite."""
-+
-+  valid_chars = '0123456789.-+eE'
-+  if repr(n).translate(string.maketrans('',''), valid_chars) != '':
-+    raise ValueError('encountered NaN or infinite')
-+
-+def decode_float(x, f):
-+    f += 1
-+    newf = x.index('e', f)
-+    try:
-+        n = float(x[f:newf].replace('E', 'e'))
-+        assert_finite(n)
-+    except (OverflowError, ValueError):
-+        raise ValueError('encountered NaN or infinite')
-+    return (n, newf+1)
-+
- def decode_string(x, f):
-     colon = x.index(':', f)
-     n = int(x[f:colon])
-@@ -55,6 +74,7 @@ decode_func = {}
- decode_func['l'] = decode_list
- decode_func['d'] = decode_dict
- decode_func['i'] = decode_int
-+decode_func['f'] = decode_float
- decode_func['0'] = decode_string
- decode_func['1'] = decode_string
- decode_func['2'] = decode_string
-@@ -75,7 +95,7 @@ def bdecode(x):
-         raise BTFailure, _("invalid bencoded value (data after valid prefix)")
-     return r
- 
--from types import StringType, IntType, LongType, DictType, ListType, TupleType
-+from types import StringType, IntType, LongType, DictType, ListType, TupleType, FloatType
- 
- 
- class Bencached(object):
-@@ -91,6 +111,10 @@ def encode_bencached(x,r):
- def encode_int(x, r):
-     r.extend(('i', str(x), 'e'))
- 
-+def encode_float(x, r):
-+    assert_finite(x)
-+    r.extend(('f', repr(x).replace('e', 'E'), 'e'))
-+
- def encode_bool(x, r):
-     if x:
-         encode_int(1, r)
-@@ -119,6 +143,7 @@ encode_func = {}
- encode_func[Bencached] = encode_bencached
- encode_func[IntType] = encode_int
- encode_func[LongType] = encode_int
-+encode_func[FloatType] = encode_float
- encode_func[StringType] = encode_string
- encode_func[ListType] = encode_list
- encode_func[TupleType] = encode_list

diff --git a/net-p2p/bittorrent/files/bittorrent-4.4.0-fastresume.patch b/net-p2p/bittorrent/files/bittorrent-4.4.0-fastresume.patch
deleted file mode 100644
index b282afd..0000000
--- a/net-p2p/bittorrent/files/bittorrent-4.4.0-fastresume.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-"Could not load fastresume data: invalid literal for int() with base 10: '1300250602.1'
-Will perform full hash check."
-
---- a/BitTorrent/Storage.py
-+++ b/BitTorrent/Storage.py
-@@ -213,7 +213,7 @@ class Storage(object):
-         resumefile.write(str(amount_done) + '\n')
-         for x, x, filename in self.ranges:
-             resumefile.write(str(os.path.getsize(filename)) + ' ' +
--                             str(os.path.getmtime(filename)) + '\n')
-+                             str(int(os.path.getmtime(filename))) + '\n')
- 
-     def check_fastresume(self, resumefile, return_filelist=False,
-                          piece_size=None, numpieces=None, allfiles=None):
-@@ -237,7 +237,7 @@ class Storage(object):
-             else:
-                 raise BTFailure(_("Another program appears to have moved, renamed, or deleted the file, "
-                                   "or %s may have crashed last time it was run.") % app_name)
--            if fsize > 0 and mtime != os.path.getmtime(filename):
-+            if fsize > 0 and mtime != int(os.path.getmtime(filename)):
-                 raise BTFailure(_("Another program appears to have modified the file, "
-                                   "or %s may have crashed last time it was run.") % app_name)
-             if size != fsize:

diff --git a/net-p2p/bittorrent/files/bittorrent-4.4.0-hashlib.patch b/net-p2p/bittorrent/files/bittorrent-4.4.0-hashlib.patch
deleted file mode 100644
index 28bfaa7..0000000
--- a/net-p2p/bittorrent/files/bittorrent-4.4.0-hashlib.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-DeprecationWarning: the sha module is deprecated; use the hashlib module instead
-
---- a/BitTorrent/ConvertedMetainfo.py
-+++ b/BitTorrent/ConvertedMetainfo.py
-@@ -15,7 +15,10 @@ from __future__ import generators
- 
- import os
- import sys
--from sha import sha
-+try:
-+    from hashlib import sha1 as sha
-+except ImportError:
-+    from sha import sha
- 
- from BitTorrent.obsoletepythonsupport import *
- 
---- a/BitTorrent/NewVersion.py
-+++ b/BitTorrent/NewVersion.py
-@@ -15,7 +15,10 @@ import sys
- import zurllib
- import pickle
- import threading
--from sha import sha
-+try:
-+    from hashlib import sha1 as sha
-+except ImportError:
-+    from sha import sha
- 
- DEBUG = False
- 
---- a/BitTorrent/PeerID.py
-+++ b/BitTorrent/PeerID.py
-@@ -11,7 +11,10 @@
- # Written by Matt Chisholm
- 
- import os
--from sha import sha
-+try:
-+    from hashlib import sha1 as sha
-+except ImportError:
-+    from sha import sha
- from time import time
- try:
-     getpid = os.getpid
---- a/BitTorrent/StorageWrapper.py
-+++ b/BitTorrent/StorageWrapper.py
-@@ -12,7 +12,10 @@
- 
- from __future__ import division
- 
--from sha import sha
-+try:
-+    from hashlib import sha1 as sha
-+except ImportError:
-+    from sha import sha
- from array import array
- from binascii import b2a_hex
- 
---- a/BitTorrent/download.py
-+++ b/BitTorrent/download.py
-@@ -19,7 +19,10 @@ import sys
- import threading
- import errno
- import gc
--from sha import sha
-+try:
-+    from hashlib import sha1 as sha
-+except ImportError:
-+    from sha import sha
- from socket import error as socketerror
- from random import seed
- from time import time
---- a/BitTorrent/makemetafile.py
-+++ b/BitTorrent/makemetafile.py
-@@ -16,7 +16,10 @@ from __future__ import division
- 
- import os
- import sys
--from sha import sha
-+try:
-+    from hashlib import sha1 as sha
-+except ImportError:
-+    from sha import sha
- from time import time
- from threading import Event
- 
---- a/BitTorrent/parsedir.py
-+++ b/BitTorrent/parsedir.py
-@@ -11,7 +11,10 @@
- # Written by John Hoffman and Uoti Urpala
- 
- import os
--from sha import sha
-+try:
-+    from hashlib import sha1 as sha
-+except ImportError:
-+    from sha import sha
- 
- from BitTorrent.bencode import bencode, bdecode
- from BitTorrent.btformats import check_message
---- a/khashmir/khash.py
-+++ b/khashmir/khash.py
-@@ -8,7 +8,10 @@
- # for the specific language governing rights and limitations under the
- # License.
- 
--from sha import sha
-+try:
-+    from hashlib import sha1 as sha
-+except ImportError:
-+    from sha import sha
- from random import randint
- 
- #this is ugly, hopefully os.entropy will be in 2.4
---- a/khashmir/khashmir.py
-+++ b/khashmir/khashmir.py
-@@ -13,7 +13,10 @@ from socket import gethostbyname
- 
- from BitTorrent.platform import bttime as time
- 
--from sha import sha
-+try:
-+    from hashlib import sha1 as sha
-+except ImportError:
-+    from sha import sha
- import re
- from BitTorrent.defaultargs import common_options, rare_options
- from BitTorrent.RawServer_magic import RawServer
---- a/khashmir/utkhashmir.py
-+++ b/khashmir/utkhashmir.py
-@@ -13,7 +13,10 @@ from actions import *
- from khash import newID
- from krpc import KRPCProtocolError, KRPCFailSilently
- from cache import Cache
--from sha import sha
-+try:
-+    from hashlib import sha1 as sha
-+except ImportError:
-+    from sha import sha
- from util import *
- from threading import Thread
- from socket import gethostbyname

diff --git a/net-p2p/bittorrent/files/bittorrent-4.4.0-keyerror.patch b/net-p2p/bittorrent/files/bittorrent-4.4.0-keyerror.patch
deleted file mode 100644
index c2730d1..0000000
--- a/net-p2p/bittorrent/files/bittorrent-4.4.0-keyerror.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix bug with error: KeyError: <type 'float'>
-
-https://bugzilla.redhat.com/451496
-
---- a/BitTorrent/track.py
-+++ b/BitTorrent/track.py
-@@ -107,6 +107,8 @@ defaults = [
-      _("scrape access allowed (can be none, specific or full)")),
-     ('max_give', 200,
-      _("maximum number of peers to give with any one request")),
-+    ('max_incomplete', 100,
-+     _("max number of outgoing incomplete connections")),
-     ('twisted', -1,
-      _("Use Twisted network libraries for network connections. 1 means use twisted, 0 means do not use twisted, -1 means autodetect, and prefer twisted")),
-     ('pid', '/var/run/bittorrent-tracker.pid',

diff --git a/net-p2p/bittorrent/files/bittorrent-4.4.0-no-version-check.patch b/net-p2p/bittorrent/files/bittorrent-4.4.0-no-version-check.patch
deleted file mode 100644
index b0c20fd..0000000
--- a/net-p2p/bittorrent/files/bittorrent-4.4.0-no-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Disable check for new versions.
-
---- a/BitTorrent/NewVersion.py
-+++ b/BitTorrent/NewVersion.py
-@@ -128,6 +128,9 @@ class Updater(object):
- 
- 
-     def get(self):
-+        self.debug('Skipping version check')
-+        return
-+
-         try:
-             self.get_available()
-         except BTFailure, e:

diff --git a/net-p2p/bittorrent/files/bittorrent-4.4.0-pkidir.patch b/net-p2p/bittorrent/files/bittorrent-4.4.0-pkidir.patch
deleted file mode 100644
index 98f9f81..0000000
--- a/net-p2p/bittorrent/files/bittorrent-4.4.0-pkidir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Install public key in standard place.
-
---- a/BitTorrent/NewVersion.py
-+++ b/BitTorrent/NewVersion.py
-@@ -163,7 +163,7 @@ class Updater(object):
-             self.threadwrap(self.errorfunc, WARNING, '\n'.join(terrors))
- 
-         if torrentfile and signature:
--            public_key_file = open(os.path.join(doc_root, 'public.key'), 'rb')
-+            public_key_file = open('/etc/pki/bittorrent/public.key', 'rb')
-             public_key = pickle.load(public_key_file)
-             h = sha(torrentfile).digest()
-             if public_key.verify(h, signature):

diff --git a/net-p2p/bittorrent/files/bittorrent-4.4.0-pygtk-thread-warnings.patch b/net-p2p/bittorrent/files/bittorrent-4.4.0-pygtk-thread-warnings.patch
deleted file mode 100644
index c4a2326..0000000
--- a/net-p2p/bittorrent/files/bittorrent-4.4.0-pygtk-thread-warnings.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-GtkDeprecationWarning: gtk.threads_leave is deprecated, use gtk.gdk.threads_leave instead
-
---- a/BitTorrent/GUI.py
-+++ b/BitTorrent/GUI.py
-@@ -25,9 +25,9 @@ from BitTorrent import app_name, FAQ_URL, languages, language_names
- from BitTorrent.platform import image_root, read_language_file, write_language_file
- 
- def lock_wrap(function, *args):
--    gtk.threads_enter()
-+    gtk.gdk.threads_enter()
-     function(*args)
--    gtk.threads_leave()
-+    gtk.gdk.threads_leave()
- 
- def gtk_wrap(function, *args):
-     gobject.idle_add(lock_wrap, function, *args)
-@@ -377,10 +377,10 @@ class AutoScrollingWindow(ScrolledWindow):
- 
-     def scroll_and_wait(self, amount, lock_held):
-         if not lock_held:
--            gtk.threads_enter()
-+            gtk.gdk.threads_enter()
-         self.scroll_by(0, amount)
-         if not lock_held:
--            gtk.threads_leave()
-+            gtk.gdk.threads_leave()
-         if self.vscrolltimeout is not None:
-             gobject.source_remove(self.vscrolltimeout)
-         self.vscrolltimeout = gobject.timeout_add(100, self.scroll_and_wait, amount, False)
---- a/bittorrent.py
-+++ b/bittorrent.py
-@@ -2742,7 +2742,7 @@ class DownloadInfoFrame(object):
-         if self.config['start_minimized']:
-             self.mainwindow.iconify()
-        
--        gtk.threads_enter()
-+        gtk.gdk.threads_enter()
- 
-         self.mainwindow.set_border_width(0)
- 
-@@ -2942,7 +2942,7 @@ class DownloadInfoFrame(object):
- 
-         self.nag()
-         
--        gtk.threads_leave()
-+        gtk.gdk.threads_leave()
- 
-     def window_event(self, widget, event, *args):
-         if event.changed_mask == gtk.gdk.WINDOW_STATE_ICONIFIED:
-@@ -3758,14 +3758,14 @@ class MainLoop:
-         self.mainwindow = None
-         self.started = 0
-         
--        gtk.threads_init()
-+        gtk.gdk.threads_init()
- 
-     def set_mainwindow(self, mainwindow):
-         self.mainwindow = mainwindow
- 
-     def run(self):
-         self.mainwindow.traythread.start()
--        gtk.threads_enter()        
-+        gtk.gdk.threads_enter()        
- 
-         if self.mainwindow:
-             self.mainwindow.ssbutton.set_paused(self.mainwindow.config['pause'])
-@@ -3777,12 +3777,12 @@ class MainLoop:
-             self.started = 1
-             gtk.main() 
-         except KeyboardInterrupt:
--            gtk.threads_leave()
-+            gtk.gdk.threads_leave()
-             if self.mainwindow:
-                 self.mainwindow.torrentqueue.set_done()
-             raise
-         
--        gtk.threads_leave()
-+        gtk.gdk.threads_leave()
- 
-     def quit(self):
-         if self.mainwindow: 

diff --git a/net-p2p/bittorrent/files/bittorrent-4.4.0-python26-syntax.patch b/net-p2p/bittorrent/files/bittorrent-4.4.0-python26-syntax.patch
deleted file mode 100644
index 1ad8751..0000000
--- a/net-p2p/bittorrent/files/bittorrent-4.4.0-python26-syntax.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix syntax errors with python 2.6.
-
-https://bugs.gentoo.org/265784
-
---- a/khashmir/inserter.py
-+++ b/khashmir/inserter.py
-@@ -28,7 +28,6 @@ def d(n):
-     done = done+1
-     
- if __name__=="__main__":
--    global done
-     host, port = sys.argv[1:]
-     x = UTKhashmir("", 22038, "/tmp/cgcgcgc")
-     x.addContact(host, int(port))
---- a/khashmir/test_krpc.py
-+++ b/khashmir/test_krpc.py
-@@ -44,20 +44,20 @@ class KRPCTests(TestCase):
-         self.r = RawServer(Event(), d)
- 
-         addr = ('127.0.0.1', 1180)
--        self.as = self.r.create_udpsocket(addr[1], addr[0], True)
-+        self.asock = self.r.create_udpsocket(addr[1], addr[0], True)
-         self.af = Receiver(addr)
--        self.a = hostbroker(self.af, addr, self.as, self.r.add_task)
--        self.r.start_listening_udp(self.as, self.a)
-+        self.a = hostbroker(self.af, addr, self.asock, self.r.add_task)
-+        self.r.start_listening_udp(self.asock, self.a)
- 
-         addr = ('127.0.0.1', 1181)
--        self.bs = self.r.create_udpsocket(addr[1], addr[0], True)
-+        self.bsock = self.r.create_udpsocket(addr[1], addr[0], True)
-         self.bf = Receiver(addr)
--        self.b = hostbroker(self.bf, addr, self.bs, self.r.add_task)
--        self.r.start_listening_udp(self.bs, self.b)
-+        self.b = hostbroker(self.bf, addr, self.bsock, self.r.add_task)
-+        self.r.start_listening_udp(self.bsock, self.b)
-         
-     def tearDown(self):
--        self.as.close()
--        self.bs.close()
-+        self.asock.close()
-+        self.bsock.close()
- 
-     def testSimpleMessage(self):
-         self.noisy = 0

diff --git a/net-p2p/bittorrent/files/bittorrent-tracker.confd b/net-p2p/bittorrent/files/bittorrent-tracker.confd
deleted file mode 100644
index 71e29cb..0000000
--- a/net-p2p/bittorrent/files/bittorrent-tracker.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/conf.d/bittorrent-tracker: config file for /etc/init.d/bittorrent-tracker
-
-# Change this to this to the port you would like to connect to for the tracker.
-# It is accessible at http://localhost:PORT/ from any web browser.
-PORT=8082
-
-# where to store recent downloader info
-DFILE=/usr/share/bittorrent/tracker.dfile
-
-# path to favicon.ico which many popular web browsers can use
-FAVICON=/usr/share/pixmaps/bittorrent.ico
-
-# Connection logs are sent to stdout by default, so they should be sent to a
-# file when using this script.
-LOGFILE=/var/log/bttrack.log

diff --git a/net-p2p/bittorrent/files/bittorrent-tracker.initd b/net-p2p/bittorrent/files/bittorrent-tracker.initd
deleted file mode 100644
index 49de33b..0000000
--- a/net-p2p/bittorrent/files/bittorrent-tracker.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting bttrack"
-	start-stop-daemon --start --quiet --background --make-pidfile \
-		--pidfile /var/run/bttrack.pid \
-		--exec /usr/bin/bittorrent-tracker -- --port ${PORT} \
-		--dfile ${DFILE} --favicon ${FAVICON} --logfile ${LOGFILE}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bttrack"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bttrack.pid
-	eend $?
-}

diff --git a/net-p2p/bittorrent/files/bittorrent.desktop b/net-p2p/bittorrent/files/bittorrent.desktop
deleted file mode 100644
index a6a5312..0000000
--- a/net-p2p/bittorrent/files/bittorrent.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=BitTorrent File Transfer
-Comment=Distributed download of files from the Internet
-Exec=bittorrent
-Icon=/usr/share/pixmaps/bittorrent.ico
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Network;FileTransfer;P2P;
-MimeType=application/x-bittorrent;

diff --git a/net-p2p/bittorrent/metadata.xml b/net-p2p/bittorrent/metadata.xml
deleted file mode 100644
index 2a0f322..0000000
--- a/net-p2p/bittorrent/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>net-p2p</herd>
-	<maintainer>
-		<email>rhill@g.o</email>
-		<name>Ryan Hill</name>
-	</maintainer>
-</pkgmetadata>