gentoo resync : 25.11.2020

3 files changed, 5 insertions, 79 deletions

diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index a64898045018..760ad9bb0177 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,5 +1,3 @@
-DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
-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 1705 BLAKE2B ee1a668f0bc4f3bff412a50afa672a356f931f40bf0c6a974165b41d1ba225d0a6f25c67d8bd153ed69b5f4aab7e21da9326931fdc8801b57d0a84eebb8158ef SHA512 817640469c17b68d44f77d2602cba29ebf3287b83c0dd66b994322873e605c34f1ffccc2cf6945117808521d233ec44736c26ab7bc2853fc534261ff4124249b
+DIST lilv-0.24.10.tar.bz2 443795 BLAKE2B a316c0aae8f93a6104ad46e9e93cd3948b4596920a9bb7f1ab5bfe596428aa43e45413f79cd9e7c094ca3239e4811bd391015f17be5c059a54b0a050aff1e964 SHA512 1dfd4fef19537686b63a4e7df45e3b1a7c4a658acc21d5646daba4d3bd5676513857b3f437b89f1a06232516433ef155772d19625c33d49d13ada37a965982cf
+EBUILD lilv-0.24.10.ebuild 1667 BLAKE2B 9c6ebef150f1927f98b95a0976dfdf8a14cb1ecb00e8f5c3b310ae80d896a3803a69535eb9ea1be0d148f68eadc5ed689cc01b870b0ac5c7ef8be463c5b988cc SHA512 f152ae9d5acd264b9c0dbd8be22429e13e42a5ca7149004d7d62561eb760ee3bb29e0f73f5308cb01142a568fe20cecb933c9a05f88aea882b5845ba64ca13b4
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.6-r2.ebuild b/media-libs/lilv/lilv-0.24.10.ebuild
index bfcd8e3ac70b..24f31b85a9ec 100644
--- a/media-libs/lilv/lilv-0.24.6-r2.ebuild
+++ b/media-libs/lilv/lilv-0.24.10.ebuild
@@ -19,10 +19,10 @@ 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}]
+	dev-libs/serd[${MULTILIB_USEDEP}]
+	dev-libs/sord[${MULTILIB_USEDEP}]
 	media-libs/libsndfile
-	>=media-libs/lv2-1.16.0[${MULTILIB_USEDEP}]
+	media-libs/lv2[${MULTILIB_USEDEP}]
 	media-libs/sratom[${MULTILIB_USEDEP}]
 "
 DEPEND="
diff --git a/media-libs/lilv/lilv-0.24.8-r1.ebuild b/media-libs/lilv/lilv-0.24.8-r1.ebuild
deleted file mode 100644
index c22bf170fdce..000000000000
--- a/media-libs/lilv/lilv-0.24.8-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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
-}