ebuild cleanup wrt #208584, also fixes #207481

Package-Manager: portage-2.1.4.4

3 files changed, 71 insertions, 54 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/Manifest b/www-misc/zoneminder/Manifest
index b0f510a39ab2..8fcf440126e4 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Makefile.am.patch 833 RMD160 599a72ad1f14a8ee8950c8646e67d2cf40b17002 SHA1 61c6156e3c640321565765a4e0034c0587f25ef8 SHA256 8a40bddee62cf52ad354e61258a98357c6b9246d9cd75cf8acd7132a02770aad
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
 AUX ffmpeg.patch 314 RMD160 a44b49741362f26770fceea62b93a7fceecb0a6b SHA1 3b935d8530b61fabb5e0411f89911f346ae99161 SHA256 0b404f229edb18a120becf20506c7564d292669ee2478ec407f817c2cd3fc326
@@ -6,6 +9,13 @@ AUX postinstall-2.txt 643 RMD160 fb8baf88fe59785c1bd2d9cfd75e2d93d33768d6 SHA1 2
 AUX postupgrade.txt 463 RMD160 2ffe191845a0aad2ee2429708d3a55871a246997 SHA1 0b9dd5d9932a09feea6fcb12349f709d77ece725 SHA256 d25b259fe650ba385c6aa4b313a78d829a429d0ba0d15ee2d0acd14d3c4e39eb
 AUX zm_create.sql.in.diff 18897 RMD160 bb7dea7b31d81e43da7307a7fe2420bd69c7e90e SHA1 c7e1dfe00ca5c94bf45bb4484aa5f094ae7fa62d SHA256 eaa9cfd549f4ff678b934d77a6e43922b028627416bb2a066b30630f93f6e76b
 DIST ZoneMinder-1.22.3.tar.gz 1258311 RMD160 0752e77333d3eb2f320bb692905eeec9ae7a311e SHA1 4e86dee31acc5f080c8a6f8ce29228b450067201 SHA256 6bee02be8d5e21d3435c17def157a87727330ee6480be3a8fa5b1966cc10a6bc
-EBUILD zoneminder-1.22.3.ebuild 2416 RMD160 6448cca2ba7ee27db845672a0242de6124255f37 SHA1 b55f513ca7bd449560bfba0b9abf0b4574422701 SHA256 b56546cb76e69faddf3bf23f01ea345c9cfabb8cca815bff239d017764bc9edc
-MISC ChangeLog 4040 RMD160 f7b9d8937f81c4e4274c1e86895c2a206102d506 SHA1 addce41c147694834589d35d85bae97c0926432b SHA256 f6ea5de3e8947df5843366744b95cf7197590addc03b1d2316cf02c24c37e1b7
+EBUILD zoneminder-1.22.3.ebuild 2538 RMD160 0b34a0bdf59127f65a3693b7813e85dff495f143 SHA1 fcc1266de1f5ed711b3f25c639e6a31c38215ecd SHA256 4be442c4e1fa66172504f9ef5c29b3285ba2409208cb22a925c063d743f5391f
+MISC ChangeLog 4168 RMD160 7e905d83d367f0648604df2dd7fc127450a7285b SHA1 d50c0aff36d3b933470c26f6716f5dcaab998499 SHA256 b2708870baf3fdb4091d34ea9304e94c3d57b2b2ff41f3fc74f236ed06176eb1
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfAJhoACgkQmPFBzbX68WGaNwCeIqeenDCmYI3Zuo0oqN797fHy
+X3cAni2Eg6MKaOv0iwXdtjw4zlSTtzgp
+=6Hrc
+-----END PGP SIGNATURE-----
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
 }