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 <prometheanfire@gentoo.org>

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 95062237cd8b830d13510091fff4efe67bc8a4f6..a683de368096b346f809407ab7a8acda4f7bb23f 100644 (file)
--- 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 1f094bb63f874984c529d99ce4e6ed15c936f237..a683de368096b346f809407ab7a8acda4f7bb23f 100644 (file)
--- 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}"/*
 }