From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DFCD259CA5 for ; Fri, 18 Mar 2016 23:32:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A7AC21C033; Fri, 18 Mar 2016 23:32:28 +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 E393421C033 for ; Fri, 18 Mar 2016 23:32:27 +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 D02D3340C7B for ; Fri, 18 Mar 2016 23:32:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75F25847 for ; Fri, 18 Mar 2016 23:32:25 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1458343935.781f02a1d863ba97f18214a7127177714cad96db.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-pnp4nagios/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-1.0.1.ebuild www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild X-VCS-Directories: www-apps/icingaweb2-module-pnp4nagios/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 781f02a1d863ba97f18214a7127177714cad96db X-VCS-Branch: master Date: Fri, 18 Mar 2016 23:32:25 +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: 800195dc-f9df-44fa-ac6d-45ecfb815b60 X-Archives-Hash: 99a980fb9b9789b0b382fd101db30a79 commit: 781f02a1d863ba97f18214a7127177714cad96db Author: Louis Sautier gmail com> AuthorDate: Fri Mar 18 17:45:42 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Fri Mar 18 23:32:15 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781f02a1 www-apps/icingaweb2-module-pnp4nagios: cosmetic fixes, unify live and release Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/1081 on behalf of Matthew Thode gentoo.org> .../icingaweb2-module-pnp4nagios-1.0.1.ebuild | 21 ++++++++++++--------- .../icingaweb2-module-pnp4nagios-9999.ebuild | 22 ++++++++++++---------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-1.0.1.ebuild b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-1.0.1.ebuild index 9506223..a683de3 100644 --- a/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-1.0.1.ebuild +++ b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-1.0.1.ebuild @@ -1,25 +1,28 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=6 DESCRIPTION="Icinga Web 2 plugin for pnp4nagios" HOMEPAGE="http://www.icinga.org/" -MY_PN="icingaweb2-module-pnp" -SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz" -S="${WORKDIR}/${MY_PN}-${PV}" +if [[ "${PV}" == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-pnp.git" +else + MY_PN="icingaweb2-module-pnp" + SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz" + S="${WORKDIR}/${MY_PN}-${PV}" +fi LICENSE="GPL-2" SLOT="0" -IUSE="" -KEYWORDS="" DEPEND=">=net-analyzer/icinga2-2.1.1 >=www-apps/icingaweb2-2.0.0" RDEPEND="${DEPEND}" src_install() { - mkdir -p "${D}/usr/share/icingaweb2/modules/pnp" - cp -R "${S}"/* "${D}/usr/share/icingaweb2/modules/pnp" + insinto "/usr/share/icingaweb2/modules/pnp" + doins -r "${S}"/* } diff --git a/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild index 1f094bb..a683de3 100644 --- a/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild +++ b/www-apps/icingaweb2-module-pnp4nagios/icingaweb2-module-pnp4nagios-9999.ebuild @@ -1,26 +1,28 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" - -inherit git-2 +EAPI=6 DESCRIPTION="Icinga Web 2 plugin for pnp4nagios" HOMEPAGE="http://www.icinga.org/" -EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-pnp.git" -EGIT_BRANCH="master" +if [[ "${PV}" == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-pnp.git" +else + MY_PN="icingaweb2-module-pnp" + SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz" + S="${WORKDIR}/${MY_PN}-${PV}" +fi LICENSE="GPL-2" SLOT="0" -IUSE="" -KEYWORDS="" DEPEND=">=net-analyzer/icinga2-2.1.1 >=www-apps/icingaweb2-2.0.0" RDEPEND="${DEPEND}" src_install() { - mkdir -p "${D}/usr/share/icingaweb2/modules/pnp" - cp -R "${S}"/* "${D}/usr/share/icingaweb2/modules/pnp" + insinto "/usr/share/icingaweb2/modules/pnp" + doins -r "${S}"/* }