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 6A36C1395E2 for ; Sat, 5 Nov 2016 09:55:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9B44E0C6A; Sat, 5 Nov 2016 09:55:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1C8DE0C6A for ; Sat, 5 Nov 2016 09:55:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55EB73415FA for ; Sat, 5 Nov 2016 09:55:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC45024B4 for ; Sat, 5 Nov 2016 09:55:00 +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: <1478339696.4acabb2e09b0b6c27e7398e497cc85133929c13c.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-11.4.2.ebuild app-admin/sysstat/sysstat-11.5.2.ebuild X-VCS-Directories: app-admin/sysstat/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 4acabb2e09b0b6c27e7398e497cc85133929c13c X-VCS-Branch: master Date: Sat, 5 Nov 2016 09:55:00 +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-Archives-Salt: a2e6e9f0-90ea-460a-b1d0-e3e2f36e1cf7 X-Archives-Hash: 068394925734ca5cff2eda50196c9abd commit: 4acabb2e09b0b6c27e7398e497cc85133929c13c Author: Jeroen Roovers gentoo org> AuthorDate: Sat Nov 5 09:47:22 2016 +0000 Commit: Jeroen Roovers gentoo 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() {