[gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/, media-sound/aqualung/files/

[Marek Szuba]

commit:     c9b822a38d0e71539ab4fef429027ec11f75e3b6
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 12 11:59:51 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jul 12 12:26:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b822a3

media-sound/aqualung: respect LUA_SINGLE_TARGET value

Default upstream behaviour is to prefer 5.2 over all others if
present, and if neither 5.2 nor 5.1 can be found try the newest version
available.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-sound/aqualung/aqualung-1.1-r101.ebuild      |  6 +++++
 .../files/aqualung-1.1-configure-lua-version.patch | 31 ++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild 
b/media-sound/aqualung/aqualung-1.1-r101.ebuild
index 3f49bddce79..af782eb7015 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -55,6 +55,7 @@ DEPEND="
 "
 
 PATCHES=(
+       "${FILESDIR}/${P}-configure-lua-version.patch"
        "${FILESDIR}/${P}-ifp.patch"
        "${FILESDIR}/${P}-var-collision.patch"
 )
@@ -63,6 +64,11 @@ pkg_setup() {
        use lua && lua-single_pkg_setup
 }
 
+src_prepare() {
+       default
+       eautoreconf
+}
+
 src_configure() {
        econf \
                --disable-rpath \

diff --git 
a/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch 
b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch
new file mode 100644
index 00000000000..a88839728c5
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -401,24 +401,11 @@
+ ])
+ 
+ AQUALUNG_DETECT([lua], [Lua Extension],
+-    [PKG_CHECK_MODULES([lua], [lua5.2],
++    [PKG_CHECK_MODULES([lua], [lua],
+         [AQUALUNG_FOUND([lua])],
+-        [PKG_CHECK_MODULES([lua], [lua-5.2],
+-            [AQUALUNG_FOUND([lua])],
+-            [PKG_CHECK_MODULES([lua], [lua52],
+-                [AQUALUNG_FOUND([lua])],
+-                [PKG_CHECK_MODULES([lua], [lua5.1],
+-                    [AQUALUNG_FOUND([lua])],
+-                    [PKG_CHECK_MODULES([lua], [lua-5.1],
+-                        [AQUALUNG_FOUND([lua])],
+-                        [PKG_CHECK_MODULES([lua], [lua51],
+-                            [AQUALUNG_FOUND([lua])],
+-                            [PKG_CHECK_MODULES([lua], [lua >= 5.2],
+-                                [AQUALUNG_FOUND([lua])],
+-                                    [PKG_CHECK_MODULES([lua], [lua >= 5.1],
+-                                    [AQUALUNG_FOUND([lua])],
+-                                [AQUALUNG_MISSING([lua], 
[$lua_PKG_ERRORS])])])])])])])])])])
+-
++        [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])]
++    )]
++)
+ 
+ # Compiler and linker variables.
+ AS_VAR_IF([GCC], [yes], [CFLAGS="-Wall $CFLAGS"])