[proaudio] proaudio/proaudio: [3182] fix multilib and depends

[subversion@xxxxxxxxxxxxx]

Revision: 3182
Author:   dominique
Date:     2019-09-15 14:42:22 +0200 (Sun, 15 Sep 2019)
Log Message:
-----------
fix multilib and depends

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/lv2/ChangeLog
    trunk/overlays/proaudio/media-libs/lv2/Manifest
    trunk/overlays/proaudio/media-libs/lv2/lv2-9999.ebuild

Modified: trunk/overlays/proaudio/media-libs/lv2/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/lv2/ChangeLog	2019-09-15 11:57:03 UTC (rev 3181)
+++ trunk/overlays/proaudio/media-libs/lv2/ChangeLog	2019-09-15 12:42:22 UTC (rev 3182)
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/lv2
 # Copyright 1999-2019 Gentoo Foundation; Distributed under the GPL v2
 
+  15 Sep 2019; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+  lv2-9999.ebuild: update dependencies and multilib
+
   16 Aug 2019; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
   lv2-9999.ebuild: update EGIT_REPO_URI
 

Modified: trunk/overlays/proaudio/media-libs/lv2/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/lv2/Manifest	2019-09-15 11:57:03 UTC (rev 3181)
+++ trunk/overlays/proaudio/media-libs/lv2/Manifest	2019-09-15 12:42:22 UTC (rev 3182)
@@ -1,3 +1,3 @@
-EBUILD lv2-9999.ebuild 981 BLAKE2B 6c7d772401dd49b4ba5df201150906729e5c8ff802a49fbb7c5be28542a99d8827067124c93752f3e614986df0992127d7a75c287f7f126c04e00c83690c0d7f SHA512 6e8cfea708b37c0068f94532196a4561de50167e2bb9e5185f1b51585812bea9dafc6f0997763ab9df06108ef85c5a59cae9d497a0306170e90e6d55def5a979
-MISC ChangeLog 905 BLAKE2B b7386a71eabd7fab83f0f610d826dab8c8aa5d152a93f1f561b23c0ddd8ac1af8b8b25c65a4124bb8bc38fb95dec44f97b9dbc43502d4d8cafca12609c98262c SHA512 f7c50ceed8bac61bb5aac2096f605493b2f9527a4b7a51a143b3148063bafa34345455f2ee21a603644751c9570d3cfa1f3e9b9a0f1264dd559bdd17f77fda58
+EBUILD lv2-9999.ebuild 1362 BLAKE2B fc4cefb25d47265a80a6bdf844012b1c3eabc1d5ec10fb96fd38fe29668e4d0ea1ce83f6995b877243ff4d8c323ee896412deaed048d5714af2749dc8defa087 SHA512 a7b52ab67a54742c6ecc4867967cd3390136a1c58d71319a2a1b695bd4fa43a0a5340f04788596b0e4097f8ae7ed87a6b7890baba34bc46cc9be6879b35ea794
+MISC ChangeLog 1030 BLAKE2B 81835570a6dfca6a46f9393f7ea63d15ad23b71e1eb8c7cb98dd26fe54daf7d2f2c4ab16c385d66f59a7a5e05ba756cfc6a022c918b43aa816b448d799b932f8 SHA512 7aaaff89b48bd9a1fd21a2c3b446232ad91cc4772d60baaa82c6b450041ca122dda2f1578eab06a990a007f571f6a1aa3bca3379784587a25861f7257807c079
 MISC metadata.xml 317 BLAKE2B cc81a5423636f40352c1801c9854c5cba0400fe6f6671e84f56312409ea218a7f24eb5980783e600581e02cb4c799678d59498c3c4d7ac31cd9f2157b21a776a SHA512 a93a4c5a5d0f9235aad887dc808af39c8b6db12fdf9c6e1a3199552fb03f623a3fddf52ee329758dee3075c397d7e0169a5383243f331804c25c0c03c59b124e

Modified: trunk/overlays/proaudio/media-libs/lv2/lv2-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/lv2/lv2-9999.ebuild	2019-09-15 11:57:03 UTC (rev 3181)
+++ trunk/overlays/proaudio/media-libs/lv2/lv2-9999.ebuild	2019-09-15 12:42:22 UTC (rev 3182)
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit git-r3 multilib python-single-r1 waf-utils
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_REQ_USE="threads(+)"
+inherit git-r3 multilib-build multilib-minimal python-single-r1 waf-utils
 
 DESCRIPTION="A simple but extensible successor of LADSPA"
 HOMEPAGE="http://lv2plug.in/";
@@ -16,32 +16,44 @@
 IUSE="doc debug plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="
+DEPEND="${PYTHON_DEPS}
+	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )"
+RDEPEND="${DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/rdflib[${PYTHON_USEDEP}]"
+	dev-python/rdflib[${PYTHON_USEDEP}]
+	!<media-libs/slv2-0.4.2
+	!media-libs/lv2core
+	!media-libs/lv2-ui"
 DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-	)"
+	plugins? ( virtual/pkgconfig )
+	doc? ( app-doc/doxygen dev-python/rdflib )"
 
+DOCS=( "README.md" "NEWS" )
+
 src_unpack() {
 	git-r3_src_unpack
 }
 
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
 src_configure() {
-	local mywafconfargs=(
-		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2
-		--copy-headers
-		$(usex debug --debug "")
-		$(usex doc --docs "")
-		$(usex plugins "" --no-plugins)
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \
+		--copy-headers \
+		$(usex debug --debug "") \
+		$(multilib_native_usex doc --docs "") \
+		$(use plugins || echo " --no-plugins")
 }
 
-src_install() {
+multilib_src_install() {
 	waf-utils_src_install
-	python_fix_shebang "${ED}"
 }
+
+multilib_src_install_all() {
+	python_fix_shebang "${D}"
+}