| 1 |
commit: 0f0b76b65413adc77832f28149f6c1abd11b7c8b |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 8 18:45:46 2015 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 8 18:45:46 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0b76b6 |
| 7 |
|
| 8 |
www-misc/zoneminder: Remove depend.php from inherit wrt bug 552840 |
| 9 |
|
| 10 |
This simply replaces the function call with the dep it was adding. |
| 11 |
No effective dep changes. |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.26 |
| 14 |
|
| 15 |
www-misc/zoneminder/zoneminder-1.27.0.ebuild | 8 ++++---- |
| 16 |
www-misc/zoneminder/zoneminder-1.28.0.ebuild | 6 +++--- |
| 17 |
www-misc/zoneminder/zoneminder-1.28.1.ebuild | 6 +++--- |
| 18 |
3 files changed, 10 insertions(+), 10 deletions(-) |
| 19 |
|
| 20 |
diff --git a/www-misc/zoneminder/zoneminder-1.27.0.ebuild b/www-misc/zoneminder/zoneminder-1.27.0.ebuild |
| 21 |
index 7870564..a5f3fc6 100644 |
| 22 |
--- a/www-misc/zoneminder/zoneminder-1.27.0.ebuild |
| 23 |
+++ b/www-misc/zoneminder/zoneminder-1.27.0.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2014 Gentoo Foundation |
| 26 |
+# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
# $Id$ |
| 29 |
|
| 30 |
@@ -19,7 +19,7 @@ EAPI=5 |
| 31 |
|
| 32 |
PERL_EXPORT_PHASE_FUNCTIONS=no |
| 33 |
|
| 34 |
-inherit perl-module readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic |
| 35 |
+inherit perl-module readme.gentoo eutils base cmake-utils depend.apache multilib flag-o-matic |
| 36 |
|
| 37 |
MY_PN="ZoneMinder" |
| 38 |
|
| 39 |
@@ -45,6 +45,7 @@ DEPEND=" |
| 40 |
dev-perl/libwww-perl |
| 41 |
sys-libs/zlib |
| 42 |
virtual/ffmpeg |
| 43 |
+ virtual/httpd-php |
| 44 |
virtual/jpeg |
| 45 |
virtual/mysql |
| 46 |
virtual/perl-ExtUtils-MakeMaker |
| 47 |
@@ -63,7 +64,6 @@ RDEPEND="${DEPEND}" |
| 48 |
# we cannot use need_httpd_cgi here, since we need to setup permissions for the |
| 49 |
# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here. |
| 50 |
need_apache |
| 51 |
-need_php_httpd |
| 52 |
|
| 53 |
S=${WORKDIR}/${MY_PN}-${PV} |
| 54 |
|
| 55 |
@@ -74,7 +74,7 @@ PATCHES=( |
| 56 |
MY_ZM_WEBDIR=/usr/share/zoneminder/www |
| 57 |
|
| 58 |
pkg_setup() { |
| 59 |
- require_php_with_use mysql sockets apache2 |
| 60 |
+ : |
| 61 |
} |
| 62 |
|
| 63 |
src_configure() { |
| 64 |
|
| 65 |
diff --git a/www-misc/zoneminder/zoneminder-1.28.0.ebuild b/www-misc/zoneminder/zoneminder-1.28.0.ebuild |
| 66 |
index 0168b2a..4015381 100644 |
| 67 |
--- a/www-misc/zoneminder/zoneminder-1.28.0.ebuild |
| 68 |
+++ b/www-misc/zoneminder/zoneminder-1.28.0.ebuild |
| 69 |
@@ -19,7 +19,7 @@ EAPI=5 |
| 70 |
|
| 71 |
PERL_EXPORT_PHASE_FUNCTIONS=no |
| 72 |
|
| 73 |
-inherit perl-module readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic |
| 74 |
+inherit perl-module readme.gentoo eutils base cmake-utils depend.apache multilib flag-o-matic |
| 75 |
|
| 76 |
MY_PN="ZoneMinder" |
| 77 |
|
| 78 |
@@ -50,6 +50,7 @@ DEPEND=" |
| 79 |
sys-auth/polkit |
| 80 |
sys-libs/zlib |
| 81 |
virtual/ffmpeg |
| 82 |
+ virtual/httpd-php |
| 83 |
virtual/jpeg |
| 84 |
virtual/mysql |
| 85 |
virtual/perl-ExtUtils-MakeMaker |
| 86 |
@@ -69,7 +70,6 @@ RDEPEND="${DEPEND}" |
| 87 |
# we cannot use need_httpd_cgi here, since we need to setup permissions for the |
| 88 |
# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here. |
| 89 |
need_apache |
| 90 |
-need_php_httpd |
| 91 |
|
| 92 |
S=${WORKDIR}/${MY_PN}-${PV} |
| 93 |
|
| 94 |
@@ -80,7 +80,7 @@ PATCHES=( |
| 95 |
MY_ZM_WEBDIR=/usr/share/zoneminder/www |
| 96 |
|
| 97 |
pkg_setup() { |
| 98 |
- require_php_with_use mysql sockets apache2 |
| 99 |
+ : |
| 100 |
} |
| 101 |
|
| 102 |
src_configure() { |
| 103 |
|
| 104 |
diff --git a/www-misc/zoneminder/zoneminder-1.28.1.ebuild b/www-misc/zoneminder/zoneminder-1.28.1.ebuild |
| 105 |
index 0168b2a..4015381 100644 |
| 106 |
--- a/www-misc/zoneminder/zoneminder-1.28.1.ebuild |
| 107 |
+++ b/www-misc/zoneminder/zoneminder-1.28.1.ebuild |
| 108 |
@@ -19,7 +19,7 @@ EAPI=5 |
| 109 |
|
| 110 |
PERL_EXPORT_PHASE_FUNCTIONS=no |
| 111 |
|
| 112 |
-inherit perl-module readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic |
| 113 |
+inherit perl-module readme.gentoo eutils base cmake-utils depend.apache multilib flag-o-matic |
| 114 |
|
| 115 |
MY_PN="ZoneMinder" |
| 116 |
|
| 117 |
@@ -50,6 +50,7 @@ DEPEND=" |
| 118 |
sys-auth/polkit |
| 119 |
sys-libs/zlib |
| 120 |
virtual/ffmpeg |
| 121 |
+ virtual/httpd-php |
| 122 |
virtual/jpeg |
| 123 |
virtual/mysql |
| 124 |
virtual/perl-ExtUtils-MakeMaker |
| 125 |
@@ -69,7 +70,6 @@ RDEPEND="${DEPEND}" |
| 126 |
# we cannot use need_httpd_cgi here, since we need to setup permissions for the |
| 127 |
# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here. |
| 128 |
need_apache |
| 129 |
-need_php_httpd |
| 130 |
|
| 131 |
S=${WORKDIR}/${MY_PN}-${PV} |
| 132 |
|
| 133 |
@@ -80,7 +80,7 @@ PATCHES=( |
| 134 |
MY_ZM_WEBDIR=/usr/share/zoneminder/www |
| 135 |
|
| 136 |
pkg_setup() { |
| 137 |
- require_php_with_use mysql sockets apache2 |
| 138 |
+ : |
| 139 |
} |
| 140 |
|
| 141 |
src_configure() { |
Archives