From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9076213827E for ; Tue, 24 Dec 2013 17:46:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBE6FE09C2; Tue, 24 Dec 2013 17:46:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 599A0E09C2 for ; Tue, 24 Dec 2013 17:46:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F89833F5FC for ; Tue, 24 Dec 2013 17:46:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7910FE5604 for ; Tue, 24 Dec 2013 17:46:09 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1387907293.7cb1ff4a1f8d01aa3c985d9ded460b925ffd3e8b.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/ X-VCS-Repository: dev/dilfridge X-VCS-Files: www-misc/zoneminder/todo.txt www-misc/zoneminder/zoneminder-1.26.5.ebuild X-VCS-Directories: www-misc/zoneminder/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 7cb1ff4a1f8d01aa3c985d9ded460b925ffd3e8b X-VCS-Branch: master Date: Tue, 24 Dec 2013 17:46:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 60e6bbff-bf95-417d-92d9-ac52269fe1e6 X-Archives-Hash: 63ae3c6262a86eb835874329d05a64cf commit: 7cb1ff4a1f8d01aa3c985d9ded460b925ffd3e8b Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Tue Dec 24 17:48:13 2013 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Tue Dec 24 17:48:13 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=7cb1ff4a [www-misc/zoneminder] more work in progress --- www-misc/zoneminder/todo.txt | 2 - www-misc/zoneminder/zoneminder-1.26.5.ebuild | 76 +++++++++++++--------------- 2 files changed, 35 insertions(+), 43 deletions(-) diff --git a/www-misc/zoneminder/todo.txt b/www-misc/zoneminder/todo.txt deleted file mode 100644 index ed0e8cf..0000000 --- a/www-misc/zoneminder/todo.txt +++ /dev/null @@ -1,2 +0,0 @@ - -* permissions on /tmp/zm, or use alternate directory diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild index 80a9020..6679b40 100644 --- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild +++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild @@ -2,6 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +# TO DO: +# permissions on /tmp/zm, or use alternate directory + EAPI=5 inherit eutils base cmake-utils depend.php depend.apache multilib flag-o-matic @@ -14,41 +17,14 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2" KEYWORDS="" -IUSE="gcrypt gnutls x10 openssl pcre zlib debug ffmpeg mmap" +IUSE="gcrypt gnutls +openssl debug ffmpeg mmap vlc" SLOT="0" +REQUIRED_USE=" + || ( openssl gnutls ) +" + DEPEND=" - app-admin/sudo - dev-lang/perl - dev-libs/libpcre - dev-libs/openssl - 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 - dev-perl/PHP-Serialization - media-video/ffmpeg - virtual/jpeg - virtual/perl-Archive-Tar - virtual/perl-Getopt-Long - virtual/perl-libnet - virtual/perl-Module-Load - virtual/perl-Sys-Syslog - virtual/perl-Time-HiRes - mmap? ( dev-perl/Sys-Mmap ) - zlib? ( sys-libs/zlib ) - virtual/jpeg - openssl? ( dev-libs/openssl ) - dev-lang/perl - pcre? ( dev-libs/libpcre ) - virtual/mysql - gcrypt? ( dev-libs/libgcrypt ) - gnutls? ( net-libs/gnutls ) - ffmpeg? ( virtual/ffmpeg ) virtual/perl-Sys-Syslog dev-perl/DBI dev-perl/DBD-mysql @@ -57,14 +33,31 @@ DEPEND=" dev-perl/DateManip dev-perl/libwww-perl virtual/perl-ExtUtils-MakeMaker + virtual/mysql + dev-lang/perl + dev-libs/libpcre + sys-libs/zlib + virtual/jpeg + gcrypt? ( dev-libs/libgcrypt ) + gnutls? ( net-libs/gnutls ) + openssl? ( dev-libs/openssl ) + ffmpeg? ( virtual/ffmpeg ) mmap? ( dev-perl/Sys-Mmap ) + vlc? ( media-video/vlc ) " -RDEPEND=" - ${DEPEND} - dev-perl/DBD-mysql - media-libs/netpbm -" +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. @@ -72,7 +65,6 @@ need_apache need_php_httpd S=${WORKDIR}/${MY_PN}-${PV} -CMAKE_IN_SOURCE_BUILD="ON" PATCHES=( "${FILESDIR}"/1.24.2/db_upgrade_script_location.patch @@ -86,13 +78,15 @@ src_configure() { append-cxxflags -D__STDC_CONSTANT_MACROS mycmakeargs=( - -DZM_WEBDIR=/var/www/zoneminder/htdocs - -DZM_CGIDIR=/var/www/zoneminder/cgi-bin + -DZM_WEBDIR=/var/www/zm/htdocs + -DZM_CGIDIR=/var/www/zm/cgi-bin + -DZM_CONTENTDIR=/var/lib/zm -DZM_WEB_USER=apache -DZM_WEB_GROUP=apache $(cmake-utils_useno mmap ZM_NO_MMAP) - $(cmake-utils_useno x10 ZM_NO_X10) + -DZM_NO_X10=OFF $(cmake-utils_useno ffmpeg ZM_NO_FFMPEG) + $(cmake-utils_useno vlc ZM_NO_VLC) ) cmake-utils_src_configure