[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_musicindex/

2023-04-13 Thread Sam James
commit: 4bad0d382c0e8e3fcc3a4a9f8dc9e98e93ee42d8
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 00:31:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 00:31:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bad0d38

www-apache/mod_musicindex: revbump for EAPI change

Signed-off-by: Sam James  gentoo.org>

 .../{mod_musicindex-1.4.1-r3.ebuild => mod_musicindex-1.4.1-r4.ebuild}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

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
similarity index 100%
rename from www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild
rename to www-apache/mod_musicindex/mod_musicindex-1.4.1-r4.ebuild



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_musicindex/, www-apache/mod_musicindex/files/

2023-04-13 Thread Sam James
commit: 709e73a4d3afb59afbda23239d9afa5dff1d9701
Author: orbea  riseup  net>
AuthorDate: Sat Apr  8 20:01:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 00:28:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709e73a4

www-apache/mod_musicindex: Fix slibtool install

Closes: https://bugs.gentoo.org/778566
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30523
Signed-off-by: Sam James  gentoo.org>

 .../files/mod_musicindex-1.4.1-slibtool.patch  | 28 ++
 .../mod_musicindex/mod_musicindex-1.4.1-r3.ebuild  | 17 ++---
 2 files changed, 42 insertions(+), 3 deletions(-)

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 ..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 
+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-r3.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-r3.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
 }



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_musicindex/

2022-10-16 Thread Sam James
commit: c7465d7977aabd921032f087a3823525e592c6e7
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 17 02:28:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 17 03:15:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7465d79

www-apache/mod_musicindex: fix linking with LLD

I think the Clang 16 issue was fixed with the APR patches.

Bug: https://bugs.gentoo.org/877011
Signed-off-by: Sam James  gentoo.org>

 www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild 
b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild
index d8cc0a001219..fa92548ef157 100644
--- a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild
+++ b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild
@@ -38,6 +38,8 @@ pkg_setup() {
 
 src_configure() {
econf \
+   --with-vorbis-libraries="${ESYSROOT}/usr/$(get_libdir)" \
+   --with-libFLAC-libraries="${ESYSROOT}/usr/$(get_libdir)" \
$(use_enable mp3) \
$(use_enable mp4) \
$(use_enable flac) \



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_musicindex/

2022-07-11 Thread Sam James
commit: d264ffe03cca7138ea042f64a286c53296dd30a4
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 12 02:09:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 12 02:09:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d264ffe0

www-apache/mod_musicindex: update HOMEPAGE

parsic-linux.org is in an archived state

Signed-off-by: Sam James  gentoo.org>

 www-apache/mod_musicindex/mod_musicindex-1.4.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r2.ebuild 
b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r2.ebuild
index d49f0bc60a48..98b5a5ff2511 100644
--- a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r2.ebuild
+++ b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit apache-module
 
 DESCRIPTION="mod_musicindex allows nice displaying of directories containing 
music files"
-HOMEPAGE="http://www.parisc-linux.org/~varenet/musicindex/;
+HOMEPAGE="http://hacks.slashdirt.org/sw/musicindex/;
 SRC_URI="http://hacks.slashdirt.org/musicindex/${P}.tar.gz
http://validator.w3.org/feed/images/valid-rss.png -> ${P}_valid-rss.png
http://jigsaw.w3.org/css-validator/images/vcss -> ${P}_vcss



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_musicindex/

2021-08-16 Thread Sam James
commit: 542fd9d9be3c8859def836cf2c26335a84de5500
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 16 21:22:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 16 21:22:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542fd9d9

www-apache/mod_musicindex: add missing slot operator dep (libid3tag)

Signed-off-by: Sam James  gentoo.org>

 ...od_musicindex-1.4.1-r1.ebuild => mod_musicindex-1.4.1-r2.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r1.ebuild 
b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r2.ebuild
similarity index 91%
rename from www-apache/mod_musicindex/mod_musicindex-1.4.1-r1.ebuild
rename to www-apache/mod_musicindex/mod_musicindex-1.4.1-r2.ebuild
index a033588e366..d49f0bc60a4 100644
--- a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r1.ebuild
+++ b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,11 +17,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+mp3 +mp4 +flac +vorbis +cache mysql archive"
 
-DEPEND="mp3? ( media-libs/libmad media-libs/libid3tag )
+DEPEND="mp3? ( media-libs/libmad media-libs/libid3tag:= )
mp4? ( media-libs/libmp4v2:0 )
flac? ( media-libs/flac )
vorbis? ( media-libs/libvorbis )
-   archive? ( app-arch/libarchive )
+   archive? ( app-arch/libarchive:= )
mysql? ( dev-db/mysql-connector-c:0= )"
 RDEPEND="${DEPEND}
sys-devel/libtool"



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_musicindex/

2019-02-07 Thread Brian Evans
commit: 0f9f86e6f09c09be343aaa2f1c64837f3dd7ce23
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Feb  7 15:54:06 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Feb  7 15:54:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9f86e6

www-apache/mod_musicindex: Revbump for dependency and EAPI change

Closes: https://bugs.gentoo.org/666076
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 ...index-1.4.1.ebuild => mod_musicindex-1.4.1-r1.ebuild} | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/www-apache/mod_musicindex/mod_musicindex-1.4.1.ebuild 
b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r1.ebuild
similarity index 87%
rename from www-apache/mod_musicindex/mod_musicindex-1.4.1.ebuild
rename to www-apache/mod_musicindex/mod_musicindex-1.4.1-r1.ebuild
index d87b3ed75c3..a033588e366 100644
--- a/www-apache/mod_musicindex/mod_musicindex-1.4.1.ebuild
+++ b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit apache-module
 
@@ -22,16 +22,20 @@ DEPEND="mp3? ( media-libs/libmad media-libs/libid3tag )
flac? ( media-libs/flac )
vorbis? ( media-libs/libvorbis )
archive? ( app-arch/libarchive )
-   mysql? ( virtual/mysql )"
+   mysql? ( dev-db/mysql-connector-c:0= )"
 RDEPEND="${DEPEND}
sys-devel/libtool"
 
 APACHE2_MOD_CONF="50_${PN}"
 APACHE2_MOD_DEFINE="MUSICINDEX"
-DOCFILES="AUTHORS BUGS ChangeLog README UPGRADING"
+DOCS=( AUTHORS BUGS ChangeLog README UPGRADING )
 
 need_apache2
 
+pkg_setup() {
+   _init_apache2_late
+}
+
 src_configure() {
econf \
$(use_enable mp3) \
@@ -44,11 +48,11 @@ src_configure() {
 }
 
 src_compile() {
-   emake || die "emake failed"
+   default
 }
 
 src_install() {
-   emake DESTDIR="${D}" install || die "emake failed"
+   default
apache-module_src_install
 
# install W3C images