1 |
commit: 66c862e94a48d0acd4f2f36dc6073d69757a6d0c |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 15 06:12:59 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 15 06:13:53 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c862e9 |
7 |
|
8 |
app-admin/sysstat: EAPI=7 updates? |
9 |
|
10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
12 |
|
13 |
app-admin/sysstat/sysstat-12.0.6.ebuild | 2 +- |
14 |
app-admin/sysstat/sysstat-12.1.6.ebuild | 2 +- |
15 |
app-admin/sysstat/sysstat-999999.ebuild | 12 ++++-------- |
16 |
3 files changed, 6 insertions(+), 10 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/sysstat/sysstat-12.0.6.ebuild b/app-admin/sysstat/sysstat-12.0.6.ebuild |
19 |
index 859a0f0df6b..db640d7d5f9 100644 |
20 |
--- a/app-admin/sysstat/sysstat-12.0.6.ebuild |
21 |
+++ b/app-admin/sysstat/sysstat-12.0.6.ebuild |
22 |
@@ -2,7 +2,7 @@ |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
EAPI=7 |
26 |
-inherit eutils flag-o-matic systemd toolchain-funcs |
27 |
+inherit flag-o-matic systemd toolchain-funcs |
28 |
|
29 |
DESCRIPTION="System performance tools for Linux" |
30 |
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/" |
31 |
|
32 |
diff --git a/app-admin/sysstat/sysstat-12.1.6.ebuild b/app-admin/sysstat/sysstat-12.1.6.ebuild |
33 |
index 88dd13ade1d..fd3a1dd527e 100644 |
34 |
--- a/app-admin/sysstat/sysstat-12.1.6.ebuild |
35 |
+++ b/app-admin/sysstat/sysstat-12.1.6.ebuild |
36 |
@@ -2,7 +2,7 @@ |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
|
39 |
EAPI=7 |
40 |
-inherit eutils flag-o-matic systemd toolchain-funcs |
41 |
+inherit flag-o-matic systemd toolchain-funcs |
42 |
|
43 |
DESCRIPTION="System performance tools for Linux" |
44 |
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/" |
45 |
|
46 |
diff --git a/app-admin/sysstat/sysstat-999999.ebuild b/app-admin/sysstat/sysstat-999999.ebuild |
47 |
index b8e79ab247b..62f6cc193b2 100644 |
48 |
--- a/app-admin/sysstat/sysstat-999999.ebuild |
49 |
+++ b/app-admin/sysstat/sysstat-999999.ebuild |
50 |
@@ -1,8 +1,8 @@ |
51 |
# Copyright 1999-2019 Gentoo Authors |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
|
54 |
-EAPI=6 |
55 |
-inherit eutils flag-o-matic git-r3 multilib systemd toolchain-funcs |
56 |
+EAPI=7 |
57 |
+inherit flag-o-matic git-r3 systemd toolchain-funcs |
58 |
|
59 |
DESCRIPTION="System performance tools for Linux" |
60 |
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/" |
61 |
@@ -30,8 +30,6 @@ PATCHES=( |
62 |
"${FILESDIR}"/${PN}-11.7.3-flags.patch |
63 |
) |
64 |
|
65 |
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d |
66 |
- |
67 |
src_prepare() { |
68 |
if use nls; then |
69 |
strip-linguas -i nls/ |
70 |
@@ -52,9 +50,8 @@ src_configure() { |
71 |
tc-export AR |
72 |
use static && append-ldflags -static |
73 |
|
74 |
- sa_lib_dir=/usr/$(get_libdir)/sa \ |
75 |
+ sa_lib_dir=/usr/lib/sa \ |
76 |
conf_dir=/etc \ |
77 |
- rcdir=${SYSSTAT_FAKE_RC_DIR} \ |
78 |
econf \ |
79 |
$(use_enable debug debuginfo) \ |
80 |
$(use_enable lm_sensors sensors) \ |
81 |
@@ -77,9 +74,8 @@ src_install() { |
82 |
|
83 |
dodoc -r contrib/ |
84 |
|
85 |
- rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die |
86 |
newinitd "${FILESDIR}"/${PN}.init.d ${PN} |
87 |
systemd_dounit ${PN}.service |
88 |
|
89 |
- rm -f "${D}"usr/share/doc/${PF}/COPYING |
90 |
+ rm "${D}"/usr/share/doc/${PF}/COPYING || die |
91 |
} |