gentoo resync : 23.09.2020

7 files changed, 38 insertions, 34 deletions

diff --git a/sys-apps/preload/Manifest b/sys-apps/preload/Manifest
index ec8f7e227198..d48171b5a7f3 100644
--- a/sys-apps/preload/Manifest
+++ b/sys-apps/preload/Manifest
@@ -1,12 +1,12 @@
-AUX 00-patch-configure.diff 554 BLAKE2B 73d5c0e5d54272f0498f461ac9bbef0434fce1cb315136955168dd70ab8a058180446fb654523be368197ac37f131d80eca7ebab233e909e7eb91262206370fb SHA512 08d0ec88d15812e9a495e3b5bef080539f088163d3ad3b390fc6f5cffaefbdf8a6ac854c9a24ec0962466afead1223ba5621566649fea6bb84d80bcecbc16c3e
+AUX 00-patch-configure.diff 557 BLAKE2B 08fa498954e6457ad82e6e71785940b243beec92f1e22ecf8adff8b9f19bc5d78baa2cd41213a1258099c2642bc954524eae7364c85d50cca95d2649bd75a01d SHA512 81388870cb61a5cc1d7b066a52c73d8478464e51e6926c63601442e6f93ac34eff603705d5bb01d4adcb012ca5c1363b1ff48d276720115fe39031f313e018ae
 AUX 0001-Early-restart-of-forking-readahead-children.patch 1900 BLAKE2B 53ce9538be78720e51ebcf894dd05780a02dc39c5c83b4af4785057e4b0b6da5a0a19243e15a34a19997fc2d818da113c70d81a9c042e7e15d6fbbd22799e093 SHA512 c24b22605e7fc020a5f2a069a65b2ffac9caae69b70d7e5925953f9e4a71992ca34f4701de7b9e975321ae3418a2d6a6bd952e162b8167891bc68128dbdc51cf
 AUX 0002-Create-short-overlapping-io-bursts.patch 856 BLAKE2B 64f61b1864cc0e4aa8dfe464bd36dc8308b99bec0b632b1e15e40992e0c5ff4b1f0b29c785d07936c9a7db6b7f17434148f07abdfca48bd08365ee47efd4a544 SHA512 ad9f8cc342e54cf36ade563351dec14d02bbcf1495f8dddae265a339531b623eeb3be100b6303670c33d588b2f0106d6162e74b449ec082e2f4257e2dd7b276b
 AUX 0003-Fix-wait_for_children-loop.patch 745 BLAKE2B 0e923e5227264e15323e5d41e65997a1f02e853c5a205fe3cba5c05a9ba802261e453c5e67c851b9914d0faa776ada5e3964564d27225921b9d91d3c778598b0 SHA512 32c107fde8d9afcf687e5e276dcb95006bc26fa0af6a1bc2223c80fbe9ec685d7952ae4e0452ed57c6edf3cffddc23fa0da4633c37f23c4450b5c68b3dbff274
-AUX 02-patch-preload_conf.diff 684 BLAKE2B 3f6a1ed6551dc015b6f32ad4631cac17955a64442736c865a3ccf2fa6ce86eea8b2d317e9d43a40479e0495891814b841d58e41e894f902292ef0e73aadbd59a SHA512 b5c6076cc4c97d917219d12d8aa30b3bc958085e2477b81c54449e2b4bc576fd86a1e01f64867933b1219842e3292e4861a1776486594ae3aa93f956fb919c9f
-AUX 02-patch-preload_sysconfig.diff 1297 BLAKE2B a97b0e815a2fab7508058de3b978864aa32edb03435bbc0985e6160be1aa8f8985e7a40031d467cfae803c6a5437102a69aa0605fb246b04390a6d78b6fbbe0a SHA512 bef0346e1b0c3fb15f9f1987a302cd0b349ce1898f387afaf6407833c2adfd3dfa985615840312d5cd09d22e330f072ab3a164cb3f7c9b356bfc51522fe924e3
-AUX preload-0.6.4-use-help2man-as-usual.patch 1170 BLAKE2B d887f3b410c03609af0263901d0772018c143d8a0bad33e3732d5b836fa6e645b34d5de3a2b3a84f37b513e6ddb27956779b16849013c1865212b88528c05e27 SHA512 cbd40b621974544f4737161a034f13d7d9e635822f7cca293ca93e7e5d7bb108260b02aa557e42fb43cbd48ca069bb19eb7946cb1f4fbf263dac84ac209de451
-AUX preload-0.6.4-use-make-dependencies.patch 533 BLAKE2B a52158e33778b7a12e3e87bfbc3c0c1ff4231b923c23f075f762a947628eb35256266ca1bdc5b0269e2ecedabd29be27c0ea7ebfe8a944e7c4d0e0917ba24e96 SHA512 060c96b9b3fe38eac79d6a39945ff4efbe7639804e97715a290d5397fff523fb8d483393305187249c61ac1acbc719f4e56bb7e5a3c1513e6384ca915ad773a0
+AUX 02-patch-preload_conf.diff 580 BLAKE2B 3e2e75da6a4c2bc12844d0ff7f10fbf40597b5dbb0652471129d8a8b0ea6cc265a07d9bd4da9358c7a4f79e6c1503a9315b72ef1c7a2f289ee705b3cb1239a20 SHA512 1b7dc7ef4062df4da232180c4a85d49c01f49d552e20e6a444fbf6933955ae47db9cc6332d3864b8f995fe5a90143169b0a93f68ee2644b654774a5c8fed67ef
+AUX 02-patch-preload_sysconfig.diff 1189 BLAKE2B e48709f2ca85358392862e76ebf005487d44dff5a3e29f6e0f6fa58752c78077173c8c43688fe7148952899c02b102772994bb4e15e41b16da60a1c9870b376f SHA512 46bead00fadea51449dcd06ce633d6725d234e6b1a2d8565a3b97306e46d00b18d66eaccfa3700f04a2498f6d65dcc0596f336b06b2fae0607d0c18bd44c4142
+AUX preload-0.6.4-use-help2man-as-usual.patch 1173 BLAKE2B 2b8e1363edddabd422fdadfc47318ad650c2413bfb040327549fe33b4e38267184902e759fa21d32422452091720791efc0190b9d1651b10f07a456768c02508 SHA512 0a8dedab11519555834f5daf9e843051598a0977080bb8bd23080e87009cfe4af3a8018071199542a2efeae55ce6a3ab0701c42465905629b2a23122251f395d
+AUX preload-0.6.4-use-make-dependencies.patch 536 BLAKE2B d19bd18e4f1411d0087a0b611c57e7f31d07d763f439b6ed7e28c6aa4fc7ce78b8573b60076fca0ee1da70bba1a7c2fe9d70cb67ab229b8b2f8a60787826db3d SHA512 0e8e42f5e03282bce68ec3c7c839175eb680ee471ea8cf22a362b9fe280a5197f2daa496465139c2ba8b6a76d733da5a910cf9f2137b3c09032ef6a8ee40ff66
 AUX preload-0.6.4.init.in-r2 1506 BLAKE2B 35622512e6321e8de7e40b41a37e25a4d4f628663050ec2c8fb4cb9220273017a4cf716464e1247d078b411773c451025e7ebe75d36055167f2940f544b60453 SHA512 0e6a058f1825f537152ddf1495dc4101f8add5ca4ce759c3cf6425025c19c5a4361d9abed447511b7d9f081c665d65d7d2f828c13a59ddfcb5f88e5529958e95
 DIST preload-0.6.4.tar.gz 140750 BLAKE2B 4992d2876bc7109d30551c16933c7b107e548d577faf2f78246bdeb6dfe16a81e09edce3a4f0ce15df346a28b81b730e246c7cba431b3d451ceaf6f48c8757bc SHA512 ffb533059b8c9cd171b0d02d52fc8c9bc45284fb16e12b9698ab74345d0e4f66cee61e17922074f7fbfaa90db254e473f815718fc72a689bb55346fcda9e823c
-EBUILD preload-0.6.4-r3.ebuild 1681 BLAKE2B d615b1f5ff1763d7e9b603e9c0746ac09b25b21e74dbf4553d4f08cf8074d115dc787f208fb261046f23ed114330757db278ebcb64b2b2238b17d6f8ff2372d7 SHA512 1fcb076e07dca79ce44945c576d8432408ddf4331f9e164a835a818f816b019a73930159064f26beadd90e263ce716d3c279e10c1da8f696ccb0aa24fcdb04c5
+EBUILD preload-0.6.4-r3.ebuild 1673 BLAKE2B 0e46d70daea3e06582f9c05e206fa5ef1a9890958ec2129b9f5fa5755f1d82d157cbdb4df62be95e44f0f9a145096aaa0580cdfe7012d78894daeb3361a807db SHA512 e1fd4cb7b4b2a41bcc73399ff6ebdb55639a0642cdc772082fd566d70c991474c0d5665b778b0a6360faf5850a24ef1da437524f652e83937417324e99594180
 MISC metadata.xml 528 BLAKE2B 2bb37590ea6a3b3fefea0be2a881f084fc1070cf510a75c34607b423e84366241292e14742c334d6489991f030b43553a425e5452c4d98335dd5b47b7aef1951 SHA512 4495fd96e629a729c9ff8cb13672204239091e8fac82b51bedc80e738481ef5c67fd88d4570e991de3a5d5226b1440529d88b5d43bc0a9e2cd803a4281279b30
diff --git a/sys-apps/preload/files/00-patch-configure.diff b/sys-apps/preload/files/00-patch-configure.diff
index 0fa5feb47b1f..17b0afc7d591 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 70055c3bbb0f..79011a1ce819 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 84308b6e14d8..7ca1a1313a00 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 61db50692524..e0e1d3e439c3 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 0f41780c31e4..5d2b61c7daf0 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 486415f63b80..97f7518dbe0d 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
 }