Backport fix for gnupg 2.1, bug #549742; Drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 51 insertions, 28 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 37bf5957e525..144361bb60a6 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,13 @@
 # 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.224 2015/05/17 20:14:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.225 2015/05/18 06:42:06 jlec Exp $
+
+*gajim-0.16.1-r1 (18 May 2015)
+
+  18 May 2015; Justin Lecher <jlec@gentoo.org>
+  +files/gajim-0.16.1-gnupg-2.1-backport.patch, +gajim-0.16.1-r1.ebuild,
+  -gajim-0.15.4.ebuild:
+  Backport fix for gnupg 2.1, bug #549742; Drop old
 
   17 May 2015; Pacho Ramos <pacho@gentoo.org> gajim-0.16.ebuild:
   ppc64 stable wrt bug #533404
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 12a4b14862db..fb0b040fa79e 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
@@ -12,20 +12,32 @@ AUX gajim-0.15.2-CVE-2012-5524.patch 2607 SHA256 9641f4497008fc965522d9114712fe4
 AUX gajim-0.15.3-roster.patch 1450 SHA256 ffbbbfbc6198fff03a566d69f2e6872898dd87df6598dea380e1642e34aba768 SHA512 4b229b8ee655856b24205cd2a23f86ff32212d869abef07abf6b410f30ad11fc84f9d6d4222cde6c58e761cc11f1cbf2787f088198e8310683334543723d944a WHIRLPOOL a00d5abf54a86543c2e2af35d441dc3aa0c38e0e569677128cd20da1f778aa445f487668d2f9bdfe0f558190cf27786bbc7fa2c807b10273c38975ebd6e8a293
 AUX gajim-0.15.3-starttls.patch 502 SHA256 24a7d4c15be003daa8a10f26730eec27ce75c0e8d0d727c5f5d8c1b7f7305be6 SHA512 5ac3b926d971eb37898a241af7e2b77189ed7874a144d3bb9955ed09f7c1e6f5373e04f94dbaac337903622ebc5825428018e3c2843cafd3e8ba9e50c0bba0f5 WHIRLPOOL 3e84c618d56e19750062e752f67ada26c260b51cc4f2bb749ec5516b5e53be18b1d4627c174ad35ac084f19bc1bad6b2d4bbec6124b40d4fc24d87398770fd7d
 AUX gajim-0.16-desktop.patch 522 SHA256 5bffb1182a6d80a7b0b360492364361f6613a11bc50039dcd12527b2d9f0cb2b SHA512 38a1d39931f31fe38aa4c981e5fb7cbec031c595303a29995b29c912edf263447ee653092702bc407482d667eaea9ac9e0181a2de262fd1530d223a6ec610fa2 WHIRLPOOL 1617889fbf54fc397bd1152ec3b0bfcdc30d459490ca70f23f0cc6cc5ca10d9a7d9df17fc57c5737f052097e87c57b5ea672b71a689d0e78a829fd4621d3bc71
+AUX gajim-0.16.1-gnupg-2.1-backport.patch 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
 AUX gajim-0.16_beta2-pyopenssl-backport-1.patch 1623 SHA256 47991437de8e6f105533360a6bba8c1f35b5175e811941ff83b956e5c8970eae SHA512 771087b9eb695d07d89d5f9f6a80fa576ffbbacdd11d5b480c77e6f4a619c1e59d32ef5f5b99c69bdc45b748689d2ad0b73b21675df4b0728f60fabda5cbcb8f WHIRLPOOL 6285da2a8cdc7dc38e902fc3bf4445ab5cfc68afdc2e8a51ea2be9771ad24763f9a31a1a6212dcd3faf1b690c644829c0801526509e05b9a88920ee07efdf7e3
 AUX gajim-0.16_beta2-pyopenssl-backport-2.patch 1758 SHA256 f0cf25a15a908e28eacbd569a5198d2994d20bc5642bc519c17dc04efc8158fb SHA512 29980e307b969e717bfdc2b1263fec6c4a56fef947bc70a36ebdf21e229d7ae85a043f1499fcdcde7bff1050cc33938613b1a4fa4c694605c651413ffa3cffcf WHIRLPOOL 03e5359ca4f47c09f89c07eb6d7b5ad0b7af4651391a217c5220bb8b0de12eed27042c20ffb713c8c7e2b59a155d2a1de3676c60e3360aaaed9e589fc01cb05c
-DIST gajim-0.15.4.tar.bz2 4473874 SHA256 27acfecf40e2da55e8f7ec5d653acaf0914376f2d42766af27963c008bee4dc0 SHA512 f1f316aa11531dc37f97b2d06fd3e3e4a4d9187de0e0b3fa468283e88e16ee6372d6c49c57dd7bd8b51809e7d3130aee88a178bb64bf29349b27450224c0840e WHIRLPOOL a12c467f7a62f097c2ec64c31f8d336f5d7c7851d36716dffcb1998d1895de385a6b567931abe94eef2e53418122e3a482e3200650893cc1cbd4b0f1fc9db238
 DIST gajim-0.16.1.tar.bz2 4593988 SHA256 26ae32706d167f97d423c84fa7276e14a5bffe30c5e91c8b9e577c6d6cabe8be SHA512 04a2cce1e755e8c4c1fe3fa950b228f768bec703b7f46d763f2aa023798bf8e38795ccb8f9b74a56ddd9e7fad502b63f447cfb77fe11c5e4a55e818760c74f40 WHIRLPOOL 34141b49481885589ca3d6a2da9bf3618f13772ba78218d988b627fef53c42c345868b254edbdf305b93ae34acfe3fed0896b8e38114aa7fc0abdf9209c66d49
 DIST gajim-0.16.tar.bz2 4575445 SHA256 7abd8dfb22522d3a2f0345da2a86b99fb9917bfd97310124df8601fab82ca193 SHA512 af2fd6b750e3ffa5770913a93ac5e61e6dab5688a28a26484ba4a097d73cc38b820797b1fedc60a67bf94e9a641cc80264210d0c4cf997047068c6dcb056ca75 WHIRLPOOL 6d5374bcc574bf851f6dde184f52ef8ca517869b96a85a9598b4c37953c2bc7849ccfdb106d975da80a394555f7ed7486cf356dad06dc11f545d375745e983be
-EBUILD gajim-0.15.4.ebuild 2933 SHA256 5049bad6228b3ca2f1d2fbf9050e9b14384c03cbbcd382a777b7e24664520f3f SHA512 b1be8488cb06bc881e7db9373d2c253a11e882fe0567087398ebc7ed033cc7d9b3c0121bcbb7ac72d3744e269db35f4ffcfceb977ddd0776469556a3e7a193b5 WHIRLPOOL f666e2721808b704d1e46fec0b60adbeb358fdcec7507c5440f2e07ce523d4e3916a9c08be0caa0cc88d546e16db7c0bdd0ad0ed07b2a000a1937eab36a89469
+EBUILD gajim-0.16.1-r1.ebuild 3089 SHA256 cf5abefbd5008e1c71ae5ab1790e7df6fe6b64485ff44457f3673f55240609d5 SHA512 dac57db9af4cfab26c1a686a27ea0ae8aa72ea86ad9558fcdb8d0e4ec3ca2e65bb076667ca9ddad86f4e2e76e20a6c553e3f6f4c7e924631f00784b6e6249e61 WHIRLPOOL 4f99b54e197de43b514832a2e72fbbea1c28fc08e48a75565ddc6a5dc7ee67ce06807d58ec6b97bcbb9fb49034b2619a5d09ec0cf61c22215fa8b50c9763cd47
 EBUILD gajim-0.16.1.ebuild 3039 SHA256 6f84e09b2eeb0beab292d2af08ad34178efabaf227fef0deeb49c61238570aa5 SHA512 352da08d3c553890082fde4b43e0b13ca501058637aa5854f78d9277fc97dea511b08ceaf590a41befea2f9c16e750bceacece43b572f57b3180c8d1d2ac3033 WHIRLPOOL 6b4e0cd103f9d9c75679713f81ecea9c2bb52e2548c9109fb7f0e542af50d5c282c52162bede6d103ea5e53f6041f270ec715da61782e844daf33ff8967f4cb3
 EBUILD gajim-0.16.ebuild 3024 SHA256 8dcf2f5bfa2a9230e770c0562a2de11d70cc673fafc605e96045b252c87c613a SHA512 de11d0382fb1f03b617975b951453b6746c8989b89a79ef7aa1e9a9d2f0206e179fbf2b218cd5f64f55de4c780f7a53afa8f008d2dbdf2b9c8b75bbe78960b2f WHIRLPOOL 062bfe19b1236c44976fbc0bc6bc381c2634912416a2aaea16f32ec122724a28e04d30ebf6205577b19a33ee830d80a38cda109e016172dfba0cdf3e9409f1b2
-MISC ChangeLog 31744 SHA256 100d402cbe12cd392a46c2b91da370ff7c1839f05cb9e617082f7be1b7c8edbd SHA512 49ce05935fb7edcf86c5689c682346f0a0ff7eb6e267d6e684695f80f59bd56a44416c9afebb91fe6f55fdb3422f2da2136e43e2e36abdfdc9427725276c66e1 WHIRLPOOL c1de3538b2370718866d7cd9e325aaacffefe03929a08b3457d3b3212961baf053b67795335a246134ef5f9b335187c85f2a8585193e54d3ecf9693986b46765
+MISC ChangeLog 31972 SHA256 8c4d683577501a694bfd74a8d3044691f3e342c5fab6849b485a8f8815c00405 SHA512 b39bb0caf75b4f53dfc6488691916670c7ef0724d25e562454046f9c2b57b963ef9461e0ba7f1232e8544f6114e0f4b387dd9cf98714507b53200ad4d44cb037 WHIRLPOOL b9223e934906968d1dc59d0d7b3897b3702dda257cfbd3d5f295276c2d09d57a0a92c4f2afe72fea2d6f21efb3c3fdd75e8a8b547f74b6ab6f87b1e6a6d1097c
 MISC metadata.xml 503 SHA256 781012e83e7e3d1480ed6413a58f8a294e3a1b4c4968b1217c9bf7b41cca3ae5 SHA512 cfc7f159daf5007962ea035289002df56575042d567aa36c495b95dcf7ca7bb931be622599537e9ea67c25b7cb75014acf38a13bda349218af7a5eb576ebb0a4 WHIRLPOOL 3ff97b378ffe5c79d63ba206dec6c346480c42aa4988bed662066efbf5599e0986c83cd1ade54bded8bb2e2ad0ab6ad6f18c791b59f11215c2a52c4503721cbb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVY9pwACgkQCaWpQKGI+9RR1gCdEzWYuMFGCK0ecUedhLD4V/Va
-2tAAni23J3w0U3XJk0kmQBdn5NnDhkJ6
-=ED6E
+iQJ8BAEBCgBmBQJVWYm6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijyEP/R0i9w881cNTuWBFr+4PNu3X
+qkwshReq67Vd4HXqn+rn8b0eLYHKpQtN4vFlBCYe2FaEdiC02zHIklA1rDa01QA0
+1N81CFKfdK2Gmo7TZCGde+NPg6oJCNWFpeQxkI5lvwleJJyxgwDLRSMlsQKC8jPB
+1GLgGFrTjJxApHJfgn4MeuKjbgnOWdJtfWT0VvnqJ8csrjtAU3ECFtMYdTLzEAEs
++0jeJ9nSKmvbKV3sOy2DkXSUabM743V9g3L5QATtMKoZ6qX9uPoiTNwaMFc6LsoG
+ISZ02pH1dHH7H2kqTYVAH09utEE+hH/Hy3EpLFZ8oAveRNCOLAwos/7m+hMSitZ9
+SiH4HOu+HyrzsQogv+hO3AKrrqkIDZZ+h0qPV3o1wfCJGdds59Hvh7FoRVf/Zjir
+wEUaxlyckkSZDZGL6iCZz/AEAJNM8YlYVMoT+97Vnq5pXZZERIGgFenuJe+RWF9w
+nHdslq3XBwLHsiPpZK+9YXb8GLy7d9KQZeStYjqDInW/FA8F7JdiYNF5id47MvWp
+LyNpK3uHAYRKJzTQUaQXb09EPG31ZsywJIIDCpGnyd1yZozPUcfZeSa4BpH+hUIX
+QLQGrl+n9oZV6WpY9sgVTm3sSnafX5voHXOTG1gnuds2XCroSniajJ+S262ywf92
+kO+HGm0kGupdNqE6PIJV
+=VfqE
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch
diff --git a/net-im/gajim/gajim-0.15.4.ebuild b/net-im/gajim/gajim-0.16.1-r1.ebuild
index 7f3a48df5a92..ff1a21850eab 100644
--- a/net-im/gajim/gajim-0.15.4.ebuild
+++ b/net-im/gajim/gajim-0.16.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.15.4.ebuild,v 1.15 2015/04/08 18:03:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16.1-r1.ebuild,v 1.1 2015/05/18 06:42:06 jlec Exp $
 
 EAPI=5
 
@@ -11,15 +11,18 @@ 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)/${P}.tar.bz2"
+	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="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+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="
@@ -38,7 +41,8 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17-r1"
 RDEPEND="${COMMON_DEPEND}
 	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${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}]
@@ -47,17 +51,15 @@ RDEPEND="${COMMON_DEPEND}
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-libs/dbus-glib
 		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python] )
+		avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
 		)
 	gnome? (
-		dev-python/libgnome-python
-		dev-python/egg-python
-		)
-	gnome-keyring? (
-		dev-python/gnome-keyring-python
+		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] )
+	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
 	kde? ( kde-base/kwalletmanager )
 	networkmanager? (
 			dev-python/dbus-python[${PYTHON_USEDEP}]
@@ -66,20 +68,22 @@ RDEPEND="${COMMON_DEPEND}
 	spell? ( app-text/gtkspell:2 )
 	srv? (
 		|| (
-			dev-python/libasyncns-python
-			net-dns/bind-tools )
+			dev-python/libasyncns-python[${PYTHON_USEDEP}]
+			net-dns/bind-tools
+			)
 		)
-	xhtml? ( dev-python/docutils )"
+	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
 
 RESTRICT="test"
 
+S="${WORKDIR}"/${MY_P}
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.3-roster.patch
+	"${FILESDIR}"/${PN}-0.16-desktop.patch
+	"${FILESDIR}"/${P}-gnupg-2.1-backport.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
 }
@@ -115,10 +119,10 @@ src_test() {
 src_install() {
 	installation() {
 		run_in_build_dir autotools-utils_src_install
-		python_optimize "${ED}"/$(python_get_sitedir)
+		python_optimize
 	}
 	python_foreach_impl installation
 
-	rm "${D}/usr/share/doc/${PF}/README.html" || die
+	rm "${ED}/usr/share/doc/${PF}/README.html" || die
 	dohtml README.html
 }