commit: dbb8a1553777a1440b9041c9178c41cd9e1e716e Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Fri May 31 08:30:13 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Fri May 31 08:30:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb8a155
app-admin/sysstat: Fix sa_lib_dir, drop rcdir variable hack Fixes: https://bugs.gentoo.org/627746 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> app-admin/sysstat/sysstat-12.0.5.ebuild | 10 +++------- app-admin/sysstat/sysstat-12.1.5.ebuild | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app-admin/sysstat/sysstat-12.0.5.ebuild b/app-admin/sysstat/sysstat-12.0.5.ebuild index b9ca3b9892b..a5698a451e7 100644 --- a/app-admin/sysstat/sysstat-12.0.5.ebuild +++ b/app-admin/sysstat/sysstat-12.0.5.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 multilib systemd toolchain-funcs +EAPI=7 +inherit eutils flag-o-matic 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,7 +74,6 @@ src_install() { dodoc -r contrib/ - rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die newinitd "${FILESDIR}"/${PN}.init.d ${PN} systemd_dounit ${PN}.service diff --git a/app-admin/sysstat/sysstat-12.1.5.ebuild b/app-admin/sysstat/sysstat-12.1.5.ebuild index b9ca3b9892b..a5698a451e7 100644 --- a/app-admin/sysstat/sysstat-12.1.5.ebuild +++ b/app-admin/sysstat/sysstat-12.1.5.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 multilib systemd toolchain-funcs +EAPI=7 +inherit eutils flag-o-matic 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,7 +74,6 @@ src_install() { dodoc -r contrib/ - rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die newinitd "${FILESDIR}"/${PN}.init.d ${PN} systemd_dounit ${PN}.service
