Work when python3 is main interpreter, bug #394675 (also bump to eapi4)

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/media-sound/soundconverter/ChangeLog b/media-sound/soundconverter/ChangeLog
index dc6d9d8e89235414678436924615e6ec32a768e5..1333d67685f63b1389da53618819c88e1f101dfb 100644 (file)
--- a/media-sound/soundconverter/ChangeLog
+++ b/media-sound/soundconverter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/soundconverter
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/ChangeLog,v 1.23 2011/10/24 06:02:22 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/ChangeLog,v 1.24 2012/01/11 19:29:11 pacho Exp $
+
+  11 Jan 2012; Pacho Ramos <pacho@gentoo.org> soundconverter-1.5.4.ebuild:
+  Work when python3 is main interpreter, bug #394675 (also bump to eapi4)
 
   24 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   soundconverter-1.5.4.ebuild:

diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index a29c82b9f4c362199da39d0a5d0339fcc2accf6c..2f247f93cc9382b29714d615de2cb7c4d58bf691 100644 (file)
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST soundconverter-1.5.4.tar.gz 241383 RMD160 6004ddf86a0852a5110a50eb39c8de4f638fb209 SHA1 8dac0ca32a2c1274f6cc9b465f1debfead473898 SHA256 980ba4d65c76747aa223b2913e1193a183c312c7e3b13733b636c6131938aac4
-EBUILD soundconverter-1.5.4.ebuild 1441 RMD160 f50fa554764989913e938b71a23016251025e257 SHA1 4763166fc770e0d852acb0738d47707734ec4af3 SHA256 7c73927993b938af612c2d455d6a4c66b54361ddf2cbe65a8a41f59562ea16e3
-MISC ChangeLog 3560 RMD160 50c8f8b99d856d62b029359f4ec1437d956c05e1 SHA1 afde6c1cfb693026a37e28fba107b2e92182866c SHA256 a923c795609e68f352221e43c1d5e9520fdb478fc01ea841eed8106a8f1dbd1d
+EBUILD soundconverter-1.5.4.ebuild 1526 RMD160 cd4a226fcee3c9180953aa53d22621ed0456e04a SHA1 c682e98005bc061af20f7e196f1a2f0aeacf851c SHA256 ad96ef334ef0451ca7609edf21c42c16e49a84b73ffea453117b8de2540fb5ec
+MISC ChangeLog 3706 RMD160 0d1dbcdef98eb278004d444542c7bcb717f78d11 SHA1 77171a1b4da2f856af2409c23947679b51ed3f10 SHA256 b2cec41dc9d42a434a0789495e01e00362d763169f6a5dafc0eb8fb3a0f31c5f
 MISC metadata.xml 219 RMD160 c3357aa8edfab7033261267720250a36fc96e7f8 SHA1 fef872e700565309235dbfe0f45d81a1692829c0 SHA256 c76952c442b16a3d2efe40e95e84f1110ec9b13775882012b30a25ca3b063ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6k/3MACgkQdjK8w9WeBnBEYQD/c22GEsfuWRSHh0BQ6iDidG9q
-QD7ggcShIFqvwzbCfn0BALC+VpBobEN0cRc+d9Td/aM1riFUVqSHcxHHApTqfjbB
-=j925
+iEYEARECAAYFAk8N4w0ACgkQCaWpQKGI+9QgoACfWN/QudDsY4688q5iPIuGuU4k
+8YoAn1dbKqdd4D45hVZwLeiDK1M+tf5M
+=T0Iv
 -----END PGP SIGNATURE-----

diff --git a/media-sound/soundconverter/soundconverter-1.5.4.ebuild b/media-sound/soundconverter/soundconverter-1.5.4.ebuild
index d8d84d41c1226ed58f5040e7dc586fb61440c8c4..93972fdfac847428dec26c00d2cbbde873323b79 100644 (file)
--- a/media-sound/soundconverter/soundconverter-1.5.4.ebuild
+++ b/media-sound/soundconverter/soundconverter-1.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/soundconverter-1.5.4.ebuild,v 1.5 2011/10/24 06:02:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundconverter/soundconverter-1.5.4.ebuild,v 1.6 2012/01/11 19:29:11 pacho Exp $
 
-EAPI="1"
+EAPI="4"
 PYTHON_DEPEND="2"
 GCONF_DEBUG="no"
 
@@ -50,4 +50,10 @@ DEPEND="${RDEPEND}
 pkg_setup() {
        DOCS="AUTHORS ChangeLog README TODO"
        python_set_active_version 2
+       python_pkg_setup
+}
+
+src_prepare() {
+       gnome2_src_prepare
+       python_convert_shebangs -r 2 .
 }