commit: 0f0b76b65413adc77832f28149f6c1abd11b7c8b
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 8 18:45:46 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Dec 8 18:45:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0b76b6
www-misc/zoneminder: Remove depend.php from inherit wrt bug 552840
This simply replaces the function call with the dep it was adding.
No effective dep changes.
Package-Manager: portage-2.2.26
www-misc/zoneminder/zoneminder-1.27.0.ebuild | 8 ++++----
www-misc/zoneminder/zoneminder-1.28.0.ebuild | 6 +++---
www-misc/zoneminder/zoneminder-1.28.1.ebuild | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/www-misc/zoneminder/zoneminder-1.27.0.ebuild
b/www-misc/zoneminder/zoneminder-1.27.0.ebuild
index 7870564..a5f3fc6 100644
--- a/www-misc/zoneminder/zoneminder-1.27.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.27.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,7 +19,7 @@ EAPI=5
PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit perl-module readme.gentoo eutils base cmake-utils depend.php
depend.apache multilib flag-o-matic
+inherit perl-module readme.gentoo eutils base cmake-utils depend.apache
multilib flag-o-matic
MY_PN="ZoneMinder"
@@ -45,6 +45,7 @@ DEPEND="
dev-perl/libwww-perl
sys-libs/zlib
virtual/ffmpeg
+ virtual/httpd-php
virtual/jpeg
virtual/mysql
virtual/perl-ExtUtils-MakeMaker
@@ -63,7 +64,6 @@ 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}
@@ -74,7 +74,7 @@ PATCHES=(
MY_ZM_WEBDIR=/usr/share/zoneminder/www
pkg_setup() {
- require_php_with_use mysql sockets apache2
+ :
}
src_configure() {
diff --git a/www-misc/zoneminder/zoneminder-1.28.0.ebuild
b/www-misc/zoneminder/zoneminder-1.28.0.ebuild
index 0168b2a..4015381 100644
--- a/www-misc/zoneminder/zoneminder-1.28.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.28.0.ebuild
@@ -19,7 +19,7 @@ EAPI=5
PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit perl-module readme.gentoo eutils base cmake-utils depend.php
depend.apache multilib flag-o-matic
+inherit perl-module readme.gentoo eutils base cmake-utils depend.apache
multilib flag-o-matic
MY_PN="ZoneMinder"
@@ -50,6 +50,7 @@ DEPEND="
sys-auth/polkit
sys-libs/zlib
virtual/ffmpeg
+ virtual/httpd-php
virtual/jpeg
virtual/mysql
virtual/perl-ExtUtils-MakeMaker
@@ -69,7 +70,6 @@ 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}
@@ -80,7 +80,7 @@ PATCHES=(
MY_ZM_WEBDIR=/usr/share/zoneminder/www
pkg_setup() {
- require_php_with_use mysql sockets apache2
+ :
}
src_configure() {
diff --git a/www-misc/zoneminder/zoneminder-1.28.1.ebuild
b/www-misc/zoneminder/zoneminder-1.28.1.ebuild
index 0168b2a..4015381 100644
--- a/www-misc/zoneminder/zoneminder-1.28.1.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.28.1.ebuild
@@ -19,7 +19,7 @@ EAPI=5
PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit perl-module readme.gentoo eutils base cmake-utils depend.php
depend.apache multilib flag-o-matic
+inherit perl-module readme.gentoo eutils base cmake-utils depend.apache
multilib flag-o-matic
MY_PN="ZoneMinder"
@@ -50,6 +50,7 @@ DEPEND="
sys-auth/polkit
sys-libs/zlib
virtual/ffmpeg
+ virtual/httpd-php
virtual/jpeg
virtual/mysql
virtual/perl-ExtUtils-MakeMaker
@@ -69,7 +70,6 @@ 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}
@@ -80,7 +80,7 @@ PATCHES=(
MY_ZM_WEBDIR=/usr/share/zoneminder/www
pkg_setup() {
- require_php_with_use mysql sockets apache2
+ :
}
src_configure() {
