Switch to EAPI=5 and python-any-r1. Allow switch tls backend, refs bug #456250.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 40 insertions, 18 deletions

diff --git a/net-voip/telepathy-salut/ChangeLog b/net-voip/telepathy-salut/ChangeLog
index b02e18a9ade1..68ed386f2311 100644
--- a/net-voip/telepathy-salut/ChangeLog
+++ b/net-voip/telepathy-salut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/telepathy-salut
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/ChangeLog,v 1.47 2013/02/02 23:08:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/ChangeLog,v 1.48 2013/02/10 15:41:10 eva Exp $
+
+  10 Feb 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  telepathy-salut-0.8.1.ebuild:
+  Switch to EAPI=5 and python-any-r1. Allow switch tls backend, refs bug
+  #456250.
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> telepathy-salut-0.8.1.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest
index e212c7a01a66..00048013bd6f 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX telepathy-salut-0.5.0-uninitialized.patch 496 SHA256 9f5c77d889880a070d7fee99c6177632f183a38a8b27c32b4761f6f0736ab3e5 SHA512 a6365b18b5c1f876c990ec4bbf522b2c8708ca73c201e9bac9447e3fc8d8979b3882c977e9393e34031ca2659b0519c841645280a03d11b4bac8e907db816ce9 WHIRLPOOL d5a6d35c95e1711328e799d0bb280dd4837804620a8227f865640ca25b1a5645d34915f870e1f83b8297197ad0f80e2acc4996a2c611c190b554f805e51408ef
 AUX telepathy-salut-0.6.0-glib-gtypes.h.patch 606 SHA256 53d6e5abf33c34dc142a026ad9f70de29ad0f52a91fb989eb9b1ad9480899cc5 SHA512 34856bf91d00d7368e2d2a23e69963b452535a72d14988b4323082b5188dab6dff362ce25a1736c6348f985de364c0aa56bb69dc321dfb2306afce0abce23d28 WHIRLPOOL 3e866cc1ee9f1144c3abf93e251d4518e8209c8dac9aa41934c0ffe82d15000854ba7eae7ec69d85cdb6ee47cc556154b74bb92b05af8b91d05c12d14cde64f0
 DIST telepathy-salut-0.8.0.tar.gz 1822511 SHA256 f504faf472e81c17c2707696124d4219fe869c83d7cdbbe53a035eb724bfb5ce SHA512 62c05d5bd28e1d97882f0e8f5d4cc7cd1f71bca6d7769a618f3b354f3cc80fdb56b96618e4ab67c80b19a53c63d52a8bfa647f545115accbfe67f249be8ff8cd WHIRLPOOL e918a9f7ef3f4778c24b2fba5e9b65b702bb3e48675e86b3aac2804e52f6e71b161e342634a3d3ae3480f71d9539ae12f65e75b6fb02ccdeafa0d314d565712f
 DIST telepathy-salut-0.8.1.tar.gz 1823482 SHA256 70b9108ac8b511b7688e1b580de4ddb8981603c3cbde01f287ef8f9cb708618e SHA512 34537ac9ce0b78015e184963ea79beaa7332ac11803f9683ff34577d9f0a14f7ed287aacb2c00059f2ff2f300c325a09a78a320e83d0a0031ad976da2c197a90 WHIRLPOOL 5f7124c5ffb870c12dd93e752f32a6382d28503e235cae7032b2ef35635bc50d992717bc924e009c4bcca944ca26a02950d37ebc95258dd7d47574375a12503a
 EBUILD telepathy-salut-0.8.0.ebuild 1546 SHA256 4a9a3fdf7172b61943bd3513f41f6d80f81cd4286538129d97b54be968e93fcc SHA512 7db1f18a42f50dd83b51283a3f3d71ac4e28ac35b66b7f135e112cc21bfd5cf93c08e1813061510e1e9fef9e5af103b5816691f4f7d6b92dade6a1b8fd5434b2 WHIRLPOOL 368555a1f20b64ea954992865ee3a2f7a3b4c7e6d0d98cb53df977e427be4e70fb737baee7c87b9d2d943115e36b75e8cdf503b11335b1fb50864265d6cf86f7
-EBUILD telepathy-salut-0.8.1.ebuild 1536 SHA256 da906a0b4b3dabb2c7736649fe5814b9f7f9fd83a52d9f3a8e6cc7bc302537a5 SHA512 d93038fc2acf816ff23f8fd0f26b652cd23d40bd6f5c0814cfaf03860d010bb421b532657a2a4af091919c4c41f2d1bb360b1850afb18495610a65ff7cf4c88f WHIRLPOOL 2433cd3838d6bc3154d08354502aed96ce8cfcf75775fbc8a77bfe792a1489494197aa0798cd32848ce8a12f5a63ccc88316c371a40bff131b81166690bf109d
-MISC ChangeLog 6675 SHA256 00996c9a3b3c3ed15daf41a1482b8f38292635cf43e8741aea677fb70f65f73c SHA512 c1e64f75130be143aac87899e065a59b581aed1e449c766fb612cec22b4fa8ed96921071dfc77fead4e9f5141d49121683367cd8374b77f15fe0f908adf7ceec WHIRLPOOL f044c8ef0e182e3ab76ae660bbfeade5b3aed7611e64d068de82835d5e1a62c33e10cf4339b4e3477c82ee40eb8fffea9619a1c83800fdf67cbad699f9aa170e
+EBUILD telepathy-salut-0.8.1.ebuild 1697 SHA256 dceac579a5c08095b59c188bce19cc963c69c0e82154d4fd66ec7fa5789110df SHA512 aba93df8425c3cb217186fd3dd00bc7782e51431ef44d5aa603e1267063846dc7a00fcdd6547e100c806509e166762edc07516414805cb7c16d8af0fa81b3502 WHIRLPOOL 07e297d8d2d996fb43e884e20606930ade6ef639dc2c064dc447f65880c6fb4a9724f363a317468d5c54931510a8131f04a8cb016b2fefb7cdf94d6b219bb851
+MISC ChangeLog 6846 SHA256 39d91e8ed98b1b136cb1bf1e85545a5559113c1f808db754adcd6c0d8237a435 SHA512 963a528c53dbbf96933910ad7caa9b673bb74c2420c905fb16de82ae229247a83af319b1d17557fbd5b5b09a55a7f8f774313cb59c0f88a4bee9acfb14b55cc2 WHIRLPOOL f907c09b1e8acf09c9fe2dde0d6af184548b32ce56ba08fb687f861563e2f822ae325a2775b8fd028a11eb11696a0b9bbb52ee2b00d46355bb9322dff59f35d3
 MISC metadata.xml 361 SHA256 7f74f962b8ee0ed285dd876f8071022f772e0160eaeb70f78098b3d683e75647 SHA512 296983f0049a609cd73946ae0b2ea1c82cc0aec5a9fca4dabfe6e18c3d02d5e845ecd655884ea8e4e5616c95732d47cc8f624c7b7ada48d128e922a6ab5af9e1 WHIRLPOOL 7401d778fc9f2437c3d4b481d8023ee9e81954376de698e7e4a2ef7c6b33a14f5d03651e8ac7da512c8d51f0a24afa64a30907747827290190f98a525690eb4c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEXv5cACgkQ1fmVwcYIWAZiTACg3c2xQ7zy/suOS/UYyVoa6KNS
+c0sAnRuWdAO6W/60gX/AQXSXGhvL6Ogc
+=E21A
+-----END PGP SIGNATURE-----
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
index 39c2402ee9b9..576575a1fde0 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild,v 1.3 2013/02/02 23:08:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild,v 1.4 2013/02/10 15:41:09 eva Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
+EAPI="5"
+PYTHON_COMPAT=( python2_{5,6,7} )
 
-inherit base python eutils
+inherit eutils python-any-r1
 
 DESCRIPTION="A link-local XMPP connection manager for Telepathy"
 HOMEPAGE="http://telepathy.freedesktop.org/wiki/CategorySalut"
@@ -14,45 +14,52 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-IUSE="test"
+IUSE="gnutls test"
 
-RDEPEND="dev-libs/libxml2
-	>=dev-libs/glib-2.24:2
+RDEPEND="
+	>=dev-libs/dbus-glib-0.61
+	dev-libs/libxml2
+	>=dev-libs/glib-2.28:2
 	>=sys-apps/dbus-1.1.0
 	>=net-libs/telepathy-glib-0.17.1
 	>=net-dns/avahi-0.6.22[dbus]
 	net-libs/libsoup:2.4
-	sys-apps/util-linux"
+	sys-apps/util-linux
+	gnutls? ( >=net-libs/gnutls-2.10.2 )
+	!gnutls? ( >=dev-libs/openssl-0.9.8g )
+"
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
 	test? (
 		>=dev-libs/check-0.9.4
 		net-libs/libgsasl
 		dev-python/twisted-words )
-	dev-libs/libxslt
-	virtual/pkgconfig"
+"
 # FIXME: needs xmppstream python module
 #               >=net-dns/avahi-0.6.22[python]
 
 pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	python_set_active_version 2
-	python_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
 	# Fix uninitialized variable, upstream bug #37701
 	epatch "${FILESDIR}/${PN}-0.5.0-uninitialized.patch"
 
-	python_convert_shebangs -r 2 .
+	_python_rewrite_shebangs .
 }
 
 src_configure() {
 	econf \
+		--disable-coding-style-checks \
 		--disable-plugins \
 		--disable-Werror \
 		--disable-static \
 		--disable-avahi-tests \
-		--docdir=/usr/share/doc/${PF}
+		--docdir=/usr/share/doc/${PF} \
+		--with-tls=$(usex gnutls gnutls openssl)
 		#$(use_enable test avahi-tests)
 }