summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-12-08 13:45:46 -0500
committerBrian Evans <grknight@gentoo.org>2015-12-08 13:45:46 -0500
commit0f0b76b65413adc77832f28149f6c1abd11b7c8b (patch)
treea6a0a00ea3e545feb45da5a10606bdc08d4443af /www-misc
parentmedia-libs/libraw: version bump for bug #567254 (diff)
downloadgentoo-0f0b76b65413adc77832f28149f6c1abd11b7c8b.tar.gz
gentoo-0f0b76b65413adc77832f28149f6c1abd11b7c8b.tar.bz2
gentoo-0f0b76b65413adc77832f28149f6c1abd11b7c8b.zip
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
Diffstat (limited to 'www-misc')
-rw-r--r--www-misc/zoneminder/zoneminder-1.27.0.ebuild8
-rw-r--r--www-misc/zoneminder/zoneminder-1.28.0.ebuild6
-rw-r--r--www-misc/zoneminder/zoneminder-1.28.1.ebuild6
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 7870564c22b4..a5f3fc69680a 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 0168b2a2e5f2..4015381c8d03 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 0168b2a2e5f2..4015381c8d03 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() {