media-sound/ardour: fixes in 6.8 and 9999

fixed handling of AS
fixed location of appdata

Closes: https://bugs.gentoo.org/800070
Closes: https://bugs.gentoo.org/800067
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

3 files changed, 27 insertions, 8 deletions

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')