gentoo resync : 29.06.2020

2 files changed, 23 insertions, 10 deletions

diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 1878fa218b66..aab597d65415 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -5,5 +5,5 @@ DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c8
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
 EBUILD aubio-0.4.7-r1.ebuild 2476 BLAKE2B bbb66cc2cdecae57c6ffd93e92199f06ac35c8b77c52a656e435956b1391a83d4ac117a471532fb99d713516254a8a6c27bf65653528dcd7493d7e1ba0901163 SHA512 d0c1d1ec2f24963f74748d83f490b7100f02682e2f15897686b0acef265175b2b821623d7a10b9f208c2b5007145022c191a764777a57c14ddc2904ae899421e
 EBUILD aubio-0.4.8.ebuild 2480 BLAKE2B 019e89355725965392524f13f48e85f346ba4c563e6c8d075428ac08dc2317f7b32001533c8d5ea9d0c0e391c1eedba989ce9e34f092cadccd39809480f558aa SHA512 644fbed7d586997c01c6a696f4329709115ed5860c0c9ab4e694004f44c22b9095e7b87a109bf908b115931c0d56aa54d41c46c929b60a35975be0247c685ac7
-EBUILD aubio-0.4.9.ebuild 2503 BLAKE2B 5ccaf8c7091c005be9d481f2689ee5e9c9d344f0fc851d6a5b77d1ae954e8e635de65f7803ebcff967be69799533fa5450cb82f02a8a6a2994f1700c5d0f2df9 SHA512 baab2d27ba3be1a91f9940b516270b94353433ca3fb6ec25a852de53e9ce5f893c0b99ddd726206c35105a2f61bf847c53384144496ca8392bf8cdca2c2f008f
+EBUILD aubio-0.4.9.ebuild 2837 BLAKE2B 4eb54f407991fb579ef4f23bde7dac337443d15c0c8f9daa357c395ee21f2fb8205fb5fd47f07828cf5f02f6147b44ca9edc00d1ac778905406a5aac105fbbb6 SHA512 e26ccf065778e2d11b17c41764dda9ba14caad4e5abffe43a1817422d302efc3cab35e8e9fc4f2276a1dd89ff916270d2d690de60304eb974d09d265dbe53405
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9.ebuild
index 786cb94ce5e6..e7905fd67a9a 100644
--- a/media-libs/aubio/aubio-0.4.9.ebuild
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -14,8 +14,14 @@ SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( double-precision libsamplerate )
+	doc? ( python )
+"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -29,15 +35,13 @@ RDEPEND="
 	)
 	sndfile? ( media-libs/libsndfile )
 "
+
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	app-text/txt2man
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( double-precision libsamplerate )
-"
 
 DOCS=( AUTHORS ChangeLog README.md )
 PYTHON_SRC_DIR="${S}"
@@ -48,8 +52,11 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
 
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
 	if ! use test; then
 		sed -e "/bld.*tests/d" -i wscript || die
 	fi
@@ -81,14 +88,20 @@ src_configure() {
 src_compile() {
 	waf-utils_src_compile --notests
 
-	if use doc; then
-		cd "${S}"/doc || die
-		emake dirhtml
-	fi
-
 	if use python ; then
 		cd "${PYTHON_SRC_DIR}" || die
 		distutils-r1_src_compile
+
+		if use doc ; then
+			# No API function like distutils_install_for_testing available for this use case
+			pushd "${S}"/doc &>/dev/null || die
+			python_setup
+			LD_LIBRARY_PATH="${S}/build/src" \
+			PYTHONPATH="${S%%/}-${EPYTHON/./_}/lib${PYTHONPATH:+:${PYTHONPATH}}" \
+			emake dirhtml
+		fi
+
+		cd "${S}" || die
 	fi
 }