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 BDD9B138335 for ; Mon, 13 May 2019 18:52:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E815E08A5; Mon, 13 May 2019 18:52:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1C900E0870 for ; Mon, 13 May 2019 18:52:13 +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 92E32344256 for ; Mon, 13 May 2019 18:52:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F319E5E6 for ; Mon, 13 May 2019 18:52:10 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1557773410.1b3f26405f688097c265702553adb19ace333ab3.ulm@gentoo> Subject: [gentoo-commits] proj/devmanual:master commit in: quickstart/ X-VCS-Repository: proj/devmanual X-VCS-Files: quickstart/text.xml X-VCS-Directories: quickstart/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 1b3f26405f688097c265702553adb19ace333ab3 X-VCS-Branch: master Date: Mon, 13 May 2019 18:52:10 +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: 730ba117-a46d-4cc8-a7c8-c38842375bd7 X-Archives-Hash: 126ed0e9f5d1f7492ea7000a8e50e1b1 commit: 1b3f26405f688097c265702553adb19ace333ab3 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 22 07:19:17 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon May 13 18:50:10 2019 +0000 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1b3f2640 quickstart: Switch to eapply Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Ulrich Müller gentoo.org> quickstart/text.xml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/quickstart/text.xml b/quickstart/text.xml index 5a33ead..51f9962 100644 --- a/quickstart/text.xml +++ b/quickstart/text.xml @@ -260,20 +260,15 @@ compile-time dependencies, and the RDEPEND lists runtime dependencies. Se

Often we need to apply patches. This is done in the src_prepare -function using the epatch helper function. To use epatch -one must first tell Portage that the epatch eclass (an eclass is -like a library) is required -this is done via inherit epatch at the top of the ebuild. Here's -app-misc/detox/detox-1.1.0.ebuild: +function using the eapply helper function. To use eapply +one must use EAPI 7. Here's app-misc/detox/detox-1.1.0.ebuild:

# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit epatch +EAPI=7 DESCRIPTION="detox safely removes spaces and strange characters from filenames" HOMEPAGE="http://detox.sourceforge.net/" @@ -289,7 +284,7 @@ DEPEND="${RDEPEND} sys-devel/bison" src_prepare() { - epatch "${FILESDIR}"/${P}-destdir.patch \ + eapply "${FILESDIR}"/${P}-destdir.patch \ "${FILESDIR}"/${P}-parallel_build.patch } @@ -371,9 +366,9 @@ Another more complicated example, this time based upon # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit epatch desktop +inherit desktop DESCRIPTION="A lightweight email client and newsreader" HOMEPAGE="https://sylpheed.good-day.net/" @@ -398,7 +393,7 @@ DEPEND="${RDEPEND} nls? ( >=sys-devel/gettext-0.12.1 )" src_prepare() { - epatch "${FILESDIR}"/${PN}-namespace.diff \ + eapply "${FILESDIR}"/${PN}-namespace.diff \ "${FILESDIR}"/${PN}-procmime.diff }