gentoo resync : 24.12.2018

3 files changed, 87 insertions, 8 deletions

diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 3be96e2d786e..8383365e8ae4 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,5 +1,7 @@
 AUX linuxsampler-2.0.0-lv2-automagic.patch 727 BLAKE2B 23d836320c5bdd8e022599c65d26c3c757828a348e9ce87d158e1bdc9f3fb82ae174cc08a7ee4b4981378c4fd556fb932b2dcd4cf7bdb88c27920fb8a2033f8f SHA512 95f7b2bf01b293c58dc673cd40d6846d50d3a430a2874260fc268de7afe414a4970d4a443801f5d16417c14c6c16732e4bfdc58f7f997b7a3dd0bc1dc7ac8ddd
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 DIST linuxsampler-2.0.0.tar.bz2 1318939 BLAKE2B 75454863e0c56518f2a423ee11567758e1605c450389e6c723d76913319d6bd7ad25c4853d9f1982551c256848fd671f257004f1fc77fb6928b252007830c0f3 SHA512 f4a57117dbec3eeb9d6d670fec76e928ef9d9e49a1a8c6bd654d6114efdc203861e7865005f06265c172e29b5e0a948eac160377dcdabc5244caed5e5ca7e441
+DIST linuxsampler-2.1.0.tar.bz2 1154834 BLAKE2B 1be8a14bb6c13d90f4068cc2e25211dccc8253a114234ba560136d9da9a806d101db49116698fe53353a649c77513d244700d7bb65be04d0eb4d10ef057898d6 SHA512 503db074437b07e3e8dc8d1cb0aa3a510a62d183148157c1a4757681a4319e531bd6a1486a83c0ab9721dde82e27306150f3be87476c9298b2335438670e19a7
 EBUILD linuxsampler-2.0.0-r2.ebuild 1239 BLAKE2B 36ad9b046dffaa8822d2754fb6b86416f035fdb11f942bd2e7ff9bf314759ffcd572fd1dd01e2e017d1f3508ffd8260cfbb36b189befc5a6e3d52d3e695bc23c SHA512 a2b299f2a9484fc156bdb07d1e5144504a2464c987ad093d33aeb27664367844c006a734b5c3c1041a48a99249a09710cbcb5c82ab8f40976b175c7e21611f9c
-MISC metadata.xml 334 BLAKE2B a0d4a45770908849dd11881a34f753bb6e9d7fe4532df9fdc0a92b4c0d4fb68c7866cb64fd2d09955a6afe3a95951948037092c6a14a2c3c6a45323ba5c55c21 SHA512 046a72ac6899e0f8e9362a8960bd5839fbc6f915673a95698ea02a9fcf3ad2325968a036340d32f1732ec9dfdc0591c3eba8e09665399bb51d5ff0f031a33716
+EBUILD linuxsampler-2.1.0.ebuild 1680 BLAKE2B 68947407aee89f1c052dbe90bc1e44508c2a23b8427d5b6fc609c18716d8d71a3c2a439d74a76b50545e3c19e9be633503b57ba8f181d9b073fc29de43212691 SHA512 707d00fe926eb04d2e4ab5781093c065ff5ba70fa3bec2e83ed32591bba3b5c8cc803fb828bca35a99eb2584d2fde962891c5bd453a53b03d0d5eac1a4798c09
+MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild
new file mode 100644
index 000000000000..b277175098e2
--- /dev/null
+++ b/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+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.1.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"
+)
+
+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() {
+	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() {
+	default
+	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/metadata.xml b/media-sound/linuxsampler/metadata.xml
index 188b388f69c6..f1a8718cd39b 100644
--- a/media-sound/linuxsampler/metadata.xml
+++ b/media-sound/linuxsampler/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-      <email>sound@gentoo.org</email>
-      <name>Gentoo Sound project</name>
-  </maintainer>
-  <use>
-    <flag name="lv2">Add support for Ladspa V2</flag>
-  </use>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="lv2">Add support for Ladspa V2</flag>
+		<flag name="sf2">Add support for SoundFont 2 sound bank files</flag>
+	</use>
 </pkgmetadata>