net-im/gajim: Update SA48695 patch with changesets f6f78f3802c07736cb63b3e696778dabe8263cbb and f046e4aaf7d49b2934622db66da1667ddddb1703; #415891

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

4 files changed, 256 insertions, 2 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index ce37a9fefc5b..af81c5ae5a9e 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.140 2012/05/10 19:30:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.141 2012/05/14 10:54:57 jlec Exp $
+
+*gajim-0.15-r2 (14 May 2012)
+
+  14 May 2012; Justin Lecher <jlec@gentoo.org> +gajim-0.15-r2.ebuild,
+  +files/gajim-0.15-SA48695-2.patch:
+  Update SA48695 patch with changesets f6f78f3802c07736cb63b3e696778dabe8263cbb
+  and f046e4aaf7d49b2934622db66da1667ddddb1703; #415891
 
   10 May 2012; Brent Baude <ranger@gentoo.org> gajim-0.15-r1.ebuild:
   Marking gajim-0.15-r1 ppc64 for bug 412215
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index d8d326f8b87c..e213b73e48c4 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 0.14-python-version.patch 316 RMD160 0866674b1e3499e8f215f0b042e15f28a54e2676 SHA1 bc360f052a46f97d1c36ec485e692080ab7a7581 SHA256 b4aba8ebc6241442f9eb1c335ba22c2eb5a3b3a24533cb2f944f3f812e06b687
 AUX 0.14.1-testing.patch 237 RMD160 a0fec65b49dc987d259a1b1df7f56ccac1813d19 SHA1 a95e49f7e0efcf207dd04da420749283630f7826 SHA256 128da6d0a8ae48132df78f9027dc5ef5d8167e561fe12b1d774c628a5fc33638
 AUX 0.14.4-unicode.patch 671 RMD160 5a1f41e2694051efac82c155399cb19b8d92051c SHA1 96cbd80d6e6fcde39f7e5cb4549b2e37f136901e SHA256 d27b8f3ca5323200b3151ec9a580bab62722ce2e8be403b0c8395b64b603726b
 AUX gajim-0.14.4-debian_patches_unicode.patch 3590 RMD160 9fbf20005ef6f605bda540dfb6a4ed96b294ad8b SHA1 5515d29ebe502315c85b59c392fa379cf85a3910 SHA256 b9a95103317d9ed543ecfe0dc8ca8b680fbd600e494ba71888bd662937a40492
+AUX gajim-0.15-SA48695-2.patch 4581 RMD160 3df1931aaa6f6685350346449c9a66af3bbc1c8f SHA1 5a9e314ecfa07655533d0a8cd9754d6da14f83a9 SHA256 76ea7870b1939282b18198927bfac5b299736ca77b0e0d8486d2ba375cfbe046
 AUX gajim-0.15-SA48695.patch 862 RMD160 595934164ec64a1b827084b3c76a4d3165becc79 SHA1 e90acd568fcf3679093532b6f3d77ecba2c224cc SHA256 9d6c0bef13e7161465e6fda2ad7031c383011e66e24b7322ce19df387d79db6d
 AUX gajim-0.15-plugin.patch 383 RMD160 bd2cc6b2c3ab3b2c75d5e87bcc40499b51b12c43 SHA1 83116cdc58f8a7162de5da9fb9d8791dc931178d SHA256 6003e53ca42b3efda9f132fd9253e5577f128ae596ce458ac7c2ce5a29c1759d
 DIST gajim-0.14.1.tar.bz2 4144916 RMD160 859cbd4a9f190adfc6b84c23ef03e3c3cab09d8d SHA1 d2fdf32ded4a5fb3c7a277a765f84a5453931f34 SHA256 5c8a10e7b06f362844ff70c6f49bd92a170b9d6e4c24e878f604032e31254d3b
@@ -11,5 +15,13 @@ EBUILD gajim-0.14.1-r2.ebuild 2430 RMD160 ca5b628796396e46f5f7b2b1668586e1e28746
 EBUILD gajim-0.14.4-r1.ebuild 2170 RMD160 9024fe0600888b6f58875402252143a1da3e268c SHA1 d2d8b28652e4bcbda9af14feecb9a407f11a16c4 SHA256 3c3a210ec951c7e275f6a3666f007dce74ae8440ad0d841663fd64829f97b0f5
 EBUILD gajim-0.14.4-r2.ebuild 2312 RMD160 827b06321511785ada28a9922a6a1d225162dfa2 SHA1 7c96af80d91eb8d8b8d1c46d29823af218c062ed SHA256 ea9524add46d36b192beabac12f21eb08959dd320f400a19302d150adf91f8ad
 EBUILD gajim-0.15-r1.ebuild 2259 RMD160 3c91016685ffb35ad52be36ba791845ae50d7f34 SHA1 13703fedf40de693c1325cac3d3653141c255516 SHA256 2b0c3d5c6a7a7ef9e206eca9cce2254a50806c4823a92479c439ef56837edeef
-MISC ChangeLog 20606 RMD160 c08dccd402877e4861b2099235e8892f14dd7fcc SHA1 938371360d15a1352b3d25a33a540c5b4b216173 SHA256 5e0514f6cb1da89ad4b3450b1bd3e74a868ce688afa6ef1475b9e7c852be642d
+EBUILD gajim-0.15-r2.ebuild 2265 RMD160 20cd23b1ff76fd3be67b9e133a9e2046e0d33fa3 SHA1 9d6d5919d45c677d962cd11d3d207e186fde2d99 SHA256 87e5352f93fdbef1da34d35ca516c1012fb848963d7cca4b31dd2c060aa5c152
+MISC ChangeLog 20878 RMD160 88d8ee9584451458f8c285e87be933424a484ef9 SHA1 f7e4b515cbf1a6cc823356be6f4b7f33b6d12cb5 SHA256 5d39327bc3e7422554f3c1c802e0b7da50cd49b94c60e65016df0012b9e70478
 MISC metadata.xml 573 RMD160 dc721373fb3fd62f6880046dae4636883f227fcb SHA1 85cba4d5f576b219ece32f59461a57575309fe99 SHA256 cdbbf751d0c4736aceae69a53fddb805be8f9daa2fb5ef1929be06814d79de69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAk+w5IYACgkQgAnW8HDreRbm2ACfTWocZVIep3eb0Fgrc9S33+c5
+mx0AoNIH9EeBSoX4HxnTBmrDp2AlIu/K
+=YK7O
+-----END PGP SIGNATURE-----
diff --git a/net-im/gajim/files/gajim-0.15-SA48695-2.patch b/net-im/gajim/files/gajim-0.15-SA48695-2.patch
new file mode 100644
index 000000000000..b8e5f192b48b
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.15-SA48695-2.patch
@@ -0,0 +1,132 @@
+ 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/gajim-0.15-r2.ebuild b/net-im/gajim/gajim-0.15-r2.ebuild
new file mode 100644
index 000000000000..c76a4284b1b4
--- /dev/null
+++ b/net-im/gajim/gajim-0.15-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15-r2.ebuild,v 1.1 2012/05/14 10:54:57 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite xml"
+
+inherit autotools eutils python versionator
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gmail gnome kde idle jingle libnotify networkmanager nls spell srv X xhtml"
+
+REQUIRED_USE="
+	libnotify? ( dbus )
+	avahi? ( dbus )"
+
+COMMON_DEPEND="
+	dev-python/pygtk:2
+	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
+	dev-python/pyopenssl
+	crypt? (
+		app-crypt/gnupg
+		dev-python/pycrypto
+		)
+	dbus? (
+		dev-python/dbus-python
+		dev-libs/dbus-glib
+		libnotify? ( dev-python/notify-python )
+		avahi? ( net-dns/avahi[dbus,gtk,python] )
+		)
+	gmail? ( net-dns/bind-tools )
+	gnome? (
+		dev-python/libgnome-python
+		dev-python/gnome-keyring-python
+		dev-python/egg-python
+		)
+	idle? ( x11-libs/libXScrnSaver )
+	jingle? ( net-libs/farsight2[python] )
+	kde? ( kde-base/kwallet )
+	networkmanager? (
+			dev-python/dbus-python
+			net-misc/networkmanager
+		)
+	srv? (
+		|| (
+			dev-python/libasyncns-python
+			net-dns/bind-tools )
+		)
+	spell? ( app-text/gtkspell:2 )
+	xhtml? ( dev-python/docutils )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-plugin.patch \
+		"${FILESDIR}"/${P}-SA48695-2.patch \
+		"${FILESDIR}"/0.14-python-version.patch \
+		"${FILESDIR}"/0.14.1-testing.patch
+	echo '#!/bin/sh' > config/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with X x) \
+		--docdir="/usr/share/doc/${PF}" \
+		--libdir="$(python_get_sitedir)" \
+		--enable-site-packages
+}
+
+src_install() {
+	default
+
+	rm "${D}/usr/share/doc/${PF}/README.html" || die
+	dohtml README.html
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}