gentoo resync : 08.06.2019

4 files changed, 2 insertions, 123 deletions

diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 3fba6717cacb..9256d8353df9 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,7 +1,4 @@
 AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
-DIST lilv-0.24.2.tar.bz2 244764 BLAKE2B e049354c2ec52116bbc0c588829c8e7d6c780a8325bb050d225e4893a4ca7b3c98b8bddd01dbfa0e67616bb6baadf2483087891d4242ccd4156aa8a8749484ef SHA512 b5d04b6bb1fb4d3a9a58d93b233db502dc2ded75672766a31d252abca657cbf2d170fa590c0c56159b2bac68c7af95d8787a512e318e3a0f30855504bb034659
 DIST lilv-0.24.4.tar.bz2 252209 BLAKE2B 71142f6a458a0edbb2087ac6eb6323b6ae4c53e45db22a616f00b22f818f507aa724ebf576f09654a98812b8b9a73689720677e64c715fbf7cd49ba26c7ddb11 SHA512 cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89
-EBUILD lilv-0.24.2-r2.ebuild 1491 BLAKE2B 4dcf0a2b5507c3ce790895a917a265ed09f2edef915bae07691788e19b83a34b2c75f7e98cb3919fe3f71d566f6fa736ef8ba2ea490ab0f2ab77390ea2f990bc SHA512 756dfb6db0cfb30532125b9e033d68f12df7eae31ac6f5c7a50d83375f16160321217aa7d78b960cfa8b2e6af6f41e24f0953d6a3cd9a21d81d647cddb2df85c
-EBUILD lilv-0.24.2-r3.ebuild 1600 BLAKE2B 846b39c71656e873d1f526e8daee94bf582e988fc28a11a6d8f7a3e4c22e9e42d5d3db843af73668d40d305bd8e5cabc93f9581dcf65e1ec9d7e8b2cda54564e SHA512 872d49474b3e2f9fedac162d9feeba0650f7c057e8aafe2a68d5ae20310b5d935f3ae409359477653caf5ec187398bf1923ab74c01dada377815b9e677a60b6c
-EBUILD lilv-0.24.4-r1.ebuild 1601 BLAKE2B 16ea39c54407f547bbc6ae16e6913e125993b40d28285ddc1f8e78894cf533fad081e07c7733739b1c6119dcd9049d6df63a787b15f821df168f3d0d864a8148 SHA512 bd6116788162314ca7060c8427d37c536d88fb073b4dcb328e0bc63d723c140f5a15b612ee85c79209b5032a97610e2cbe134d416e600c6357ef148276a901a0
+EBUILD lilv-0.24.4-r1.ebuild 1599 BLAKE2B 89991ac2abadae3ed3491dc7159773f65c11de2869f3b5cde273853a025eb57b64cb6d7e6fc453bbfeb73c89b199c7b8d29a53d608542d8af6c484cee9820e8b SHA512 a05334c8a3fc45bc6f0e91095b22954dee8f622136c2abbea29283fc72377e4038422647b7e9e997444dfc0f827b2ae0032af70beb6ad5dcb56b8e466160ee7d
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.2-r2.ebuild b/media-libs/lilv/lilv-0.24.2-r2.ebuild
deleted file mode 100644
index ca54e0e874c6..000000000000
--- a/media-libs/lilv/lilv-0.24.2-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-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="amd64 arm64 ~hppa ~ia64 ~ppc x86"
-IUSE="doc +dyn-manifest static-libs test"
-
-RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	eapply "${FILESDIR}/includedir.patch"
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	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}
-}
diff --git a/media-libs/lilv/lilv-0.24.2-r3.ebuild b/media-libs/lilv/lilv-0.24.2-r3.ebuild
deleted file mode 100644
index 5ff84a5e6d4c..000000000000
--- a/media-libs/lilv/lilv-0.24.2-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-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 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc +dyn-manifest static-libs test"
-
-RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	eapply "${FILESDIR}/includedir.patch"
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	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.4-r1.ebuild b/media-libs/lilv/lilv-0.24.4-r1.ebuild
index 54877d5c31b2..c23890a1e051 100644
--- a/media-libs/lilv/lilv-0.24.4-r1.ebuild
+++ b/media-libs/lilv/lilv-0.24.4-r1.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 ~x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="doc +dyn-manifest static-libs test"
 
 RDEPEND="