gentoo resync : 17.01.2010

4 files changed, 3 insertions, 149 deletions

diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index 69ec2bd998fa..6d92f0471398 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,10 +1,7 @@
 AUX calf-0.90.1-desktop.patch 1207 BLAKE2B f4af4c5a7a366bb204d0317fb7b6cf47b1cc31859392d360cd4acb46e89e98044bef6bd61d017dcb11ea8c6b264b908ffc0039ddc32c01c4a2ab12f7dc70a981 SHA512 e48183918f1ea2f12d59236a2b62ae68a6e66946e67d7ea8a84b8b1232b93556af222a8536a5fa0347e13af46566582a796b8f357799d53fc4ee987a1ed147ba
-AUX calf-0.90.1-fluidsynth-2.patch 2410 BLAKE2B 199e9c5f4ae4253073ef80ef1ba3cc8e1d5cde5140a606041dc90bfac199cfcc0fc413b36732dc4c8dd257600e84993d819c80c704c593e49b801bad421db2ae SHA512 e93c6de13da1917af28726ec0441504a884d6233cb1c276c01635543a3c22d8f0e7be38725363b2b2c9aafd3bd81adf985d27aac091f6903b27a0511d8d41bc9
 AUX calf-0.90.1-htmldir.patch 3997 BLAKE2B 657248c76dfb82f39e8f6589c485e2993122b4d26c7b4c223191e3e97c8b36e723efcbbfbf324dc0bc72eee2da4a1cb23e1095ce9b638bf2485e3dade00b65be SHA512 ecace91bfdb2599ac98d7bc5e6b441c6bcedaab20c928177c74f5bb8810416ab6035f6b0efa6962bfd2d85969c902eaf2a640bc77efd97501f0b08e878b14c48
 AUX calf-0.90.1-no-automagic.patch 1268 BLAKE2B 1a6a7038a9beb9bdbe370c37c1283dfbbec21e378e063fb87aeb49b993a75b6ff16f9b7f0f94e8bb5e0ccdb524f786ae3679b9dc497e73ec3fd4f84d196f6e98 SHA512 ed96d843b6733bbe89c3fda2d21e1cb6b7e812471df73bf2ccbc96af8153cd7fd20d52047ab53693382894ac77c7ab70017d923e4f148c3079766536ae5dab6f
-DIST calf-0.90.1.tar.gz 15872959 BLAKE2B 5d2d9e77ea600690814e503a0af0fcbc413b7a21496271add0ea3b1e83f3dc2d56b0df249447a861884422ac5b159befe2632c232fed4721cc7e0e7ac45f12b1 SHA512 48e5489fd3e1dd43ff520b3653597dea6903c60adcdd0462ac2ce4db6f35e2355a0386f8a29066b301dd9c3190f8f836a61d12f37cfc3a4fea3170947cec03ff
 DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7
-EBUILD calf-0.90.1.ebuild 1656 BLAKE2B c1b17477020a7e2e602770604a752647a844b28728aa8fd1b89d0932b6c03cc1e03604d0dd8a8b8b50ad0555a4e8f932c6c55aa30940cd115ba36324e06ba3c6 SHA512 2ecea54b241edd15a99c069ea4ca6cc39cc29cf64ecbf345055817c7a5cfcfdec4fe4feeebc136fa09a3518bd35ef32eca7de95d763fee1ff210e15d67eccda4
-EBUILD calf-0.90.3.ebuild 1636 BLAKE2B 26944eed996b1f7c0c2db5871c858f33268f95a3a82dce479462b1866af682d4e241c526eb5dd948f2141d131c3051721dc1a22c6403aefe13cc32bfa63e2edc SHA512 867ed42443ba883ccde95fca8e1b6b72b6a4dbd45e9984dd488d43325d66f93eeb0e8f13733f25533cb34f675fc315791a41b6dbf4fae17fd821d50729a558d5
+EBUILD calf-0.90.3.ebuild 1634 BLAKE2B ec791a12f1e3e4cc989883d063066cf174c9d1119109440b03d72a43c02154d7e37275c6dffcb7bbab22a26631423150df0e7fdff574a4b75ef27454b2abb6eb SHA512 5611112012d3e678c2d2db41bf15149865d28ab09c72a11c25e57b1e3c4aaa184f5071bb0e070f936e8c8698b0406459ad5933f59c4c5b0e3ae54c7e00c00525
 EBUILD calf-9999.ebuild 1636 BLAKE2B 26944eed996b1f7c0c2db5871c858f33268f95a3a82dce479462b1866af682d4e241c526eb5dd948f2141d131c3051721dc1a22c6403aefe13cc32bfa63e2edc SHA512 867ed42443ba883ccde95fca8e1b6b72b6a4dbd45e9984dd488d43325d66f93eeb0e8f13733f25533cb34f675fc315791a41b6dbf4fae17fd821d50729a558d5
 MISC metadata.xml 500 BLAKE2B 79be90120221b85a9bd6960b4245d17085b158e3653d1560998e0f5bcf154f9955af7fd1a5b04e54769189753c3b1ac176df45d838bf6c6a3b1dac5cbabb422f SHA512 a88cde96e4ca78145f3214ce16552d43ef974b5235829e51e98a5c7c8f60bcaa259ba7da166e5e4c59aade062fe16de915355c67ea7ded9ba9d83a04a98bb37b
diff --git a/media-plugins/calf/calf-0.90.1.ebuild b/media-plugins/calf/calf-0.90.1.ebuild
deleted file mode 100644
index 24614bd103c8..000000000000
--- a/media-plugins/calf/calf-0.90.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
-HOMEPAGE="http://calf-studio-gear.org/"
-
-if [[ "${PV}" = "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
-else
-	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2 static-libs"
-
-REQUIRED_USE="jack? ( gtk )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	media-sound/fluidsynth:=
-	gtk? (
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-automagic.patch"
-	"${FILESDIR}/${P}-htmldir.patch"
-	"${FILESDIR}/${P}-desktop.patch"
-	"${FILESDIR}/${P}-fluidsynth-2.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--prefix="${EPREFIX}"/usr
-		--without-obsolete-check
-		$(use_enable experimental)
-		$(use_enable gtk gui)
-		$(use_enable jack)
-		$(use_with lash)
-		$(use_with lv2 lv2)
-		$(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "")
-		$(use_enable static-libs static)
-		$(use_enable cpu_flags_x86_sse sse)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/share/bash-completion/completions/calf \
-		"${ED}"/usr/share/bash-completion/completions/calfjackhost || die
-}
diff --git a/media-plugins/calf/calf-0.90.3.ebuild b/media-plugins/calf/calf-0.90.3.ebuild
index e8aaa6330d72..27d1b0c7a242 100644
--- a/media-plugins/calf/calf-0.90.3.ebuild
+++ b/media-plugins/calf/calf-0.90.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ "${PV}" = "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
 else
 	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-plugins/calf/files/calf-0.90.1-fluidsynth-2.patch b/media-plugins/calf/files/calf-0.90.1-fluidsynth-2.patch
deleted file mode 100644
index 083b1e95d7dc..000000000000
--- a/media-plugins/calf/files/calf-0.90.1-fluidsynth-2.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bba03b6080dc198f3513b5c29fe1ba4ff9e4aa59 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 10 Oct 2018 00:22:46 +0200
-Subject: [PATCH] fluidsynth: port to API for fluidsynth version > 2.0.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Build tested with fluidsynth 1.1.11 and 2.0.1
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/fluidsynth.cpp | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/src/fluidsynth.cpp b/src/fluidsynth.cpp
-index c5d307d76..54023dc8b 100644
---- a/src/fluidsynth.cpp
-+++ b/src/fluidsynth.cpp
-@@ -74,6 +74,7 @@ fluid_synth_t *fluidsynth_audio_module::create_synth(int &new_sfid)
-         new_sfid = sid;
- 
-         fluid_sfont_t* sfont = fluid_synth_get_sfont(s, 0);
-+#if FLUIDSYNTH_VERSION_MAJOR < 2
-         soundfont_name = (*sfont->get_name)(sfont);
- 
-         sfont->iteration_start(sfont);
-@@ -92,6 +93,26 @@ fluid_synth_t *fluidsynth_audio_module::create_synth(int &new_sfid)
-             if (first_preset == -1)
-                 first_preset = id;
-         }
-+#else
-+        soundfont_name = fluid_sfont_get_name(sfont);
-+
-+        fluid_sfont_iteration_start(sfont);
-+
-+        string preset_list;
-+        fluid_preset_t* tmp;
-+        int first_preset = -1;
-+        while((tmp = fluid_sfont_iteration_next(sfont)))
-+        {
-+            string pname = fluid_preset_get_name(tmp);
-+            int bank = fluid_preset_get_banknum(tmp);
-+            int num = fluid_preset_get_num(tmp);
-+            int id = num + 128 * bank;
-+            sf_preset_names[id] = pname;
-+            preset_list += calf_utils::i2s(id) + "\t" + pname + "\n";
-+            if (first_preset == -1)
-+                first_preset = id;
-+        }
-+#endif
-         if (first_preset != -1)
-         {
-             fluid_synth_bank_select(s, 0, first_preset >> 7);
-@@ -134,7 +155,11 @@ void fluidsynth_audio_module::update_preset_num(int channel)
- {
-     fluid_preset_t *p = fluid_synth_get_channel_preset(synth, channel);
-     if (p)
-+#if FLUIDSYNTH_VERSION_MAJOR < 2
-         last_selected_presets[channel] = p->get_num(p) + 128 * p->get_banknum(p);
-+#else
-+        last_selected_presets[channel] = fluid_preset_get_num(p) + 128 * fluid_preset_get_banknum(p);
-+#endif
-     else
-         last_selected_presets[channel] = -1;
-     status_serial++;