commit: 807082cb6a3ea2d3a65367195bb04b8ddcdab25b
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 09:39:34 2017 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 09:39:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807082cb
sys-cluster/resource-agents: version bump, move to EAPI 6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sys-cluster/resource-agents/Manifest | 1 +
sys-cluster/resource-agents/resource-agents-3.9.6.ebuild | 8 ++++----
...source-agents-3.9.6.ebuild => resource-agents-4.0.1.ebuild} | 10 +++++-----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/sys-cluster/resource-agents/Manifest
b/sys-cluster/resource-agents/Manifest
index fcf0170293c..b7b1df465b3 100644
--- a/sys-cluster/resource-agents/Manifest
+++ b/sys-cluster/resource-agents/Manifest
@@ -1 +1,2 @@
DIST resource-agents-3.9.6.tar.gz 617790 SHA256
39722cdee68ff96d06788f05f325bd21ec2fc59c59d847e5e4b23c6df23bf678 SHA512
b4ca8b8cc3e09508847af3f1cf50cef946f374eae4ee7903700ba49ef7a3357b1ceaa26dca0616feaa79fb290713f18939dda42ee92a5a7bca2fab807fc77901
WHIRLPOOL
d5210c70096d45dc91f49f1333711a3d2350d682d9e5720eeda1470b680fcba2b7cbe8c0dd1fbcd26408e88c40ad0ec60951b06a6e2174131f0c588d2a10720c
+DIST resource-agents-4.0.1.tar.gz 659123 SHA256
863f83c724bad3a8bcff12b9c8712406c43e010041868826cad7b78fd8cfb9fb SHA512
9c92bca7775e3c47c6463587fd7eea89f019997cfab0361ef37ee97192604d3b3d0dcd1cb70f774e01689b803dc856af170bd10e86a9d4824597293c264735d5
WHIRLPOOL
8fe3ce305b0b6b37fce83464bcf2ac45c3c060d9b4021fdb8cf5bb7972ab547fea8ec19603210d473c917d7314268296c682b0b9366c7a735cee1b0f7e767496
diff --git a/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
b/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
index 0ed39e237c0..70c075ce654 100644
--- a/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
MY_P="${P/resource-}"
-inherit autotools base eutils multilib
+inherit autotools eutils multilib
DESCRIPTION="Resources pack for Heartbeat / Pacemaker"
HOMEPAGE="http://www.linux-ha.org/wiki/Resource_Agents";
@@ -30,7 +30,7 @@ PATCHES=(
)
src_prepare() {
- base_src_prepare
+ default
eautoreconf
}
@@ -47,7 +47,7 @@ src_configure() {
}
src_install() {
- base_src_install
+ default
rm -rf "${D}"/etc/init.d/ || die
rm -rf "${D}"/var/run || die
use rgmanager || rm -rf "${D}"/usr/share/cluster/ "${D}"/var/
diff --git a/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
b/sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
similarity index 92%
copy from sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
copy to sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
index 0ed39e237c0..dcbb842b6cd 100644
--- a/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
MY_P="${P/resource-}"
-inherit autotools base eutils multilib
+inherit autotools eutils multilib
DESCRIPTION="Resources pack for Heartbeat / Pacemaker"
HOMEPAGE="http://www.linux-ha.org/wiki/Resource_Agents";
@@ -12,7 +12,7 @@
SRC_URI="https://github.com/ClusterLabs/resource-agents/archive/v${PV}.tar.gz ->
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
IUSE="doc libnet rgmanager"
RDEPEND="sys-apps/iproute2
@@ -30,7 +30,7 @@ PATCHES=(
)
src_prepare() {
- base_src_prepare
+ default
eautoreconf
}
@@ -47,7 +47,7 @@ src_configure() {
}
src_install() {
- base_src_install
+ default
rm -rf "${D}"/etc/init.d/ || die
rm -rf "${D}"/var/run || die
use rgmanager || rm -rf "${D}"/usr/share/cluster/ "${D}"/var/
