From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 10 Nov 2019 13:21:36 +0000
Subject: gentoo resync : 10.11.2019

---
 sys-cluster/cman-lib/Manifest                   |  2 +-
 sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild | 37 ++++++++++++-------------
 2 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'sys-cluster/cman-lib')

diff --git a/sys-cluster/cman-lib/Manifest b/sys-cluster/cman-lib/Manifest
index ddfb94d16ed4..7c9452802daa 100644
--- a/sys-cluster/cman-lib/Manifest
+++ b/sys-cluster/cman-lib/Manifest
@@ -1,3 +1,3 @@
 DIST cluster-2.03.09.tar.gz 1784357 BLAKE2B bf024c93fd5ccd9b7410abc2a3bd792c55c3937604d750019a20190753d95d19b2232923a7a76463ccff592bde7fed942aa679af9e39158fef6041258eaf6eb7 SHA512 5dbcf978336a6b7998df0d3dfcff037e1e77e9e69b43d78eb573a65432445e572e69d7783e7874e9edf2632627f02426f428103831e10f5d1f338afa91a62c28
-EBUILD cman-lib-2.03.09-r1.ebuild 1100 BLAKE2B 8e27241a42bc9f16a2a8eca143f23dad007dfd09c2122724b6a8194a6a6dc003fef6b49ec9c4368b58b6964b564c594897a8c2cf1637825c7ecd361024f4fdfd SHA512 8f4f511d1fb59301c50c04027170cc0d1777e60ddb0733adee622a2e75d441eae250d25fcc6035d7f721746994be33fc75e9852bcf80859b96a83fa885df76fb
+EBUILD cman-lib-2.03.09-r1.ebuild 979 BLAKE2B 65f8aef9477c8889085377d5778a3cdbb5687373220ce23e6fb1ccc257a702dad8ef90295619fc81798c841c910d845c5f7940b20c55c85310300dcf9b526e08 SHA512 ee66b60db070270dca35ac5b0ab0190bec4771efeeecd4983bcbaf87ceed519a9a05d43d84cc4cdec4a27a76998b78406f2f8be6ae65664a622c229c3bb9a7fb
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild b/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild
index b3b168af577e..3bf3a08a2cd9 100644
--- a/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild
+++ b/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils versionator multilib
+inherit toolchain-funcs
 
 MY_P=cluster-${PV}
-
-MAJ_PV=$(get_major_version)
-MIN_PV=$(get_version_component_range 2).$(get_version_component_range 3)
+MAJ_PV=$(ver_cut 1)
+MIN_PV=$(ver_cut 2-3)
 
 DESCRIPTION="A library for cluster management common to the various pieces of Cluster Suite"
 HOMEPAGE="https://sourceware.org/cluster/wiki/"
@@ -26,23 +25,21 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}/${PN/-//}
 
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc="$(tc-getCC)" \
-			--libdir=/usr/$(get_libdir) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-	) || die "configure problem"
+src_configure() {
+	cd "${WORKDIR}"/${MY_P} || die
+	./configure \
+		--cc="$(tc-getCC)" \
+		--libdir=/usr/$(get_libdir) \
+		--cflags="-Wall" \
+		--disable_kernel_check \
+		--somajor="$MAJ_PV" \
+		--sominor="$MIN_PV" \
+		|| die "configure problem"
 
 	sed -e 's:\($(CC)\):\1 $(LDFLAGS):' \
 		-i Makefile "${WORKDIR}/${MY_P}/make/cobj.mk" || die
-
-	emake clean all || die
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
+src_compile() {
+	emake clean all
 }
-- 
cgit v1.2.3