1 |
hollow 08/02/23 13:56:33 |
2 |
|
3 |
Modified: zoneminder-1.22.3.ebuild ChangeLog |
4 |
Log: |
5 |
ebuild cleanup wrt #208584, also fixes #207481 |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.4 www-misc/zoneminder/zoneminder-1.22.3.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.3.ebuild?rev=1.4&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.3.ebuild?rev=1.4&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.3.ebuild?r1=1.3&r2=1.4 |
14 |
|
15 |
Index: zoneminder-1.22.3.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.3.ebuild,v |
18 |
retrieving revision 1.3 |
19 |
retrieving revision 1.4 |
20 |
diff -u -r1.3 -r1.4 |
21 |
--- zoneminder-1.22.3.ebuild 26 May 2007 23:55:43 -0000 1.3 |
22 |
+++ zoneminder-1.22.3.ebuild 23 Feb 2008 13:56:33 -0000 1.4 |
23 |
@@ -1,75 +1,76 @@ |
24 |
-# Copyright 1999-2007 Gentoo Foundation |
25 |
+# Copyright 1999-2008 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.3.ebuild,v 1.3 2007/05/26 23:55:43 rl03 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.3.ebuild,v 1.4 2008/02/23 13:56:33 hollow Exp $ |
29 |
|
30 |
inherit eutils webapp autotools depend.php depend.apache |
31 |
|
32 |
WEBAPP_MANUAL_SLOT="yes" |
33 |
-SLOT="0" |
34 |
+ |
35 |
MY_PV=${PV/_/-} |
36 |
MY_PN="ZoneMinder" |
37 |
|
38 |
DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any cameras attached to your system." |
39 |
HOMEPAGE="http://www.zoneminder.com/" |
40 |
SRC_URI="http://www.zoneminder.com/downloads/${MY_PN}-${MY_PV}.tar.gz" |
41 |
+ |
42 |
LICENSE="GPL-2" |
43 |
KEYWORDS="~amd64 ~ppc ~x86" |
44 |
IUSE="mpeg" |
45 |
+SLOT="0" |
46 |
|
47 |
-DEPEND=" |
48 |
+DEPEND="app-admin/sudo |
49 |
>=media-libs/jpeg-6b |
50 |
>=dev-lang/perl-5.6.0 |
51 |
- dev-perl/DBI |
52 |
- dev-perl/DBD-mysql |
53 |
- virtual/perl-Getopt-Long |
54 |
- virtual/perl-Time-HiRes |
55 |
- dev-perl/DateManip |
56 |
- dev-perl/libwww-perl |
57 |
- dev-perl/Device-SerialPort |
58 |
- virtual/perl-libnet |
59 |
dev-perl/Archive-Tar |
60 |
dev-perl/Archive-Zip |
61 |
+ dev-perl/DateManip |
62 |
+ dev-perl/DBD-mysql |
63 |
+ dev-perl/DBI |
64 |
+ dev-perl/Device-SerialPort |
65 |
+ dev-perl/libwww-perl |
66 |
dev-perl/MIME-Lite |
67 |
dev-perl/MIME-tools |
68 |
- virtual/perl-Sys-Syslog |
69 |
dev-perl/X10 |
70 |
- app-admin/sudo |
71 |
-" |
72 |
- |
73 |
-want_apache |
74 |
-need_php |
75 |
+ virtual/perl-Getopt-Long |
76 |
+ virtual/perl-libnet |
77 |
+ virtual/perl-Sys-Syslog |
78 |
+ virtual/perl-Time-HiRes" |
79 |
|
80 |
-RDEPEND="mpeg? ( media-video/ffmpeg ) |
81 |
- media-libs/netpbm |
82 |
- dev-perl/DBD-mysql" |
83 |
+RDEPEND="dev-perl/DBD-mysql |
84 |
+ mpeg? ( media-video/ffmpeg ) |
85 |
+ media-libs/netpbm" |
86 |
+ |
87 |
+# we cannot use need_httpd_cgi here, since we need to setup permissions for the |
88 |
+# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here. |
89 |
+need_apache |
90 |
+need_php_httpd |
91 |
|
92 |
-S=${WORKDIR}/${MY_PN}-${MY_PV} |
93 |
+S="${WORKDIR}"/${MY_PN}-${MY_PV} |
94 |
|
95 |
pkg_setup() { |
96 |
webapp_pkg_setup |
97 |
- has_php |
98 |
require_php_with_use mysql |
99 |
} |
100 |
|
101 |
src_unpack() { |
102 |
unpack ${A} |
103 |
- cd ${S} |
104 |
- epatch ${FILESDIR}/Makefile.am.patch |
105 |
- epatch ${FILESDIR}/zm_create.sql.in.diff |
106 |
- epatch ${FILESDIR}/ffmpeg.patch |
107 |
-} |
108 |
+ cd "${S}" |
109 |
+ |
110 |
+ epatch "${FILESDIR}"/Makefile.am.patch |
111 |
+ epatch "${FILESDIR}"/zm_create.sql.in.diff |
112 |
+ epatch "${FILESDIR}"/ffmpeg.patch |
113 |
|
114 |
-src_compile() { |
115 |
eautoreconf |
116 |
+} |
117 |
|
118 |
- local MY_CONF="--with-mysql=/usr \ |
119 |
- --with-webdir=${MY_HTDOCSDIR} \ |
120 |
- --with-cgidir=${MY_CGIBINDIR} \ |
121 |
+src_compile() { |
122 |
+ econf --with-mysql=/usr \ |
123 |
+ --with-webdir="${MY_HTDOCSDIR}" \ |
124 |
+ --with-cgidir="${MY_CGIBINDIR}" \ |
125 |
--with-webuser=apache \ |
126 |
- --with-webgroup=apache" |
127 |
- use mpeg && MY_CONF="${MY_CONF} --with-ffmpeg=/usr" |
128 |
- |
129 |
- econf ${MY_CONF} || die "econf failed" |
130 |
+ --with-webgroup=apache \ |
131 |
+ $(use_with mpeg ffmpeg /usr) \ |
132 |
+ || die "econf failed" |
133 |
emake || die "emake failed" |
134 |
} |
135 |
|
136 |
@@ -77,27 +78,30 @@ |
137 |
webapp_src_preinst |
138 |
|
139 |
keepdir /var/run/zm |
140 |
- emake -j1 DESTDIR=${D} install || die "emake install failed" |
141 |
+ emake -j1 DESTDIR="${D}" install || die "emake install failed" |
142 |
+ |
143 |
+ fperms 0644 /etc/zm.conf |
144 |
+ |
145 |
+ keepdir /var/log/${PN} |
146 |
+ fowners apache:apache /var/log/${PN} |
147 |
+ fowners apache:apache /var/run/zm |
148 |
+ |
149 |
+ newinitd "${FILESDIR}"/init.d zoneminder |
150 |
+ newconfd "${FILESDIR}"/conf.d zoneminder |
151 |
+ |
152 |
dodoc AUTHORS ChangeLog INSTALL NEWS README README.[prt]* TODO |
153 |
dohtml README.html |
154 |
|
155 |
- dodir /usr/share/${PN}/db |
156 |
- cp db/zm_u* db/zm_create.sql ${D}/usr/share/${PN}/db |
157 |
+ insinto /usr/share/${PN}/db |
158 |
+ doins db/zm_u* db/zm_create.sql |
159 |
|
160 |
for DIR in events images sound; do |
161 |
- dodir ${MY_HTDOCSDIR}/${DIR} |
162 |
- webapp_serverowned ${MY_HTDOCSDIR}/${DIR} |
163 |
+ dodir "${MY_HTDOCSDIR}"/${DIR} |
164 |
+ webapp_serverowned "${MY_HTDOCSDIR}"/${DIR} |
165 |
done |
166 |
|
167 |
- webapp_postinst_txt en ${FILESDIR}/postinstall-2.txt |
168 |
- webapp_postupgrade_txt en ${FILESDIR}/postupgrade.txt |
169 |
- webapp_src_install |
170 |
- fperms 0644 /etc/zm.conf |
171 |
- |
172 |
- keepdir /var/log/${PN} |
173 |
- fowners apache:apache /var/log/${PN} |
174 |
- fowners apache:apache /var/run/zm |
175 |
+ webapp_postinst_txt en "${FILESDIR}"/postinstall-2.txt |
176 |
+ webapp_postupgrade_txt en "${FILESDIR}"/postupgrade.txt |
177 |
|
178 |
- newinitd ${FILESDIR}/init.d zoneminder |
179 |
- newconfd ${FILESDIR}/conf.d zoneminder |
180 |
+ webapp_src_install |
181 |
} |
182 |
|
183 |
|
184 |
|
185 |
1.23 www-misc/zoneminder/ChangeLog |
186 |
|
187 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/ChangeLog?rev=1.23&view=markup |
188 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/ChangeLog?rev=1.23&content-type=text/plain |
189 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/ChangeLog?r1=1.22&r2=1.23 |
190 |
|
191 |
Index: ChangeLog |
192 |
=================================================================== |
193 |
RCS file: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v |
194 |
retrieving revision 1.22 |
195 |
retrieving revision 1.23 |
196 |
diff -u -r1.22 -r1.23 |
197 |
--- ChangeLog 26 May 2007 23:55:43 -0000 1.22 |
198 |
+++ ChangeLog 23 Feb 2008 13:56:33 -0000 1.23 |
199 |
@@ -1,6 +1,9 @@ |
200 |
# ChangeLog for www-misc/zoneminder |
201 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
202 |
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.22 2007/05/26 23:55:43 rl03 Exp $ |
203 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
204 |
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.23 2008/02/23 13:56:33 hollow Exp $ |
205 |
+ |
206 |
+ 23 Feb 2008; Benedikt Böhm <hollow@g.o> zoneminder-1.22.3.ebuild: |
207 |
+ ebuild cleanup wrt #208584, also fixes #207481 |
208 |
|
209 |
26 May 2007; Renat Lumpau <rl03@g.o> +files/ffmpeg.patch, |
210 |
zoneminder-1.22.3.ebuild: |
211 |
|
212 |
|
213 |
|
214 |
-- |
215 |
gentoo-commits@l.g.o mailing list |