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 068601385D5 for ; Thu, 20 Oct 2016 23:47:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65EB1E08E9; Thu, 20 Oct 2016 23:47:54 +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 3D292E08E9 for ; Thu, 20 Oct 2016 23:47:54 +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 177D334165F for ; Thu, 20 Oct 2016 23:47:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3DA462494 for ; Thu, 20 Oct 2016 23:47:51 +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: <1477007251.b3fc7c53eb7ab7b31dda4cc5d8741206aa6e59f2.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-r1.ebuild www-apps/icingaweb2/icingaweb2-2.3.4.ebuild X-VCS-Directories: www-apps/icingaweb2/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: b3fc7c53eb7ab7b31dda4cc5d8741206aa6e59f2 X-VCS-Branch: master Date: Thu, 20 Oct 2016 23:47:51 +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: 0d5a402c-7033-474f-ba6a-c21dbc57b7d9 X-Archives-Hash: 1a4a0f277c9405d420648eafb539f3f1 commit: b3fc7c53eb7ab7b31dda4cc5d8741206aa6e59f2 Author: Matthew Thode gentoo org> AuthorDate: Thu Oct 20 23:47:31 2016 +0000 Commit: Matt Thode gentoo org> CommitDate: Thu Oct 20 23:47:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3fc7c53 www-apps/icingaweb2: stable amd64 and x86 Package-Manager: portage-2.3.0 www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild | 2 +- www-apps/icingaweb2/icingaweb2-2.3.4.ebuild | 68 -------------------------- 2 files changed, 1 insertion(+), 69 deletions(-) diff --git a/www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild index f06e4f0..3a20691 100644 --- a/www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild +++ b/www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="apache2 ldap mysql nginx postgres" REQUIRED_USE="^^ ( apache2 nginx )" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND=">=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick diff --git a/www-apps/icingaweb2/icingaweb2-2.3.4.ebuild b/www-apps/icingaweb2/icingaweb2-2.3.4.ebuild deleted file mode 100644 index 227a7dc..00000000 --- a/www-apps/icingaweb2/icingaweb2-2.3.4.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit depend.apache eutils multilib user - -DESCRIPTION="Icinga Web 2 - Frontend for icinga2" -HOMEPAGE="http://www.icinga.org/" -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" -KEYWORDS="amd64 x86" - -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-php/pecl-imagick - apache2? ( >=www-servers/apache-2.4.0 ) - nginx? ( >=www-servers/nginx-1.7.0:* )" -RDEPEND="${DEPEND}" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - - enewgroup icingaweb2 - enewgroup icingacmd - use nginx && usermod -a -G icingacmd,icingaweb2 nginx - use apache2 && usermod -a -G icingacmd,icingaweb2 apache -} - -pkg_config() { - if [[ -d /etc/icingaweb2 ]] ; then - einfo "Updating existing installation ..." - else - einfo "Running first time setup ..." - einfo "Creating configuration directory ..." - /usr/share/${PN}/bin/icingacli setup config directory - einfo "Creating authentication token for web setup ..." - /usr/share/${PN}/bin/icingacli setup token create - if use apache2 ; then - einfo "The following might be useful for your Apache2 configuration:" - /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public - fi - if use nginx ; then - einfo "The following might be useful for your NGinx configuration:" - /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public - fi - fi - einfo "All done." -} - -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() { - einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup." -}