Updated for webapp.eclass wrt bug #58378.

(Portage version: 2.0.53)

4 files changed, 119 insertions, 18 deletions

diff --git a/media-sound/mserv/ChangeLog b/media-sound/mserv/ChangeLog
index 45ce72a42d4c..03248d631b00 100644
--- a/media-sound/mserv/ChangeLog
+++ b/media-sound/mserv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mserv
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/ChangeLog,v 1.12 2005/08/24 16:52:27 flameeyes Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/ChangeLog,v 1.13 2006/01/10 17:07:28 rl03 Exp $
+
+*mserv-0.35-r1 (10 Jan 2006)
+
+  10 Jan 2006; Renat Lumpau <rl03@gentoo.org> +mserv-0.35-r1.ebuild:
+  Updated for webapp.eclass wrt bug #58378.
 
   24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> mserv-0.35.ebuild:
   Use newconfd/newinitd.
diff --git a/media-sound/mserv/Manifest b/media-sound/mserv/Manifest
index fac8d480cc3f..062838f4c67a 100644
--- a/media-sound/mserv/Manifest
+++ b/media-sound/mserv/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6a26beb7d45a4d3c335db226d08c4329 mserv-0.35.ebuild 2556
 MD5 141e115247cb7e4f02e114676ea8f169 ChangeLog 1556
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 85efb51a180ddf66f95a59ffbbb9f81a files/mserv-0.35-confd 230
 MD5 d1973ea3781773cbbe8510ea648ddb19 files/digest-mserv-0.35 62
-MD5 bab25861d10f61d56534a40883052be3 files/mserv-0.35-paths.patch 2673
+MD5 d1973ea3781773cbbe8510ea648ddb19 files/digest-mserv-0.35-r1 62
+MD5 d5465c51ab8fd155dab29a702c04897a files/mserv-0.35-acl 52
+MD5 85efb51a180ddf66f95a59ffbbb9f81a files/mserv-0.35-confd 230
+MD5 e4b81c74040c77c60a324f42646e960e files/mserv-0.35-config 1515
 MD5 324eccbee0054d56a6da344d0712b2cc files/mserv-0.35-initd 580
 MD5 80c9282eed058c3239f45586473cbf70 files/mserv-0.35-mservplay.patch 430
-MD5 d5465c51ab8fd155dab29a702c04897a files/mserv-0.35-acl 52
+MD5 bab25861d10f61d56534a40883052be3 files/mserv-0.35-paths.patch 2673
 MD5 a823115f64db37b88b25a3689b0f9e19 files/mserv-0.35-webacl 39
-MD5 e4b81c74040c77c60a324f42646e960e files/mserv-0.35-config 1515
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDDKXmj5H05b2HAEkRAlixAJ9bDtz3BIduJA0mIcGbIswdHGRNcwCgnGoR
-Sm4yVWIfuiDHW+kbkonkdCQ=
-=e3sW
------END PGP SIGNATURE-----
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 998033fd42a1554e7db9de7309100c98 mserv-0.35-r1.ebuild 2494
+MD5 6a26beb7d45a4d3c335db226d08c4329 mserv-0.35.ebuild 2556
diff --git a/media-sound/mserv/files/digest-mserv-0.35-r1 b/media-sound/mserv/files/digest-mserv-0.35-r1
new file mode 100644
index 000000000000..66eeaf0b58ae
--- /dev/null
+++ b/media-sound/mserv/files/digest-mserv-0.35-r1
@@ -0,0 +1 @@
+MD5 8ba12b7b015f1262f00166b3db7b05d3 mserv-0.35.tar.gz 280299
diff --git a/media-sound/mserv/mserv-0.35-r1.ebuild b/media-sound/mserv/mserv-0.35-r1.ebuild
new file mode 100644
index 000000000000..7336d598eb02
--- /dev/null
+++ b/media-sound/mserv/mserv-0.35-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/mserv-0.35-r1.ebuild,v 1.1 2006/01/10 17:07:28 rl03 Exp $
+
+inherit webapp eutils
+
+DESCRIPTION="Jukebox-style music server"
+HOMEPAGE="http://www.mserv.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="mserv"
+
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+IUSE="oggvorbis"
+
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+
+DEPEND="virtual/libc"
+RDEPEND=">=dev-lang/perl-5.6.1
+	 virtual/mpg123
+	 media-sound/sox
+	 net-www/apache
+	 oggvorbis? ( media-sound/vorbis-tools )"
+
+pkg_setup() {
+	webapp_pkg_setup
+	enewgroup mserv
+	enewuser mserv -1 -1 /dev/null mserv -G audio
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Adjust paths to match Gentoo
+	epatch ${FILESDIR}/${P}-paths.patch || die
+	# Mservplay uses stricmp - should be strcasecmp
+	epatch ${FILESDIR}/${P}-mservplay.patch || die
+}
+
+src_compile() {
+	econf || die
+	emake || die
+
+	# Optional suid wrapper
+	cd ${S}/support
+	gcc -I.. -I../mserv ${CFLAGS} mservplay.c -o mservplay || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	make DESTDIR=${D} install || die
+
+	dobin support/mservedit support/mservripcd support/mservplay
+	dodoc AUTHORS COPYING ChangeLog docs/quick-start.txt
+
+	# Web client
+	dodir ${MY_CGIBINDIR}/${PN}
+	cp webclient/*.cgi ${D}/${MY_CGIBINDIR}/${PN}
+	cp webclient/*.gif webclient/index.html ${D}/${MY_HTDOCSDIR}
+
+	# Configuration files
+	insopts -o mserv -g mserv -m0644
+	insinto /etc/mserv
+	fowners mserv:mserv /etc/mserv
+	insinto ${MY_HOSTROOTDIR}/${PN}
+	fowners mserv:mserv ${MY_HOSTROOTDIR}/${PN}
+	newins ${FILESDIR}/${P}-config config
+	newins ${FILESDIR}/${P}-webacl webacl
+	newins ${FILESDIR}/${P}-acl acl
+	fperms 0600 ${MY_HOSTROOTDIR}/${PN}/acl
+
+	newinitd ${FILESDIR}/${P}-initd ${PN}
+	newconfd ${FILESDIR}/${P}-confd ${PN}
+
+	# Log file
+	dodir /var/log
+	touch ${D}var/log/mserv.log
+	fowners mserv:mserv /var/log/mserv.log
+
+	# Track and album info
+	keepdir /var/lib/mserv/trackinfo
+	fowners mserv:mserv /var/lib/mserv/trackinfo
+
+	# Current track output
+	dodir /var/spool/mserv
+	touch ${D}var/spool/mserv/player.out
+	fowners mserv:mserv /var/spool/mserv /var/spool/mserv/player.out
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo "The wrapper program 'mservplay' is disabled for"
+	einfo "security reasons.  If you wish to use mservplay"
+	einfo "to pass a 'nice' value to mpg123, you must make"
+	einfo "/usr/bin/mservplay suid root."
+	ewarn
+	ewarn "Please edit /etc/mserv/config and set path_tracks"
+	ewarn "to the location of your music files."
+	webapp_pkg_postinst
+}