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