Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/mserv: mserv-0.35-r1.ebuild
Date: Mon, 01 Jun 2009 18:08:43
Message-Id: E1MBBw9-0001hn-3O@stork.gentoo.org
1 ssuominen 09/06/01 18:08:41
2
3 Modified: mserv-0.35-r1.ebuild
4 Log:
5 Fix repoman warnings
6 (Portage version: 2.1.6.13/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.12 media-sound/mserv/mserv-0.35-r1.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mserv/mserv-0.35-r1.ebuild?rev=1.12&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mserv/mserv-0.35-r1.ebuild?rev=1.12&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mserv/mserv-0.35-r1.ebuild?r1=1.11&r2=1.12
14
15 Index: mserv-0.35-r1.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-sound/mserv/mserv-0.35-r1.ebuild,v
18 retrieving revision 1.11
19 retrieving revision 1.12
20 diff -u -r1.11 -r1.12
21 --- mserv-0.35-r1.ebuild 2 Feb 2008 15:31:53 -0000 1.11
22 +++ mserv-0.35-r1.ebuild 1 Jun 2009 18:08:41 -0000 1.12
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2008 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/mserv-0.35-r1.ebuild,v 1.11 2008/02/02 15:31:53 hollow Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mserv/mserv-0.35-r1.ebuild,v 1.12 2009/06/01 18:08:41 ssuominen Exp $
28
29 inherit depend.apache webapp eutils toolchain-funcs
30
31 @@ -19,6 +19,7 @@
32 virtual/mpg123
33 media-sound/sox
34 vorbis? ( media-sound/vorbis-tools )"
35 +DEPEND=""
36
37 need_apache
38
39 @@ -30,35 +31,35 @@
40
41 src_unpack() {
42 unpack ${A}
43 - cd ${S}
44 + cd "${S}"
45
46 # Adjust paths to match Gentoo
47 - epatch ${FILESDIR}/${P}-paths.patch || die
48 + epatch "${FILESDIR}"/${P}-paths.patch
49 # Mservplay uses stricmp - should be strcasecmp
50 - epatch ${FILESDIR}/${P}-mservplay.patch || die
51 + epatch "${FILESDIR}"/${P}-mservplay.patch
52 }
53
54 src_compile() {
55 - econf || die
56 - emake || die
57 + econf
58 + emake || die "emake failed"
59
60 # Optional suid wrapper
61 - cd ${S}/support
62 + cd "${S}"/support
63 $(tc-getCC) -I.. -I../mserv ${CFLAGS} ${LDFLAGS} mservplay.c -o mservplay || die
64 }
65
66 src_install() {
67 webapp_src_preinst
68
69 - make DESTDIR=${D} install || die
70 + emake DESTDIR="${D}" install || die "emake install failed"
71
72 dobin support/mservedit support/mservripcd support/mservplay
73 dodoc AUTHORS ChangeLog docs/quick-start.txt
74
75 # Web client
76 dodir ${MY_CGIBINDIR}/${PN}
77 - cp webclient/*.cgi ${D}/${MY_CGIBINDIR}/${PN}
78 - cp webclient/*.gif webclient/index.html ${D}/${MY_HTDOCSDIR}
79 + cp webclient/*.cgi "${D}"/${MY_CGIBINDIR}/${PN}
80 + cp webclient/*.gif webclient/index.html "${D}"/${MY_HTDOCSDIR}
81
82 webapp_src_install
83
84 @@ -66,22 +67,22 @@
85 insopts -o mserv -g mserv -m0644
86 insinto /etc/mserv
87 fowners mserv:mserv /etc/mserv
88 - newins ${FILESDIR}/${P}-config config
89 - newins ${FILESDIR}/${P}-webacl webacl
90 - newins ${FILESDIR}/${P}-acl acl
91 + newins "${FILESDIR}"/${P}-config config
92 + newins "${FILESDIR}"/${P}-webacl webacl
93 + newins "${FILESDIR}"/${P}-acl acl
94 insinto ${MY_HOSTROOTDIR}/${PN}
95 fowners mserv:mserv ${MY_HOSTROOTDIR}/${PN}
96 - newins ${FILESDIR}/${P}-config config
97 - newins ${FILESDIR}/${P}-webacl webacl
98 - newins ${FILESDIR}/${P}-acl acl
99 + newins "${FILESDIR}"/${P}-config config
100 + newins "${FILESDIR}"/${P}-webacl webacl
101 + newins "${FILESDIR}"/${P}-acl acl
102 fperms 0600 ${MY_HOSTROOTDIR}/${PN}/acl
103
104 - newinitd ${FILESDIR}/${P}-initd ${PN}
105 - newconfd ${FILESDIR}/${P}-confd ${PN}
106 + newinitd "${FILESDIR}"/${P}-initd ${PN}
107 + newconfd "${FILESDIR}"/${P}-confd ${PN}
108
109 # Log file
110 dodir /var/log
111 - touch ${D}var/log/mserv.log
112 + touch "${D}"var/log/mserv.log
113 fowners mserv:mserv /var/log/mserv.log
114
115 # Track and album info
116 @@ -90,7 +91,7 @@
117
118 # Current track output
119 dodir /var/spool/mserv
120 - touch ${D}var/spool/mserv/player.out
121 + touch "${D}"var/spool/mserv/player.out
122 fowners mserv:mserv /var/spool/mserv /var/spool/mserv/player.out
123 }