commit: a88a5b1785824350199e1c17e4254a042b7339b0 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Sun Sep 25 16:11:02 2016 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Sun Sep 25 16:11:02 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a88a5b17
www-apps/icingaweb2: fixing fpm usage for nginx Package-Manager: portage-2.2.28 ...web2-9999.ebuild => icingaweb2-2.3.4-r1.ebuild} | 27 +++++++++++++++------- www-apps/icingaweb2/icingaweb2-9999.ebuild | 18 ++++++++++++--- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild similarity index 67% copy from www-apps/icingaweb2/icingaweb2-9999.ebuild copy to www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild index 320a819..f06e4f0 100644 --- a/www-apps/icingaweb2/icingaweb2-9999.ebuild +++ b/www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild @@ -4,23 +4,33 @@ EAPI="5" -inherit depend.apache eutils git-2 multilib user +inherit depend.apache eutils multilib user DESCRIPTION="Icinga Web 2 - Frontend for icinga2" HOMEPAGE="http://www.icinga.org/"; -EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"; -EGIT_BRANCH="master" - +SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" IUSE="apache2 ldap mysql nginx postgres" -KEYWORDS="" +REQUIRED_USE="^^ ( apache2 nginx )" +KEYWORDS="~amd64 ~x86" DEPEND=">=net-analyzer/icinga2-2.1.1 - dev-lang/php:*[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] dev-php/pecl-imagick - apache2? ( >=www-servers/apache-2.4.0 ) - nginx? ( >=www-servers/nginx-1.7.0:* )" + apache2? ( + >=www-servers/apache-2.4.0 + || ( + dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + ) + ) + nginx? ( + >=www-servers/nginx-1.7.0:* + || ( + dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + ) + )" RDEPEND="${DEPEND}" want_apache2 @@ -59,6 +69,7 @@ src_install() { insinto "/usr/share/${PN}" doins -r "${S}"/* fperms -R a+rX "/usr/share/${PN}/public/" + fperms u+x,g+x "/usr/share/${PN}/bin/icingacli" } pkg_postinst() { diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild index 320a819..8caad16 100644 --- a/www-apps/icingaweb2/icingaweb2-9999.ebuild +++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild @@ -14,13 +14,25 @@ EGIT_BRANCH="master" LICENSE="GPL-2" SLOT="0" IUSE="apache2 ldap mysql nginx postgres" +REQUIRED_USE="^^ ( apache2 nginx )" KEYWORDS="" DEPEND=">=net-analyzer/icinga2-2.1.1 - dev-lang/php:*[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] dev-php/pecl-imagick - apache2? ( >=www-servers/apache-2.4.0 ) - nginx? ( >=www-servers/nginx-1.7.0:* )" + apache2? ( + >=www-servers/apache-2.4.0 + || ( + dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + ) + ) + nginx? ( + >=www-servers/nginx-1.7.0:* + || ( + dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + ) + )" RDEPEND="${DEPEND}" want_apache2
