From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 607C51395E2 for ; Thu, 8 Dec 2016 18:39:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9FE8E0CCC; Thu, 8 Dec 2016 18:39:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70ADBE0CCC for ; Thu, 8 Dec 2016 18:39:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 816AB3411B5 for ; Thu, 8 Dec 2016 18:39:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0597B4A8 for ; Thu, 8 Dec 2016 18:39:09 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1481222333.357a9c24f436530d027b237c03749f4fbbabab0b.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/icingaweb2/icingaweb2-2.3.4-r2.ebuild www-apps/icingaweb2/icingaweb2-9999.ebuild X-VCS-Directories: www-apps/icingaweb2/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 357a9c24f436530d027b237c03749f4fbbabab0b X-VCS-Branch: master Date: Thu, 8 Dec 2016 18:39:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 72bf387f-e0af-4d11-a445-cd2fd2a3e708 X-Archives-Hash: 0aa250ea783c3985d36a27688be18cd4 commit: 357a9c24f436530d027b237c03749f4fbbabab0b Author: Matthew Thode gentoo org> AuthorDate: Thu Dec 8 18:38:53 2016 +0000 Commit: Matt Thode gentoo 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}"