Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/openais/
Date: Fri, 01 Jun 2018 14:05:38
Message-Id: 1527861916.2dff1897e537b6100e69315faf0244b9e9b42480.bman@gentoo
1 commit: 2dff1897e537b6100e69315faf0244b9e9b42480
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 31 21:54:23 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 1 14:05:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dff1897
7
8 sys-cluster/openais: bump EAPI and drop base eclass
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 sys-cluster/openais/openais-1.1.4-r1.ebuild | 22 ++++++++++++++--------
13 1 file changed, 14 insertions(+), 8 deletions(-)
14
15 diff --git a/sys-cluster/openais/openais-1.1.4-r1.ebuild b/sys-cluster/openais/openais-1.1.4-r1.ebuild
16 index bf42581c57c..7a6db5be9bb 100644
17 --- a/sys-cluster/openais/openais-1.1.4-r1.ebuild
18 +++ b/sys-cluster/openais/openais-1.1.4-r1.ebuild
19 @@ -1,9 +1,9 @@
20 -# Copyright 1999-2017 Gentoo Foundation
21 +# Copyright 1999-2018 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI="2"
25 +EAPI=6
26
27 -inherit autotools base
28 +inherit autotools
29
30 DESCRIPTION="Open Application Interface Specification cluster framework"
31 HOMEPAGE="http://www.openais.org/"
32 @@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
33 DOCS=( "${S}/AUTHORS" "${S}/README.amf" )
34
35 src_prepare() {
36 + default
37 +
38 # respect CFLAGS
39 sed -i -e "s/\$OPT_CFLAGS \$GDB_FLAGS//" configure.ac || die
40 # respect LDFLAGS
41 @@ -28,18 +30,22 @@ src_prepare() {
42 services/Makefile.am || die
43 # don't install docs
44 sed -i -e "/^dist_doc/d" Makefile.am || die
45 +
46 eautoreconf
47 }
48
49 src_configure() {
50 econf \
51 - --disable-dependency-tracking \
52 - --docdir=/usr/share/doc/${PF} \
53 - --localstatedir=/var
54 + --docdir="${EPREFIX}"/usr/share/doc/${PF} \
55 + --localstatedir="${EPREFIX}"/var
56 }
57
58 src_install() {
59 - base_src_install
60 rm -rf "${D}"/etc/init.d/openais || die
61 - use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.a || die
62 +
63 + if ! use static-libs; then
64 + find "${D}" -name '*.la' -delete || die "Pruning failed"
65 + fi
66 +
67 + default
68 }