net-im/gajim: Drop parts of upstream which should fix CVE-2012-5524 but added more code which is incompatible with current implementation

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8009D6F070EB7916

6 files changed, 176 insertions, 197 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 40c0dfb15601..5e8af4f702a3 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.171 2013/02/20 14:29:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.172 2013/02/23 10:32:18 jlec Exp $
+
+*gajim-0.15.2-r4 (23 Feb 2013)
+
+  23 Feb 2013; Justin Lecher <jlec@gentoo.org> -gajim-0.15.2-r2.ebuild,
+  gajim-0.15.2-r3.ebuild, +gajim-0.15.2-r4.ebuild,
+  files/gajim-0.15.2-CVE-2012-5524.patch:
+  Drop parts of upstream which should fix CVE-2012-5524 but added more code
+  which is incompatible with current implementation
 
   20 Feb 2013; Justin Lecher <jlec@gentoo.org> -gajim-0.15.1.ebuild:
   Drop vulnerable versions for CVE-2012-5524, #442860
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 6f6671dd1ed6..407cc1904137 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.14-python-version.patch 316 SHA256 b4aba8ebc6241442f9eb1c335ba22c2eb5a3b3a24533cb2f944f3f812e06b687 SHA512 e7fc69f87b3106e171bc8c9db786217e1c903c5e82d2b60035f00203e32b17f73be17e64f1d013afd32ce280c53c32af2c46a6c9f33d25e9cf52db6dfb7ece3e WHIRLPOOL 107ac113d5ae3645155ba9eb1e215eb0d9750e2e440976ab0a3da28da1526b408eb37eeafe74e3a0a1bae79a1af5af724fe2ec9a6d7a044392d0b236479efc92
 AUX 0.14.1-testing.patch 237 SHA256 128da6d0a8ae48132df78f9027dc5ef5d8167e561fe12b1d774c628a5fc33638 SHA512 8c6df58972e22886599f99e1b9d59b088a155dcf1c5ccdff9002d8fd4a12a9ec2d38dc62f30f191342190200c0aebb60a19f2cbf1b2073449ad61bdd0adff6d5 WHIRLPOOL 5fc62c7beadb6c2bd39d2c966ab7bfd9ef857d799f0c06d80a9cece681f8d9bfc19657c8a7463d9743bff61708a8795e01b55d28a794b7d5a812670fa8430f70
@@ -8,17 +8,17 @@ AUX gajim-0.14.4-debian_patches_unicode.patch 3590 SHA256 b9a95103317d9ed543ecfe
 AUX gajim-0.15-SA48695-2.patch 4581 SHA256 76ea7870b1939282b18198927bfac5b299736ca77b0e0d8486d2ba375cfbe046 SHA512 8f735f6c97ab7292a02cdf810df4eda50e322f2ee69b076b46f55720215da013fd4f880fc995fada7e53b57dbea952f24191e95f06b7026db64cf743d259d37e WHIRLPOOL 615c735927626e73c26f7dcac077f5d8be5c99b5310f7b1168bf2b47c8c90736a7fb39bd5167a046d1f882ca3391e6e8cb22f63ddc0cddfef0b0295d57c784bd
 AUX gajim-0.15-SA48695.patch 862 SHA256 9d6c0bef13e7161465e6fda2ad7031c383011e66e24b7322ce19df387d79db6d SHA512 40a5c9c572c755050993191266287e11bbfa9ea2731c975d088c85c069391e79a6a982c13eb0c007ece036d216dc5a42d72b4ed128d95192864313a444ccb050 WHIRLPOOL 41d369123b06f6afc77ab70e8fd152b98e0202111bf1dc889b573783398f467ab40cd8c6cd47b18944b7258116270341ec051d367fda4803f589e71e7dce8c9e
 AUX gajim-0.15-plugin.patch 383 SHA256 6003e53ca42b3efda9f132fd9253e5577f128ae596ce458ac7c2ce5a29c1759d SHA512 a8bf05e69547cb62db119e1faeaff6a4cfc27a44e4b925921cb43f22b4970d19c08c97d00d5166d4d439dcf706e972f617d20ff58f040cfe28dc5cf6389e408f WHIRLPOOL 6a16b97758015c7e51f43df45614ccbae3d682f5c75270118ea06b780a9f10a2184650265ae1aa3e663dc06d7ed803f263b8054433a8b64552c3b71f8be938c7
-AUX gajim-0.15.2-CVE-2012-5524.patch 4322 SHA256 921b5cfd1af603a99a134bc80404f3f531da0869dc0be90d68a364c59b733194 SHA512 260e352267eadd9cb062286565d2e507899b4bece1c24172193e676314473b38fc4811c651c287fdbe48768dbd608b3545ec1d7520d6a9366cfb9b96055d829d WHIRLPOOL 4da3b8be018c69a32058eec12648854dcbc17f4e838d57d48a8479f3b7f54875ab28330a1bba0e5fc947b681ace714c54a220e7da150c760e9f833589b6fcc72
+AUX gajim-0.15.2-CVE-2012-5524.patch 2607 SHA256 9641f4497008fc965522d9114712fe4be5d7cbaec289c74dc038d93a5ee7ce92 SHA512 7751060ecc45b54a2ba00c9fd7e26e36324a6f5095be791ed222a4b75b130eb76fe15448fe98184599e26f23f3bd1e84c93154c3c042ea03606db736e5bbd6d1 WHIRLPOOL 2bb832e01e2963d0941ba3bc4531cc25ea11b9a757950d565dc3c810f271a2f8112a91cb543b90891dc8ae9c3e94543652f3f065e004216870f3a2a1a5b6f758
 DIST gajim-0.15.2.tar.bz2 4473077 SHA256 7e71ee82e44303992792644803c749cb89ecad7ec7547db4f9841fcbeec49940 SHA512 ea1e64de54bd15a5af40e3fdfcc46808467555e671a8a86708f22400f7a329290d9d921d9e3ae56e7f47b90842c49b4f8d432d0df4fed7471d457ed2092f552a WHIRLPOOL 0faec1b189d48d83beed5aaf89a1a9d6351e30fda5b86abc8c57ffaf6c867d1a6531318c30c66a0b280899cef584068c7a684286d0be78c118fa528f54f6afbf
 DIST gajim-tests-0.15.2.tar.xz 22228 SHA256 9b972efa685ed854cfbaadb37f3fe5629fac65995100e20c3ca8294a4e0ee756 SHA512 0f5a6233be1db55e9cc7dab7f638d503b6ea71237c4039d43b8ff69421742c5c92034cdd40dd662f57a8a519e088b98b1c30040c30c3fec1546e10a4b41d301d WHIRLPOOL ddb53abd70533a60e62ae317864d5b396820373a9822f17f175c885dc9bd31f20ac1653ddc637e569141f3ab31283865114255095dd973ebf0826dd34ff8d3ca
-EBUILD gajim-0.15.2-r2.ebuild 2256 SHA256 149afbda24798061c3fdb8cc7b20ad0d38fff7099712756a8ad69ba60b697682 SHA512 709dd5e921cc9b125fcff23d9bb46755f318716f3459568ff6b9cb656b80df89604796bac28354fc19ea769011fb16fbc4d78df3e84864b38402f8884169af6e WHIRLPOOL 91d220080f0e094946364018488f45e497a821f724cfa011219d46894819a720945ac486af66a849a7b1553cca90c55c6a6667db425a920971220a42ae1f1d7d
-EBUILD gajim-0.15.2-r3.ebuild 2841 SHA256 8c5dd12221d4fc9eee3804f76d1997d8a144d1ce4bd63e7c530f709b6dbba84c SHA512 f55fd23245b0839faa8901495efb72cc9a925ca1fb2cb634a464f9ecc9af0eeeaa443a3148b7485dfc6e4b71c83646d2f637a34030b9991ff9642e54971a3912 WHIRLPOOL c1e706a28bbc58825fdf045d8e5984f7385f58ba45492a658166171ed1dcc41f8a1702109b92a26562a891f791d52db86f2e35a79df7fbfe9b6840fdf2ac75f5
-MISC ChangeLog 24601 SHA256 3ec665ab0bc77186e28edf302e6d28f5894a5cc31d706adea2169eb052dae2da SHA512 2860e496b10ff59e0dc43eefe9457343d0a64bb9f0c3ede516bf0e58c164acc931d147f6ca93aea5bc3b4c1f7760f1f8bf1d48d459fe9503a8a6aae5fe7e6b91 WHIRLPOOL f3c0a53d7109210732ea772f2eb96c43099e0a1bf2add16e028f4cf394810752ff20af3370f6da23c248321865c9af2ad9e5b83fbb770afe999cd7304605c02b
+EBUILD gajim-0.15.2-r3.ebuild 2257 SHA256 37fa9e82002538209c07d64fab09aee1f332fa0a63ec2fc4b5885f5fcae605fe SHA512 d8554b8c587a7a388a8660fac90bf4b18cf53614af8c5a54f0773fec59de88507cf7b64ab464052ea918654983503a0cbc5a102cf158b007ff598924888758dc WHIRLPOOL 1fba4f11aa5415f6316cfbdffc140e50398a2397cea0909c575eea46d2fc0856bdf2987e9220c09315529da21409c32e8cd43f2a0740a00622df93fa54c3738a
+EBUILD gajim-0.15.2-r4.ebuild 2841 SHA256 88264497bec6a9364899fb2fa0f93712f6dab308de0ca5b3a81c1a8f1dc163e4 SHA512 9a2ea50cd4e135ebf9d9928cc9c0191d6cfde1beb07da2459098598e43e2185980675e0d4b44f66c10303007ce3ecfce420dca072c51a2dd0a41e42750b55847 WHIRLPOOL 4bd18b04a348e0493f0cc3c2f85d5269eedac0722bd885c81016db81311468544fc374d0721f47a4bdbf668c143ba16a566ddd857fbff2a2dcd815bf1d217b4f
+MISC ChangeLog 24927 SHA256 651749ce2d064dbfe5e8cfd58393b047164745869618c3a75e00a04f198995ba SHA512 475dcc5699a1dca29fd94a102a8ae79855647a2d83fd38779740c0455aba6271b44edcfad3b1cd3e1185aa8391ac62fc4ba81f16322c1be7aef97f9d1c7c2a30 WHIRLPOOL 884fbf96576ed82a8cde58b5bf5b9af7f4c3e90d7e9d953cda15212e5065af2c98c30c8553ea073fcc38047a5ddbbc2852752a59fa274644dd8c365ef15e7f65
 MISC metadata.xml 503 SHA256 781012e83e7e3d1480ed6413a58f8a294e3a1b4c4968b1217c9bf7b41cca3ae5 SHA512 cfc7f159daf5007962ea035289002df56575042d567aa36c495b95dcf7ca7bb931be622599537e9ea67c25b7cb75014acf38a13bda349218af7a5eb576ebb0a4 WHIRLPOOL 3ff97b378ffe5c79d63ba206dec6c346480c42aa4988bed662066efbf5599e0986c83cd1ade54bded8bb2e2ad0ab6ad6f18c791b59f11215c2a52c4503721cbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEk3b0ACgkQgAnW8HDreRYUwACgprmTNGcCTG+vZhl+/YkfmKNl
-PM4An3tTvecshUPyfjZn1WVhf6CBAfqj
-=d4KL
+iEYEAREKAAYFAlEomt8ACgkQgAnW8HDreRbrCQCgwQZd2JKyysNkTay1BO6hL52n
+cQkAoM/9Lcwl9uXS/N5oF/MNWJpUM48L
+=CAVa
 -----END PGP SIGNATURE-----
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
index 5249ce80da54..b0b8882bdc32 100644
--- 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
@@ -5,7 +5,7 @@ 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,36 +1309,42 @@ class Connection(CommonConnection, ConnectionHandlers):
+@@ -1309,25 +1309,28 @@ class Connection(CommonConnection, ConnectionHandlers):
          hostname = gajim.config.get_per('accounts', self.name, 'hostname')
          self.connection = con
          try:
@@ -50,32 +50,3 @@ index 8240652..6d3037a 100644
                  'ssl_fingerprint_sha1')
              if saved_fingerprint:
                  # Check sha1 fingerprint
--                if con.Connection.ssl_fingerprint_sha1 != saved_fingerprint:
-+                if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint:
-                     gajim.nec.push_incoming_event(FingerprintErrorEvent(None,
--                        conn=self, certificate=con.Connection.ssl_certificate,
--                        new_fingerprint=con.Connection.ssl_fingerprint_sha1))
-+                        conn=self,
-+                        certificate=con.Connection.ssl_certificate,
-+                        new_fingerprint=con.Connection.ssl_fingerprint_sha1[
-+                        -1]))
-                     return True
-             else:
-                 gajim.config.set_per('accounts', self.name,
--                    'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1)
-+                    'ssl_fingerprint_sha1',
-+                    con.Connection.ssl_fingerprint_sha1[-1])
-             if not check_X509.check_certificate(con.Connection.ssl_certificate,
-             hostname) and '100' not in gajim.config.get_per('accounts',
-             self.name, 'ignore_ssl_errors').split():
-@@ -1347,8 +1353,8 @@ class Connection(CommonConnection, ConnectionHandlers):
-                     hostname
-                 gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self,
-                     error_text=txt, error_num=100,
--                    cert=con.Connection.ssl_cert_pem,
--                    fingerprint=con.Connection.ssl_fingerprint_sha1,
-+                    cert=con.Connection.ssl_cert_pem[-1],
-+                    fingerprint=con.Connection.ssl_fingerprint_sha1[-1],
-                     certificate=con.Connection.ssl_certificate))
-                 return True
- 
diff --git a/net-im/gajim/gajim-0.15.2-r2.ebuild b/net-im/gajim/gajim-0.15.2-r2.ebuild
deleted file mode 100644
index 35c40b23385a..000000000000
--- a/net-im/gajim/gajim-0.15.2-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.2-r2.ebuild,v 1.8 2013/02/20 14:12:32 ago 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 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi crypt dbus 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] )
-		)
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/gnome-keyring-python
-		dev-python/egg-python
-		)
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwallet )
-	networkmanager? (
-			dev-python/dbus-python
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python
-			net-dns/bind-tools )
-		)
-	xhtml? ( dev-python/docutils )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	echo "src/command_system/mapping.py" >> po/POTFILES.in
-	epatch \
-		"${FILESDIR}"/0.14-python-version.patch \
-		"${FILESDIR}"/0.14.1-testing.patch \
-		"${FILESDIR}"/${P}-CVE-2012-5524.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}
-}
diff --git a/net-im/gajim/gajim-0.15.2-r3.ebuild b/net-im/gajim/gajim-0.15.2-r3.ebuild
index ccf46663b477..a8a47c81e39c 100644
--- a/net-im/gajim/gajim-0.15.2-r3.ebuild
+++ b/net-im/gajim/gajim-0.15.2-r3.ebuild
@@ -1,49 +1,45 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.2-r3.ebuild,v 1.1 2013/02/20 10:46:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.2-r3.ebuild,v 1.2 2013/02/23 10:32:18 jlec Exp $
 
-EAPI=5
+EAPI=4
 
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite xml"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite xml"
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
+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
-	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
+SRC_URI="http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv X xhtml"
 
 REQUIRED_USE="
 	libnotify? ( dbus )
 	avahi? ( dbus )"
 
 COMMON_DEPEND="
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	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[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyasn1
+	dev-python/pyopenssl
 	crypt? (
 		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
+		dev-python/pycrypto
 		)
 	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/dbus-python
 		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+		libnotify? ( dev-python/notify-python )
 		avahi? ( net-dns/avahi[dbus,gtk,python] )
 		)
 	gnome? (
@@ -55,7 +51,7 @@ RDEPEND="${COMMON_DEPEND}
 	jingle? ( net-libs/farstream:0.1[python] )
 	kde? ( kde-base/kwallet )
 	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/dbus-python
 			net-misc/networkmanager
 		)
 	spell? ( app-text/gtkspell:2 )
@@ -66,54 +62,41 @@ RDEPEND="${COMMON_DEPEND}
 		)
 	xhtml? ( dev-python/docutils )"
 
-RESTRICT="test"
-
-PATCHES=(
-		"${FILESDIR}"/${P}-CVE-2012-5524.patch
-	)
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
 
 src_prepare() {
 	echo "src/command_system/mapping.py" >> po/POTFILES.in
+	epatch \
+		"${FILESDIR}"/0.14-python-version.patch \
+		"${FILESDIR}"/0.14.1-testing.patch \
+		"${FILESDIR}"/${P}-CVE-2012-5524.patch
 	echo '#!/bin/sh' > config/py-compile
-	autotools-utils_src_prepare
-	python_copy_sources
+	eautoreconf
 }
 
 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
+	econf \
+		$(use_enable nls) \
+		$(use_with X x) \
+		--docdir="/usr/share/doc/${PF}" \
+		--libdir="$(python_get_sitedir)" \
+		--enable-site-packages
 }
 
 src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize "${ED}"/$(python_get_sitedir)
-	}
-	python_foreach_impl installation
+	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}
+}
diff --git a/net-im/gajim/gajim-0.15.2-r4.ebuild b/net-im/gajim/gajim-0.15.2-r4.ebuild
new file mode 100644
index 000000000000..98a4b6d9db1d
--- /dev/null
+++ b/net-im/gajim/gajim-0.15.2-r4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.2-r4.ebuild,v 1.1 2013/02/23 10:32:18 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite xml"
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1 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
+	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
+
+REQUIRED_USE="
+	libnotify? ( dbus )
+	avahi? ( dbus )"
+
+COMMON_DEPEND="
+	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[${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] )
+		)
+	gnome? (
+		dev-python/libgnome-python
+		dev-python/gnome-keyring-python
+		dev-python/egg-python
+		)
+	idle? ( x11-libs/libXScrnSaver )
+	jingle? ( net-libs/farstream:0.1[python] )
+	kde? ( kde-base/kwallet )
+	networkmanager? (
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			net-misc/networkmanager
+		)
+	spell? ( app-text/gtkspell:2 )
+	srv? (
+		|| (
+			dev-python/libasyncns-python
+			net-dns/bind-tools )
+		)
+	xhtml? ( dev-python/docutils )"
+
+RESTRICT="test"
+
+PATCHES=(
+		"${FILESDIR}"/${P}-CVE-2012-5524.patch
+	)
+
+src_prepare() {
+	echo "src/command_system/mapping.py" >> po/POTFILES.in
+	echo '#!/bin/sh' > config/py-compile
+	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 "${ED}"/$(python_get_sitedir)
+	}
+	python_foreach_impl installation
+
+	rm "${D}/usr/share/doc/${PF}/README.html" || die
+	dohtml README.html
+}