public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/milo/
Date: Wed, 13 Nov 2019 06:53:27 +0000 (UTC)	[thread overview]
Message-ID: <1573627994.870fda96e30afeaf24a7b0159be2401454030958.mattst88@gentoo> (raw)

commit:     870fda96e30afeaf24a7b0159be2401454030958
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 06:51:12 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 06:53:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=870fda96

sys-boot/milo: Port to EAPI=7

Closes: https://bugs.gentoo.org/697180
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sys-boot/milo/milo-2.4.18.ebuild | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/sys-boot/milo/milo-2.4.18.ebuild b/sys-boot/milo/milo-2.4.18.ebuild
index 3902314970f..e6bee2b3f6c 100644
--- a/sys-boot/milo/milo-2.4.18.ebuild
+++ b/sys-boot/milo/milo-2.4.18.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit flag-o-matic eutils
 
@@ -87,12 +87,16 @@ src_unpack() {
 	# unpack everything the kernel and milo sources
 	unpack linux-${kernel_version}.tar.bz2
 	unpack milo-${milo_version}.tar.bz2
+	unpack linux-2.2.20-reiserfs-3.5.35.diff.bz2
+}
 
+src_prepare() {
 	# gcc3 fixes, and some tweaks to get a build, also
 	# reiserfs support for the kernel (and milo).
-	cd ${WORKDIR}/linux; epatch "${FILESDIR}"/linux-${kernel_version}-gcc3-milo.diff || die
-	cd ${WORKDIR}/linux; epatch "${DISTDIR}"/linux-2.2.20-reiserfs-3.5.35.diff.bz2 || die
-	cd ${S}; epatch "${FILESDIR}"/milo-${milo_version}-gcc3-gentoo.diff || die
+	cd ${WORKDIR}/linux; eapply "${FILESDIR}"/linux-${kernel_version}-gcc3-milo.diff || die
+	cd ${WORKDIR}/linux; eapply "${WORKDIR}"/linux-2.2.20-reiserfs-3.5.35.diff || die
+	cd ${S}; eapply "${FILESDIR}"/milo-${milo_version}-gcc3-gentoo.diff || die
+	eapply_user
 }
 
 src_compile() {
@@ -149,9 +153,6 @@ src_compile() {
 	einfo "i will use it instead of the default."
 	ewarn
 
-	einfon "continuing in 10 seconds ..."
-	epause 10
-
 	# get kernel configured
 	cp ${custom_milo_kernel_config:-${S}/Documentation/config/linux-2.2.19-SuSE.config} \
 		${WORKDIR}/linux/.config


             reply	other threads:[~2019-11-13  6:53 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-13  6:53 Matt Turner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-05  7:18 [gentoo-commits] repo/gentoo:master commit in: sys-boot/milo/ Joonas Niilola
2022-12-07 13:52 David Seifert
2022-08-11 11:13 Sam James
2019-10-05 18:56 Michał Górny
2017-11-27 11:24 David Seifert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1573627994.870fda96e30afeaf24a7b0159be2401454030958.mattst88@gentoo \
    --to=mattst88@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox