gentoo resync : 16.01.2021

5 files changed, 30 insertions, 113 deletions

diff --git a/sys-apps/epoch/Manifest b/sys-apps/epoch/Manifest
index e14d5a264a6b..bb4b72dd95b4 100644
--- a/sys-apps/epoch/Manifest
+++ b/sys-apps/epoch/Manifest
@@ -1,11 +1,9 @@
 AUX epoch-1.0-epoch.conf 1914 BLAKE2B 3ccb5ae37d8453702049c11ba3e4cc6b65133ccc2aa76ac3c490d1285112a768c68f83ad6e77f3df821ac329ca086a571774032dd1cf1a6c85aec7db0f413d6d SHA512 7844d05f86e969e308cbbeb6b0e766a724b59ba5d58f2905ffe1e6d8cdc55436233203fa4434e41becd8b7488c774bf8f3d5cd6ff0b43acabc738643cd3c292b
 AUX epoch-1.0-fix-CFLAGS.patch 156 BLAKE2B 8cc3a52e243d839df65c27cd9517c8ae5d8a84effba6d9288867ebae2dee214c0cbdcfc50c388229b06a437c649f9e530118552fe9cf90861bdfb0888880243a SHA512 ddb76c70acc1f76a8842f8abbc5e62861e249b37dea0b97dd4b74496dca95683123ccb86c39d2414b679b4cb74db00a2cc069801897efbe3a8eafaa9454db538
-AUX epoch-1.3.0-fix-main.patch 631 BLAKE2B c9513ad352d9a2f8644595a6b1d3a881ec9bb2423ddf4ce19c80f6a6dfe3764b7989c56c08bbc9e17562fd13e228e6ae3956fec4992d489dbb8fae53a80557ce SHA512 ab542435d5dec6be5d71a742270b5897a6798c6c89163853cf089c76ee3602056201eaa8836af1d0dad0392396f45b50d8c15e1b65ada892b703c5f70ed8ec32
+AUX epoch-1.3.0-fix-main.patch 558 BLAKE2B ee210b3579ba0a57fa458cdc894b7c05a8bb8993215bf37360cb7c0d83893c64dd7046c6222754439f866cbb8baa205771cc8c77e10ce3ee6162cbee1fa8b5b2 SHA512 079d1d53ca2b8703376d11da14a978ff3075d798e6c2e79dc1820e135bfa575d34afb19d5516b1b91d8dad896ea76f595667a4390049302d40036f46b1a4fd0d
 DIST epoch-1.2.1.tar.gz 66718 BLAKE2B 1fc75001ead0f65df6a303ae4933995eb5607e4f8f2de21c2b74b95f7a8a5ca0be21bf6c509826d36c79795905a1f65c18a755b7944d0eceb0364abc1d58613a SHA512 2d0c767165ec41452d1dabf338c8ea31772f1a8cd1e1dbd60c8469f2f235bb1f0cb60b467189f1fd1079dfc223b0687c1cfe5e729e1142ebc63323b1f9c0cf93
-DIST epoch_1.2.2.tar.gz 229377 BLAKE2B 0f2c00df56a7d35dd224b8a1b22c78dae943c09eabb78c72cddc1085d5596cf6ef23b4d0c240191bb6b69e511a97f0bdb9f0cf99a4146097211867ae1beaf213 SHA512 9e3e38ef95c20237a3db4f47c9464f27e893a665f0692200d89e96b12f6b2e3af9b84d951356b7b354f19ea4fbe372e2e0ba406fdfeb8819914d46cfed3024a3
 DIST epoch_1.3.0.tar.gz 70681 BLAKE2B 7ad2ab4c7f6c5544138aeb29a9b3a3f8889ade23b448abf1ec257fc7bbf811f4f6b01f0c9c81005aec56fe243d1f1e53a2daacdcdc4ff935bfcbd707fb8b2ab6 SHA512 1e4a8bee26d8819303cbeb67265ee74e294502acfb3f5e594222bb7bdcb2d077fe19e73c40e9111a6ef9af788d767434f5a9a357430b59d6a0cac0e36a3b8f9e
 EBUILD epoch-1.2.1.ebuild 1848 BLAKE2B 7f8b52344040a2e3832735dd43cdfc6170b1e70b50df351eb04667de382bb1fecb2b5f14b1ae3b3ece4beb83e69445366522baff437af26e86b9ff0583983f2c SHA512 6d5a03c2ebabb0e40a5771744cd703eecac16adf4eb37e3deeebefb40b53f808f87176f8f226cf6e390d03540e369578b947a7878928a6480d2a5428d30fbde7
-EBUILD epoch-1.2.2.ebuild 1818 BLAKE2B 15777f6382a6c5c6dad9dacb7bfd52b5df3d93892b65d9db05deb9482fad8bd215a1cbb80d00bc8de527b8b7995f20dd80b97e7e5ccfb7e63a3de474e2f5208f SHA512 ec88610743e15cf38e5fa028cffd9d9e801cf2398cfc8fd39964e28e4d503ed7bfd985e1f05cef2bef7e20491e69973244cd5b3dc5c08761d50999deab4b03bd
-EBUILD epoch-1.3.0.ebuild 1867 BLAKE2B 255ee90b14302b5bf81c818d9292da5872bdbe9538cee6b039e89d366feea7dcd5747d294c16a25cd9004f830b42b678b1a5830f673c61c690bc4fb3725a4dc1 SHA512 5082ce94571599d5396b27ce542eb4eaec367344fb2c4c6f209593b3c349104b7de029ca10ba3d3ffab9dd4fbde72ece7d0fcb9778661e4d2dbe8e2880d9b483
-EBUILD epoch-9999.ebuild 1813 BLAKE2B 2053480d5b90cfddb11d32c084dcdda42cce3006c460f098dbf13b360b7bc2e6c44d225d2acf8673ceae0ad3da98131eca721429379beb7cc7372006c623fb15 SHA512 68178acc8e4781240eb700d69df4d765df522df641ee87f62f536f7546b702d4b496993263ed0de27cc737734ec14e57d5b9892653fac2624dad6941d631f625
+EBUILD epoch-1.3.0.ebuild 1794 BLAKE2B 2f9423e2952f3fe93d5c1faa6d076ecb258e9a4a830a487834b5b817d2049237fbd1a94e6605e3550d5b3bd32438b21fbe4098034bed1c81e7e8e0146f31d2bd SHA512 3cd02ecd31dfac1c6d49d040668c1bdf33a08da81d429f321b85f37c1d34244768c50586145651811fbe5a36302cd6f42ebcb2b5a91fd299a476c5f59a88782a
+EBUILD epoch-9999.ebuild 1753 BLAKE2B 0d16756e1ef06e12ccc93a5393dc221a6fd35d627ac9383bf4bae35c4259d075873d6aca33d881303095cd549930150deff8ccf802e6d00914702b114f135512 SHA512 83fdf4f68e744781d2d86df5e14ebb942cf4a2f1c8e8911dbf0e2afaf4b973ce9e05590d18f6a963b2335cfc14605bd83a1e5eb462d32ac86ccfa22f2df84f0d
 MISC metadata.xml 979 BLAKE2B 9ebcc97c47fa3d0d3b97bca019a55177c4164df79d82f061029f6b90401ceef2152b9b6386e03509a75c8b2df00deb86ef3f1cd838f50fc829304febb70c85c5 SHA512 322c71336dad1949b9b739c476576dcaaadad0210f0d1d0bda89948dd209f4c2349ac92896495f56f8542c4a068c6aac602dcf7e7e1939dcc10f5a674191aabd
diff --git a/sys-apps/epoch/epoch-1.2.2.ebuild b/sys-apps/epoch/epoch-1.2.2.ebuild
deleted file mode 100644
index af18fc85b21a..000000000000
--- a/sys-apps/epoch/epoch-1.2.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch linux-info
-
-MY_PV="${PV/rc/RC}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An init system, a /sbin/init replacement; designed for simplicity"
-HOMEPAGE="http://universe2.us/epoch.html"
-SRC_URI="http://universe2.us/${PN}_${PV}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-S="${WORKDIR}/${PN}_${PV}"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~PROC_FS"
-
-	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch
-}
-
-src_compile() {
-	NEED_EMPTY_CFLAGS=1 sh ./buildepoch.sh || die "Cannot build epoch."
-}
-
-newepochins() {
-	local type="$1"
-
-	cd ${type} || die "Cannot change directory."
-	for file in * ; do
-		if [[ "${file}" != "epoch" ]] ; then
-			new${type} ${file} epoch-${file}
-		fi
-	done
-	cd .. || die "Cannot change directory."
-}
-
-src_install() {
-	cd built || die "Cannot change directory."
-
-	dosbin sbin/epoch
-
-	# For now, rename to epoch-* until we can blend in with a standard approach.
-	newepochins bin
-	newepochins sbin
-
-	insinto /etc/epoch/
-	newins "${FILESDIR}"/${PN}-1.0-epoch.conf epoch.conf
-}
-
-pkg_postinst() {
-	elog "Make sure to provide /run and /tmp tmpfs mounts using /etc/fstab."
-	elog ""
-	elog "An example epoch configuration is provided at /etc/epoch/epoch.conf"
-	elog "which starts a minimal needed to use Gentoo."
-	elog ""
-	elog "To use epoch, add this kernel parameter: init=/usr/sbin/epoch-init"
-	elog ""
-	elog "Additional information about epoch is available at"
-	elog "${HOMEPAGE} and configuration documentation at"
-	elog "http://universe2.us/epochconfig.html which is useful reading material."
-	elog ""
-	elog "Its author Subsentient can be contacted at #epoch on irc.freenode.net."
-}
diff --git a/sys-apps/epoch/epoch-1.3.0.ebuild b/sys-apps/epoch/epoch-1.3.0.ebuild
index a37c2f912f6a..6e888e4e4b61 100644
--- a/sys-apps/epoch/epoch-1.3.0.ebuild
+++ b/sys-apps/epoch/epoch-1.3.0.ebuild
@@ -1,22 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
-inherit epatch linux-info
+inherit linux-info
 
-MY_PV="${PV/rc/RC}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An init system, a /sbin/init replacement; designed for simplicity"
-HOMEPAGE="http://universe2.us/epoch.html"
-SRC_URI="http://universe2.us/${PN}_${PV}.tar.gz"
+DESCRIPTION="Init system, /sbin/init replacement; designed for simplicity"
+HOMEPAGE="https://universe2.us/epoch.html"
+SRC_URI="https://universe2.us/${PN}_${PV}.tar.gz"
+S="${WORKDIR}/${PN}_${PV/rc/RC}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-S="${WORKDIR}/${PN}_${PV}"
+KEYWORDS="amd64 arm x86"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~PROC_FS"
@@ -24,10 +20,10 @@ pkg_pretend() {
 	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-1.3.0-fix-main.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.3.0-fix-main.patch
+)
 
 src_compile() {
 	NEED_EMPTY_CFLAGS=1 sh ./buildepoch.sh || die "Cannot build epoch."
@@ -68,7 +64,7 @@ pkg_postinst() {
 	elog ""
 	elog "Additional information about epoch is available at"
 	elog "${HOMEPAGE} and configuration documentation at"
-	elog "http://universe2.us/epochconfig.html which is useful reading material."
+	elog "https://universe2.us/epochconfig.html which is useful reading material."
 	elog ""
-	elog "Its author Subsentient can be contacted at #epoch on irc.freenode.net."
+	elog "Its author Subsentient can be contacted at #epoch on irc.libera.chat."
 }
diff --git a/sys-apps/epoch/epoch-9999.ebuild b/sys-apps/epoch/epoch-9999.ebuild
index 007de0c5e28b..8022520e994c 100644
--- a/sys-apps/epoch/epoch-9999.ebuild
+++ b/sys-apps/epoch/epoch-9999.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
-inherit epatch linux-info git-r3
+inherit linux-info git-r3
 
-MY_PV="${PV/rc/RC}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An init system, a /sbin/init replacement; designed for simplicity"
-HOMEPAGE="http://universe2.us/epoch.html"
+DESCRIPTION="Init system, /sbin/init replacement; designed for simplicity"
+HOMEPAGE="https://universe2.us/epoch.html"
 EGIT_REPO_URI="https://github.com/Subsentient/epoch.git"
+S="${WORKDIR}/${PN}-${PV/rc/RC}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS=""
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_pretend() {
 	local CONFIG_CHECK="~PROC_FS"
 
 	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch
+)
 
 src_compile() {
 	NEED_EMPTY_CFLAGS=1 sh ./buildepoch.sh || die "Cannot build epoch."
@@ -67,7 +63,7 @@ pkg_postinst() {
 	elog ""
 	elog "Additional information about epoch is available at"
 	elog "${HOMEPAGE} and configuration documentation at"
-	elog "http://universe2.us/epochconfig.html which is useful reading material."
+	elog "https://universe2.us/epochconfig.html which is useful reading material."
 	elog ""
-	elog "Its author Subsentient can be contacted at #epoch on irc.freenode.net."
+	elog "Its author Subsentient can be contacted at #epoch on irc.libera.chat."
 }
diff --git a/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch b/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch
index b158ae2e3396..f6df7680ac29 100644
--- a/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch
+++ b/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch
@@ -1,5 +1,5 @@
---- src/main.c.orig	2016-11-13 15:11:58.511021203 +0000
-+++ src/main.c	2016-11-13 15:12:21.096021358 +0000
+--- a/src/main.c
++++ b/src/main.c
 @@ -1142,8 +1142,9 @@ static ReturnCode HandleEpochCommand(int
  		ShutdownMemBus(false); //We're done with membus now.