[proaudio] proaudio/proaudio: [3158] denemo-9999: make it work with last guile versions

[subversion@xxxxxxxxxxxxx]

Revision: 3158
Author:   dominique
Date:     2019-01-21 18:51:19 +0100 (Mon, 21 Jan 2019)
Log Message:
-----------
denemo-9999: make it work with last guile versions

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/denemo/ChangeLog
    trunk/overlays/proaudio/media-sound/denemo/Manifest
    trunk/overlays/proaudio/media-sound/denemo/denemo-9999.ebuild

Modified: trunk/overlays/proaudio/media-sound/denemo/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/denemo/ChangeLog	2019-01-21 16:37:12 UTC (rev 3157)
+++ trunk/overlays/proaudio/media-sound/denemo/ChangeLog	2019-01-21 17:51:19 UTC (rev 3158)
@@ -3,7 +3,7 @@
 # $Header: $
 
   21 Jan 2019: Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
-  denemo-9999.ebuild: use git-r3 eclass
+  denemo-9999.ebuild: use git-r3 eclass; add multilib for correct guile pkg-config
 
   25 Apr 2017: Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx> 9999 +
   .9999: initial denemo commit

Modified: trunk/overlays/proaudio/media-sound/denemo/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/denemo/Manifest	2019-01-21 16:37:12 UTC (rev 3157)
+++ trunk/overlays/proaudio/media-sound/denemo/Manifest	2019-01-21 17:51:19 UTC (rev 3158)
@@ -1,3 +1,3 @@
-EBUILD denemo-9999.ebuild 1736 BLAKE2B db102e3ba8e2ce0541695d2fecd60fe7534823a40c7609f50d314418a893f01367ea6663934a23ca303829b347eb9b49d8bd937dfe702de4d632523fe737c46a SHA512 6927ff8f4f471104f6639a271fe4d70b2c1ba1cf35084686ba147a58001e941be9784936da32cdfa68ebf688ac512b3579cadacf8d78e2f8739d485ce7d0e2b4
-MISC ChangeLog 370 BLAKE2B 5af611c6c255f88e4feca6d526058bce8dd23fb6ac18cf403456804aa80eb6fd3195503d2553c12638edcc2482cbbc3f0885a4f1050d6785a4b1d82beb56f7dc SHA512 75c40c504685ddfee8f7972e1795231e80eb784c39d5918bd293a56b9749ad564c9ba456b2780530d22f95053a2d677e4f1fa30c800a8b4413c211c5298d46ff
+EBUILD denemo-9999.ebuild 1931 BLAKE2B 4a46fbfb829c450492780accb8e34774a5a6cabe772ecb806dc48b00fa06b23b76d986bc41094fa9393d841c68a3f032a63bcaad54cd4cab6f4f705743bf9e9d SHA512 97b76e6d01e60f5ae470305e40a78ab8f754f70bdbe2c7dabe2ccb3e0f1dd38b5a80161ee1db4ad606a92195231e1f65349e979c688f5e7a07f0960b4d24cfab
+MISC ChangeLog 413 BLAKE2B e9c1e5261501bf67687752afc6669ee1afd0f836026f5978f290ed4f2e5041e7977b46f3e377e8aec024ce429a94dfce48dffcf9964bc39316503cf46ad60bf7 SHA512 e14d552b0be701513b8f06f9367d0aa6fa54de7405f5de269fdc4dfba14e00b0241273d93171dddd493158cfb459f6225c43219788a9cc402a298ebae699c285
 MISC metadata.xml 562 BLAKE2B d8a215bf3e76317cbeab578f27ed38e810f8e0b1b14eda3fe8af5f25e655b0d2bcf3cb2058198fb1b9bc117a4272a7fd5c73261652c2ab8da7552909929f3dd0 SHA512 267695eb5d84516a4ab0554cadd4a5e0cc1752f37c69e58e12d6af4c42509189de10a93390f2e07087f1789e918460a62bc25d9a5a3e17cd0a9afd8eb501398e

Modified: trunk/overlays/proaudio/media-sound/denemo/denemo-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/denemo/denemo-9999.ebuild	2019-01-21 16:37:12 UTC (rev 3157)
+++ trunk/overlays/proaudio/media-sound/denemo/denemo-9999.ebuild	2019-01-21 17:51:19 UTC (rev 3158)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils fdo-mime git-r3 autotools-utils
+inherit eutils fdo-mime git-r3 autotools-utils multilib
 AUTOTOOLS_AUTORECONF=1
 
 DESCRIPTION="A music notation editor"
@@ -49,11 +49,13 @@
 DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
 
 src_configure() {
+	GUILE_VERSION="$(ls /usr/$(get_libdir)/pkgconfig|grep guile|sed "s:.pc::")"
+
 	local myeconfargs=(
 		--disable-static \
 		--enable-gtk3 \
 		$(use_enable alsa) \
-		$(use_enable aubio aubio4 ) \
+		$(use_enable aubio) \
 		$(use_enable fluidsynth) \
 		$(use_enable guile guile_2_0) \
 		$(use_enable jack) \
@@ -63,6 +65,8 @@
 		$(use_enable rubberband) \
 		--enable-x11
 		)
+	GUILE_2_CFLAGS="$(pkg-config --cflags ${GUILE_VERSION})" \
+	GUILE_2_LIBS="$(pkg-config --libs ${GUILE_VERSION})" \
 	autotools-utils_src_configure
 }