gentoo resync : 25.08.2020

4 files changed, 75 insertions, 15 deletions

diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index d2866d9af5bf..d0e562e3bbe2 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,4 +1,5 @@
-AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
-EBUILD lilv-0.24.6.ebuild 1744 BLAKE2B 8215ab36a46d5e44a2efe870e719efa061bdb6b9917981671ca6889685090cdbdd1922501c8dee394b55ed6ab54769a302f1436ab033085f5783e5cce646a330 SHA512 ee36be9929f9a1cd117acc52a9fcf9e399c4c68fc11c2c1759ffe46763c3d67814e8aea2fd1bb9042888d8b8d8c558d4fbddbf998a305a502b6db18172169bb5
+DIST lilv-0.24.8.tar.bz2 545545 BLAKE2B 606beb68d6e277dfea85e3d2e27b58adf22f0a47a91583e4f1cd85649f237e75fac9b397eb07be69b5a278d02346d58bdf35c4c8fb248e4899a4fc9b05288c23 SHA512 f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192
+EBUILD lilv-0.24.6-r2.ebuild 1700 BLAKE2B cb5acdff832430616f13aec5b2396166d6480ef0c01c3e5b0595100cb32c5af06100bdfa9d40c083987367db579eb259b58a38d36da3e15bcbf855aa8f3cb663 SHA512 9bc6eeb31effdb6609052075b5991ec602c94ca8a0b4a0d29ff8508067716aa6140be9729ce5251808d1cf0ebe86a729153ec92163b7eb9137b55bdde561057c
+EBUILD lilv-0.24.8-r1.ebuild 1706 BLAKE2B bbcf8c9856d714b638caaf900be37c4f69f13ad4ee189b6edd0beae73af62d4abc1aa4831be8e2ab52c3188b6b386eea6e16410e2d7d359f0b8ea9d6bfb3ab4f SHA512 0eafa79adf988939890b8b56ff3d0e0899cbf7a6c5c705f1a2adc8b2eddc7ada325d086317371b1662b0caaad61c441af4666545135bea52e601d11e510250f2
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/files/includedir.patch b/media-libs/lilv/files/includedir.patch
deleted file mode 100644
index f20357302b23..000000000000
--- a/media-libs/lilv/files/includedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/wscript	2017-12-19 20:47:08.288722501 -0600
-+++ b/wscript	2017-12-19 20:46:46.932616417 -0600
-@@ -196,7 +196,7 @@
- 
- def build(bld):
-     # C/C++ Headers
-+    includedir = '${INCLUDEDIR}/lilv'
--    includedir = '${INCLUDEDIR}/lilv-%s/lilv' % LILV_MAJOR_VERSION
-     bld.install_files(includedir, bld.path.ant_glob('lilv/*.h'))
-     bld.install_files(includedir, bld.path.ant_glob('lilv/*.hpp'))
- 
diff --git a/media-libs/lilv/lilv-0.24.6.ebuild b/media-libs/lilv/lilv-0.24.6-r2.ebuild
index 58febaec1c0f..bfcd8e3ac70b 100644
--- a/media-libs/lilv/lilv-0.24.6.ebuild
+++ b/media-libs/lilv/lilv-0.24.6-r2.ebuild
@@ -33,8 +33,6 @@ DEPEND="
 	test? ( dev-python/unittest2 )
 "
 
-PATCHES=( "${FILESDIR}/includedir.patch" )
-
 src_prepare() {
 	default
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
diff --git a/media-libs/lilv/lilv-0.24.8-r1.ebuild b/media-libs/lilv/lilv-0.24.8-r1.ebuild
new file mode 100644
index 000000000000..9478c738d163
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.8-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/serd-0.30.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	>=media-libs/lv2-1.16.0[${MULTILIB_USEDEP}]
+	media-libs/sratom[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-python/unittest2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "") \
+		$(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_compile() {
+	./waf build || die
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	sed -i "/lv2jack/d" utils/lilv.bash_completion
+	newbashcomp utils/lilv.bash_completion lv2info
+
+	dodir /etc/env.d
+	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+
+	python_optimize
+}