gentoo auto-resync : 14:04:2023 - 05:44:49

4 files changed, 44 insertions, 4 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 8683de362186..26492090038e 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_musicindex/Manifest b/www-apache/mod_musicindex/Manifest
index 6e15d1f6b521..c4055ab11b80 100644
--- a/www-apache/mod_musicindex/Manifest
+++ b/www-apache/mod_musicindex/Manifest
@@ -1,7 +1,8 @@
 AUX 50_mod_musicindex.conf 118 BLAKE2B 9100a5b0cffb7e47602e5acd2a7c0a6e43a41dedd8f54781f3172b72fa616d3f36fd2dafcfe165609399dc51a6b5d9b40a9eb29583080b7a10f87b8fce0f5c4f SHA512 95c74787d194d55aba605e9e43f07f690d63960f09eaf8086d639f966c2a1b1343ffeea6c96cc02db31bcf263652a9aeb5a8f374a5c422000bbbec88078be319
+AUX mod_musicindex-1.4.1-slibtool.patch 895 BLAKE2B 2ae569709ba47cd56e7cb3e6769fb5b941d716af8b107a7a5fd2a91df4fbd17186fdc4ebd5c0051598e8cf713e7f49a09a937f05d2270555977f584810e99760 SHA512 a71593dc1e7cbfe2c4ea3575a92ef236c7cfb700093c81a1bbbeeceec4b0a657661d06f98f82020f0b1dd59fc835ab36365f84d3fb0b9e5ddec048d414439eb3
 DIST mod_musicindex-1.4.1.tar.gz 508795 BLAKE2B 272cdddc16097b55c7b89df42f72c4607bfcf2bb1c623967b2f0404d076ee8a58b23c0fceb17960410e0cb41129bd43c70724ad3981fa840611c5708c26d3490 SHA512 2d3acfcf319070dd5352db66b14766498189e9d0790596c4c712b7564f9221cf058ca38fa118f18ec358c2d7c37d695d61f9d43d91bf83fa9582d834f06fbfea
 DIST mod_musicindex-1.4.1_valid-rss.png 1523 BLAKE2B 679a17627a73561ca2fa02bf3c3a8e3ec71883b65b0215d4a580e441f2c935538e4477228c7e0ea83df2322e7b7158e0f0cfd9f895744cf10080a5e3f698c936 SHA512 e9df8ea0c6da2d1f268f8aa17e396dcdf53a61d1196ed67f44f03f22f0c5a9661a1e8a96f6d506c02374bc4f0923be9371372a2c678b705017ee733be2b402ec
 DIST mod_musicindex-1.4.1_valid-xhtml11 1842 BLAKE2B b145d2c8d36e677db38dc8a8ad31e7c69b29d28a56aae8c0c4c89319d95ece7f164968b02f30b6abb425309f4c77a1ead59b2058365eee161ed9b7898685d4e3 SHA512 8beb13a595b402e7de416ae05992f3e0a17719554fbc83cd5c3e0518cd859c560339a61c2f198c8e4982ca397f29823b521e05f29ed632826bfb02646990cc9c
 DIST mod_musicindex-1.4.1_vcss 1547 BLAKE2B 465f63519c64353e1ec6d62e99ea9cf95c00244c717d9bc8d2213723dc55d6186589446a19725d5b8c95f45800946040ad9bfe89ec0b951c514651a9447ad281 SHA512 6c2fa4a0c3fbad68752d7471f95838b69816fd00f58c28f32076af24972117d8b0f2cebb075548ec1317f886a8955cf5686dda571c4d5a823d3ff09da8e33a70
-EBUILD mod_musicindex-1.4.1-r3.ebuild 1690 BLAKE2B be444b9af65f8c19ada65e7ae4e5b6f04fe30dbcd3a0fd70de241e9e12a5d62eba249e29b54fdfbda96f4b9c80d63b36916b192410916e399d997ebea5d878d3 SHA512 efa25b5ac26c45f38371acff6fb67096bed0e1d8adab1f409c29aec9f88708b4a2f83b8001f2b8728bb6bf0abc0e04f12cfdb3a23b11c4331bb53e2836869a76
+EBUILD mod_musicindex-1.4.1-r4.ebuild 1848 BLAKE2B ed9a2ad56bd42f66da2ddd4141e879ae4f67c1045079d510ce21a412d79ce5a5df251b8fbaab47b045c6eb0a837d587456ab0c90183b527108e3dee913890a52 SHA512 ee4c25381928a7e083bacd149cc98a02bb1aee8ec7dee398276d0805b9a71a7e945aacda6e136c7caa9096e019a4533257d6e5615637586574d8130ce5ebd130
 MISC metadata.xml 334 BLAKE2B bf19e7af99a17373a2634ed2f0d807bacbc1a3f902483b8ebca8e10f348e8fe8290b56c9b88aba3fa99c28b65fa609b0720bc5472e9cbc579c87316e7ae83311 SHA512 4c24167ab1c904d81dd7c08dcc8cbda63e0155566007fedc60562109ac73a231bad27cbf0315680eca759d8c33939a4cad1ac4476a691a5b6a21bc5c5b9a63c7
diff --git a/www-apache/mod_musicindex/files/mod_musicindex-1.4.1-slibtool.patch b/www-apache/mod_musicindex/files/mod_musicindex-1.4.1-slibtool.patch
new file mode 100644
index 000000000000..37b829334a29
--- /dev/null
+++ b/www-apache/mod_musicindex/files/mod_musicindex-1.4.1-slibtool.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/778566
+
+commit 7455f156499c1980193f0c7a4e25b1040ba99104
+Author: orbea <orbea@riseup.net>
+Date:   Sat Apr 8 12:31:47 2023 -0700
+
+    build: Don't overwrite the default install target
+    
+    Autotools is capable of creating a working install target without any
+    help from apache's apxs which results in calling apache's libtool
+    implementation instead of GNU libtool or slibtool.
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 4815507..7a63571 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -69,11 +69,3 @@ noinst_HEADERS = \
+ 	playlist-mp4.h \
+ 	playlist-vorbis.h \
+ 	sort.h
+-
+-install: $(lib_LTLIBRARIES)
+-	$(mkinstalldirs) "$(DESTDIR)$(libdir)"
+-if BUILD_FOR_APACHE2
+-	$(APXS) -S LIBEXECDIR="$(DESTDIR)$(libdir)" -i -n musicindex mod_musicindex.la
+-else
+-	$(APXS) -S LIBEXECDIR="$(DESTDIR)$(libdir)" -i -n musicindex .libs/mod_musicindex.so
+-endif
diff --git a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r4.ebuild
index fa92548ef157..1ef181d29e3c 100644
--- a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild
+++ b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit apache-module
+inherit apache-module autotools
 
 DESCRIPTION="mod_musicindex allows nice displaying of directories containing music files"
 HOMEPAGE="http://hacks.slashdirt.org/sw/musicindex/"
@@ -30,12 +30,21 @@ APACHE2_MOD_CONF="50_${PN}"
 APACHE2_MOD_DEFINE="MUSICINDEX"
 DOCS=( AUTHORS BUGS ChangeLog README UPGRADING )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-slibtool.patch #778566
+)
+
 need_apache2
 
 pkg_setup() {
 	_init_apache2_late
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--with-vorbis-libraries="${ESYSROOT}/usr/$(get_libdir)" \
@@ -62,4 +71,6 @@ src_install() {
 	newins "${DISTDIR}/${P}_valid-rss.png" valid-rss.png
 	newins "${DISTDIR}/${P}_valid-xhtml11" valid-xhtml11
 	newins "${DISTDIR}/${P}_vcss" vcss
+
+	find "${ED}" -type f -name "*.la" -delete || die
 }