gentoo resync : 15.06.2021

3 files changed, 2 insertions, 83 deletions

diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 61167867c5e7..488b5093bf34 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,9 +1,7 @@
 AUX linuxsampler-2.0.0-lv2-automagic.patch 929 BLAKE2B 11e2dac74d6e4bc76385544f9cfbf60defe7c3fdcac0f3e943c54dfc38e152df3beb71c5453c7e1df126a3415aa9ea9d75b2abba80efbbf65e64b10388f195c4 SHA512 4d7204b567e578efb3370e11ae69c631c49b01e864c7fb59d6eed309c7ff9ad9d2aa7832ef233f4c5b8e6a26af06c2d9d239cb361d69966e2556cb2816415de2
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 AUX linuxsampler-2.1.1-fix-yyterror-not-declared.patch 427 BLAKE2B 017c8fd7e7343eb582a5fcbf083be3fa9fcb02fff69caace767534ee509215a835caf548cce73955295c39a6a42409e0caf3ec3e5752018235ccf2defe327b0f SHA512 6a89d17600eab3aac9b9a90899c441af1359b7798fe79ceed4e3acb624024e6285e56210b484f50fc03dfd7da4def2cfdb708adfd0526d84d9b041256fd6f4e6
-DIST linuxsampler-2.1.1.tar.bz2 1410461 BLAKE2B dacaab33601f25954ea1a3380c8e28358d2111b664982f25ec9cac46adb99241ecfd53101ca3b23428c1a16fcef738b1e7e481b1c7eeb6d9659773f5b8856b55 SHA512 3f172efe40bbe130a2ac09f9393a46a30cc327a6754a80fdb36e65276518ec82befa2075acc567ccd99c22d9859c1a65f58ff2ad7af70cd9e4649ae14fd5357c
 DIST linuxsampler-2.2.0.tar.bz2 1507276 BLAKE2B 9650938d0aace876e817884121b824713dd2f747505344d7895e7d99da62f2214fb4c4bf43c398f4e486202e23e7a57288e19734e8c565a917d823169deb717a SHA512 9015bb8d3af125e13c5c2ef3ae2d3987f7b7dda72e238cff25e622a3291019f5e392195dd27e7e783c70d877d9b267915fc443369eb17117e5eb7c54b8496c68
-EBUILD linuxsampler-2.1.1.ebuild 1771 BLAKE2B cc80a074fe0207af14bf0ff376ca725905489182eb7b66303548e9bc6aa84cde640777c20e69ef1032305693a39da3efb7f0e21977d5b48d77edbcfdde37f8a1 SHA512 5f94e326e83d9c9adf20d70d893262c44aeb2c0f9b178027348f053bcd6f7ddcbbce613db48e35d3b53582b81e1f5bbe410167746ccdeef817e5cc96411d7843
-EBUILD linuxsampler-2.2.0.ebuild 1736 BLAKE2B 4eb201a3026a0b354427f61ef28d033eeff6e62b9249ef3112f28d1c0ccdc054dd0e212655d6f353b581e48ee534d6d07d786994f0a98fd2628766389c59070d SHA512 c32b57b3d9803b820abb581a179c6d4851f011a7bafc6fe1d68bbcf5d1541d68fea81c18ffe2a6a728fccad89b9145641757faaf4a0451a6ee0a730bd398d3eb
+EBUILD linuxsampler-2.2.0.ebuild 1735 BLAKE2B 8133c90eea4922a25e5c3d36d93fe166c0d5f35ef0676739e4ebf1575707abd85790d47225d5cdfbb976ef9d8dfc7673f151683741e93b85c9f025f6e83d271b SHA512 7bc4f789a2471cd793371b388f1b4f89078e24701516e3a82bf6eccac8a2cc9bf28572642648af9db9ab759f7257484421971fdac55eea29f66a23ceda919926
 EBUILD linuxsampler-9999.ebuild 1563 BLAKE2B 9e429cc9f1877db28206ab161a952d3a0219a099a4d04aaa54f59a313ffbd4471a579a2e8b86d42c289af60da6518e7f2e6cdf7d01b8f30b5af39224aff81387 SHA512 cea0571ab48c8db627184052d56b9f0c8e6f3096d89dfff8ce2fcdf4a24e556b1cd06d75dc1b5baa5e50851d3bc12e3281f3c6d2d72347224d0b34da2455b3fb
 MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild b/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
deleted file mode 100644
index 7236b6df4f29..000000000000
--- a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Software audio sampler engine with professional grade features"
-HOMEPAGE="https://www.linuxsampler.org/"
-SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="alsa doc jack lv2 sf2 sqlite"
-REQUIRED_USE="|| ( alsa jack )"
-
-RDEPEND="
-	>=media-libs/libgig-4.2.0
-	media-libs/libsndfile[-minimal]
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	lv2? ( media-libs/lv2 )
-	sqlite? ( >=dev-db/sqlite-3.3 )
-"
-DEPEND="${RDEPEND}
-	media-libs/dssi
-	media-libs/ladspa-sdk
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch"
-	"${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch"
-	"${FILESDIR}/${P}-fix-yyterror-not-declared.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	default
-	# Force regeneration of the file to let it build with all bison
-	# versions, bug #556204
-	rm src/network/lscpparser.cpp || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	local myeconfargs=(
-		--disable-arts-driver
-		--disable-static
-		$(use_enable alsa alsa-driver)
-		$(use_enable jack jack-driver)
-		$(use_enable lv2)
-		$(use_enable sqlite instruments-db)
-		$(use_enable sf2 sf2-engine)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake
-	use doc && emake docs
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	# lscp files conflict with nilfs-utils, bug #556330
-	mv "${D}/usr/bin/lscp" "${D}/usr/bin/lscp-${PN}" || die
-	mv "${D}/usr/share/man/man1/lscp.1" "${D}/usr/share/man/man1/lscp-${PN}.1" || die
-}
diff --git a/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
index db469f65a3ab..b8df140e6296 100644
--- a/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="alsa doc jack lv2 sf2 sqlite"
 REQUIRED_USE="|| ( alsa jack )"