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 D1F1D138334 for ; Thu, 19 Jul 2018 16:00:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B2AAE0A7C; Thu, 19 Jul 2018 16:00:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3ADE9E0A7C for ; Thu, 19 Jul 2018 16:00:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C302335C32 for ; Thu, 19 Jul 2018 16:00:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30D5235F for ; Thu, 19 Jul 2018 16:00:40 +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: <1532016030.ae10d34995cf43cef4cad2ab6b7edcbc5bcf6522.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/icingaweb2/Manifest www-apps/icingaweb2/icingaweb2-2.6.0.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: ae10d34995cf43cef4cad2ab6b7edcbc5bcf6522 X-VCS-Branch: master Date: Thu, 19 Jul 2018 16:00:40 +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: 7c7f6e5b-e699-4e85-9493-48ef29cdc028 X-Archives-Hash: 49c1b2d8e3ac22e266edcb3139151992 commit: ae10d34995cf43cef4cad2ab6b7edcbc5bcf6522 Author: Matthew Thode gentoo org> AuthorDate: Thu Jul 19 16:00:08 2018 +0000 Commit: Matt Thode gentoo org> CommitDate: Thu Jul 19 16:00:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae10d349 www-apps/icingaweb2: 2.6.0 bup Package-Manager: Portage-2.3.43, Repoman-2.3.10 www-apps/icingaweb2/Manifest | 1 + .../{icingaweb2-9999.ebuild => icingaweb2-2.6.0.ebuild} | 12 ++++++------ www-apps/icingaweb2/icingaweb2-9999.ebuild | 4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest index c3b9104fd26..570d781e498 100644 --- a/www-apps/icingaweb2/Manifest +++ b/www-apps/icingaweb2/Manifest @@ -1 +1,2 @@ DIST icingaweb2-2.5.3.tar.gz 8124667 BLAKE2B 43f9e47d670aaeffb15a8dbca6794d72436b195d4a19491d31f548a57ef9d2d0c411f16276be5355700e8dc863b8ef84821c68759d65ef2e97688a88d92605ca SHA512 d11d4f90f0cb54ab6fc5412151d412fc7827c895e81f6c91806090c364b3df4f2999bbc5f65cd4007406a3e7a7c9e0d48fb8f8362f3d7780681ac8702cfcb572 +DIST icingaweb2-2.6.0.tar.gz 8165659 BLAKE2B 9e66a583cdec58b8eb2be7c86363d0154786eb7289ffbbc2b8c2978907537f56ef345313b9b916b3029793812431842ce88c525b29ed226f43bdeefc4af59c97 SHA512 a4788a40e87fa5a388acd6d87890cd5066c1622ba13ddb161beacf16d0765fd224c551c37ed83ef0a6059dd277a63c5c62427a411ccaae9b9deb7c7c88db8cb9 diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.0.ebuild similarity index 85% copy from www-apps/icingaweb2/icingaweb2-9999.ebuild copy to www-apps/icingaweb2/icingaweb2-2.6.0.ebuild index 77eb59b174d..d4db7e02c01 100644 --- a/www-apps/icingaweb2/icingaweb2-9999.ebuild +++ b/www-apps/icingaweb2/icingaweb2-2.6.0.ebuild @@ -1,20 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" -inherit depend.apache eutils git-r3 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 @@ -25,6 +23,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1 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] + dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( @@ -33,6 +32,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1 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] + dev-lang/php:7.2[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 77eb59b174d..97c2252b8de 100644 --- a/www-apps/icingaweb2/icingaweb2-9999.ebuild +++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -25,6 +25,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1 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] + dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( @@ -33,6 +34,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1 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] + dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) )" RDEPEND="${DEPEND}"