commit: ba68e040154d1cf997e1663e89a8aefb554cc46d Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Tue Apr 25 17:56:57 2017 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Tue Apr 25 17:56:57 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba68e040
www-apps/icingaweb2: fix to dep on php[nls] bug 615004 Package-Manager: Portage-2.3.3, Repoman-2.3.2 ...web2-9999.ebuild => icingaweb2-2.4.1-r1.ebuild} | 22 ++++++++++------------ www-apps/icingaweb2/icingaweb2-9999.ebuild | 16 ++++++++-------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild similarity index 81% copy from www-apps/icingaweb2/icingaweb2-9999.ebuild copy to www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild index 693ad5ef3a6..9c54138b2b4 100644 --- a/www-apps/icingaweb2/icingaweb2-9999.ebuild +++ b/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild @@ -1,20 +1,18 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" -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 pdf postgres" REQUIRED_USE="^^ ( apache2 nginx )" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" DEPEND=">=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick @@ -22,17 +20,17 @@ DEPEND=">=net-analyzer/icinga2-2.1.1 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] - dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,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] - dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) )" RDEPEND="${DEPEND}" diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild index 693ad5ef3a6..77eb59b174d 100644 --- a/www-apps/icingaweb2/icingaweb2-9999.ebuild +++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" -inherit depend.apache eutils git-2 multilib user +inherit depend.apache eutils git-r3 multilib user DESCRIPTION="Icinga Web 2 - Frontend for icinga2" HOMEPAGE="http://www.icinga.org/"; @@ -22,17 +22,17 @@ DEPEND=">=net-analyzer/icinga2-2.1.1 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] - dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,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] - dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] + dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) )" RDEPEND="${DEPEND}"
