[gentoo-commits] repo/gentoo:master commit in: media-plugins/vamp-aubio-plugins/

[Marek Szuba]

commit:     227bb472c1463e0293717d46b67a5f7345207d81
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 16:16:40 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 16:19:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=227bb472

media-plugins/vamp-aubio-plugins: update to a py3-compatible waf

Committed with permission of aballier (on behalf of proaudio <AT> g.o.).

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-plugins/vamp-aubio-plugins/Manifest                  |  1 +
 ...ins-0.5.1.ebuild => vamp-aubio-plugins-0.5.1-r1.ebuild} | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/media-plugins/vamp-aubio-plugins/Manifest 
b/media-plugins/vamp-aubio-plugins/Manifest
index 1499f55f881..546bdff74b3 100644
--- a/media-plugins/vamp-aubio-plugins/Manifest
+++ b/media-plugins/vamp-aubio-plugins/Manifest
@@ -1,2 +1,3 @@
 DIST vamp-aubio-plugins-0.5.0.tar.bz2 26253 BLAKE2B 
dc05ef4d642fee389e60dee5ab46ad9679e641060a47cd084d5328067e88c325d007f9b317b9d46d0600c7cddb82ea7af156ab67330b23746dee6fa78adce2eb
 SHA512 
7b1c13a91cb12b9e5f25a78ed31ccb4b5cfdabc8b3ac546dee776de1786008e6bb4471aa242bb4b128d202ea523e15efa4889e4f1c4189583b6d20d8b0dba675
 DIST vamp-aubio-plugins-0.5.1.tar.bz2 234156 BLAKE2B 
99b064a2d2372a6c42e1251ac5d29d0cc607543b4e651c3b006106bad888c9ab22fcc2a907acde135d7e663187388a52c2513f8845501908318ff9d1c0b5df9b
 SHA512 
ebbd8466ec3907d55e24824d7a725586df38212994f1398b75974dfac8e282dd8b2cb2a9381ad7e3da1a130b77936f109b36909b23591cc58ff176d6eb22625e
+DIST waf-2.0.20 104725 BLAKE2B 
c9467b5205f596cd1b5d4b6ccb97806e9fa1f4d4eb9109d378a0978179ab49a029926cb86876ca2088878378f88eb292d899840b4a072e62fc6542b93bc2d894
 SHA512 
72de1c5a78eb353da4b4a6ea4fbf52d232ed6dd08e972872744e3727b952f813f44e47f0b47106bd6f05ce7fa137c4685ac313fb0b0d70e5fc85dc34918e66f0

diff --git a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.ebuild 
b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
similarity index 66%
rename from media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.ebuild
rename to media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
index b8f7cf32509..a8e0a1b481f 100644
--- a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.ebuild
+++ b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
@@ -1,15 +1,18 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic toolchain-funcs multilib python-any-r1 waf-utils
 
+WAF_PV='2.0.20'
+
 DESCRIPTION="Onset detection, pitch tracking, note tracking and tempo tracking 
plugins"
 HOMEPAGE="https://www.vamp-plugins.org/";
-SRC_URI="https://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2";
+SRC_URI="https://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2
+       https://waf.io/waf-${WAF_PV}";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,3 +25,8 @@ DEPEND=">=media-libs/aubio-0.4.1
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
        ${PYTHON_DEPS}"
+
+src_prepare() {
+       rm -r "${S}"/waflib && cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die 
'Failed to update waf'
+       default
+}