app-admin/sysstat: EAPI=6.

Package-Manager: portage-2.3.2

diff --git a/app-admin/sysstat/sysstat-11.4.2.ebuild b/app-admin/sysstat/sysstat-11.4.2.ebuild
index 3f9181c675f391214b2ad7ab7f6ddb7bb2f43f11..716e055289ac0dc06f03ac719a339f9422263b01 100644 (file)
--- 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 c86b8b3bcb6dd1ca57e739dbc59177bd371d8901..b9a751627b55c44c8484b21a909893f83f26fbea 100644 (file)
--- 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() {