From 0bff53119f08d677db6c1a991bd30741682a8a08 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 2 Jun 2018 17:13:10 +0100
Subject: Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.
---
 sys-cluster/openais/Manifest                |  2 +-
 sys-cluster/openais/openais-1.1.4-r1.ebuild | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'sys-cluster/openais')

diff --git a/sys-cluster/openais/Manifest b/sys-cluster/openais/Manifest
index 7c4cb2845ae4..bd535e47cd62 100644
--- a/sys-cluster/openais/Manifest
+++ b/sys-cluster/openais/Manifest
@@ -1,3 +1,3 @@
 DIST openais-1.1.4.tar.gz 566559 BLAKE2B 47857bd4257a12af612311d422c861f6ce97988c06fbe7aa677f91342be3d4e27cd584fe8947eccc0559e07f6a09f9db8e270194b809d68495735abfa9b5a14f SHA512 9dab2d0c3ac1996fd76385cc89071dc84268065e6992642fefe005962e8367170681fed626c5bd863a8ea24abe57e2b8b3eddc20bc38b14104c729c599f3c79e
-EBUILD openais-1.1.4-r1.ebuild 1065 BLAKE2B 4230eccf2412509d1604da529cd868672c5d8d2145e95585cbb56f2c76818b8aa3d2903dc31e0676af4c7449d25083eceab12992737b5c7ec99ad9625b85ae06 SHA512 c5dcd6a023cf796e58e839a4e34f6f4253d80417baebe7a5ceea68b8d76e90ff1e30a0ed82f6c27db690363e352084f0f4894c2227e0ded66e45180fa0698d72
+EBUILD openais-1.1.4-r1.ebuild 1096 BLAKE2B caed06393bec5732fc7980139d877645f861b6d1209497ef85ca859b8fd734f53a317e47e1d9ecb63e9d7d07e8348df6198c598e3d93a69c60a92f1e9b205b37 SHA512 75ac8549f13a7c4b752ffaa5d59b805294ea236c91fe551af70bd66c66ef129a6afcd7b9b701261aca60311cfedcfd78ffae5201c8e16b267e71e787b0fd3d4d
 MISC metadata.xml 822 BLAKE2B 5d37bbc89a82b4e32c67e753be3ad850efa9326efe0c1ad43c3ea252a7bb72732630aab2983fc53cfde9e73b160c1f1f3e199f08ec123a723292275341669ea9 SHA512 85eb8ae73ebc0614b240733110eecf256f00cd694c303c1dc5b42d5b038f8cef72adf65a99866cd270d6cdbc229e6730d947fcfedb2b59e2a51bf8b8a4f12aa3
diff --git a/sys-cluster/openais/openais-1.1.4-r1.ebuild b/sys-cluster/openais/openais-1.1.4-r1.ebuild
index e052e5a0af63..bf42581c57c3 100644
--- a/sys-cluster/openais/openais-1.1.4-r1.ebuild
+++ b/sys-cluster/openais/openais-1.1.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="2"
 
-inherit autotools
+inherit autotools base
 
 DESCRIPTION="Open Application Interface Specification cluster framework"
 HOMEPAGE="http://www.openais.org/"
@@ -21,8 +21,6 @@ DEPEND="${RDEPEND}
 DOCS=( "${S}/AUTHORS" "${S}/README.amf" )
 
 src_prepare() {
-	default
-
 	# respect CFLAGS
 	sed -i -e "s/\$OPT_CFLAGS \$GDB_FLAGS//" configure.ac || die
 	# respect LDFLAGS
@@ -30,21 +28,18 @@ src_prepare() {
 		services/Makefile.am || die
 	# don't install docs
 	sed -i -e "/^dist_doc/d" Makefile.am || die
-
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--localstatedir="${EPREFIX}"/var
+		--disable-dependency-tracking \
+		--docdir=/usr/share/doc/${PF} \
+		--localstatedir=/var
 }
 
 src_install() {
-	default
-
+	base_src_install
 	rm -rf "${D}"/etc/init.d/openais || die
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die "Pruning failed"
-	fi
+	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.a || die
 }
-- 
cgit v1.2.3