commit: 66c862e94a48d0acd4f2f36dc6073d69757a6d0c Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Thu Aug 15 06:12:59 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Thu Aug 15 06:13:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c862e9
app-admin/sysstat: EAPI=7 updates? Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> app-admin/sysstat/sysstat-12.0.6.ebuild | 2 +- app-admin/sysstat/sysstat-12.1.6.ebuild | 2 +- app-admin/sysstat/sysstat-999999.ebuild | 12 ++++-------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app-admin/sysstat/sysstat-12.0.6.ebuild b/app-admin/sysstat/sysstat-12.0.6.ebuild index 859a0f0df6b..db640d7d5f9 100644 --- a/app-admin/sysstat/sysstat-12.0.6.ebuild +++ b/app-admin/sysstat/sysstat-12.0.6.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils flag-o-matic systemd toolchain-funcs +inherit flag-o-matic systemd toolchain-funcs DESCRIPTION="System performance tools for Linux" HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"; diff --git a/app-admin/sysstat/sysstat-12.1.6.ebuild b/app-admin/sysstat/sysstat-12.1.6.ebuild index 88dd13ade1d..fd3a1dd527e 100644 --- a/app-admin/sysstat/sysstat-12.1.6.ebuild +++ b/app-admin/sysstat/sysstat-12.1.6.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils flag-o-matic systemd toolchain-funcs +inherit flag-o-matic systemd toolchain-funcs DESCRIPTION="System performance tools for Linux" HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"; diff --git a/app-admin/sysstat/sysstat-999999.ebuild b/app-admin/sysstat/sysstat-999999.ebuild index b8e79ab247b..62f6cc193b2 100644 --- a/app-admin/sysstat/sysstat-999999.ebuild +++ b/app-admin/sysstat/sysstat-999999.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils flag-o-matic git-r3 multilib systemd toolchain-funcs +EAPI=7 +inherit flag-o-matic git-r3 systemd toolchain-funcs DESCRIPTION="System performance tools for Linux" HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"; @@ -30,8 +30,6 @@ PATCHES=( "${FILESDIR}"/${PN}-11.7.3-flags.patch ) -SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d - src_prepare() { if use nls; then strip-linguas -i nls/ @@ -52,9 +50,8 @@ src_configure() { tc-export AR use static && append-ldflags -static - sa_lib_dir=/usr/$(get_libdir)/sa \ + sa_lib_dir=/usr/lib/sa \ conf_dir=/etc \ - rcdir=${SYSSTAT_FAKE_RC_DIR} \ econf \ $(use_enable debug debuginfo) \ $(use_enable lm_sensors sensors) \ @@ -77,9 +74,8 @@ src_install() { dodoc -r contrib/ - rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die newinitd "${FILESDIR}"/${PN}.init.d ${PN} systemd_dounit ${PN}.service - rm -f "${D}"usr/share/doc/${PF}/COPYING + rm "${D}"/usr/share/doc/${PF}/COPYING || die }
