Apache herd package refresh

9 files changed, 101 insertions, 10 deletions

diff --git a/net-www/mod_mp3/ChangeLog b/net-www/mod_mp3/ChangeLog
index 333b88179b27..26d41cd5b9af 100644
--- a/net-www/mod_mp3/ChangeLog
+++ b/net-www/mod_mp3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mod_mp3
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/ChangeLog,v 1.20 2004/11/04 08:16:46 urilith Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/ChangeLog,v 1.21 2005/01/07 19:26:00 vericgar Exp $
+
+*mod_mp3-0.40-r1 (07 Jan 2005)
+
+  07 Jan 2005; Michael Stewart <vericgar@gentoo.org> +mod_mp3-0.40-r1.ebuild:
+  Package Refresh
 
   04 Nov 2004; Michael Tindal <urilith@gentoo.org> mod_mp3-0.35-r1.ebuild:
   IUSE fixes.
diff --git a/net-www/mod_mp3/Manifest b/net-www/mod_mp3/Manifest
index 38bb0b6d8cd2..7d614f06bc13 100644
--- a/net-www/mod_mp3/Manifest
+++ b/net-www/mod_mp3/Manifest
@@ -4,8 +4,10 @@ MD5 0d045bcbc1fee7551e950e590d82184e mod_mp3-0.35-r1.ebuild 1373
 MD5 2820bd43230cefaf221a72f8ce2812b5 mod_mp3-0.35-r2.ebuild 1480
 MD5 7d91b582ee143471f7ff487f8fc6e895 mod_mp3-0.39.ebuild 1568
 MD5 85d7132951975e35dfac78dce4ca0e6c mod_mp3-0.40.ebuild 1570
+MD5 be5fcfed4945de781be74b7061235f03 mod_mp3-0.40-r1.ebuild 925
 MD5 8a7822e7dc0ef7f482a9eea2f2dc7f99 files/digest-mod_mp3-0.35-r1 63
 MD5 8a7822e7dc0ef7f482a9eea2f2dc7f99 files/digest-mod_mp3-0.35-r2 63
 MD5 eed7a5bfc98ac86ce87a0e8acc8cc63d files/digest-mod_mp3-0.39 63
 MD5 a87aa3881f9296ed5334e2bccf010ab1 files/digest-mod_mp3-0.40 63
 MD5 b5e3152aec6736c0cb2be7346b0423dd files/mod_mp3.conf 316
+MD5 a87aa3881f9296ed5334e2bccf010ab1 files/digest-mod_mp3-0.40-r1 63
diff --git a/net-www/mod_mp3/files/50_mod_mp3.conf b/net-www/mod_mp3/files/50_mod_mp3.conf
new file mode 100644
index 000000000000..8ad364767663
--- /dev/null
+++ b/net-www/mod_mp3/files/50_mod_mp3.conf
@@ -0,0 +1,41 @@
+<IfDefine MP3>
+  <IfModule !mod_mp3.c>
+    LoadModule mp3_module     modules/mod_mp3.so
+  </IfModule>
+</IfDefine>
+
+<IfModule mod_mp3.c>
+
+# There are more examples and documentation of all directives 
+# in /usr/share/doc/mod_mp3-<pkgversion>
+
+<Location /mp3>
+
+# Uncomment this line to turn on the streaming server
+#MP3Engine On
+
+# The name of your server
+MP3CastName "Gentoo MP3 Streamer"
+
+# The genre of music sent to client
+MP3Genre "Sound of Open Source"
+
+# Uncomment if you want to stream files randomly
+#MP3Random On
+
+# Uncomment this loop through all files
+#MP3Loop On
+
+# Change this to where your MP3s are
+MP3 /media/mp3
+
+</Location>
+
+<Location /mp3-status>
+  SetHandler mp3-status
+  Order deny,allow
+  Deny from all
+  Allow from localhost
+</Location>
+
+</IfModule>
diff --git a/net-www/mod_mp3/files/digest-mod_mp3-0.40-r1 b/net-www/mod_mp3/files/digest-mod_mp3-0.40-r1
new file mode 100644
index 000000000000..040708f82bae
--- /dev/null
+++ b/net-www/mod_mp3/files/digest-mod_mp3-0.40-r1
@@ -0,0 +1 @@
+MD5 a36b25ee4db268df45a03231993e718d mod_mp3-0.40.tar.gz 55064
diff --git a/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild b/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild
index 08d0b38df6d9..0d75470647f5 100644
--- a/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild
+++ b/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild,v 1.14 2004/11/04 08:16:46 urilith Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild,v 1.15 2005/01/07 19:26:00 vericgar Exp $
 
 DESCRIPTION="Module for turning Apache into an MP3 or Ogg streaming server"
 HOMEPAGE="http://media.tangent.org/"
diff --git a/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild b/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild
index b8ff74e6754a..fee06efaeedb 100644
--- a/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild
+++ b/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild,v 1.10 2004/07/01 22:46:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild,v 1.11 2005/01/07 19:26:00 vericgar Exp $
 
 IUSE="mysql"
 
diff --git a/net-www/mod_mp3/mod_mp3-0.39.ebuild b/net-www/mod_mp3/mod_mp3-0.39.ebuild
index 88a6a15fe62d..f540bd2546ef 100644
--- a/net-www/mod_mp3/mod_mp3-0.39.ebuild
+++ b/net-www/mod_mp3/mod_mp3-0.39.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.39.ebuild,v 1.11 2004/07/01 22:46:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.39.ebuild,v 1.12 2005/01/07 19:26:00 vericgar Exp $
 
 IUSE="mysql postgres"
 
diff --git a/net-www/mod_mp3/mod_mp3-0.40-r1.ebuild b/net-www/mod_mp3/mod_mp3-0.40-r1.ebuild
new file mode 100644
index 000000000000..d99773b33e9e
--- /dev/null
+++ b/net-www/mod_mp3/mod_mp3-0.40-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.40-r1.ebuild,v 1.1 2005/01/07 19:26:00 vericgar Exp $
+
+inherit apache-module
+
+# test target in Makefile isn't sane
+RESTRICT="maketest"
+
+IUSE="mysql postgres"
+
+DESCRIPTION="Module for turning Apache into an MP3 or Ogg streaming server"
+HOMEPAGE="http://software.tangent.org/"
+KEYWORDS="~x86 ~sparc ~ppc"
+
+SRC_URI="http://download.tangent.org/${P}.tar.gz"
+
+DEPEND="dev-lang/perl
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	postgres? ( dev-db/postgresql )"
+
+LICENSE="as-is"
+SLOT="0"
+
+APXS1_S="${S}"
+
+APACHE1_MOD_FILE="src/${PN}.so"
+APACHE1_MOD_CONF="50_mod_mp3"
+APACHE1_MOD_DEFINE="MP3"
+
+DOCFILES="CONTRIBUTORS ChangeLog LICENSE README TODO faq.html support/*"
+
+need_apache1
+
+src_compile() {
+	local myconf
+
+	myconf="$(use_with mysql)"
+	myconf="${myconf} $(use_with postgres)"
+	./configure ${myconf} --with-playlist || die "configure failed"
+	make || die "make failed"
+}
diff --git a/net-www/mod_mp3/mod_mp3-0.40.ebuild b/net-www/mod_mp3/mod_mp3-0.40.ebuild
index 816b3cc4f5ce..1496a8b96b17 100644
--- a/net-www/mod_mp3/mod_mp3-0.40.ebuild
+++ b/net-www/mod_mp3/mod_mp3-0.40.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.40.ebuild,v 1.7 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.40.ebuild,v 1.8 2005/01/07 19:26:00 vericgar Exp $
 
 IUSE="mysql postgres"