gentoo resync : 23.09.2020

4 files changed, 25 insertions, 10 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index ec9b5fb7d2b0..58b190ba40c6 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -2,7 +2,7 @@ AUX ardour-6.2-fix-no-nls.patch 13153 BLAKE2B e246105d9c4b43c109155716903de02051
 AUX ardour-6.2-use-signed-int-for-atomic-operations.patch 2015 BLAKE2B 535da9c7318a2c5e12f2d531acb09a47ebcb570bd59583e5683df05c1067d81e09f0fbd7a45f89843571fbc3a655c68bf11313c4aa73f9ce02fdc52c68414fae SHA512 720ee2920cbb88ff5266202ffdf5464503550f47fa440466aa241e89380548c31079700a1cf55dd9dd76a4e9185be6fff9ee8d499cc5e0bfc7976a7ebd0869fe
 DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8
 DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
-EBUILD ardour-6.2-r1.ebuild 4435 BLAKE2B e546f198d129f4f5193e9f6d153859385fc1e420fd8d9995f73587d9a555522d077bbea684d252770f091c63ba844f24b8564e74b8767fc9e3ff306294f5abf0 SHA512 7c82b2762b3e787fc7276aba9fa68391fc599dc672e72f55d1280a7279c350de27f1a8129c0b55fa672cff2b94c0948d8d7cdb43085bd887793b34f119fd63e2
-EBUILD ardour-6.3.ebuild 4323 BLAKE2B f9970069239670093057c724947e5b2fb5235cea146c201730d702d74567990bc8501b2552a044fbfe38c2171754165b9463711be3f0d2301ee51bd4049a42aa SHA512 a265d4655dfc0bb1d3fcb7bf727ea7481a2ed52e0269b45693f04529a3fda7e4eb6b792d632530eca78f37df978dad8344e8b461cb42a774041adf7cdc53df0b
-EBUILD ardour-9999.ebuild 4103 BLAKE2B 8f9d9dd9726c416cfeca182d72fdf3de6d666e7954c887b451d6b0436224ea6caa5dccd04aaf753c1d25e2ff188017b9c61b22d5603a1dbd79a2d48ce1967e8e SHA512 9ff953c51285b0f978fd9b885a39de70a8758807bf22bb62e37853c6ffe0ced0fde17e7849b9e9b24fc4acf30de507e76a9b8cedb7c9404215d4f2096434d047
+EBUILD ardour-6.2-r1.ebuild 4531 BLAKE2B bb80b35e9ee409319f2179d9d899d5c3364dc56db33f241d1881723a29bb16ad7f8ebff99c348163a17b0a3c27fa9de086a465b99d7d0f6866c7e0198018dd19 SHA512 9c37a9e9086300d93e2e462f3de52bb0f4985ae6b52790d54327b5eeeb71bab91afcff2db39091919d43fdb46c1399f18bfd97b8ac72157dd8f7eab53d373483
+EBUILD ardour-6.3.ebuild 4420 BLAKE2B b4d034279e29e9db62c0c890e28b216c44c37697b57f51c5f5a4db0f5ed3e3b1bd0432f3022a0e4179fe8df7cd7792b7362af88b8aecb58998d9c3db228b9383 SHA512 45b0ab3bf7e5fc8e27e7d6c0520b324d52f546ec3831dc4cf66203d37f4361b9c4851092f7ddbd77069eddca4f73de3b81f4c03bff65c53eb41c59dea0b5dbcb
+EBUILD ardour-9999.ebuild 4200 BLAKE2B cc1cc69ddb90f45526ad638f551b266a4742525634386cc24c48cbcd30986ec9c1c2e2cb6ebc88c654ae94e13583dc8dfda6491ef7110799d3aa8987fb9597b1 SHA512 863550b9a61b77aa128fe30d4772c2a2b6394d8cb3eddcd24da792ab94f788c0743c18d431cd055ac21a7bd1bfe976f94651721dfc87a9cf8654b3d83f2543a7
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild
index 82d1575b195a..735fd6555384 100644
--- a/media-sound/ardour/ardour-6.2-r1.ebuild
+++ b/media-sound/ardour/ardour-6.2-r1.ebuild
@@ -14,14 +14,14 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
 LICENSE="GPL-2"
 SLOT="6"
-IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -55,6 +55,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
@@ -120,15 +121,19 @@ src_prepare() {
 }
 
 src_configure() {
+	local backends="alsa"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
 		--destdir="${D}" \
 		--configdir=/etc \
 		--optimize \
+		--with-backends=${backends} \
 		$(usex doc "--docs" '') \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
 		$(usex phonehome "--phone-home" "--no-phone-home") \
 		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs
diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild
index 6bd303b0e465..75cb0848c611 100644
--- a/media-sound/ardour/ardour-6.3.ebuild
+++ b/media-sound/ardour/ardour-6.3.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="6"
-IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -55,6 +55,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
@@ -115,15 +116,19 @@ src_prepare() {
 }
 
 src_configure() {
+	local backends="alsa"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
 		--destdir="${D}" \
 		--configdir=/etc \
 		--optimize \
+		--with-backends=${backends} \
 		$(usex doc "--docs" '') \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
 		$(usex phonehome "--phone-home" "--no-phone-home") \
 		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 43c1789b324f..9e5b5ec26e19 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="6"
-IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -55,6 +55,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
@@ -110,15 +111,19 @@ src_prepare() {
 }
 
 src_configure() {
+	local backends="alsa"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
 		--destdir="${D}" \
 		--configdir=/etc \
 		--optimize \
+		--with-backends=${backends} \
 		$(usex doc "--docs" '') \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
 		$(usex phonehome "--phone-home" "--no-phone-home") \
 		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs