From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42D4B138334 for ; Fri, 31 May 2019 08:31:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53CDAE0872; Fri, 31 May 2019 08:31:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 272FFE0872 for ; Fri, 31 May 2019 08:31:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9FFF345223 for ; Fri, 31 May 2019 08:31:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4FEAF55B for ; Fri, 31 May 2019 08:30:59 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1559291453.dbb8a1553777a1440b9041c9178c41cd9e1e716e.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/sysstat/sysstat-12.0.5.ebuild app-admin/sysstat/sysstat-12.1.5.ebuild X-VCS-Directories: app-admin/sysstat/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: dbb8a1553777a1440b9041c9178c41cd9e1e716e X-VCS-Branch: master Date: Fri, 31 May 2019 08:30:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c567e84a-7568-4c3f-a828-9c41582bcc95 X-Archives-Hash: 20068ef2c34e5b162231aafe25cc7cb9 commit: dbb8a1553777a1440b9041c9178c41cd9e1e716e Author: Jeroen Roovers gentoo org> AuthorDate: Fri May 31 08:30:13 2019 +0000 Commit: Jeroen Roovers gentoo 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 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