gentoo resync : 25.08.2020

3 files changed, 105 insertions, 14 deletions

diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index b5a9e9eca348..f202474c6244 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,4 +1,5 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.125.0.ebuild 1979 BLAKE2B 372a239eed7bc52f39ab7630332887f9ab038d466e96e5313ff953b0634b0033a5a001bc46d3302e9e42a1f00f404c8cfe9112be4336211deddbe64eee702849 SHA512 45eb39223a263c6d606e4b2a575c47c8ee74a4df142426c74a8c3af4dcd3c9281e2b85457c06bb3d4b4fcbada9bcf572b14dfa421973fface1cf015f77a70e40
+EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2148 BLAKE2B 626ac9050904f455152f8ec130eef3ba783f24d3e936a0fdfeb88ceabe57194aeff526bf8ab9242ec980cbc0e08d772e45ff9bafafc04373b4fe4786dffad32f SHA512 4b65648017f0be27c027766e96c997e0b776d67b922cc93cd3affaa6d7ad929db83c7f23c1fbc724d4cdfbf4334a906faa65a848730085d1bc2f9f90111b1ba9
+EBUILD jack-audio-connection-kit-0.125.0.ebuild 1947 BLAKE2B 54ad16c5a76b562c2a9cff2bb545463121870f2414171f0b7cd46bae55a52a4e431fed51527eace5244cabd35130964fb031916d4a5028d2965c85448ef92889 SHA512 e4407c136e6a24006cbb0ae3597493d862eccd5b60e04dcc4f0418defbd10fe3d98f687d90db33f89fbada2dbe556ae86e1d1df9a7e56d222f7dc8780eb0d5b5
 MISC metadata.xml 371 BLAKE2B 2fa3a14e38f42ff31b9d3e502fc2762d77ba396dd80af4b4453f4a84ce29e9d6af5da4303c8dea26490b50ff8426a253d64107a605829f8301f9bde45cba4eee SHA512 0b7621340dacce1e798cf7452398200e7d1c6a808ec634d5fb9a6936e4bc6298c0059601074150a26dc92631e5d127c7357f8cf8821afefb121a40219788bb21
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
new file mode 100644
index 000000000000..ace5ea4bac35
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic eutils multilib-minimal
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org"
+SRC_URI="https://github.com/jackaudio/jack1/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~s390 ~sparc"
+IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
+
+# readline: only used for jack_transport -> useless for non native ABIs
+# libsndfile: ditto for jackrec
+# zita: ditto for jackd
+RDEPEND="
+	sys-libs/db:=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=media-libs/libsndfile-1.0.0
+	alsa? (
+		>=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}]
+		media-libs/zita-resampler
+		media-libs/zita-alsa-pcmi
+	)
+	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	alsa? ( sys-process/lsof )
+	pam? ( sys-auth/realtime-base )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS TODO README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.125.0-freebsd.patch"
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=""
+
+	# Disabling CPU Detection (dynsimd) disables optimized asm routines (3dnow
+	# or sse)
+	if use cpu_flags_x86_3dnow || use cpu_flags_x86_sse ; then
+		myconf="${myconf} --enable-dynsimd"
+	fi
+
+	if multilib_is_native_abi ; then
+		myconf="${myconf} $(use_enable alsa zalsa)"
+	else
+		myconf="${myconf} --disable-zalsa"
+	fi
+
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable coreaudio) \
+		$(use_enable debug) \
+		$(use_enable oss) \
+		--disable-portaudio \
+		--disable-firewire \
+		$(use_enable cpu_flags_x86_sse sse) \
+		--with-html-dir=/usr/share/doc/${PF} \
+		${myconf}
+
+	if ! multilib_is_native_abi ; then
+		for i in tools man ; do
+			sed -i -e "s/ ${i}//" Makefile || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use examples; then
+		dodoc -r "${S}/example-clients"
+		docompress -x /usr/share/doc/${PF}/example-clients
+	fi
+}
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
index 2dffe774f5da..2bf8c095b503 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit flag-o-matic eutils multilib-minimal
 
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://www.jackaudio.org"
-SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
+SRC_URI="https://github.com/jackaudio/jack1/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -21,21 +21,21 @@ RDEPEND="
 	sys-libs/readline:0=
 	>=media-libs/libsndfile-1.0.0
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-	!media-sound/jack-cvs"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
 RDEPEND="${RDEPEND}
 	alsa? ( sys-process/lsof )
 	pam? ( sys-auth/realtime-base )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.125.0-freebsd.patch"
-}
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS TODO README )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.125.0-freebsd.patch"
+)
+
 multilib_src_configure() {
 	local myconf=""
 
@@ -69,8 +69,7 @@ multilib_src_configure() {
 multilib_src_install_all() {
 	einstalldocs
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/example-clients"
+		dodoc -r "${S}/example-clients"
 		docompress -x /usr/share/doc/${PF}/example-clients
 	fi
 }