Improve use of distutils-r1. Ensure correct Python impl for waf-utils.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/media-libs/aubio/ChangeLog b/media-libs/aubio/ChangeLog
index 81433466f32a7164d7e7542afbb5418eb912cc6d..aecf23ef28ef8984eda8d20dce35b64c4a666570 100644 (file)
--- a/media-libs/aubio/ChangeLog
+++ b/media-libs/aubio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/aubio
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/ChangeLog,v 1.29 2014/03/14 10:04:20 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/ChangeLog,v 1.30 2015/01/03 11:00:24 mgorny Exp $
+
+*aubio-0.4.0-r1 (03 Jan 2015)
+
+  03 Jan 2015; Michał Górny <mgorny@gentoo.org> +aubio-0.4.0-r1.ebuild,
+  -aubio-0.4.0.ebuild:
+  Improve use of distutils-r1. Ensure correct Python impl for waf-utils.
 
   14 Mar 2014; Agostino Sarubbo <ago@gentoo.org> aubio-0.3.2-r2.ebuild:
   Stable for ppc64, wrt bug #474886

diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 343dffcc8d9557eb4cbee28d70d3348058237ecb..3ec19977c20a4c15b3a673e48a2ade8234251608 100644 (file)
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -7,23 +7,25 @@ DIST aubio-0.3.2.tar.gz 609006 SHA256 dc1387b048610a6141f523c27314b7a60bd299c3d6
 DIST aubio-0.4.0.tar.bz2 277613 SHA256 49de9a06c819d4c4e0a9198a95eac374a1650083aef16c397004258bac2d33a2 SHA512 4f04ca8a873e45b6cdf84e3fb6028d9ad0abc0300daf83b1f7b08021355b1449f9c8d3a9b617bd479668e6b2c0c63c3ce69d61baeb6b0f621a84e850dedce8b6 WHIRLPOOL 432c0f555d21190838b573b90a68f625b267a399380ac79cb8687e8d2de53db1dff8c9ab235db446b315a98d9df729d45db7360b825e0ad37d6924b09788b1b9
 EBUILD aubio-0.3.2-r1.ebuild 1857 SHA256 6456d52afbfbb66f4208c9a8f0028fc6231b4d1b60970cd459a01e1976daa398 SHA512 b7d43f9791c5be297e11a3ea5089dc360584abeb7cf9aca99ca52c3b79cd05407ce31b3fae030ac5e9883ee85510f5d621df4b5ec4641fd32756a2cdb87c4510 WHIRLPOOL b1993fd08ce345fb980df86465eda25b3a21a87decaff278be40fe6b111ddcc9f979176f8e4b3936f5206bafea9e26b3593cc7887885e63af53001a58f2390c9
 EBUILD aubio-0.3.2-r2.ebuild 2219 SHA256 a2599c0cd8cad188ad53cf40aced7db693bca5b4ad4896fafd6aaa7ada55f41b SHA512 1c1ffa7e2fe513369f910cee2769156bebd9b0c843f6949c8819f4f74d2ed65deff5ad9eed2d1c2a2903da6472d067054e347f609e7e95f85171679af0510186 WHIRLPOOL a5811bbdecf55dfe9e13c800f1e52f1eaed4ce1c9585fcae2376580a79a3efd67db6e132fec27011fcd5fb16bca1dffc927291d09976f0cff4823f5759b538f5
-EBUILD aubio-0.4.0.ebuild 2276 SHA256 e7f945e75a82430512b2ac8020766a9231eb24d4e616a8f4ac226698314d65c3 SHA512 e35c093886b955061d4c6b1e8e0600e54b850bd6a0f884af29c93ba4a85af67c9491dba6e0c335084c9617862fcd73c1390ec57f3a16bff058efa52b6f4908e9 WHIRLPOOL 02bf7aec0ed9e1ce018906630ee518e7659601953ef32645b56ac11fa7a9ebc94f6789056dca00debcfe34cfc4cc75e0b7dc819e52992931eb15684a4da78a81
-MISC ChangeLog 3687 SHA256 087208679ac25ae2987195b843c10b89c257df8a66988c21b988467acb3f26ac SHA512 968e8af4d6c5df1858eff03c054a8d3e29447022d309f994f9ce37b9402cc8427d64a9f37301da5488cd0fd55a0663f1ee77087690c3ace938e885ebf74bd266 WHIRLPOOL f12b8d20917c76f5a0aaab7bc18b0e87349d3c6a720a25154fbedec758cb3f8d9cbdecf1d9b3c7889179a39c62c5eb2b0d2800f53a1ac6cbe1c7c40f8acdab72
+EBUILD aubio-0.4.0-r1.ebuild 2333 SHA256 bdeaebdd9a9cadf259ed4f9a2a25d4f5e1031cbceedefa91c219bc4876a13dc6 SHA512 1985e1bc0e965bc4d7675e46f0902b21eb39b79113ca355fde52fdcde428e7b3452aa393ba4034993a05ef5e3b37e63cbbfc0b34790ffaa8708ac0849caed3f8 WHIRLPOOL f8862950a71de9304c8d08e09a22c55c9d57144684b103a6023fa8eb73ca2abb4125b4135f818b2ac1d3354ede5fdc1c6df97e07900f13bd85f34e80f46fa5a9
+MISC ChangeLog 3892 SHA256 239f379f313d575b28906d8dd45f51732b566a2d6e132a6408085fdd7ff8e2e8 SHA512 dfa9b8aa794c53560cb18c161d8726bf5a645b51fc735bddf14e4f54c5b6135ff1c971267212c2db16877234b89abc98b447a955526be540e985e8b68de9a2a3 WHIRLPOOL 2a53d363694bfcd867b0f97ebadde09ad9ac0603f62c2234f20a96d7a6b9f0c8c314db3a1068aa9e4019fd8e94727f28ca236c2ced6e0f33a38fa0e2a65898aa
 MISC metadata.xml 249 SHA256 b6d580d282db0647e53bc60ee9886f5509a0e3444b62763da8637814e7aedfbf SHA512 8c0e630abfbfcfe3df95f68d6a058f0683279af6cac92003bcb57b7de0a5701300375a1062c690a7d33a87d7763662f72ca0f4fafac46595a3c81c12ab89e71c WHIRLPOOL e7fcaa6003fe0952579431067e28dfeb2ea0a41c3f5e910858a325e7841d0c9c9857cf94e443b63ee8194f8565c26d71d58449b0bf6f9403bb9d3ba0124cd298
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTItQlAAoJELp701BxlEWfmMcP/ijZc9L2xL4aveMHIoPCUHNG
-D6UQVRDifJs3X+yjFNiDhgZD86Lbei2GEeZ0VK9lOcNIdIKbDEcDKJUj/L+16j2B
-iguS1N0OjCB0giGEWb7IkfWVe+aZ34Pvh1Qzvylu0R04zVW6th3n25x/m4amUo4A
-WW1ASIbISb3mxAUgPZsco58owrAXMUrVkoXklNbWc95FbSrxfxOkqsuHpHyImRc8
-pZNFmb+uDb4fz6yb26wgI4rwLhOIgxn+UYyOXUA6BZWV8X/pS6a5HXOPpbCaylob
-543udRkfhHik/AzyU69Qsnls2YPtZ3gqJAlF0eKL8b0Lq/IAwgWD+g2yXSOLWx3k
-Up/I24lQvT+PbXIZiIh8ybTE3VCCnMwCYV24Tdiv/zvi3EgYXxQ7coy5audEzUWb
-97i2TviP6aMaLhL+bN3kgf/sRMz5R51fU1M3y595JpdAB261FWHDMLc0X7+YWNGc
-mF6BBnd05D7kAaZKqTxJMUwrbub9U62VahEs22kwselcLzNOv9pi1KX7nddd5aEH
-rcTf3Fv6K3c25xfqkGOgtyezyviXJRW4qZzHVNh9RCOu8Srmz2oIYAV2Zwa9bgH1
-2naIOrGksp9rAWC7IjAdRO6FHYGt9dwCPFXVVNY31AYYmbYATvZTflbty5mThj+/
-Nmq6bwfiyfwb3nvXY46X
-=QJNJ
+iQJ8BAEBCABmBQJUp8vhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKmEP/Rb61shz1AMBg3ieIXczpwBF
+FEH3RfDQjVCTfQiPgvEGqinqIb9jkbBTEkmNZR8CFkv2q9nVF4O3Sf3sgazqI/jf
+lC4Y/ZGEy91NagaYWiIRyHvRyBpKWX4DBUyfpYHGxuGQ1L86UvB0NgEi9l4VMa8Q
+Qjti7iiy9CCU+/n+R7vpdd2UpBUKn3DorphDBoS8ASqn8IYT7xHzictWzy+mj+So
+afrZ6ayB1m46DYXtoLEEmyK6VJxxf7zceAsZLOpHG1EBN6SDbfDRzPY9X8MOE8lt
+FhccNOmjDW/+6udSxIu9TTFjEbAOpiS6IH5YBT58b8oDc3ogl7IXpz0U2wWysfn0
+wLgnzwj3OC+OI9YkCaHg6yS0XCuxDi64Ygk8mdItKUjKNdwWCeYI+fXvIk9gcsfN
+cafMSlXPijGAyP8GqCEuPPacQ7FhHyhMQ1IlD7T8tpzF1eL8zMTpfXl8hItnjlsx
+djR9oBVROGyc1O/gmYcBDR8NrinrEcHcKbss2HNOEvV8MvH2Q420CMzA57h8CaVY
+H89Sa1ZQRXzKjZhCeyzG6OZ6aCMvJcIBGElUOYlLNdYm3L1tlV7DWQLq8ZnkVAJ6
+UelTcN7vNHpSApbcSMKSwzo5HwDEfkzPXwn66+eP3bjw6afDHviXd+WkM3BK9QKz
+wUUElWDfoLY7ZE/h1ofk
+=+0PE
 -----END PGP SIGNATURE-----

diff --git a/media-libs/aubio/aubio-0.4.0.ebuild b/media-libs/aubio/aubio-0.4.0-r1.ebuild
similarity index 77%
rename from media-libs/aubio/aubio-0.4.0.ebuild
rename to media-libs/aubio/aubio-0.4.0-r1.ebuild
index 203d7469bd7d4d3916facc62f8e7c2e2fcd2b1d8..fa34e1d2bb5c69250fc9cc66f93e9a63a93d4fd8 100644 (file)
--- a/media-libs/aubio/aubio-0.4.0.ebuild
+++ b/media-libs/aubio/aubio-0.4.0-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.4.0.ebuild,v 1.1 2014/01/18 12:13:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.4.0-r1.ebuild,v 1.1 2015/01/03 11:00:24 mgorny Exp $
 
 EAPI=5
 
+DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
 
 inherit distutils-r1 waf-utils multilib
 
@@ -25,9 +27,11 @@ RDEPEND="
        python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
        sndfile? ( media-libs/libsndfile )"
 DEPEND="${RDEPEND}
+       ${PYTHON_DEPS}
        virtual/pkgconfig
        app-text/txt2man
        doc? ( app-doc/doxygen )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 DOCS=( AUTHORS ChangeLog README.md )
 PYTHON_SRC_DIR="${S}/python"
@@ -35,14 +39,10 @@ PYTHON_SRC_DIR="${S}/python"
 src_prepare() {
        sed -i -e "s:\/lib:\/$(get_libdir):" src/wscript_build || die
        sed -i -e "s:doxygen:doxygen_disabled:" wscript || die
-
-       if use python ; then
-               cd "${PYTHON_SRC_DIR}"
-               distutils-r1_src_prepare
-       fi
 }
 
 src_configure() {
+       python_setup
        waf-utils_src_configure \
                --enable-complex \
                --docdir="${EPREFIX}"/usr/share/doc/${PF} \
@@ -55,7 +55,7 @@ src_configure() {
                $(use_enable sndfile)
 
        if use python ; then
-               cd "${PYTHON_SRC_DIR}"
+               cd "${PYTHON_SRC_DIR}" || die
                distutils-r1_src_configure
        fi
 }
@@ -64,12 +64,12 @@ src_compile() {
        waf-utils_src_compile --notests
 
        if use doc; then
-               cd "${S}"/doc
+               cd "${S}"/doc || die
                doxygen full.cfg || die
        fi
 
        if use python ; then
-               cd "${PYTHON_SRC_DIR}"
+               cd "${PYTHON_SRC_DIR}" || die
                distutils-r1_src_compile
        fi
 }
@@ -78,7 +78,7 @@ src_test() {
        waf-utils_src_compile --alltests
 
        if use python ; then
-               cd "${PYTHON_SRC_DIR}"
+               cd "${PYTHON_SRC_DIR}" || die
                distutils-r1_src_test
        fi
 }
@@ -87,18 +87,18 @@ src_install() {
        waf-utils_src_install
 
        if use python ; then
-               cd "${PYTHON_SRC_DIR}"
-               DOCS="README" distutils-r1_src_install
+               cd "${PYTHON_SRC_DIR}" || die
+               DOCS="" distutils-r1_src_install
+               newdoc README README.python
        fi
 
        if use doc; then
-               dohtml -r doc/full/html/*
+               dohtml -r doc/full/html/.
                dodoc doc/*.txt
        fi
 
        if use examples; then
                # install dist_noinst_SCRIPTS from Makefile.am
-               insinto /usr/share/doc/${PF}/examples
-               doins examples/*
+               dodoc -r examples
        fi
 }