Use python-any-r1.eclass properly: pkg_setup is exported by eclass and it doesn't need shebangs conversion at all (#462966 by ago, thanks also to mgorny for help)

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 12 insertions, 13 deletions

diff --git a/net-voip/telepathy-salut/ChangeLog b/net-voip/telepathy-salut/ChangeLog
index 68ed386f2311..e9ec19652568 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.48 2013/02/10 15:41:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/ChangeLog,v 1.49 2013/03/24 19:09:16 pacho Exp $
+
+  24 Mar 2013; Pacho Ramos <pacho@gentoo.org> telepathy-salut-0.8.1.ebuild:
+  Use python-any-r1.eclass properly: pkg_setup is exported by eclass and it
+  doesn't need shebangs conversion at all (#462966 by ago, thanks also to mgorny
+  for help)
 
   10 Feb 2013; Gilles Dartiguelongue <eva@gentoo.org>
   telepathy-salut-0.8.1.ebuild:
diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest
index 00048013bd6f..a07d7a6cb895 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -6,13 +6,13 @@ AUX telepathy-salut-0.6.0-glib-gtypes.h.patch 606 SHA256 53d6e5abf33c34dc142a026
 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 1697 SHA256 dceac579a5c08095b59c188bce19cc963c69c0e82154d4fd66ec7fa5789110df SHA512 aba93df8425c3cb217186fd3dd00bc7782e51431ef44d5aa603e1267063846dc7a00fcdd6547e100c806509e166762edc07516414805cb7c16d8af0fa81b3502 WHIRLPOOL 07e297d8d2d996fb43e884e20606930ade6ef639dc2c064dc447f65880c6fb4a9724f363a317468d5c54931510a8131f04a8cb016b2fefb7cdf94d6b219bb851
-MISC ChangeLog 6846 SHA256 39d91e8ed98b1b136cb1bf1e85545a5559113c1f808db754adcd6c0d8237a435 SHA512 963a528c53dbbf96933910ad7caa9b673bb74c2420c905fb16de82ae229247a83af319b1d17557fbd5b5b09a55a7f8f774313cb59c0f88a4bee9acfb14b55cc2 WHIRLPOOL f907c09b1e8acf09c9fe2dde0d6af184548b32ce56ba08fb687f861563e2f822ae325a2775b8fd028a11eb11696a0b9bbb52ee2b00d46355bb9322dff59f35d3
+EBUILD telepathy-salut-0.8.1.ebuild 1628 SHA256 adaeb7ae482fdede55753547b6fee02e7197739b32ef8f62b2e643efa4436a13 SHA512 0e711d5fd3abf3fba871022eb9176b963b283a350c84dea729d19358c1e15dadf2fa23c715997b2a3f622b381922f0c6e59d71f37fce3d4160ef6aa0989fb747 WHIRLPOOL 7c01734d8d717156ef2511f9ec3a853c49e500427143d1d727fc57210e523861fa74357d90beb5da3b235d9f3732bbc12f4690f8bd38b7cc044eefc67c8a57c1
+MISC ChangeLog 7094 SHA256 61b8b0aac994ae050b72b7ae81c38509282636bed2bb095a75b4aba808bf5036 SHA512 adeae6a8d5011921ebf5e259ab2e07025be5d2a50012d6fd3b00ffe79bbaf7743d81eceaa8e96c7316adec817c5faec4b630632bd509c28fee1c90f3aaf1c13c WHIRLPOOL 8d9dd16086f851ee8388aaa7bb69a2e4dbd250272e7c4885106b1f48715434c48daa3b8ab540df779a140d9c1ed59ecfaf0639493b3bd9133461f1194037d330
 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
+iEYEAREIAAYFAlFPT10ACgkQCaWpQKGI+9RODQCbBjxPwOKNY1J/89aH4KAgrKDU
+FuUAniblofVq4SE3x8+ibFY3QDawraCY
+=Iith
 -----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 576575a1fde0..ca44e3a3e506 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2013/02/10 15:41:09 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild,v 1.5 2013/03/24 19:09:16 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{5,6,7} )
@@ -40,15 +40,9 @@ DEPEND="${RDEPEND}
 # FIXME: needs xmppstream python module
 #               >=net-dns/avahi-0.6.22[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_rewrite_shebangs .
 }
 
 src_configure() {