| 1 |
commit: a88a5b1785824350199e1c17e4254a042b7339b0 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 25 16:11:02 2016 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 25 16:11:02 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a88a5b17 |
| 7 |
|
| 8 |
www-apps/icingaweb2: fixing fpm usage for nginx |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
...web2-9999.ebuild => icingaweb2-2.3.4-r1.ebuild} | 27 +++++++++++++++------- |
| 13 |
www-apps/icingaweb2/icingaweb2-9999.ebuild | 18 ++++++++++++--- |
| 14 |
2 files changed, 34 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild |
| 17 |
similarity index 67% |
| 18 |
copy from www-apps/icingaweb2/icingaweb2-9999.ebuild |
| 19 |
copy to www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild |
| 20 |
index 320a819..f06e4f0 100644 |
| 21 |
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild |
| 22 |
+++ b/www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild |
| 23 |
@@ -4,23 +4,33 @@ |
| 24 |
|
| 25 |
EAPI="5" |
| 26 |
|
| 27 |
-inherit depend.apache eutils git-2 multilib user |
| 28 |
+inherit depend.apache eutils multilib user |
| 29 |
|
| 30 |
DESCRIPTION="Icinga Web 2 - Frontend for icinga2" |
| 31 |
HOMEPAGE="http://www.icinga.org/" |
| 32 |
-EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git" |
| 33 |
-EGIT_BRANCH="master" |
| 34 |
- |
| 35 |
+SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" |
| 36 |
LICENSE="GPL-2" |
| 37 |
SLOT="0" |
| 38 |
IUSE="apache2 ldap mysql nginx postgres" |
| 39 |
-KEYWORDS="" |
| 40 |
+REQUIRED_USE="^^ ( apache2 nginx )" |
| 41 |
+KEYWORDS="~amd64 ~x86" |
| 42 |
|
| 43 |
DEPEND=">=net-analyzer/icinga2-2.1.1 |
| 44 |
- dev-lang/php:*[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] |
| 45 |
dev-php/pecl-imagick |
| 46 |
- apache2? ( >=www-servers/apache-2.4.0 ) |
| 47 |
- nginx? ( >=www-servers/nginx-1.7.0:* )" |
| 48 |
+ apache2? ( |
| 49 |
+ >=www-servers/apache-2.4.0 |
| 50 |
+ || ( |
| 51 |
+ dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] |
| 52 |
+ dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] |
| 53 |
+ ) |
| 54 |
+ ) |
| 55 |
+ nginx? ( |
| 56 |
+ >=www-servers/nginx-1.7.0:* |
| 57 |
+ || ( |
| 58 |
+ dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] |
| 59 |
+ dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] |
| 60 |
+ ) |
| 61 |
+ )" |
| 62 |
RDEPEND="${DEPEND}" |
| 63 |
|
| 64 |
want_apache2 |
| 65 |
@@ -59,6 +69,7 @@ src_install() { |
| 66 |
insinto "/usr/share/${PN}" |
| 67 |
doins -r "${S}"/* |
| 68 |
fperms -R a+rX "/usr/share/${PN}/public/" |
| 69 |
+ fperms u+x,g+x "/usr/share/${PN}/bin/icingacli" |
| 70 |
} |
| 71 |
|
| 72 |
pkg_postinst() { |
| 73 |
|
| 74 |
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild |
| 75 |
index 320a819..8caad16 100644 |
| 76 |
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild |
| 77 |
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild |
| 78 |
@@ -14,13 +14,25 @@ EGIT_BRANCH="master" |
| 79 |
LICENSE="GPL-2" |
| 80 |
SLOT="0" |
| 81 |
IUSE="apache2 ldap mysql nginx postgres" |
| 82 |
+REQUIRED_USE="^^ ( apache2 nginx )" |
| 83 |
KEYWORDS="" |
| 84 |
|
| 85 |
DEPEND=">=net-analyzer/icinga2-2.1.1 |
| 86 |
- dev-lang/php:*[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] |
| 87 |
dev-php/pecl-imagick |
| 88 |
- apache2? ( >=www-servers/apache-2.4.0 ) |
| 89 |
- nginx? ( >=www-servers/nginx-1.7.0:* )" |
| 90 |
+ apache2? ( |
| 91 |
+ >=www-servers/apache-2.4.0 |
| 92 |
+ || ( |
| 93 |
+ dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] |
| 94 |
+ dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] |
| 95 |
+ ) |
| 96 |
+ ) |
| 97 |
+ nginx? ( |
| 98 |
+ >=www-servers/nginx-1.7.0:* |
| 99 |
+ || ( |
| 100 |
+ dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] |
| 101 |
+ dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] |
| 102 |
+ ) |
| 103 |
+ )" |
| 104 |
RDEPEND="${DEPEND}" |
| 105 |
|
| 106 |
want_apache2 |
Archives