gentoo resync : 13.06.2020

3 files changed, 2 insertions, 68 deletions

diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 5c846b8adb08..e0425bdc8f08 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,6 +1,4 @@
 AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
-DIST lilv-0.24.4.tar.bz2 252209 BLAKE2B 71142f6a458a0edbb2087ac6eb6323b6ae4c53e45db22a616f00b22f818f507aa724ebf576f09654a98812b8b9a73689720677e64c715fbf7cd49ba26c7ddb11 SHA512 cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89
 DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
-EBUILD lilv-0.24.4-r1.ebuild 1627 BLAKE2B a763f1383ab4f0e7b631d0023375bf35989ef4da4a82e0973f4e5ce929353e54103553a74c177ffbc227b309499c8a55c3d152d81af778f0cee35d81d7ad1adf SHA512 d256df37dd57149c0b34e693ded331dd571b22a0ecae86f87af24e636f778bc0cc85cb71313d35fb55db8be785bd58b9392be73340762873b1e9d14af4398e4e
-EBUILD lilv-0.24.6.ebuild 1765 BLAKE2B 0d922b4cdfb6f0fbcc63f0cd35b0483715bc1ca2273530b6e95f4bc2f3486514125e02130aa5ebbc3383b0fbd5ae62f5eccc556f8de2ae74e435a8c66c4094ec SHA512 15a179dc612e88d4c7ad3f0a62df947e1986c521a83cb039c9c7f735f18ac4fb56f9b662f29063ac593bc614c654ce0bea0a1c1ba3fb33d666fc1b062bfc9d5e
+EBUILD lilv-0.24.6.ebuild 1764 BLAKE2B 23d5c0f39b6fc96a9e15c411395d48f8ba4a949c507dfb0b7799e60ffae98f2bc22182b95a11e7b629a7b05caaa9cc96a7d7005ddb506bf0bb40ce906ac0237a SHA512 c875e9fd916ce0e67d42e22192bba538b03bcc8abc802926f089cdc8c57bfd5ac4df05ba1d8c51a1c740eaf958f3daa081736efc9de78e1095e329f9ccf96b2c
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.4-r1.ebuild b/media-libs/lilv/lilv-0.24.4-r1.ebuild
deleted file mode 100644
index 25e49d8494c0..000000000000
--- a/media-libs/lilv/lilv-0.24.4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-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.28.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]
-	media-libs/libsndfile
-	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/includedir.patch" )
-
-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_test() {
-	./waf test || die
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	newbashcomp utils/lilv.bash_completion ${PN}
-	dodir /etc/env.d
-	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
-}
diff --git a/media-libs/lilv/lilv-0.24.6.ebuild b/media-libs/lilv/lilv-0.24.6.ebuild
index 71194ebb48b8..01a192c0cd71 100644
--- a/media-libs/lilv/lilv-0.24.6.ebuild
+++ b/media-libs/lilv/lilv-0.24.6.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"
 RESTRICT="!test? ( test )"