Clean old; obsoletes bug #556596

Signed-off-by: Justin Lecher <jlec@gentoo.org>
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

17 files changed, 13 insertions, 892 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 599a95c8561c..5626c5497295 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.230 2015/08/02 11:28:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.231 2015/08/06 10:41:00 jlec Exp $
+
+  06 Aug 2015; Justin Lecher <jlec@gentoo.org> -files/0.14-python-version.patch,
+  -files/0.14.1-testing.patch, -files/0.14.4-unicode.patch,
+  -files/gajim-0.14.4-debian_patches_unicode.patch,
+  -files/gajim-0.15-SA48695-2.patch, -files/gajim-0.15-SA48695.patch,
+  -files/gajim-0.15-plugin.patch, -files/gajim-0.15.2-CVE-2012-5524.patch,
+  -files/gajim-0.15.3-roster.patch, -files/gajim-0.15.3-starttls.patch,
+  -files/gajim-0.16.1-gnupg-2.1-backport.patch,
+  -files/gajim-0.16_beta2-pyopenssl-backport-1.patch,
+  -files/gajim-0.16_beta2-pyopenssl-backport-2.patch, -gajim-0.16.1-r2.ebuild,
+  -gajim-0.16.1.ebuild, -gajim-0.16.2.ebuild:
+  Clean old; obsoletes bug #556596
 
 *gajim-0.16.3 (02 Aug 2015)
 
diff --git a/net-im/gajim/files/0.14-python-version.patch b/net-im/gajim/files/0.14-python-version.patch
deleted file mode 100644
index 30ee445d405c..000000000000
--- a/net-im/gajim/files/0.14-python-version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/scripts/gajim.in b/scripts/gajim.in
-index e163a9b..73dc9e0 100644
---- a/scripts/gajim.in
-+++ b/scripts/gajim.in
-@@ -30,4 +30,4 @@ fi
- [ "$APP" = "gajim-history-manager" ] && APP="history_manager"
- 
- cd "@GAJIM_SRCDIR@"
--exec "@PYTHON@" -OO $APP.py "$@"
-+exec "@PYTHON@@PYTHON_VERSION@" -OO $APP.py "$@"
diff --git a/net-im/gajim/files/0.14.1-testing.patch b/net-im/gajim/files/0.14.1-testing.patch
deleted file mode 100644
index 10dd844e7902..000000000000
--- a/net-im/gajim/files/0.14.1-testing.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 4e70251..8b8702f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -59,7 +59,7 @@ MAINTAINERCLEANDIRS = \
- 
- 
- test:
--	python test/runtests.py
-+	$(GENTOOPY) test/runtests.py
- .PHONY: test
- 
- doc:
diff --git a/net-im/gajim/files/0.14.4-unicode.patch b/net-im/gajim/files/0.14.4-unicode.patch
deleted file mode 100644
index 5c0dd0d314aa..000000000000
--- a/net-im/gajim/files/0.14.4-unicode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/remote_control.py b/src/remote_control.py
---- a/src/remote_control.py
-+++ b/src/remote_control.py
-@@ -211,6 +211,15 @@ class Remote:
-
-     def raise_signal(self, signal, arg):
-         if self.signal_object:
-+            arg_copy = list(arg)
-+            newarg = []
-+            for a in arg_copy[1]:
-+                try:
-+                    newarg.append(a.decode('utf-8', 'replace'))
-+                except:
-+                    newarg.append(a)
-+            arg_copy[1] = newarg
-+            arg = tuple(arg_copy)
-             try:
-                 getattr(self.signal_object, signal)(get_dbus_struct(arg))
-             except UnicodeDecodeError:
diff --git a/net-im/gajim/files/gajim-0.14.4-debian_patches_unicode.patch b/net-im/gajim/files/gajim-0.14.4-debian_patches_unicode.patch
deleted file mode 100644
index 7ac6764902c0..000000000000
--- a/net-im/gajim/files/gajim-0.14.4-debian_patches_unicode.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Index: gajim-0.14.4/src/common/connection_handlers.py
-===================================================================
---- gajim-0.14.4.orig/src/common/connection_handlers.py	2011-05-31 18:00:32.000000000 +0200
-+++ gajim-0.14.4/src/common/connection_handlers.py	2011-10-23 19:52:10.679106710 +0200
-@@ -1607,6 +1607,8 @@
-             if keyID:
-                 def decrypt_thread(encmsg, keyID):
-                     decmsg = self.gpg.decrypt(encmsg, keyID)
-+                    decmsg = self.connection.Dispatcher.replace_non_character(
-+                        decmsg)
-                     # \x00 chars are not allowed in C (so in GTK)
-                     msgtxt = helpers.decode_string(decmsg.replace('\x00', ''))
-                     encrypted = 'xep27'
-Index: gajim-0.14.4/src/common/stanza_session.py
-===================================================================
---- gajim-0.14.4.orig/src/common/stanza_session.py	2011-05-31 18:00:32.000000000 +0200
-+++ gajim-0.14.4/src/common/stanza_session.py	2011-10-23 20:05:40.979105851 +0200
-@@ -375,6 +375,12 @@
-         for child in parsed.getChildren():
-             stanza.addChild(node=child)
- 
-+        # replace non-character unicode
-+        body = stanza.getBody()
-+        if body:
-+            stanza.setBody(
-+                self.conn.connection.Dispatcher.replace_non_character(body))
-+
-         return stanza
- 
-     def decrypt(self, ciphertext):
-Index: gajim-0.14.4/src/common/xmpp/dispatcher_nb.py
-===================================================================
---- gajim-0.14.4.orig/src/common/xmpp/dispatcher_nb.py	2011-05-22 13:12:53.000000000 +0200
-+++ gajim-0.14.4/src/common/xmpp/dispatcher_nb.py	2011-10-23 19:52:10.709106647 +0200
-@@ -20,7 +20,7 @@
- different handlers to different XMPP stanzas and namespaces
- """
- 
--import simplexml, sys, locale
-+import re, simplexml, sys, locale
- from xml.parsers.expat import ExpatError
- from plugin import PlugIn
- from protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence,
-@@ -89,6 +89,24 @@
-                 self.UnregisterHandler, self.RegisterProtocol,
-                 self.SendAndWaitForResponse, self.SendAndCallForResponse,
-                 self.getAnID, self.Event, self.send]
-+	
-+        # \ufddo -> \ufdef range
-+        c = u'\ufdd0'
-+        r = c.encode('utf8')
-+        while (c < u'\ufdef'):
-+                c = unichr(ord(c) + 1)
-+                r += '|' + c.encode('utf8')
-+
-+        # \ufffe-\uffff, \u1fffe-\u1ffff, ..., \u10fffe-\u10ffff
-+        c = u'\ufffe'
-+        r += '|' + c.encode('utf8')
-+        r += '|' + unichr(ord(c) + 1).encode('utf8')
-+        while (c < u'\U0010fffe'):
-+                c = unichr(ord(c) + 0x10000)
-+                r += '|' + c.encode('utf8')
-+                r += '|' + unichr(ord(c) + 1).encode('utf8')
-+
-+        self.invalid_chars_re = re.compile(r)
- 
-     def getAnID(self):
-         global outgoingID
-@@ -174,6 +192,9 @@
-             raise ValueError('Incorrect stream start: (%s,%s). Terminating.'
-                     % (tag, ns))
- 
-+    def replace_non_character(self, data):
-+        return re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data)
-+
-     def ProcessNonBlocking(self, data):
-         """
-         Check incoming stream for data waiting
-@@ -189,6 +210,7 @@
-         # disconnect method will never be called.
-         # Is this intended?
-         # also look at transports start_disconnect()
-+        data = self.replace_non_character(data)
-         for handler in self._cycleHandlers:
-             handler(self)
-         if len(self._pendingExceptions) > 0:
diff --git a/net-im/gajim/files/gajim-0.15-SA48695-2.patch b/net-im/gajim/files/gajim-0.15-SA48695-2.patch
deleted file mode 100644
index b8e5f192b48b..000000000000
--- a/net-im/gajim/files/gajim-0.15-SA48695-2.patch
+++ /dev/null
@@ -1,132 +0,0 @@
- src/common/latex.py |   52 ++++++++++++++++++++++++++++++--------------------
- 1 files changed, 31 insertions(+), 21 deletions(-)
-
-diff --git a/src/common/latex.py b/src/common/latex.py
-index 7567eb6..cedf2f1 100644
---- a/src/common/latex.py
-+++ b/src/common/latex.py
-@@ -29,7 +29,7 @@
- 
- import os
- import random
--from tempfile import gettempdir
-+from tempfile import mkstemp, mkdtemp
- from subprocess import Popen, PIPE
- 
- import logging
-@@ -57,11 +57,6 @@ def check_blacklist(str_):
-             return True
-     return False
- 
--def get_tmpfile_name():
--    random.seed()
--    int_ = random.randint(0, 100)
--    return os.path.join(gettempdir(), 'gajimtex_' + int_.__str__())
--
- def write_latex(filename, str_):
-     texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}'
-     texstr += '\\usepackage{amsmath}\\usepackage{amssymb}'
-@@ -78,12 +73,13 @@ def write_latex(filename, str_):
- # a wrapper for Popen so that no window gets opened on Windows
- # (i think this is the reason we're using Popen rather than just system())
- # stdout goes to a pipe so that it can be read
--def popen_nt_friendly(command):
-+def popen_nt_friendly(command, directory):
-     if os.name == 'nt':
-         # CREATE_NO_WINDOW
--        return Popen(command, creationflags=0x08000000, cwd=gettempdir(), stdout=PIPE)
-+        return Popen(command, creationflags=0x08000000, cwd=directory,
-+            stdout=PIPE)
-     else:
--        return Popen(command, cwd=gettempdir(), stdout=PIPE)
-+        return Popen(command, cwd=directory, stdout=PIPE)
- 
- def check_for_latex_support():
-     """
-@@ -99,16 +95,16 @@ def check_for_latex_support():
-     except LatexError:
-         return False
- 
--def try_run(argv):
-+def try_run(argv, directory):
-     try:
--        p = popen_nt_friendly(argv)
-+        p = popen_nt_friendly(argv, directory)
-         out = p.communicate()[0]
-         log.info(out)
-         return p.wait()
-     except Exception, e:
-         return _('Error executing "%(command)s": %(error)s') % {
--                'command': " ".join(argv),
--                'error': helpers.decode_string(str(e))}
-+            'command': " ".join(argv),
-+            'error': helpers.decode_string(str(e))}
- 
- 
- def latex_to_image(str_):
-@@ -124,32 +120,41 @@ def latex_to_image(str_):
-             return []
-         except AttributeError:
-             # interface may not be available when we test latext at startup
--            return ['-fg', 'rgb 0.0 0.0 0.0']
-+            return {'hex': ['+level-colors', '0x000000'],
-+                'tex': ['-fg', 'rgb 0.0 0.0 0.0']}[fmt]
- 
-     # filter latex code with bad commands
-     if check_blacklist(str_):
-         # we triggered the blacklist, immediately return None
-         return None
- 
--    tmpfile = get_tmpfile_name()
-+    try:
-+        tmpdir = mkdtemp(prefix='gajimtex')
-+        tmppng = mkstemp(prefix='gajim_tex', suffix='.png')[1]
-+    except Exception:
-+        raise LatexError('could not securely create one or more temporary files'
-+            ' for LaTeX conversion')
-+
-+    tmpfile = os.path.join(tmpdir, 'gajim_tex')
- 
-     # build latex string
--    write_latex(os.path.join(tmpfile + '.tex'), str_)
-+    write_latex(tmpfile + '.tex', str_)
- 
-     # convert TeX to dvi
--    exitcode = try_run(['latex', '--interaction=nonstopmode',
--                      tmpfile + '.tex'])
-+    exitcode = try_run(['latex', '--interaction=nonstopmode', tmpfile + '.tex'],
-+        tmpdir)
- 
-     if exitcode == 0:
-         # convert dvi to png
-         latex_png_dpi = gajim.config.get('latex_png_dpi')
-         exitcode = try_run(['dvipng'] + fg_str('tex') + ['-T', 'tight', '-D',
--            latex_png_dpi, tmpfile + '.dvi', '-o', tmpfile + '.png'])
-+            latex_png_dpi, tmpfile + '.dvi', '-o', tmpfile + '.png'], tmpdir)
- 
-         if exitcode:
-             # dvipng failed, try convert
-             exitcode = try_run(['convert'] + fg_str('hex') + ['-trim',
--                '-density', latex_png_dpi, tmpfile + '.dvi', tmpfile + '.png'])
-+                '-density', latex_png_dpi, tmpfile + '.dvi', tmpfile + '.png'],
-+                tmpdir)
- 
-     # remove temp files created by us and TeX
-     extensions = ['.tex', '.log', '.aux', '.dvi']
-@@ -159,10 +164,15 @@ def latex_to_image(str_):
-         except Exception:
-             pass
- 
-+    if exitcode == 0:
-+        os.rename(tmpfile + '.png', tmppng)
-+
-+    os.rmdir(tmpdir)
-+
-     if isinstance(exitcode, (unicode, str)):
-         raise LatexError(exitcode)
- 
-     if exitcode == 0:
--        result = tmpfile + '.png'
-+        result = tmppng
- 
-     return result
diff --git a/net-im/gajim/files/gajim-0.15-SA48695.patch b/net-im/gajim/files/gajim-0.15-SA48695.patch
deleted file mode 100644
index 93ee69ed1c3a..000000000000
--- a/net-im/gajim/files/gajim-0.15-SA48695.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: src/common/latex.py

-===================================================================

---- src/common/latex.py	(revision 13591)

-+++ src/common/latex.py	(revision 13759)

-@@ -60,6 +60,17 @@

- def get_tmpfile_name():

-     random.seed()

--    int_ = random.randint(0, 100)

--    return os.path.join(gettempdir(), 'gajimtex_' + int_.__str__())

-+    while(nb < 100):

-+        int_ = random.randint(0, 10000)

-+        filename = os.path.join(gettempdir(), 'gajimtex_' + int_.__str__())

-+        # Check if a file to not overwrite it

-+        ok = True

-+        extensions = ['.tex', '.log', '.aux', '.dvi']

-+        for ext in extensions:

-+            if os.path.exists(filename + ext):

-+                ok = False

-+                break

-+        if ok:

-+            return filename

-+    return filename

- 

- def write_latex(filename, str_):

diff --git a/net-im/gajim/files/gajim-0.15-plugin.patch b/net-im/gajim/files/gajim-0.15-plugin.patch
deleted file mode 100644
index fa52ddac24c5..000000000000
--- a/net-im/gajim/files/gajim-0.15-plugin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.ac	(revision 13405)

-+++ configure.ac	(revision 13748)

-@@ -48,9 +48,9 @@

- ,

- AC_SUBST([gajim_srcdir], [\${pkgpythondir}])

--AC_SUBST([gajim_pluginsdir], [\${pkgpythondir}])

- ,

- AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src])

-+)

-+

- AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins])

--)

- 

- AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}")

-

diff --git a/net-im/gajim/files/gajim-0.15.2-CVE-2012-5524.patch b/net-im/gajim/files/gajim-0.15.2-CVE-2012-5524.patch
deleted file mode 100644
index b0b8882bdc32..000000000000
--- a/net-im/gajim/files/gajim-0.15.2-CVE-2012-5524.patch
+++ /dev/null
@@ -1,52 +0,0 @@
- src/common/connection.py | 50 +++++++++++++++++++++++++++---------------------
- 1 file changed, 28 insertions(+), 22 deletions(-)
-
-diff --git a/src/common/connection.py b/src/common/connection.py
-index 8240652..6d3037a 100644
---- a/src/common/connection.py
-+++ b/src/common/connection.py
-@@ -1309,25 +1309,28 @@ class Connection(CommonConnection, ConnectionHandlers):
-         hostname = gajim.config.get_per('accounts', self.name, 'hostname')
-         self.connection = con
-         try:
--            errnum = con.Connection.ssl_errnum
-+            errnum = [con.Connection.ssl_errnum]
-         except AttributeError:
--            errnum = -1 # we don't have an errnum
--        if errnum > 0 and str(errnum) not in gajim.config.get_per('accounts',
--        self.name, 'ignore_ssl_errors').split():
--            text = _('The authenticity of the %s certificate could be invalid.'
--                ) % hostname
--            if errnum in ssl_error:
--                text += _('\nSSL Error: <b>%s</b>') % ssl_error[errnum]
--            else:
--                text += _('\nUnknown SSL error: %d') % errnum
--            gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self,
--                error_text=text, error_num=errnum,
--                cert=con.Connection.ssl_cert_pem,
--                fingerprint=con.Connection.ssl_fingerprint_sha1,
--                certificate=con.Connection.ssl_certificate))
--            return True
-+            errnum = [] # we don't have an errnum
-+        i = 0
-+        for er in errnum:
-+            if er > 0 and str(er) not in gajim.config.get_per('accounts',
-+            self.name, 'ignore_ssl_errors').split():
-+                text = _('The authenticity of the %s certificate could be '
-+                    'invalid.') % hostname
-+                if er in ssl_error:
-+                    text += _('\nSSL Error: <b>%s</b>') % ssl_error[er]
-+                else:
-+                    text += _('\nUnknown SSL error: %d') % er
-+                gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self,
-+                    error_text=text, error_num=er,
-+                    cert=con.Connection.ssl_cert_pem[i],
-+                    fingerprint=con.Connection.ssl_fingerprint_sha1[i],
-+                    certificate=con.Connection.ssl_certificate[i]))
-+                return True
-+            i += 1
-         if hasattr(con.Connection, 'ssl_fingerprint_sha1'):
-             saved_fingerprint = gajim.config.get_per('accounts', self.name,
-                 'ssl_fingerprint_sha1')
-             if saved_fingerprint:
-                 # Check sha1 fingerprint
diff --git a/net-im/gajim/files/gajim-0.15.3-roster.patch b/net-im/gajim/files/gajim-0.15.3-roster.patch
deleted file mode 100644
index 9b3498daf591..000000000000
--- a/net-im/gajim/files/gajim-0.15.3-roster.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: src/common/config.py

-===================================================================

---- src/common/config.py	(revision 14330)

-+++ src/common/config.py	(revision 14450)

-@@ -163,4 +163,5 @@

-             'roster_width': [ opt_int, 200 ],

-             'roster_height': [ opt_int, 400 ],

-+            'roster_hpaned_position': [opt_int, 200],

-             'history_window_width': [ opt_int, 650 ],

-             'history_window_height': [ opt_int, 450 ],

-Index: src/message_window.py

-===================================================================

---- src/message_window.py	(revision 14114)

-+++ src/message_window.py	(revision 14450)

-@@ -1000,5 +1000,5 @@

-         win.resize(size[0], size[1])

-         if win.parent_paned:

--            win.parent_paned.set_position(parent_size[0])

-+            win.parent_paned.set_position(gajim.config.get('roster_hpaned_position'))

- 

-     def _position_window(self, win, acct, type_):

-Index: src/roster_window.py

-===================================================================

---- src/roster_window.py	(revision 14436)

-+++ src/roster_window.py	(revision 14450)

-@@ -4492,4 +4492,5 @@

-             roster_width = pane.get_child1().allocation.width

-             gajim.config.set('roster_width', roster_width)

-+            gajim.config.set('roster_hpaned_position', pane.get_position())

- 

- ################################################################################

diff --git a/net-im/gajim/files/gajim-0.15.3-starttls.patch b/net-im/gajim/files/gajim-0.15.3-starttls.patch
deleted file mode 100644
index 91f0e4940234..000000000000
--- a/net-im/gajim/files/gajim-0.15.3-starttls.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: src/common/connection.py

-===================================================================

---- src/common/connection.py	(revision 14431)

-+++ src/common/connection.py	(revision 14476)

-@@ -1329,5 +1329,5 @@

-                 return True

-             i += 1

--        if hasattr(con.Connection, 'ssl_fingerprint_sha1'):

-+        if con.Connection.ssl_fingerprint_sha1:

-             saved_fingerprint = gajim.config.get_per('accounts', self.name,

-                 'ssl_fingerprint_sha1')

diff --git a/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch b/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch
deleted file mode 100644
index 0eabc3000c53..000000000000
--- a/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: src/common/gnupg.py
-===================================================================
---- a/src/common/gnupg.py
-+++ b/src/common/gnupg.py
-@@ -230,5 +230,5 @@
-                      "FILE_DONE", "PKA_TRUST_GOOD", "PKA_TRUST_BAD", "BADMDC",
-                      "GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA",
--                     "PROGRESS"):
-+                     "PROGRESS", "PINENTRY_LAUNCHED", "NEWSIG"):
-             pass
-         elif key == "BADSIG":
-@@ -510,5 +510,6 @@
-         if key in ("ENC_TO", "USERID_HINT", "GOODMDC", "END_DECRYPTION",
-                    "BEGIN_SIGNING", "NO_SECKEY", "ERROR", "NODATA", "PROGRESS",
--                   "CARDCTRL", "BADMDC", "SC_OP_FAILURE", "SC_OP_SUCCESS"):
-+                   "CARDCTRL", "BADMDC", "SC_OP_FAILURE", "SC_OP_SUCCESS",
-+                   "PINENTRY_LAUNCHED"):
-             # in the case of ERROR, this is because a more specific error
-             # message will have come first
-@@ -558,5 +559,6 @@
- 
-     def handle_status(self, key, value):
--        if key in ("PROGRESS", "GOOD_PASSPHRASE", "NODATA", "KEY_NOT_CREATED"):
-+        if key in ("PROGRESS", "GOOD_PASSPHRASE", "NODATA", "KEY_NOT_CREATED",
-+                   "PINENTRY_LAUNCHED"):
-             pass
-         elif key == "KEY_CREATED":
-@@ -1203,8 +1205,6 @@
-         parms.setdefault('Key-Length',2048)
-         parms.setdefault('Name-Real', "Autogenerated Key")
--        try:
--            logname = os.environ['LOGNAME']
--        except KeyError:
--            logname = os.environ['USERNAME']
-+        logname = (os.environ.get('LOGNAME') or os.environ.get('USERNAME') or
-+                   'unspecified')
-         hostname = socket.gethostname()
-         parms.setdefault('Name-Email', "%s@%s" % (logname.replace(' ', '_'),
diff --git a/net-im/gajim/files/gajim-0.16_beta2-pyopenssl-backport-1.patch b/net-im/gajim/files/gajim-0.16_beta2-pyopenssl-backport-1.patch
deleted file mode 100644
index 576c8b394424..000000000000
--- a/net-im/gajim/files/gajim-0.16_beta2-pyopenssl-backport-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: src/common/crypto.py

-===================================================================

---- src/common/crypto.py	(revision 15157)

-+++ src/common/crypto.py	(revision 15338)

-@@ -88,5 +88,5 @@

- 

-     for s in sources:

--        OpenSSL.rand.add(str(s), 0.01)

-+        OpenSSL.rand.add(str(s), 1)

- 

-     # On Windows add the current contents of the screen to the PRNG state.

-Index: src/common/jingle_xtls.py

-===================================================================

---- src/common/jingle_xtls.py	(revision 15334)

-+++ src/common/jingle_xtls.py	(revision 15338)

-@@ -120,5 +120,5 @@

-     try:

-         with open(dh_params_name, "r") as dh_params_file:

--            ctx.load_tmp_dh(dh_params_name)

-+            ctx.load_tmp_dh(str(dh_params_name))

-     except IOError as err:

-         log.warn('Unable to load DH parameter file: %s. You should generate it '

-@@ -130,5 +130,5 @@

-         try:

-             with open(default_dh_params_name, "r") as default_dh_params_file:

--                ctx.load_tmp_dh(default_dh_params_name)

-+                ctx.load_tmp_dh(str(default_dh_params_name))

-         except IOError as err:

-             log.error('Unable to load default DH parameter file: %s , %s'

-Index: src/gajim.py

-===================================================================

---- src/gajim.py	(revision 15332)

-+++ src/gajim.py	(revision 15338)

-@@ -311,5 +311,5 @@

-     PYOPENSSL_PRNG_PRESENT = True

-     # Seed from file

--    OpenSSL.rand.load_file(RNG_SEED)

-+    OpenSSL.rand.load_file(str(RNG_SEED))

-     crypto.add_entropy_sources_OpenSSL()

- except ImportError:

diff --git a/net-im/gajim/files/gajim-0.16_beta2-pyopenssl-backport-2.patch b/net-im/gajim/files/gajim-0.16_beta2-pyopenssl-backport-2.patch
deleted file mode 100644
index e3375c3f836b..000000000000
--- a/net-im/gajim/files/gajim-0.16_beta2-pyopenssl-backport-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: src/common/crypto.py

-===================================================================

---- src/common/crypto.py	(revision 15338)

-+++ src/common/crypto.py	(revision 15339)

-@@ -99,14 +99,14 @@

-         for d in dirs:

-             if os.access(d, os.R_OK):

--               for filename in os.listdir(d):

--                  OpenSSL.rand.add(filename, 0)

--                  try:

--                     with open(d + os.sep + filename, "r") as fp:

--                         # Limit the ammount of read bytes, in case a memory

--                         # file was opened

--                         OpenSSL.rand.add(str(fp.read(5000)), 0.01)

--                  except:

--                      # Ignore all read and access errors

--                      pass

-+                for filename in os.listdir(d):

-+                    OpenSSL.rand.add(filename, 0)

-+                    try:

-+                        with open(d + os.sep + filename, "r") as fp:

-+                        # Limit the ammount of read bytes, in case a memory

-+                        # file was opened

-+                            OpenSSL.rand.add(str(fp.read(5000)), 1)

-+                    except IOError:

-+                        # Ignore all read and access errors

-+                        pass

- 

- PYOPENSSL_PRNG_PRESENT = False

-Index: src/gajim.py

-===================================================================

---- src/gajim.py	(revision 15338)

-+++ src/gajim.py	(revision 15339)

-@@ -464,5 +464,5 @@

-     # Save the entropy from OpenSSL PRNG

-     if PYOPENSSL_PRNG_PRESENT:

--        OpenSSL.rand.write_file(RNG_SEED)

-+        OpenSSL.rand.write_file(str(RNG_SEED))

-     # delete pid file on normal exit

-     if os.path.exists(pid_filename):

diff --git a/net-im/gajim/gajim-0.16.1-r2.ebuild b/net-im/gajim/gajim-0.16.1-r2.ebuild
deleted file mode 100644
index 7dbc0e046b79..000000000000
--- a/net-im/gajim/gajim-0.16.1-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16.1-r2.ebuild,v 1.2 2015/06/04 19:05:03 kensington Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	avahi? ( dbus )
-	gnome? ( gnome-keyring )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.5.2[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python[${PYTHON_USEDEP}]
-		dev-python/egg-python[${PYTHON_USEDEP}]
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-	kde? ( kde-apps/kwalletmanager )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python[${PYTHON_USEDEP}]
-			net-dns/bind-tools
-			)
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.16-desktop.patch
-	"${FILESDIR}"/${P}-gnupg-2.1-backport.patch
-	)
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	rm "${ED}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
diff --git a/net-im/gajim/gajim-0.16.1.ebuild b/net-im/gajim/gajim-0.16.1.ebuild
deleted file mode 100644
index 8a94b6c406b1..000000000000
--- a/net-im/gajim/gajim-0.16.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16.1.ebuild,v 1.3 2015/06/04 19:05:03 kensington Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	avahi? ( dbus )
-	gnome? ( gnome-keyring )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.5.2[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python[${PYTHON_USEDEP}]
-		dev-python/egg-python[${PYTHON_USEDEP}]
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-	kde? ( kde-apps/kwalletmanager )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python[${PYTHON_USEDEP}]
-			net-dns/bind-tools
-			)
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-0.16-desktop.patch )
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	rm "${ED}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
diff --git a/net-im/gajim/gajim-0.16.2.ebuild b/net-im/gajim/gajim-0.16.2.ebuild
deleted file mode 100644
index b24e514dc1e0..000000000000
--- a/net-im/gajim/gajim-0.16.2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16.2.ebuild,v 1.2 2015/07/28 06:49:06 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	avahi? ( dbus )
-	gnome? ( gnome-keyring )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python[${PYTHON_USEDEP}]
-		dev-python/egg-python[${PYTHON_USEDEP}]
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-	kde? ( kde-apps/kwalletmanager )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python[${PYTHON_USEDEP}]
-			net-dns/bind-tools
-			)
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.16-desktop.patch
-	)
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	rm "${ED}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}