commit: 4acabb2e09b0b6c27e7398e497cc85133929c13c Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Nov 5 09:47:22 2016 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Nov 5 09:54:56 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4acabb2e
app-admin/sysstat: EAPI=6. Package-Manager: portage-2.3.2 app-admin/sysstat/sysstat-11.4.2.ebuild | 15 +++++++++------ app-admin/sysstat/sysstat-11.5.2.ebuild | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app-admin/sysstat/sysstat-11.4.2.ebuild b/app-admin/sysstat/sysstat-11.4.2.ebuild index 3f9181c..716e055 100644 --- a/app-admin/sysstat/sysstat-11.4.2.ebuild +++ b/app-admin/sysstat/sysstat-11.4.2.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils flag-o-matic multilib systemd toolchain-funcs +EAPI=6 +inherit flag-o-matic multilib systemd toolchain-funcs DESCRIPTION="System performance tools for Linux" HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"; @@ -31,6 +31,10 @@ RDEPEND=" ${CDEPEND} selinux? ( sec-policy/selinux-sysstat ) " +PATCHES=( + "${FILESDIR}"/${PN}-10.0.4-flags.patch + "${FILESDIR}"/${PN}-11.0.4-cron.patch +) SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d @@ -46,9 +50,8 @@ src_prepare() { fi done fi - epatch \ - "${FILESDIR}"/${PN}-10.0.4-flags.patch \ - "${FILESDIR}"/${PN}-11.0.4-cron.patch + + default } src_configure() { @@ -66,7 +69,7 @@ src_configure() { --enable-copy-only \ --enable-documentation \ --enable-install-cron \ - --with-systemdsystemunitdir=$(systemd_get_unitdir) + --with-systemdsystemunitdir=$(systemd_get_systemunitdir) } src_compile() { diff --git a/app-admin/sysstat/sysstat-11.5.2.ebuild b/app-admin/sysstat/sysstat-11.5.2.ebuild index c86b8b3..b9a7516 100644 --- a/app-admin/sysstat/sysstat-11.5.2.ebuild +++ b/app-admin/sysstat/sysstat-11.5.2.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils flag-o-matic multilib systemd toolchain-funcs +EAPI=6 +inherit flag-o-matic multilib systemd toolchain-funcs DESCRIPTION="System performance tools for Linux" HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"; @@ -31,6 +31,10 @@ RDEPEND=" ${CDEPEND} selinux? ( sec-policy/selinux-sysstat ) " +PATCHES=( + "${FILESDIR}"/${PN}-10.0.4-flags.patch + "${FILESDIR}"/${PN}-11.0.4-cron.patch +) SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d @@ -46,9 +50,8 @@ src_prepare() { fi done fi - epatch \ - "${FILESDIR}"/${PN}-10.0.4-flags.patch \ - "${FILESDIR}"/${PN}-11.0.4-cron.patch + + default } src_configure() { @@ -66,7 +69,7 @@ src_configure() { --enable-copy-only \ --enable-documentation \ --enable-install-cron \ - --with-systemdsystemunitdir=$(systemd_get_unitdir) + --with-systemdsystemunitdir=$(systemd_get_systemunitdir) } src_compile() {
