[gentoo-commits] repo/gentoo:master commit in: sys-apps/preload/files/, sys-apps/preload/

[Sam James]

commit:     5fd44b7a4a76694fddc47e0b90c6597c3fff3e2b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 21:05:24 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 21:09:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd44b7a

sys-apps/preload: port to EAPI 7

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/preload/files/00-patch-configure.diff     |  4 +--
 sys-apps/preload/files/02-patch-preload_conf.diff  |  5 ++-
 .../preload/files/02-patch-preload_sysconfig.diff  |  5 ++-
 .../preload-0.6.4-use-help2man-as-usual.patch      |  4 +--
 .../preload-0.6.4-use-make-dependencies.patch      |  4 +--
 sys-apps/preload/preload-0.6.4-r3.ebuild           | 38 +++++++++++++---------
 6 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/sys-apps/preload/files/00-patch-configure.diff b/sys-apps/preload/files/00-patch-configure.diff
index 0fa5feb47b1..17b0afc7d59 100644
--- a/sys-apps/preload/files/00-patch-configure.diff
+++ b/sys-apps/preload/files/00-patch-configure.diff
@@ -1,5 +1,5 @@
---- configure.ac~	2009-04-15 23:47:52.000000000 +0200
-+++ configure.ac	2010-03-29 17:59:39.000000000 +0200
+--- a/configure.ac	2009-04-15 23:47:52.000000000 +0200
++++ b/configure.ac	2010-03-29 17:59:39.000000000 +0200
 @@ -54,9 +54,9 @@
  PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14)
  

diff --git a/sys-apps/preload/files/02-patch-preload_conf.diff b/sys-apps/preload/files/02-patch-preload_conf.diff
index 70055c3bbb0..79011a1ce81 100644
--- a/sys-apps/preload/files/02-patch-preload_conf.diff
+++ b/sys-apps/preload/files/02-patch-preload_conf.diff
@@ -1,6 +1,5 @@
-diff -urN preload-0.6.orig/src/preload.conf.in preload-0.6/src/preload.conf.in
---- preload-0.6.orig/src/preload.conf.in	2008-07-24 02:02:11.000000000 +0200
-+++ preload-0.6/src/preload.conf.in	2008-07-24 16:32:28.565184094 +0200
+--- a/src/preload.conf.in	2008-07-24 02:02:11.000000000 +0200
++++ b/src/preload.conf.in	2008-07-24 16:32:28.565184094 +0200
 @@ -132,7 +132,7 @@
  # preload doesn't special-handle device files internally.
  #

diff --git a/sys-apps/preload/files/02-patch-preload_sysconfig.diff b/sys-apps/preload/files/02-patch-preload_sysconfig.diff
index 84308b6e14d..7ca1a1313a0 100644
--- a/sys-apps/preload/files/02-patch-preload_sysconfig.diff
+++ b/sys-apps/preload/files/02-patch-preload_sysconfig.diff
@@ -1,6 +1,5 @@
-diff -urN preload-0.6.4.orig/preload.sysconfig preload-0.6.4/preload.sysconfig
---- preload-0.6.4.orig/preload.sysconfig	2008-10-23 03:08:20.000000000 +0200
-+++ preload-0.6.4/preload.sysconfig	2009-05-01 13:51:03.493828659 +0200
+--- a/preload.sysconfig	2008-10-23 03:08:20.000000000 +0200
++++ b/preload.sysconfig	2009-05-01 13:51:03.493828659 +0200
 @@ -1,10 +1,30 @@
 +# Copyright 1999-2008 Gentoo Foundation
 +# $Id$

diff --git a/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch b/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch
index 61db5069252..e0e1d3e439c 100644
--- a/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch
+++ b/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am~	2009-04-15 23:46:04.000000000 +0200
-+++ src/Makefile.am	2010-04-09 12:56:45.000000000 +0200
+--- a/src/Makefile.am	2009-04-15 23:46:04.000000000 +0200
++++ b/src/Makefile.am	2010-04-09 12:56:45.000000000 +0200
 @@ -54,23 +54,11 @@
  
  dist_man_MANS = preload.8

diff --git a/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch b/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch
index 0f41780c31e..5d2b61c7daf 100644
--- a/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch
+++ b/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am~	2010-04-09 12:56:45.000000000 +0200
-+++ src/Makefile.am	2010-04-09 12:58:36.000000000 +0200
+--- a/src/Makefile.am	2010-04-09 12:56:45.000000000 +0200
++++ b/src/Makefile.am	2010-04-09 12:58:36.000000000 +0200
 @@ -8,8 +8,6 @@
  		-DLOGDIR='"${logdir}"'	\
  		-DPKGLOCALSTATEDIR='"${pkglocalstatedir}"'

diff --git a/sys-apps/preload/preload-0.6.4-r3.ebuild b/sys-apps/preload/preload-0.6.4-r3.ebuild
index 486415f63b8..97f7518dbe0 100644
--- a/sys-apps/preload/preload-0.6.4-r3.ebuild
+++ b/sys-apps/preload/preload-0.6.4-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils autotools
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Adaptive readahead daemon"
 HOMEPAGE="https://sourceforge.net/projects/preload/"
@@ -13,20 +14,26 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="vanilla"
 
-RDEPEND=">=dev-libs/glib-2.6:2"
-DEPEND="${RDEPEND}
+BDEPEND="
+	sys-apps/help2man
 	virtual/pkgconfig
-	sys-apps/help2man"
+"
+RDEPEND=">=dev-libs/glib-2.6:2"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/00-patch-configure.diff
+	"${FILESDIR}"/02-patch-preload_conf.diff
+	"${FILESDIR}"/02-patch-preload_sysconfig.diff
+	"${FILESDIR}"/${PN}-0.6.4-use-help2man-as-usual.patch
+	"${FILESDIR}"/${PN}-0.6.4-use-make-dependencies.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/00-patch-configure.diff
-	epatch "${FILESDIR}"/02-patch-preload_conf.diff
-	epatch "${FILESDIR}"/02-patch-preload_sysconfig.diff
-	epatch "${FILESDIR}"/${PN}-0.6.4-use-help2man-as-usual.patch
-	epatch "${FILESDIR}"/${PN}-0.6.4-use-make-dependencies.patch
-	use vanilla || epatch "${FILESDIR}"/000{1,2,3}-*.patch
-	cat "${FILESDIR}"/preload-0.6.4.init.in-r2 > preload.init.in || die
+	use vanilla || eapply "${FILESDIR}"/000{1,2,3}-*.patch
+	default
 
+	cat "${FILESDIR}"/preload-0.6.4.init.in-r2 > preload.init.in || die
 	eautoreconf
 }
 
@@ -46,16 +53,15 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ "$(rc-config list default | grep preload)" = "" ] ; then
+	if [[ "$(rc-config list default | grep preload)" = "" ]] ; then
 		elog "You probably want to add preload to the default runlevel like so:"
 		elog "# rc-update add preload default"
 	fi
 
-	if has_version sys-fs/e4rat; then
+	if has_version sys-fs/e4rat ; then
 		elog "It appears you have sys-fs/e4rat installed. This may"
 		elog "has negative effects on it. You may want to disable preload"
 		elog "when using sys-fs/e4rat."
 		elog "http://e4rat.sourceforge.net/wiki/index.php/Main_Page#Debian.2FUbuntu"
-
 	fi
 }