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

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

commit:     b291c30a99dee4e0810d87095afee1f84600dac9
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 14:43:53 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 14:43:53 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=b291c30a

[www-misc/zoneminder] moved to main tree

---
 www-misc/zoneminder/Manifest                       |   2 -
 www-misc/zoneminder/files/10_zoneminder.conf       |  18 ---
 www-misc/zoneminder/files/README.gentoo            |  27 -----
 www-misc/zoneminder/files/conf.d                   |   6 -
 www-misc/zoneminder/files/init.d                   |  26 -----
 ...eminder-1.24.2-db_upgrade_script_location.patch |  11 --
 .../files/zoneminder-1.26.5-automagic.patch        |  34 ------
 www-misc/zoneminder/metadata.xml                   |  13 ---
 www-misc/zoneminder/zoneminder-1.26.5.ebuild       | 129 ---------------------
 www-misc/zoneminder/zoneminder-1.27.0.ebuild       | 129 ---------------------
 10 files changed, 395 deletions(-)

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
deleted file mode 100644
index adad46c..0000000
--- a/www-misc/zoneminder/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST zoneminder-1.26.5.tar.gz 1107153 SHA256 a10acfea5066bd2fbcdcb40f2ddfa81a00f1eaf9123b6090aca69d3318281eec SHA512 0cd63d9271f8a8284597db41f52d8ba764bd3644c54be50a03c8b72695347104266ed14e1a399949d986af370a15885aceec833980f4cdc4f7b953ee74d44cce WHIRLPOOL b1510c873d7a9262276a08392ca5e598563183946db7e2acf270067e29b9241c4d1ae39ee63bd2998948b76448311af7adf8d0e51c546345f130a9f191e5aac3
-DIST zoneminder-1.27.0.tar.gz 1262653 SHA256 2f31c10e6c5930aedfa9f08edfa074ef1b168e5bdffb77a147d4e631bfb03ef2 SHA512 8a349558399381a9062365ddc8bd8f815e3800929914096b2e4ea63e4d6dd12054f7b849fab5bea4bcfc87ea60739479a55734c7075a74aab0622d35f1d2bb14 WHIRLPOOL 869811e289e11343ff0cd0bd078a477db3511ed3cc96574d71163e1ab9eaf703e26f7c526841164a41f8d1e1aae47eb7f198831999b0c39f2729199fe81f43c0

diff --git a/www-misc/zoneminder/files/10_zoneminder.conf b/www-misc/zoneminder/files/10_zoneminder.conf
deleted file mode 100644
index 277d680..0000000
--- a/www-misc/zoneminder/files/10_zoneminder.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-ScriptAlias /cgi-bin/zms "/usr/libexec/zoneminder/cgi-bin/zms"
-ScriptAlias /cgi-bin/nph-zms "/usr/libexec/zoneminder/cgi-bin/nph-zms"
-
-<Directory "/usr/libexec/zoneminder/cgi-bin">
-  AllowOverride All
-  Options ExecCGI
-  Order allow,deny
-  Allow from all
-</Directory> 
-
-Alias /zoneminder "%ZM_WEBDIR%"
-
-<Directory "%ZM_WEBDIR%">
-  Options -Indexes MultiViews FollowSymLinks
-  AllowOverride All
-  Order allow,deny
-  Allow from all
-</Directory> 

diff --git a/www-misc/zoneminder/files/README.gentoo b/www-misc/zoneminder/files/README.gentoo
deleted file mode 100644
index 2ada7c7..0000000
--- a/www-misc/zoneminder/files/README.gentoo
+++ /dev/null
@@ -1,27 +0,0 @@
-1. If this is a new installation, you will need to create a MySQL
-   database for zoneminder to use
-   (see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).
-   E.g., when logged into mysql as root,
-     mysql> CREATE DATABASE \`zm\`;
-     mysql> GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'topsecretpassword';
-   Once you completed that you should execute the following:
-     cd /usr/share/zoneminder
-     mysql -u zmuser -p < db/zm_create.sql
-
-2. Set your database settings in /etc/zm.conf, including above topsecretpassword
-
-3. Configure apache to use zoneminder, see /usr/share/doc/zoneminder*/10_zoneminder.conf
-   for an example configuration snippet.
-
-4. Enable PHP in your webserver configuration,
-   enable short_open_tags in php.ini,
-   set the time zone in php.ini,
-   and restart/reload the webserver.
-
-5. Start the zoneminder daemon:
-     /etc/init.d/zoneminder start
-
-6. Finally point your browser to http://your.webserver/zoneminder
-
-If you are upgrading, you will need to run the zmupdate.pl script:
-      /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser --pass=topsecretpassword]

diff --git a/www-misc/zoneminder/files/conf.d b/www-misc/zoneminder/files/conf.d
deleted file mode 100644
index d2e0336..0000000
--- a/www-misc/zoneminder/files/conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-ZM_SCRIPT=/usr/bin/zmpkg.pl
-
-# Commands for starting and stopping the server
-
-CMD_START="${ZM_SCRIPT} start"
-CMD_STOP="${ZM_SCRIPT} stop"

diff --git a/www-misc/zoneminder/files/init.d b/www-misc/zoneminder/files/init.d
deleted file mode 100644
index 30a9b13..0000000
--- a/www-misc/zoneminder/files/init.d
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/files/Attic/init.d,v 1.3 2009/01/01 16:47:24 gentoofan23 Exp $
-
-depend() {
-	need mysql
-	need apache2
-}
-
-start_pre() {
-	checkpath -d -m 0775 -o apache:apache /var/run/zm
-	checkpath -d -m 0775 -o apache:apache /var/tmp/zm
-}
-
-start() {
-	ebegin "Starting zoneminder"
-	${CMD_START}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping zoneminder"
-	${CMD_STOP}
-	eend $?
-}

diff --git a/www-misc/zoneminder/files/zoneminder-1.24.2-db_upgrade_script_location.patch b/www-misc/zoneminder/files/zoneminder-1.24.2-db_upgrade_script_location.patch
deleted file mode 100644
index 41b537c..0000000
--- a/www-misc/zoneminder/files/zoneminder-1.24.2-db_upgrade_script_location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ZoneMinder-1.24.1/zm.conf.in.orig	2009-03-23 13:55:43.000000000 +0000
-+++ ZoneMinder-1.24.1/zm.conf.in	2009-03-23 13:57:22.000000000 +0000
-@@ -13,7 +13,7 @@
- ZM_VERSION=@VERSION@
- 
- # Path to build directory, used mostly for finding DB upgrade scripts
--ZM_PATH_BUILD=@PATH_BUILD@
-+ZM_PATH_BUILD=/usr/share/zoneminder
- 
- # Build time, used to record when to trigger various checks
- ZM_TIME_BUILD=@TIME_BUILD@

diff --git a/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch b/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
deleted file mode 100644
index 266bd64..0000000
--- a/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/metadata.xml b/www-misc/zoneminder/metadata.xml
deleted file mode 100644
index bd56d97..0000000
--- a/www-misc/zoneminder/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Huettel</name>
-	</maintainer>
-	<use>
-		<flag name="gcrypt">...</flag>
-		<flag name="vlc">...</flag>
-		<flag name="openssl">...</flag>
-	</use>
-</pkgmetadata>

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
deleted file mode 100644
index 64670f0..0000000
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# TO DO:
-# * 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:
-# 	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
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-
-inherit perl-module readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
-
-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="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE="gcrypt gnutls mmap +openssl vlc"
-SLOT="0"
-
-REQUIRED_USE="
-	|| ( openssl gnutls )
-"
-
-DEPEND="
-	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 )
-	mmap? ( dev-perl/Sys-Mmap )
-	openssl? ( dev-libs/openssl )
-	vlc? ( media-video/vlc )
-"
-RDEPEND="${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.
-need_apache
-need_php_httpd
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
-)
-
-MY_ZM_WEBDIR=/usr/share/zoneminder/www
-
-pkg_setup() {
-	require_php_with_use mysql sockets apache2
-}
-
-src_configure() {
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-	perl_set_version
-
-	mycmakeargs=(
-		-DZM_PERL_SUBPREFIX=${VENDOR_LIB}
-		-DZM_TMPDIR=/var/tmp/zm
-		-DZM_WEB_USER=apache
-		-DZM_WEB_GROUP=apache
-		-DZM_WEBDIR=${MY_ZM_WEBDIR}
-		$(cmake-utils_useno mmap ZM_NO_MMAP)
-		-DZM_NO_X10=OFF
-		-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
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# the log directory
-	keepdir /var/log/zm
-	fowners apache:apache /var/log/zm
-
-	# now we duplicate the work of zmlinkcontent.sh
-	dodir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events
-	fperms -R 0775 /var/lib/zoneminder
-	fowners -R apache:apache /var/lib/zoneminder
-	dosym /var/lib/zoneminder/images ${MY_ZM_WEBDIR}/images
-	dosym /var/lib/zoneminder/events ${MY_ZM_WEBDIR}/events
-
-	# the configuration file
-	fperms 0640 /etc/zm.conf
-	fowners root:apache /etc/zm.conf
-
-	# init scripts etc
-	newinitd "${FILESDIR}"/init.d zoneminder
-	newconfd "${FILESDIR}"/conf.d zoneminder
-
-	cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
-	sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
-
-	readme.gentoo_src_install
-}

diff --git a/www-misc/zoneminder/zoneminder-1.27.0.ebuild b/www-misc/zoneminder/zoneminder-1.27.0.ebuild
deleted file mode 100644
index 64670f0..0000000
--- a/www-misc/zoneminder/zoneminder-1.27.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# TO DO:
-# * 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:
-# 	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
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-
-inherit perl-module readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
-
-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="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE="gcrypt gnutls mmap +openssl vlc"
-SLOT="0"
-
-REQUIRED_USE="
-	|| ( openssl gnutls )
-"
-
-DEPEND="
-	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 )
-	mmap? ( dev-perl/Sys-Mmap )
-	openssl? ( dev-libs/openssl )
-	vlc? ( media-video/vlc )
-"
-RDEPEND="${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.
-need_apache
-need_php_httpd
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
-)
-
-MY_ZM_WEBDIR=/usr/share/zoneminder/www
-
-pkg_setup() {
-	require_php_with_use mysql sockets apache2
-}
-
-src_configure() {
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-	perl_set_version
-
-	mycmakeargs=(
-		-DZM_PERL_SUBPREFIX=${VENDOR_LIB}
-		-DZM_TMPDIR=/var/tmp/zm
-		-DZM_WEB_USER=apache
-		-DZM_WEB_GROUP=apache
-		-DZM_WEBDIR=${MY_ZM_WEBDIR}
-		$(cmake-utils_useno mmap ZM_NO_MMAP)
-		-DZM_NO_X10=OFF
-		-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
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# the log directory
-	keepdir /var/log/zm
-	fowners apache:apache /var/log/zm
-
-	# now we duplicate the work of zmlinkcontent.sh
-	dodir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events
-	fperms -R 0775 /var/lib/zoneminder
-	fowners -R apache:apache /var/lib/zoneminder
-	dosym /var/lib/zoneminder/images ${MY_ZM_WEBDIR}/images
-	dosym /var/lib/zoneminder/events ${MY_ZM_WEBDIR}/events
-
-	# the configuration file
-	fperms 0640 /etc/zm.conf
-	fowners root:apache /etc/zm.conf
-
-	# init scripts etc
-	newinitd "${FILESDIR}"/init.d zoneminder
-	newconfd "${FILESDIR}"/conf.d zoneminder
-
-	cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
-	sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
-
-	readme.gentoo_src_install
-}