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

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

commit:     350948771b8f21cc8af9dd0e42b4953791b75d61
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 18:20:11 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 18:20:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=35094877

[www-misc/zoneminder] lots more fixes

Package-Manager: portage-2.2.7

---
 www-misc/zoneminder/files/init.d                   |  1 +
 .../files/zoneminder-1.26.5-automagic.patch        | 34 ++++++++++
 www-misc/zoneminder/zoneminder-1.26.5.ebuild       | 74 ++++++++++++----------
 3 files changed, 75 insertions(+), 34 deletions(-)

diff --git a/www-misc/zoneminder/files/init.d b/www-misc/zoneminder/files/init.d
index ffb8667..00c5045 100644
--- a/www-misc/zoneminder/files/init.d
+++ b/www-misc/zoneminder/files/init.d
@@ -9,6 +9,7 @@ depend() {
 
 start_pre() {
 	checkpath -d -m 0775 -o apache:apache /var/run/zm
+	checkpath -d -m 0775 -o apache:apache /var/tmp/zm
 }
 
 start() {

diff --git a/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch b/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
new file mode 100644
index 0000000..266bd64
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 83e9d81..8619c8b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -171,6 +171,7 @@ else(PCRE_LIBRARIES)
+ 	set(optlibsnotfound "${optlibsnotfound} PCRE")
+ endif(PCRE_LIBRARIES)
+ 
++if(HAVE_GCRYPT)
+ # gcrypt (using find_library and find_path)
+ find_library(GCRYPT_LIBRARIES gcrypt)
+ if(GCRYPT_LIBRARIES)
+@@ -187,7 +188,11 @@ if(GCRYPT_LIBRARIES)
+ else(GCRYPT_LIBRARIES)
+ 	set(optlibsnotfound "${optlibsnotfound} GCrypt")
+ endif(GCRYPT_LIBRARIES)
++else(HAVE_GCRYPT)
++	set(optlibsnotfound "${optlibsnotfound} GCrypt")
++endif(HAVE_GCRYPT)
+ 
++if(HAVE_GNUTLS)
+ # gnutls (using find_library and find_path)
+ find_library(GNUTLS_LIBRARIES gnutls)
+ if(GNUTLS_LIBRARIES)
+@@ -205,6 +210,9 @@ if(GNUTLS_LIBRARIES)
+ else(GNUTLS_LIBRARIES)
+ 	set(optlibsnotfound "${optlibsnotfound} GnuTLS")
+ endif(GNUTLS_LIBRARIES)
++else(HAVE_GNUTLS)
++	set(optlibsnotfound "${optlibsnotfound} GnuTLS")
++endif(HAVE_GNUTLS)
+ 
+ # mysqlclient (using find_library and find_path)
+ find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
index a6693fd..0f507d9 100644
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
@@ -3,7 +3,18 @@
 # $Header: $
 
 # TO DO:
-# permissions on /tmp/zm, or use alternate directory
+# * ffmpeg support can be disabled in CMakeLists.txt but it does not build then 
+#		$(cmake-utils_useno ffmpeg ZM_NO_FFMPEG)
+# * dependencies of unknown status:
+# 	app-admin/sudo
+# 	dev-perl/Archive-Zip
+# 	dev-perl/Device-SerialPort
+# 	dev-perl/MIME-Lite
+# 	dev-perl/MIME-tools
+# 	dev-perl/PHP-Serialization
+# 	virtual/perl-Archive-Tar
+# 	virtual/perl-libnet
+# 	virtual/perl-Module-Load
 
 EAPI=5
 
@@ -17,7 +28,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 KEYWORDS=""
-IUSE="gcrypt gnutls +openssl debug ffmpeg mmap vlc"
+IUSE="gcrypt gnutls mmap +openssl vlc"
 SLOT="0"
 
 REQUIRED_USE="
@@ -25,40 +36,28 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	virtual/perl-Sys-Syslog
-	dev-perl/DBI
-	dev-perl/DBD-mysql
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	dev-perl/DateManip
-	dev-perl/libwww-perl
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/mysql
 	dev-lang/perl
 	dev-libs/libpcre
+	dev-perl/DateManip
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	dev-perl/libwww-perl
 	sys-libs/zlib
+	virtual/ffmpeg
 	virtual/jpeg
+	virtual/mysql
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Getopt-Long
+	virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes
 	gcrypt? ( dev-libs/libgcrypt )
 	gnutls? ( net-libs/gnutls )
-	openssl? ( dev-libs/openssl )
-	ffmpeg? ( virtual/ffmpeg )
 	mmap? ( dev-perl/Sys-Mmap )
+	openssl? ( dev-libs/openssl )
 	vlc? ( media-video/vlc )
 "
-
 RDEPEND="${DEPEND}"
 
-# dependencies of unknown status:
-# 	app-admin/sudo
-# 	dev-perl/Archive-Zip
-# 	dev-perl/Device-SerialPort
-# 	dev-perl/MIME-Lite
-# 	dev-perl/MIME-tools
-# 	dev-perl/PHP-Serialization
-# 	virtual/perl-Archive-Tar
-# 	virtual/perl-libnet
-# 	virtual/perl-Module-Load
-
 # 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
@@ -66,8 +65,9 @@ need_php_httpd
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
-#PATCHES=(
-#)
+PATCHES=(
+	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
+)
 
 pkg_setup() {
 	require_php_with_use mysql sockets apache2
@@ -80,12 +80,16 @@ src_configure() {
 		-DZM_WEBDIR=/var/www/zm/htdocs
 		-DZM_CGIDIR=/var/www/zm/cgi-bin
 		-DZM_CONTENTDIR=/var/lib/zm
+		-DZM_TMPDIR=/var/tmp/zm
 		-DZM_WEB_USER=apache
 		-DZM_WEB_GROUP=apache
 		$(cmake-utils_useno mmap ZM_NO_MMAP)
 		-DZM_NO_X10=OFF
-		$(cmake-utils_useno ffmpeg ZM_NO_FFMPEG)
+		-DZM_NO_FFMPEG=OFF
 		$(cmake-utils_useno vlc ZM_NO_VLC)
+		$(cmake-utils_useno openssl CMAKE_DISABLE_FIND_PACKAGE_OpenSSL)
+		$(cmake-utils_use_has gnutls)
+		$(cmake-utils_use_has gcrypt)
 	)
 
 	cmake-utils_src_configure
@@ -113,24 +117,26 @@ src_install() {
 	done
 
 	DOC_CONTENTS="
-0. If this is a new installation, you will need to create a MySQL\n
+1. If this is a new installation, you will need to create a MySQL\n
    database for ${PN} to use\n
    (see http://www.gentoo.org/doc/en/mysql-howto.xml).\n
    Once you completed that you should execute the following:\n
  cd /usr/share/${PN}\n
- mysql -u  -p  < db/zm_create.sql\n
+ mysql -u -p < db/zm_create.sql\n
+\n
+2.  Set your database settings in /etc/zm.conf\n
 \n
-1.  Set your database settings in /etc/zm.conf\n
+3. Check /etc/apache2/vhosts.d/10_zoneminder.conf\n
 \n
-2.  Enable PHP in your webserver configuration, \n
+4.  Enable PHP in your webserver configuration, \n
     enable short_open_tags in php.ini,\n
     set the time zone in php.ini, \n
     and restart/reload the webserver.\n
 \n
-3.  Start the ${PN} daemon:\n
+5.  Start the ${PN} daemon:\n
   /etc/init.d/${PN} start\n
 \n
-4. Finally point your browser to http://localhost/${PN}\n
+6. Finally point your browser to http://localhost/${PN}\n
 \n
 If you are upgrading, you will need to run the zmupdate.pl script:\n
  /usr/bin/zmupdate.pl version= [--user= --pass=]\n