gentoo resync : 17.07.2021

3 files changed, 123 insertions, 2 deletions

diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index f69da860a6b9..8ab1201398fd 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,7 @@
 DIST fluidsynth-2.2.0.tar.gz 1507709 BLAKE2B 4ec162ecf461f3fbc80d1b5c1a4bc0624d8274dedcfa32addfd79d7270811e532bccee46b90181bca504183e092176652f6c9d0ae8eccfb5617b9176b8bc511e SHA512 fa08c6d6914accbb5a99bb912066d97ded26ab3c706e663e76a4f1b024f610f676d2e1f7c30872d00e0fe86b5c494dcea581ecd0770977d235962a845c074bd6
 DIST fluidsynth-2.2.1.tar.gz 1594153 BLAKE2B 9a297859ae90e3dba21a3923059c081596d2a5ff107219b829f75e2067bea315364c9b4a9a4e6563c5a9f9ded92efff2c58d1aef9840b308fe69f546797c83ae SHA512 a42728f179fd2583a292d18d9b7d98498b42574aff6559e8e3762329893dd18c451b5611517aa9aa7ee6ba9fc0db3c83e127d097c68769c5d8562a49dc427ee9
+DIST fluidsynth-2.2.2.tar.gz 1741567 BLAKE2B 78fe02ae37db70e7aa92071aa609ff6f3dc6217827f89091ded1a8e2d30e84f3d7a095e101fcccfe720e9c3445f58e15da588cfcd7063388ab642649536b8fa0 SHA512 208956e367725de4b1faeba7d4125a6a85bb4191ef0354a7087809e93d93b8986cdc30b78c135a743104851d15f3bb09776855fa02a686de0810dd14c97851c3
 EBUILD fluidsynth-2.2.0-r1.ebuild 3314 BLAKE2B 1170bc2979a36dcbe5b84ca2ef8e4c34256c9da3514833bd23d1e0edd7753f876a943be534630a8ec0637024ca0a4a34ec06bcf83a42ee4f3f0948cd716cf29b SHA512 6de4ee1f429768af858bc9bedf365e4977ef8f2d04a815ba0fb6c5649b2989c56bb56951cd1647e3c6f3a1a93d1daf99783532aa4e32512db4273df4091b235f
-EBUILD fluidsynth-2.2.1.ebuild 3357 BLAKE2B cef1dd162fa1c63d1b12e2b34821cb3afb341ee80e1237bb5844ecc3f40a0026d1dafcbbb49b35fa021f2959e5cf89dcc0e93b4868c3a8f1dce20c5db8c29ec1 SHA512 d85b312be9ccbc4e363d834b49a52f2b77f89195f76d608bede59a8f865bc8341f48d83503799fffddaccbe9115b9c3b7a6e94913210c8f4a1d596a4b5332437
+EBUILD fluidsynth-2.2.1.ebuild 3356 BLAKE2B db78921d090a791457306485639b42d424d8c4695b8b55c2a00a66c1aa706fa65d14289072127ad96a49edbc1f437efb40dde003e44861f6b8a80b1d01a2f7d1 SHA512 c78089e8fe83cbd8f922814b3d797fe0a618feedd15c0cef0708c32f0cc24ee0b969b1f756d3f13b6637a0ee312bb09ae695e4a497a982ac76df234aa75497a2
+EBUILD fluidsynth-2.2.2.ebuild 3360 BLAKE2B 2f0caa610b00d7ac09122ab8dfae6390864240cff2272232f1ebd582f5d3e30d4460ab0ce0a33ba3fb14694a119017aafb96defabe36acb34b58db35709a4b1d SHA512 1f35e5811cb12736c6ee7790a507298bf2a78aa2c0263c4f510381cbe1ecc52a5b2e3d12b723978b25909cdd2288d3a90cb3ffc3ff9dd4708da8370f02c63245
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
index c7eb8de786ca..b066b19eae1b 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild
new file mode 100644
index 000000000000..aca45d6ed7a1
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib systemd
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="https://www.fluidsynth.org"
+SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable-alsa=$(usex alsa)
+		-Denable-aufile=ON
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-dsound=OFF # Windows
+		-Denable-floats=OFF # loat instead of double for DSP samples
+		-Denable-fpe-check=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
+		-Denable-midishare=OFF # http://midishare.sourceforge.net/
+		-Denable-network=$(usex network)
+		-Denable-opensles=OFF
+		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-pkgconfig=ON
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-profiling=$(usex debug)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+		-Denable-sdl2=$(usex sdl)
+		-Denable-systemd=$(usex systemd)
+		-Denable-threads=$(usex threads)
+		-Denable-trap-on-fpe=$(usex debug)
+		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
+		-Denable-waveout=OFF # Windows
+		-Denable-winmidi=OFF # Windows
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	if use systemd; then
+		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+install_systemd_files() {
+	if multilib_is_native_abi; then
+		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
+		insinto /etc
+		doins "${BUILD_DIR}/fluidsynth.conf"
+	fi
+}
+
+multilib_src_test() {
+	eninja check
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+
+	if use systemd; then
+		multilib_foreach_abi install_systemd_files
+
+		elog "When using fluidsynth as a systemd service, make sure"
+		elog "to configure your fluidsynth settings globally in "
+		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
+	fi
+}