From 5ac232c7f6ed5284380c565a461605f68bdf00cb Mon Sep 17 00:00:00 2001 From: "Marty E. Plummer" Date: Fri, 20 Apr 2018 11:34:22 -0500 Subject: [PATCH] dev-libs/libcgroup: epatch->PATCHES=() Also dropped unneeded eutils eclass. Package-Manager: Portage-2.3.31, Repoman-2.3.9 --- dev-libs/libcgroup/libcgroup-0.41-r4.ebuild | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild index 0f827edbd6f7e..67b609f2dfec6 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 -inherit autotools eutils flag-o-matic linux-info pam +inherit autotools flag-o-matic linux-info pam DESCRIPTION="Tools and libraries to configure and manage kernel control groups" HOMEPAGE="http://libcg.sourceforge.net/" @@ -33,11 +33,14 @@ pkg_setup() { linux-info_pkg_setup } -src_prepare() { - epatch "${FILESDIR}"/${P}-replace_DECLS.patch - epatch "${FILESDIR}"/${P}-replace_INLCUDES.patch - epatch "${FILESDIR}"/${P}-reorder-headers.patch +PATCHES=( + "${FILESDIR}"/${P}-replace_DECLS.patch + "${FILESDIR}"/${P}-replace_INLCUDES.patch + "${FILESDIR}"/${P}-reorder-headers.patch +) +src_prepare() { + default # Change rules file location sed -e 's:/etc/cgrules.conf:/etc/cgroup/cgrules.conf:' \ -i src/libcgroup-internal.h || die "sed failed" @@ -47,7 +50,6 @@ src_prepare() { -i src/pam/Makefile.am || die "sed failed" sed -e 's#/var/run#/run#g' -i configure.in || die "sed failed" - eapply_user eautoreconf }