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

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

commit:     41309d5cb140d6ef5bde246159469a64a8c87b83
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 08:55:13 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 08:55:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=41309d5c

Builds but does not install yet

(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 |   23 +++++++++++--------
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index a4e65a6..b9c44c3 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 $
 
+  17 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  zoneminder-1.25.0.ebuild:
+  Builds but does not install yet
+
   16 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   zoneminder-1.25.0.ebuild:
   Sort out patches

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 94cd9e6..9ca672b 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -12,23 +12,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 3744 RMD160 cec4c041827a40d758339d4a1c563cf48f85bff3 SHA1 1236263a108490467d05df8b3003327b3920e660 SHA256 d6d16bba96ea005a0cb5304bbc32e2390b7f1783a520fc9df77095010a0e45c1
-MISC ChangeLog 7937 RMD160 4f8bb4a5dd76074ca455f1dfb70db4c6bd36fb5f SHA1 fd6449368a28a3663cc7bd82f5cb5b19d111f92b SHA256 71c7d6b4fe28a1df01aca33c828f330c89bcd5d0c2f487c18a89c9ca207c3d32
+EBUILD zoneminder-1.25.0.ebuild 3722 RMD160 dfa31404e10c8fe0d2a989ea522608b7d29074d3 SHA1 c3dc455ee1384341199fcfafecab0a2ded159a3a SHA256 0459249406ff666463760928e29a74d2022f9ce96f141a5b2edbe341939deda5
+MISC ChangeLog 8057 RMD160 2b8b1f255e0ca05fc8beb78a6cd7e87d020e0f0e SHA1 e0ab433b58bb7c37e904ebe52e264a8396b6da48 SHA256 d2206ee6f60f7fd28720a4da2cd7a5bd7d09ac810264ddd7c628512afeeb5256
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOc5V9AAoJEEb+UGWnxTyH/OEP/jLWnwWqsn1W1nDmeiaxKzxd
-GVypnavElZTevQ5ybbQlWllfPIGKXAf8Z6pji65Vpj1V4aXItStevbpkEZNP8Tp4
-gNX4BhbTiSHVo0zrOTeq05NJ/ZSrDodIhsFJAnQam28H2jCVZxdLNusRV9QGocR2
-sYci98OMpDtq436Cctl+IKDZGgWmh8eRxBmHus6653xzCalmMSQFrZG20smwcPxM
-YoxI1o1fe92jcPsjM9oMRh1IjQvC76yLYgSdcaWYmpyDyXKCB9sO/OqM9ShIEMLf
-QyBwU5d+v4HAl4eegf4c0LxOCb1GnBkke3AT9J7DADxHVuWPORsOwarCJuPfXNYm
-fzpkXBeWS4bcfA3B+dCgOlLLYKzJShQ0nzwO3ZcjEhj+w72ghbT3RHxw5LXzK8HN
-BNQcOAqHTx5SpcLkfMtHi0DkBtqyve9FEU8fYst0gkj9a+zqV2zCIg+Nmzd7daa/
-q+WqBukDw+l0yVr3gAvXmfXO6Ah8BdrE/47SKbEIgX4zx7J5CIvaGEXfF2amxqzW
-IyPJSs2l6I6lU0L/PvetTrlyWo1sSLy2m59p8mEbQDlRB1xeVG5YOZ7kLH5WLocm
-tPQwnuvoDfCBg7ZMYkhs93Ng7y9rte21SLwctIzn50F2BwBOQF1Ivom6S3+cSwLM
-/87uZ2rYrzWLU4dbtvym
-=AtWc
+iQIcBAEBCgAGBQJOdGBxAAoJEEb+UGWnxTyHlxIP/ivYJkxhYyD+QNwqhUotIEBN
+mr+UL0T2Kz3Iltv4qNsx7M35yhtLVkdXEzbPSyQZjRLakwapoEv1lyEIzZkdC4OQ
+c7LS2xQytVsUFKbhtavDG7bGRX/Cnu049YG41ca2FZTHqKA/7bkmBgDXd7Q5ZMzT
+THoxNPGp16M/g8LR8QrDWSWMb1zEhRCgMS9PltURGwZCcivaTHcq+74QnFAbIxsp
+BdrN00JwBMAIEYK5FY8SSQLezqWYf1ejtT9z303pOsN3vrkAn+HP+TsotNlNHv/t
+fcmpittHBEe+j6w2/EJSUCFOXR1533gp87fzqKjKVOObJatuk9Zur0ciS9DXbwwd
+xuCN40wHVZv4Q8tC+O2O/S2auH2Nid+td6QdYvW734f5B/RTN028/AI1nYO5gMac
+Z43VTzZ/ZocAZBdDus8KQ//mu9ekkooyNBrRHzA6aZHMMW57zpzf7JLTsn/pMKpn
+baWsgpvqewR/tjF+nh23g2jK2X8HDlMYJUw4k8Bd5t0fkvfoayvu2ii88ZaG7AiE
+TTFiWHJ5A7PRTfNQ5H3WkbOx4quyjOg0oeYOBlvnWtld8zGkJ2aeFpi/QkFBn57u
+eu/ATB6A3Rr7doN6WWpuXDP0a4dhiyx8mRn0Z/yaIISkaBWP3VX6VHq6E+gc8I20
+CIK7tWsa5XKMjAiQiiUr
+=tH9X
 -----END PGP SIGNATURE-----

diff --git a/www-misc/zoneminder/zoneminder-1.25.0.ebuild b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
index 47b2ddb..d9c056a 100644
--- a/www-misc/zoneminder/zoneminder-1.25.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils base autotools depend.php depend.apache multilib
+inherit eutils base autotools depend.php depend.apache multilib flag-o-matic
 
 MY_PN="ZoneMinder"
 
@@ -14,12 +14,13 @@ SRC_URI="http://www.zoneminder.com/downloads/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS=""
-IUSE="debug ffmpeg"
+IUSE="debug ffmpeg mmap"
 SLOT="0"
 
 DEPEND="app-admin/sudo
 	dev-libs/libpcre
 	virtual/jpeg
+	>=media-video/ffmpeg-0.8
 	net-libs/gnutls
 	>=dev-lang/perl-5.6.0
 	virtual/perl-Archive-Tar
@@ -36,7 +37,9 @@ DEPEND="app-admin/sudo
 	virtual/perl-libnet
 	virtual/perl-Module-Load
 	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes"
+	virtual/perl-Time-HiRes
+	mmap? ( dev-perl/Sys-Mmap )
+"
 
 RDEPEND="dev-perl/DBD-mysql
 	ffmpeg? ( virtual/ffmpeg )
@@ -64,15 +67,15 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+
 	local myconf
 
-# To enable mmap support we need a dependancy of Sys::Mmap
-# It installs fine via g-cpan, but there's no ebuild currently in portage.
-#	if use mmap; then
-#		myconf="${myconf} --enable-mmap=yes"
-#	else
-#		myconf="${myconf} --enable-mmap=no"
-#	fi
+	if use mmap; then
+		myconf="${myconf} --enable-mmap=yes"
+	else
+		myconf="${myconf} --enable-mmap=no"
+	fi
 
 	if use debug; then
 		myconf="${myconf} --enable-debug=yes --enable-crashtrace=yes"