| 1 |
commit: 4acabb2e09b0b6c27e7398e497cc85133929c13c |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 5 09:47:22 2016 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 5 09:54:56 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4acabb2e |
| 7 |
|
| 8 |
app-admin/sysstat: EAPI=6. |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
app-admin/sysstat/sysstat-11.4.2.ebuild | 15 +++++++++------ |
| 13 |
app-admin/sysstat/sysstat-11.5.2.ebuild | 15 +++++++++------ |
| 14 |
2 files changed, 18 insertions(+), 12 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-admin/sysstat/sysstat-11.4.2.ebuild b/app-admin/sysstat/sysstat-11.4.2.ebuild |
| 17 |
index 3f9181c..716e055 100644 |
| 18 |
--- a/app-admin/sysstat/sysstat-11.4.2.ebuild |
| 19 |
+++ b/app-admin/sysstat/sysstat-11.4.2.ebuild |
| 20 |
@@ -2,8 +2,8 @@ |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
# $Id$ |
| 23 |
|
| 24 |
-EAPI=5 |
| 25 |
-inherit eutils flag-o-matic multilib systemd toolchain-funcs |
| 26 |
+EAPI=6 |
| 27 |
+inherit flag-o-matic multilib systemd toolchain-funcs |
| 28 |
|
| 29 |
DESCRIPTION="System performance tools for Linux" |
| 30 |
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/" |
| 31 |
@@ -31,6 +31,10 @@ RDEPEND=" |
| 32 |
${CDEPEND} |
| 33 |
selinux? ( sec-policy/selinux-sysstat ) |
| 34 |
" |
| 35 |
+PATCHES=( |
| 36 |
+ "${FILESDIR}"/${PN}-10.0.4-flags.patch |
| 37 |
+ "${FILESDIR}"/${PN}-11.0.4-cron.patch |
| 38 |
+) |
| 39 |
|
| 40 |
SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d |
| 41 |
|
| 42 |
@@ -46,9 +50,8 @@ src_prepare() { |
| 43 |
fi |
| 44 |
done |
| 45 |
fi |
| 46 |
- epatch \ |
| 47 |
- "${FILESDIR}"/${PN}-10.0.4-flags.patch \ |
| 48 |
- "${FILESDIR}"/${PN}-11.0.4-cron.patch |
| 49 |
+ |
| 50 |
+ default |
| 51 |
} |
| 52 |
|
| 53 |
src_configure() { |
| 54 |
@@ -66,7 +69,7 @@ src_configure() { |
| 55 |
--enable-copy-only \ |
| 56 |
--enable-documentation \ |
| 57 |
--enable-install-cron \ |
| 58 |
- --with-systemdsystemunitdir=$(systemd_get_unitdir) |
| 59 |
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir) |
| 60 |
} |
| 61 |
|
| 62 |
src_compile() { |
| 63 |
|
| 64 |
diff --git a/app-admin/sysstat/sysstat-11.5.2.ebuild b/app-admin/sysstat/sysstat-11.5.2.ebuild |
| 65 |
index c86b8b3..b9a7516 100644 |
| 66 |
--- a/app-admin/sysstat/sysstat-11.5.2.ebuild |
| 67 |
+++ b/app-admin/sysstat/sysstat-11.5.2.ebuild |
| 68 |
@@ -2,8 +2,8 @@ |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
# $Id$ |
| 71 |
|
| 72 |
-EAPI=5 |
| 73 |
-inherit eutils flag-o-matic multilib systemd toolchain-funcs |
| 74 |
+EAPI=6 |
| 75 |
+inherit flag-o-matic multilib systemd toolchain-funcs |
| 76 |
|
| 77 |
DESCRIPTION="System performance tools for Linux" |
| 78 |
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/" |
| 79 |
@@ -31,6 +31,10 @@ RDEPEND=" |
| 80 |
${CDEPEND} |
| 81 |
selinux? ( sec-policy/selinux-sysstat ) |
| 82 |
" |
| 83 |
+PATCHES=( |
| 84 |
+ "${FILESDIR}"/${PN}-10.0.4-flags.patch |
| 85 |
+ "${FILESDIR}"/${PN}-11.0.4-cron.patch |
| 86 |
+) |
| 87 |
|
| 88 |
SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d |
| 89 |
|
| 90 |
@@ -46,9 +50,8 @@ src_prepare() { |
| 91 |
fi |
| 92 |
done |
| 93 |
fi |
| 94 |
- epatch \ |
| 95 |
- "${FILESDIR}"/${PN}-10.0.4-flags.patch \ |
| 96 |
- "${FILESDIR}"/${PN}-11.0.4-cron.patch |
| 97 |
+ |
| 98 |
+ default |
| 99 |
} |
| 100 |
|
| 101 |
src_configure() { |
| 102 |
@@ -66,7 +69,7 @@ src_configure() { |
| 103 |
--enable-copy-only \ |
| 104 |
--enable-documentation \ |
| 105 |
--enable-install-cron \ |
| 106 |
- --with-systemdsystemunitdir=$(systemd_get_unitdir) |
| 107 |
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir) |
| 108 |
} |
| 109 |
|
| 110 |
src_compile() { |
Archives