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 0D318138336 for ; Thu, 25 Apr 2019 15:54:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76006E08F9; Thu, 25 Apr 2019 15:54:42 +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 4A07BE08F9 for ; Thu, 25 Apr 2019 15:54:42 +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 9FD75342718 for ; Thu, 25 Apr 2019 15:54:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16D325CB for ; Thu, 25 Apr 2019 15:54:39 +0000 (UTC) From: "Matthew 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, "Matthew Thode" Message-ID: <1556207660.f492b32ef9a46090b8ffb359c4509c2e71b33217.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.3.ebuild www-apps/icingaweb2/icingaweb2-9999.ebuild X-VCS-Directories: www-apps/icingaweb2/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: f492b32ef9a46090b8ffb359c4509c2e71b33217 X-VCS-Branch: master Date: Thu, 25 Apr 2019 15:54:39 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: df4c7ce1-4f1f-4d4f-ae47-e3f07c80dbf8 X-Archives-Hash: 99d701b724d7d0a7fb65c5337e34dfab commit: f492b32ef9a46090b8ffb359c4509c2e71b33217 Author: Matthew Thode gentoo org> AuthorDate: Thu Apr 25 15:44:42 2019 +0000 Commit: Matthew Thode gentoo org> CommitDate: Thu Apr 25 15:54:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f492b32e www-apps/icingaweb2: 2.6.3 bump Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Matthew Thode gentoo.org> www-apps/icingaweb2/Manifest | 1 + .../{icingaweb2-9999.ebuild => icingaweb2-2.6.3.ebuild} | 16 +++++++++++----- www-apps/icingaweb2/icingaweb2-9999.ebuild | 16 +++++++++++----- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest index d851b530ca4..7dfed7aa6c3 100644 --- a/www-apps/icingaweb2/Manifest +++ b/www-apps/icingaweb2/Manifest @@ -1,2 +1,3 @@ DIST icingaweb2-2.6.1.tar.gz 8165384 BLAKE2B ea9b499f7da9fbdbe8340443f02b5a9fc348549bbffc7777ad63ac1e04c12ff45e5337418f1714b1d76af3818e9733bb0eb51a6bfbc39a7d1eb4820af8747392 SHA512 f2ac728abde9795e578b7d512f5b87e3307faed35a5413aaa2d3a958b57389c5297a124b530667aa248ee368aafaf3875097fa8e27b4c3090bb64badc7c329b7 DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a SHA512 f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520 +DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb SHA512 f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710 diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild similarity index 86% copy from www-apps/icingaweb2/icingaweb2-9999.ebuild copy to www-apps/icingaweb2/icingaweb2-2.6.3.ebuild index 03a2c2bd75d..45655f2ebdb 100644 --- a/www-apps/icingaweb2/icingaweb2-9999.ebuild +++ b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild @@ -3,18 +3,24 @@ 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" + +if [[ ${PV} == *9999 ]];then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git" + EGIT_BRANCH="master" +else + SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi LICENSE="GPL-2" SLOT="0" IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres" REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )" -KEYWORDS="" DEPEND=">=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick @@ -23,9 +29,9 @@ DEPEND=">=net-analyzer/icinga2-2.1.1 nginx? ( >=www-servers/nginx-1.7.0:* ) || ( 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] + dev-lang/php:7.3[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 03a2c2bd75d..45655f2ebdb 100644 --- a/www-apps/icingaweb2/icingaweb2-9999.ebuild +++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild @@ -3,18 +3,24 @@ 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" + +if [[ ${PV} == *9999 ]];then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git" + EGIT_BRANCH="master" +else + SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi LICENSE="GPL-2" SLOT="0" IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres" REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )" -KEYWORDS="" DEPEND=">=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick @@ -23,9 +29,9 @@ DEPEND=">=net-analyzer/icinga2-2.1.1 nginx? ( >=www-servers/nginx-1.7.0:* ) || ( 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] + dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] )" RDEPEND="${DEPEND}"