[gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     946d116374e32e49d31aa95bd30bf9db9d9cfe06
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 09:01:40 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 09:01:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=946d1163

Cleanups

(Portage version: 2.1.10.17/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 www-misc/zoneminder/ChangeLog                |    4 +++
 www-misc/zoneminder/Manifest                 |   30 +++++++++++++-------------
 www-misc/zoneminder/zoneminder-1.25.0.ebuild |   26 ++++++++++++----------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index 5c754bb..5843028 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/Attic/ChangeLog,v 1.41 2011/04/04 12:11:35 scarabeus Exp $
 
+  18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  zoneminder-1.25.0.ebuild:
+  Cleanups
+
   17 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   +files/1.25.0/Makefile.am.2.patch, files/1.25.0/Makefile.am.patch,
   zoneminder-1.25.0.ebuild:

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 90d5d94..d6c6edc 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -13,23 +13,23 @@ AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
 AUX init.d 398 RMD160 d124ef1c1e6f5b0a9e4535d96620e46de71457c4 SHA1 5afc09eb838d9ebb28e9e91ffa0f482830862396 SHA256 b5dd459ddd0a331f625b5fa0b9441b9236f676ad2e6f6ea2da896ed4056cb0c6
 DIST ZoneMinder-1.25.0.tar.gz 1119091 RMD160 32a4f503770103e55bfe592864c1cab82e7395a6 SHA1 a93a976a5cd82f1e197f4d7bd626d3f0387c4231 SHA256 ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d
-EBUILD zoneminder-1.25.0.ebuild 3782 RMD160 946a6519eb58ab827bc7a4a6b64a7e420822624c SHA1 06fb3487002b0846bc194b5d90dbef5e4b250838 SHA256 904b0d5c9f7cac6b52b4052ed0d199869795cfc21ed00dee618f3ab8d7fe8999
-MISC ChangeLog 8381 RMD160 571a60fba206623f4fe400388ae9468e5eb39f78 SHA1 cfe6c2272ec5ac149cca92ce3646fafc092f5eb2 SHA256 71878be30cbb65303516b368dcbfbad0f77e04b0482b3fc96b7a37e81927aca6
+EBUILD zoneminder-1.25.0.ebuild 3772 RMD160 6bdc04574faa36b3372d3c68035f7c288ed055e2 SHA1 1abae8a63557070bba1ae49c26858d4b1c155974 SHA256 a640995c0307c6496c27ba74e45fe6acc767e7b6bd168415740f8fd4f0372eb6
+MISC ChangeLog 8478 RMD160 d479defb002aa7e36a645c0466741090282f8fc7 SHA1 8eeef884ade80e1af44b8b2a560c71546beebec3 SHA256 5cb3ffcf9cd2aef441b17a0311f12aae16d82eb1e8726a6ab44918c980ea8905
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOdR+aAAoJEEb+UGWnxTyH6GgQALjUwrGzu8BIh4vqIwsla4rn
-ZEA4EWejTgXYrC36N04Wm27/2goG7pQIfCR6PSjpKHIBT0qmd/0aripz3vYKD73z
-Ra8Qj+OJIWxrbzt9LXEqOqqH7/74PKcXXGuY9ykE4k5/OItAK5ZWiMVLKdE5e1JI
-6CTrTUc8NQVmi01n9MM48mX706EzpjeLrqTju6qW2ERBLKGYVc3jJPRR/qb7LHHY
-fr0r82clLkfushcMj3NrXs0z+RtzGSpsMdiTAiTpVysuIbLfxMr4LGdNDHz2KBs5
-6AfYzvYNyQv0C/LQHvaVc3tSRpUw5xheSm6deFuSQqmoR8xv9F5xAIsBl/tayIQ2
-NqheUO7EsAXFEGVMN03J1lxTdJhfdBNxsD0XgnUh0erYbO+ZIk2VcZtTO3c63aUd
-LQbn4EFZQ+5KeefuE/llsp5iKasGt86qZxbU4t38VSQPOu9KDUVxkfJ++AeHuFDG
-AOMskhLnHj6lhzWwInjShRS6gn19z65iyKIP80tXRtvyTKIU7Fg3asWSeglOBE5F
-jmGc0EL8g9fyKjPeXoaJTJInaDyr4OF75rwHfLU4j9Y2s+RV0fc34timo/LvvlkO
-s2DWoHYPieBjXqJygUrb26CQsUGFjCaLn0/RT5q1x+jGG0Y9aNwnSX2v8MkVv8b0
-AiCHqER4M2JJDFtceNfv
-=555t
+iQIcBAEBCgAGBQJOdbN0AAoJEEb+UGWnxTyHIVkQAI7YT8JE/IVNE6yiMf9G82uT
+pr8giBstDMcUJtsMRhdvi7QbGnncRi46YF1UcwHC5fYWMoeNLOcBFKfVAz4GGAdV
+Hcaju+Vm6z69Vl5NVNn7VJw0iC5yb3mimV7fvEFy9yYDdwRsNRdmk/Uv/gC+rAWC
+6ACYmJmUQKh1OoG1UOpQkyoyTApchLirbGbetfJtH/qJ20iPN8V8tueFHLdxl+Pj
+HHEDcg3p4wVmtp7olktoWe5evTZKwY0Vpd4qi8ZqWZ5NuEL5gNjvZ+ghG4DVcyo7
+ravdMx4YHEvcHZF8fzqo8gBATaA3/eC1JZFWa8IWJzaYx3BAjFI/Xz+7RiDXyDLw
+uj94eJCK4SUTbG+0kdyLySrH9rqM8CQWUp0IVM9bHcNRqBq3rjS9Sjm5Bywcvwii
+4Mv1Zg5pwq9SLW0YMpDeM8vFaglRgFprUwrVV84zQho90Dwlnj4/cI+vZTLt1q0J
+MnKLQZ9HZcG05lTOt8ITsPfIkXvatRSDi/ccD3JWt2/KIPSH2FHffDESHUJ6+i/b
+EMyqhX+vWKhcInbxgvO3BTqtiq0BdkkcXH2M2/2rC3iUmoxxBpb7msej1ilED0ul
+4jcskIgdI6/Td+dAVFyC+1g/DrYTC49XbV3D01PQkunptBqPV4RbobnpEJGilJNr
+ckJvQyzb38El9mJV7XIy
+=iXFp
 -----END PGP SIGNATURE-----

diff --git a/www-misc/zoneminder/zoneminder-1.25.0.ebuild b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
index 646197b..9f855ba 100644
--- a/www-misc/zoneminder/zoneminder-1.25.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
@@ -17,13 +17,11 @@ KEYWORDS=""
 IUSE="debug ffmpeg mmap"
 SLOT="0"
 
-DEPEND="app-admin/sudo
+DEPEND="
+	app-admin/sudo
+	dev-lang/perl
 	dev-libs/libpcre
-	virtual/jpeg
-	>=media-video/ffmpeg-0.7
 	dev-libs/openssl
-	>=dev-lang/perl-5.6.0
-	virtual/perl-Archive-Tar
 	dev-perl/Archive-Zip
 	dev-perl/DateManip
 	dev-perl/DBD-mysql
@@ -33,6 +31,9 @@ DEPEND="app-admin/sudo
 	dev-perl/MIME-Lite
 	dev-perl/MIME-tools
 	dev-perl/PHP-Serialization
+	media-video/ffmpeg
+	virtual/jpeg
+	virtual/perl-Archive-Tar
 	virtual/perl-Getopt-Long
 	virtual/perl-libnet
 	virtual/perl-Module-Load
@@ -41,9 +42,12 @@ DEPEND="app-admin/sudo
 	mmap? ( dev-perl/Sys-Mmap )
 "
 
-RDEPEND="dev-perl/DBD-mysql
+RDEPEND="
+	dev-perl/DBD-mysql
 	ffmpeg? ( virtual/ffmpeg )
-	media-libs/netpbm"
+	media-libs/netpbm
+"
+# ^ huh? not include DEPEND???
 
 # 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.
@@ -101,12 +105,13 @@ src_compile() {
 
 src_install() {
 	keepdir /var/run/zm
+	keepdir /var/log/zm
+
 	emake -j1 DESTDIR="${D}" install
 
 	fperms 0640 /etc/zm.conf
 
-	keepdir /var/log/${PN}
-	fowners apache:apache /var/log/${PN}
+	fowners apache:apache /var/log/zm
 	fowners apache:apache /var/run/zm
 
 	newinitd "${FILESDIR}"/init.d zoneminder
@@ -137,14 +142,11 @@ pkg_postinst() {
 	elog "1.  Set your database settings in /etc/zm.conf"
 	elog ""
 	elog "2.  Start the ${PN} daemon:"
-	elog ""
 	elog "  /etc/init.d/${PN} start"
 	elog ""
 	elog "3. Finally point your browser to http://localhost/${PN}"
 	elog ""
-	elog ""
 	elog "If you are upgrading, you will need to run the zmupdate.pl script:"
-	elog ""
 	elog " /usr/bin/zmupdate.pl version=<from version> [--user=<my_database_user> --pass=<my_database_pass>]"
 	elog ""
 }