From 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 17 Jul 2021 19:04:28 +0100
Subject: gentoo resync : 17.07.2021

---
 media-sound/aqualung/Manifest                      |  3 ++-
 media-sound/aqualung/aqualung-1.1-r101.ebuild      | 12 +++++++--
 .../files/aqualung-1.1-configure-lua-version.patch | 31 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch

(limited to 'media-sound/aqualung')

diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index a595c86ce8d8..b4d9de974db3 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,5 +1,6 @@
+AUX aqualung-1.1-configure-lua-version.patch 1230 BLAKE2B ea7a3f9a5bfaef41e97639e9a417da233cd0b0577abf674ebee2e07141493f6f6207142f9b910e14e765d7fe2c1cdf43ab0b1a68234944f4134b3d8e35a255f1 SHA512 dfdfa42025e7c27cb735129fa0af0c2cd0b29803231bf225daa16c9b46357172eb9a5b6429cffc634dd4c3003de17339df3a4f27fbd0de682291302c63b89b10
 AUX aqualung-1.1-ifp.patch 1445 BLAKE2B 80e4baadf577d17985d657ff3b3a357f30ec027d1c2e81398472226c87f787a37257eecc34ef3c8c435216e8746947d1d87dc9acb62d08d8a1c44f2ba51e8159 SHA512 c20426ff125f9273dc8297a188c768ca64ae57f8a507049ed534b58fb0214ad21477c8375a5c999c5dda5de96dd2f1599fda0c768878441f4ca7190ef75bf90e
 AUX aqualung-1.1-var-collision.patch 1174 BLAKE2B 25ff8f99a38b5d857f3f3175400e535ba9343eec1954b97fc9552101c8581557b9ea3241d3976a6f9dd6d44e41aaaf6e4319469d89d7f68a6bfab5104a63d52c SHA512 d414f1af65466391a4b59e4b2de81b83db9eeddb60fe1b44f9a0fe101aa33453f18ac8c28e5a57ddba8ecb604c4571adfad1f94f12d4b0ef03e4c01c503a2e4d
 DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
-EBUILD aqualung-1.1-r101.ebuild 2498 BLAKE2B 23ecf60db98468881ee9c4d338998a7c988bbd2d0c1e50cdeece3213baa84d210f4daf6d8c55dd8aff6d57fb64b3a9ef6d3b495bb4d512973a2f24209163bcf7 SHA512 cb2b8401f75e1a9be4fc9c30d4ab0559c25b01668da23e6d914d31f45783545bc494298968124a8dff9fe173f1a9d597d3f06e88c846f162fa202c210e75a954
+EBUILD aqualung-1.1-r101.ebuild 2645 BLAKE2B 596843f46ed718bd2977782ee9c066efd1462fc907eda1bc593ae247d1fecd761b64591f887d41d3f44bf36e566bc5f02fb22a2cc80873ce338774aef05cddcf SHA512 ba93c99aeb4a5c55fef8a4cfa2f897988d997e36e89b96995682369c9c43d9a1aa49478c844f831e9fa04d2ea5cf346461e0dcac988008b1fe8638bb8abd3df3
 MISC metadata.xml 918 BLAKE2B b095813ec060712043d858b8e1ab6e4b5bcfa9ec2dd8e3b2003310774c4d1bf51d9a97c5335d1403d079e044006c4dd4a70e72258cf21f412bcc54facf57f003 SHA512 734b389036bed628f85a69b992efc5f144121c2edc9cc3f08bf7f00b8cbc73bcdcebc5893f8ceb9188de86a605ad6d4013451f45ba3478baaa5d16dc50643531
diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild
index 87d3f7995f0b..26cd9a923812 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-2 )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit autotools desktop lua-single xdg
 
 DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+HOMEPAGE="https://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
 SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -18,6 +18,8 @@ IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
 	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
 	vorbis wavpack"
 
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
 BDEPEND="
 	virtual/pkgconfig
 	sys-devel/gettext
@@ -53,6 +55,7 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}/${P}-configure-lua-version.patch"
 	"${FILESDIR}/${P}-ifp.patch"
 	"${FILESDIR}/${P}-var-collision.patch"
 )
@@ -61,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 000000000000..a88839728c53
--- /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"])
-- 
cgit v1.2.3