gentoo resync : 22.05.2021

3 files changed, 2 insertions, 85 deletions

diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index b6fe85d3d888..591b4ad15409 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,5 +1,3 @@
-DIST lilv-0.24.10.tar.bz2 443795 BLAKE2B a316c0aae8f93a6104ad46e9e93cd3948b4596920a9bb7f1ab5bfe596428aa43e45413f79cd9e7c094ca3239e4811bd391015f17be5c059a54b0a050aff1e964 SHA512 1dfd4fef19537686b63a4e7df45e3b1a7c4a658acc21d5646daba4d3bd5676513857b3f437b89f1a06232516433ef155772d19625c33d49d13ada37a965982cf
 DIST lilv-0.24.12.tar.bz2 427404 BLAKE2B 47efe553c6fc249ed0cde47a47a01e0b3496ea4dfac88849b75d9720cb3a158fa1c95959ffc1a09e606f8ba3831e79382ba08ad100ee17cf19c7f1ffa186d6e2 SHA512 ea22db4e995792b62d60d793169c792549b8fb0255c2cf7a85780dd149811921e2fae5eaea0fb83465f01b14dfa66361af3be40bf7cb3733e98655b943f4faee
-EBUILD lilv-0.24.10-r1.ebuild 1792 BLAKE2B 7cb6e3a3c046d518152359e1561c27b7d48cf6b0c09e1b9fa5122d1d71776a18732b7e4b8751f5e2d82a3d50264d7f91a3e3a71bbc1c54ecde27501bc813b624 SHA512 7cb8e4da42e9c0a6edbe448c2b1727b6028e96dffa5dfaf64ecaab5a8c43ad5547e2c7a91de1d8c1fcfcc88eda77d3482917cddfac88801cd5ad31794ac0579b
-EBUILD lilv-0.24.12.ebuild 1856 BLAKE2B d675d1fc4dbaabcfcbb987366f54b28e7d7e5ea6d35908749ac79e5da0bdc016c7339dfd8d33775e8b3ba667d2ba96b7ff3afc48598082f0dd115b46a3f684a4 SHA512 c606c0c4fc6418b8834eda378288e4d5075ac5903f6aa3f745547fc374bf9dff1b2cbb38435ac9e17f20788b5cbdbcfcc811ad82b16561c8536d183d824c694b
+EBUILD lilv-0.24.12.ebuild 1854 BLAKE2B 236a33f88d7a321032c52a15984cd53af11fc7711578a2e1d08978219f2dedfe988ea79b8819637922c84031e3a106679afc8b0f9c53be062b4e4cef6833e83f SHA512 bfaf6f3c9c2988fa9f2f8d5623fb29c272ebfab05cbd268b437e345e2bbf70524b997e7578d571d53c0e3afc888b63e388e97cdf137a506bb3b7445d53f39e4e
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.10-r1.ebuild b/media-libs/lilv/lilv-0.24.10-r1.ebuild
deleted file mode 100644
index d39fc0b06433..000000000000
--- a/media-libs/lilv/lilv-0.24.10-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/serd[${MULTILIB_USEDEP}]
-	dev-libs/sord[${MULTILIB_USEDEP}]
-	media-libs/libsndfile
-	media-libs/lv2[${MULTILIB_USEDEP}]
-	media-libs/sratom[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/unittest2[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-pkg_setup() {
-	python_setup
-}
-
-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
-}
diff --git a/media-libs/lilv/lilv-0.24.12.ebuild b/media-libs/lilv/lilv-0.24.12.ebuild
index 2c1b1c006d8d..cd8939ba7a9e 100644
--- a/media-libs/lilv/lilv-0.24.12.ebuild
+++ b/media-libs/lilv/lilv-0.24.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc +dyn-manifest static-libs test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"