ebuild cleanup wrt #208584, also fixes #207481

(Portage version: 2.1.4.4)

2 files changed, 59 insertions, 52 deletions

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index 2a52b6b04b77..1e13f11169a5 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-misc/zoneminder
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.22 2007/05/26 23:55:43 rl03 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.23 2008/02/23 13:56:33 hollow Exp $
+
+  23 Feb 2008; Benedikt Böhm <hollow@gentoo.org> zoneminder-1.22.3.ebuild:
+  ebuild cleanup wrt #208584, also fixes #207481
 
   26 May 2007; Renat Lumpau <rl03@gentoo.org> +files/ffmpeg.patch,
   zoneminder-1.22.3.ebuild:
diff --git a/www-misc/zoneminder/zoneminder-1.22.3.ebuild b/www-misc/zoneminder/zoneminder-1.22.3.ebuild
index 162cbae364ae..06b674ada2c5 100644
--- a/www-misc/zoneminder/zoneminder-1.22.3.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.22.3.ebuild
@@ -1,75 +1,76 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.3.ebuild,v 1.3 2007/05/26 23:55:43 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.3.ebuild,v 1.4 2008/02/23 13:56:33 hollow Exp $
 
 inherit eutils webapp autotools depend.php depend.apache
 
 WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
+
 MY_PV=${PV/_/-}
 MY_PN="ZoneMinder"
 
 DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any cameras attached to your system."
 HOMEPAGE="http://www.zoneminder.com/"
 SRC_URI="http://www.zoneminder.com/downloads/${MY_PN}-${MY_PV}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mpeg"
+SLOT="0"
 
-DEPEND="
+DEPEND="app-admin/sudo
 	>=media-libs/jpeg-6b
 	>=dev-lang/perl-5.6.0
-	dev-perl/DBI
-	dev-perl/DBD-mysql
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	dev-perl/DateManip
-	dev-perl/libwww-perl
-	dev-perl/Device-SerialPort
-	virtual/perl-libnet
 	dev-perl/Archive-Tar
 	dev-perl/Archive-Zip
+	dev-perl/DateManip
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	dev-perl/Device-SerialPort
+	dev-perl/libwww-perl
 	dev-perl/MIME-Lite
 	dev-perl/MIME-tools
-	virtual/perl-Sys-Syslog
 	dev-perl/X10
-	app-admin/sudo
-"
+	virtual/perl-Getopt-Long
+	virtual/perl-libnet
+	virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes"
 
-want_apache
-need_php
+RDEPEND="dev-perl/DBD-mysql
+	mpeg? ( media-video/ffmpeg )
+	media-libs/netpbm"
 
-RDEPEND="mpeg? ( media-video/ffmpeg )
-	media-libs/netpbm
-	dev-perl/DBD-mysql"
+# we cannot use need_httpd_cgi here, since we need to setup permissions for the
+# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
+need_apache
+need_php_httpd
 
-S=${WORKDIR}/${MY_PN}-${MY_PV}
+S="${WORKDIR}"/${MY_PN}-${MY_PV}
 
 pkg_setup() {
 	webapp_pkg_setup
-	has_php
 	require_php_with_use mysql
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/Makefile.am.patch
-	epatch ${FILESDIR}/zm_create.sql.in.diff
-	epatch ${FILESDIR}/ffmpeg.patch
-}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/Makefile.am.patch
+	epatch "${FILESDIR}"/zm_create.sql.in.diff
+	epatch "${FILESDIR}"/ffmpeg.patch
 
-src_compile() {
 	eautoreconf
+}
 
-	local MY_CONF="--with-mysql=/usr \
-		--with-webdir=${MY_HTDOCSDIR} \
-		--with-cgidir=${MY_CGIBINDIR} \
+src_compile() {
+	econf --with-mysql=/usr \
+		--with-webdir="${MY_HTDOCSDIR}" \
+		--with-cgidir="${MY_CGIBINDIR}" \
 		--with-webuser=apache \
-		--with-webgroup=apache"
-	use mpeg && MY_CONF="${MY_CONF} --with-ffmpeg=/usr"
-
-	econf ${MY_CONF} || die "econf failed"
+		--with-webgroup=apache \
+		$(use_with mpeg ffmpeg /usr) \
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
@@ -77,27 +78,30 @@ src_install() {
 	webapp_src_preinst
 
 	keepdir /var/run/zm
-	emake -j1 DESTDIR=${D} install || die "emake install failed"
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	fperms 0644 /etc/zm.conf
+
+	keepdir /var/log/${PN}
+	fowners apache:apache /var/log/${PN}
+	fowners apache:apache /var/run/zm
+
+	newinitd "${FILESDIR}"/init.d zoneminder
+	newconfd "${FILESDIR}"/conf.d zoneminder
+
 	dodoc AUTHORS ChangeLog INSTALL NEWS README README.[prt]* TODO
 	dohtml README.html
 
-	dodir /usr/share/${PN}/db
-	cp db/zm_u* db/zm_create.sql ${D}/usr/share/${PN}/db
+	insinto /usr/share/${PN}/db
+	doins db/zm_u* db/zm_create.sql
 
 	for DIR in events images sound; do
-		dodir ${MY_HTDOCSDIR}/${DIR}
-		webapp_serverowned ${MY_HTDOCSDIR}/${DIR}
+		dodir "${MY_HTDOCSDIR}"/${DIR}
+		webapp_serverowned "${MY_HTDOCSDIR}"/${DIR}
 	done
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-2.txt
-	webapp_postupgrade_txt en ${FILESDIR}/postupgrade.txt
-	webapp_src_install
-	fperms 0644 /etc/zm.conf
-
-	keepdir /var/log/${PN}
-	fowners apache:apache /var/log/${PN}
-	fowners apache:apache /var/run/zm
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-2.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade.txt
 
-	newinitd ${FILESDIR}/init.d zoneminder
-	newconfd ${FILESDIR}/conf.d zoneminder
+	webapp_src_install
 }