Use python.eclass and set python2 as default wrt bugs #313523 and #385129

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/media-libs/aubio/ChangeLog b/media-libs/aubio/ChangeLog
index 2c878ed91e941b1b884802d84afd05f6afa4d4a1..a605e21e0519824981d2b7dd9cbe8bb1bbf3674e 100644 (file)
--- a/media-libs/aubio/ChangeLog
+++ b/media-libs/aubio/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/aubio
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/ChangeLog,v 1.16 2011/09/29 20:09:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/ChangeLog,v 1.17 2011/10/01 10:08:12 ssuominen Exp $
+
+  01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> aubio-0.3.2-r1.ebuild:
+  Use python.eclass and set python2 as default wrt bugs #313523 and #385129
 
   29 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> aubio-0.3.2-r1.ebuild:
   USE="static-libs" and remove libtool files

diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 79bb1935db890bdf73483a80384f4dea09f884be..ba5210e56a0954481dcd0edef8c08e5c1eb03438 100644 (file)
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
 
 AUX aubio-0.3.2-multilib.patch 420 RMD160 bff07b86d296ad8de57252260c3790167c543474 SHA1 da7552530668096be8bf94036fa82b34e6bc6577 SHA256 ff264f47c7c1d35f703c28dce59053428015c616a7c43ddf3dbd8c21e806b16a
 DIST aubio-0.3.2.tar.gz 609006 RMD160 44e3bb8ab38aa715052466e7ae50123089914b5b SHA1 8ef7ccbf18a4fa6db712a9192acafc9c8d080978 SHA256 dc1387b048610a6141f523c27314b7a60bd299c3d6789c372445ddc6511512cd
-EBUILD aubio-0.3.2-r1.ebuild 1529 RMD160 8184e66ce25f0f97c74139cc3c90f2e0ac00a555 SHA1 7387e51bc446990904dcc46cdea5e78f4386e330 SHA256 0fa8f027b2d28f177c274b3d55518371255b85a5a348b5092d1cede73905ee0a
-MISC ChangeLog 2148 RMD160 dbd6d12cfda2c90d4e0a1ae7537124252e5bbb73 SHA1 85181d8985048a820174cc50a91eb55172815ef9 SHA256 78d70dfa48964d97ae5387f15005a073f15ff820b20a275ca0a44994aebfa49b
+EBUILD aubio-0.3.2-r1.ebuild 1861 RMD160 ecce0d8e0e53f58a0bd00ffe77b4a03c09cde19b SHA1 0bcae942c1b37c54e53519bb08128f0150214ba2 SHA256 63168ceba80f4dba216bc85aa4caeaa90a2376ebbb33f2f0ccc7ab45aa8859bf
+MISC ChangeLog 2302 RMD160 667ec174ef8f6cdf0a4d8b107a334c8907b571ec SHA1 7023eccae6190a10cc6e52a47b389e627b8715d2 SHA256 3829285110ae728f6ff0aedda5908d1667d31ae47ae502d22e1524eb80e71d44
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOhNCnAAoJEEdUh39IaPFNJE4H/AoatXQ/gfT/84vJieGSc782
-ldUBpzsrAfpMrdb6BaNplaWFwKxgj8EEK9ZU7GeUwB3SaLlHMWIb/VoeqVO7JYKe
-eNCS6yPYuEX0N6RZibYTXtT0/7mFKiv5BBQZ6CuJKNgTb1943JCVcj5b+LKNtDJz
-pXmEENNTl2CA00kNtprnqMYU16iRjSHI9rBQhRIcLBMsOxSF6aaQCCpnNSjPSHER
-qvsKcr/eVfcGQE79Qb2+PnSXMY6F/afuMxwN6K72gAJvlZcojq4gwNNjkGmjMD/z
-1aR53paPXBQeGgBJWxfXFxZERtxlgjTnvEkU+JXgKV4tENFHrhOH6rGinW52MiI=
-=wmZ3
+iQEcBAEBAgAGBQJOhuazAAoJEEdUh39IaPFN3/EIAJs5sH+DBBTaqd5KptRaaquW
+wojHEmKSEkZi+rsM9r4VCw8L9IIFVDlW6m8pTtlvckibuhY4RzWlOXPneKU8pCVy
+V6QZv+HzWv8ov76FsKTteophCC0zuBcbq41fQNTAVMiHu1nb7wHF2EWKeikpXrj3
+t+wbwWNNrHK2ujUYy3qMWZ1LAd33W4Ps0G0JXMHJ2lZI6q/0LuPh4jhyXewjosjx
+lKJ026/TMMWTMxdRe6RXB9l1mPbQwCn1dVW/j0yk/Vldeg2rLVoAhSCZ0/MzSarB
+9EYi7WFpUC7kS6kzxsy0js66sGjNYk4ciJPTQExtTtGmeX1nruFTwtHnPu213TA=
+=rxWV
 -----END PGP SIGNATURE-----

diff --git a/media-libs/aubio/aubio-0.3.2-r1.ebuild b/media-libs/aubio/aubio-0.3.2-r1.ebuild
index cc748df6c25eec5050711b8844742cb5341d4dcb..a6af42a620e31c90abfa0e0b8377221944225c6a 100644 (file)
--- a/media-libs/aubio/aubio-0.3.2-r1.ebuild
+++ b/media-libs/aubio/aubio-0.3.2-r1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.3.2-r1.ebuild,v 1.10 2011/09/29 20:09:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.3.2-r1.ebuild,v 1.11 2011/10/01 10:08:12 ssuominen Exp $
 
-EAPI=4
+EAPI=3
 
-inherit eutils autotools
+PYTHON_DEPEND="2:2.6"
+
+inherit autotools eutils python
 
 DESCRIPTION="Library for audio labelling"
 HOMEPAGE="http://aubio.piem.org"
@@ -18,7 +20,7 @@ IUSE="alsa doc jack lash static-libs"
 RDEPEND="sci-libs/fftw:3.0
        media-libs/libsndfile
        media-libs/libsamplerate
-       dev-lang/python
+       || ( dev-lang/python:2.7 dev-lang/python:2.6 )
        alsa? ( media-libs/alsa-lib )
        jack? ( media-sound/jack-audio-connection-kit )
        lash? ( media-sound/lash )"
@@ -27,7 +29,12 @@ DEPEND="${RDEPEND}
        dev-util/pkgconfig
        doc? ( app-doc/doxygen virtual/latex-base )"
 
-DOCS=( AUTHORS ChangeLog README TODO )
+pkg_setup() {
+       DOCS=( AUTHORS ChangeLog README TODO )
+
+       python_set_active_version 2
+       python_pkg_setup
+}
 
 src_prepare() {
        epatch "${FILESDIR}"/aubio-0.3.2-multilib.patch
@@ -55,7 +62,9 @@ src_compile() {
 }
 
 src_install() {
-       default
+       # `default` would be enough here if python.eclass supported EAPI=4
+       emake DESTDIR="${D}" install || die
+       dodoc "${DOCS[@]}"
 
        doman doc/*.1
        if use doc; then
@@ -69,3 +78,6 @@ src_install() {
 
        find "${ED}"usr -name '*.la' -exec rm -f {} +
 }
+
+pkg_postinst() { python_mod_optimize aubio; }
+pkg_postrm() { python_mod_cleanup aubio; }