commit: 357a9c24f436530d027b237c03749f4fbbabab0b
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 8 18:38:53 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Dec 8 18:38:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357a9c24
www-apps/icingaweb2: adding php-7.1 support bug 601668
Package-Manager: portage-2.3.0
.../{icingaweb2-9999.ebuild => icingaweb2-2.3.4-r2.ebuild} | 11 ++++++-----
www-apps/icingaweb2/icingaweb2-9999.ebuild | 2 ++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild
b/www-apps/icingaweb2/icingaweb2-2.3.4-r2.ebuild
similarity index 84%
copy from www-apps/icingaweb2/icingaweb2-9999.ebuild
copy to www-apps/icingaweb2/icingaweb2-2.3.4-r2.ebuild
index 8caad16..0da8152 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.3.4-r2.ebuild
@@ -4,18 +4,16 @@
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"
REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
DEPEND=">=net-analyzer/icinga2-2.1.1
dev-php/pecl-imagick
@@ -24,6 +22,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
|| (
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]
+
dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
)
)
nginx? (
@@ -31,6 +30,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
|| (
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]
+
dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
)
)"
RDEPEND="${DEPEND}"
@@ -71,6 +71,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 8caad16..d679516 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -24,6 +24,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
|| (
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]
+
dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
)
)
nginx? (
@@ -31,6 +32,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
|| (
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]
+
dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
)
)"
RDEPEND="${DEPEND}"
