gentoo resync : 07.08.2021

4 files changed, 30 insertions, 10 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index fb8fb4c57d0d..417de8d01c59 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,6 +1,7 @@
+AUX ardour-6.8-metadata.patch 653 BLAKE2B 3929d825fd8de5205d0f5aa8d0172e6374ca9ffd195789386b756ae540e1842a9902592b8b6d74019c52f134e8cb9886085e23277ef022883c4425dc580c5bc9 SHA512 963f3cfcd00a3fb15cb9875f7fc31a8294058898b6fab94feb32f786369643139b1e8787ecc47a4ea6a33dabe6bd90f564b6009e0d6e482d8e5129534c789972
 DIST Ardour-6.7.0.tar.bz2 12135868 BLAKE2B 3b217340187e16d3da9302e3505c499c3bba8da7e3be82ff12e8aa99e1c934d42e71c62ae357d7a1265e668293c933a2192ae2f6d6b97f21a2f7c379caf5e9be SHA512 73cf6fff40c838c42c3b29842e15d2e2b991f1e92d57ef0a8e68ef75b39ec8075906ac3ded322b521f2c5fd9fa9d1b7f9c7770b4cc6deee9efe1796889aeffe2
 DIST Ardour-6.8.0.tar.bz2 12152361 BLAKE2B 9f00a0eeae40fcb1f24e3138a639d1063a9cdbaecae2f17425bce133edee5e34ce4d0a1455be4da00725e52389bc1f9d829825b7ef5c591df2c5b0ce5538f463 SHA512 9f829df99fd6d857d54491e18a5c936b4a9b5e55715d71618454dc7c23fb3aaaaa2878a0ec87035c226a69da604111e27ddb00cd28087e34a46e24810c0ff403
 EBUILD ardour-6.7.ebuild 4793 BLAKE2B 20a909b02a0dcb1fc23bc0111fb6524cde07bda5f01c2adbcf60aa38dbce3f40ca12c882b7cff3888142ead3e922cc39f2089600a94d04ceb91fd72c8a6dfa80 SHA512 a1b9878119a933ed8fd0ba74972457f0a767abdeb90848243baa29eada53088aafdd3a5d26019f165795275e16c6edc6da163deb3fbe5873c14eda83e41860e5
-EBUILD ardour-6.8.ebuild 4795 BLAKE2B ed06f247c0d731c0ca4ecccadc3f026565e8d0d9e22d65a0b98d7e028ece42ac3f7d4dadfb8100e0af1592f4c0e0cfcca1645ce59d493c8b67a41683d2fab7ce SHA512 89a6ac56997b3d70bf1077c9eab801c32e84d0b453d1f774cff66ba62813dede7742bda5b6a12e66679847731cf3b5d4fdaf7a982d10bc14d9595e6af976e108
-EBUILD ardour-9999.ebuild 4795 BLAKE2B ed06f247c0d731c0ca4ecccadc3f026565e8d0d9e22d65a0b98d7e028ece42ac3f7d4dadfb8100e0af1592f4c0e0cfcca1645ce59d493c8b67a41683d2fab7ce SHA512 89a6ac56997b3d70bf1077c9eab801c32e84d0b453d1f774cff66ba62813dede7742bda5b6a12e66679847731cf3b5d4fdaf7a982d10bc14d9595e6af976e108
+EBUILD ardour-6.8-r1.ebuild 4828 BLAKE2B 10d3e8d9873ce86abc74ca5ded714de7dc5f0c40a02e127fbb410891f710f7dc1eda35d68c785f37d3ddbfb255df49f42a5a3fe4dccba002ea2988e9cdf7f4b6 SHA512 0d8b4eca1f5556f84033560a1d59efb2ff74bdd02d742bcb48dcd6d8df476846bc400b619999a72f7fc81a5404729132f46708cd80299465724916a97a8d87bb
+EBUILD ardour-9999.ebuild 4833 BLAKE2B 31b4b2bc2270be509b0c1430490001284e3fbe8b584120120927522f386407b70c7e2a039292d435467d289641ce53dd2e94c64f506a7721b55db74b38c0475d SHA512 26daaed2414da80dd52fb7f238a48ed1ba82557e8e6cb270af1e6f9a4eda3d5db287a85596da7214f49cd92ac3ddcb3c066d8ed58506bf379e48535220f94af8
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.8.ebuild b/media-sound/ardour/ardour-6.8-r1.ebuild
index bd4fb59624cd..f3108601e729 100644
--- a/media-sound/ardour/ardour-6.8.ebuild
+++ b/media-sound/ardour/ardour-6.8-r1.ebuild
@@ -71,6 +71,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	jack? ( virtual/jack )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-metadata.patch"
+)
+
 pkg_pretend() {
 	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
 		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
@@ -84,7 +88,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
 	xdg_src_prepare
 
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
@@ -119,6 +122,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# avoid bug https://bugs.gentoo.org/800067
+	local -x AS="$(tc-getCC) -c"
+
 	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"
@@ -166,9 +172,6 @@ src_install() {
 
 	insinto /usr/share/mime/packages
 	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-
-	insinto /usr/share/metainfo
-	doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
 }
 
 pkg_postinst() {
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index bd4fb59624cd..41b264273ca0 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -71,6 +71,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	jack? ( virtual/jack )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-6.8-metadata.patch"
+)
+
 pkg_pretend() {
 	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
 		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
@@ -84,7 +88,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
 	xdg_src_prepare
 
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
@@ -119,6 +122,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# avoid bug https://bugs.gentoo.org/800067
+	local -x AS="$(tc-getCC) -c"
+
 	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"
@@ -166,9 +172,6 @@ src_install() {
 
 	insinto /usr/share/mime/packages
 	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-
-	insinto /usr/share/metainfo
-	doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
 }
 
 pkg_postinst() {
diff --git a/media-sound/ardour/files/ardour-6.8-metadata.patch b/media-sound/ardour/files/ardour-6.8-metadata.patch
new file mode 100644
index 000000000000..fa7b6e121197
--- /dev/null
+++ b/media-sound/ardour/files/ardour-6.8-metadata.patch
@@ -0,0 +1,13 @@
+diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
+index f5d0533..a68cb3f 100644
+--- a/gtk2_ardour/wscript
++++ b/gtk2_ardour/wscript
+@@ -943,7 +943,7 @@ def build(bld):
+         obj.chmod        = Utils.O644
+         obj.dict         = freedesktop_subst_dict
+         set_subst_dict(obj, freedesktop_subst_dict)
+-        bld.install_files (os.path.join (bld.env['PREFIX'], 'share/appdata'), obj.target)
++        bld.install_files (os.path.join (bld.env['PREFIX'], 'share/metadata'), obj.target)
+ 
+         # install desktop icon files
+         bld.install_as('${PREFIX}/share/icons/hicolor/16x16/apps/ardour6.png', 'resources/Ardour-icon_16px.png')