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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8C790158086 for ; Sun, 9 Jan 2022 18:07:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B87822BC02A; Sun, 9 Jan 2022 18:07:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0971A2BC02A for ; Sun, 9 Jan 2022 18:06:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48AA0342D06 for ; Sun, 9 Jan 2022 17:56:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FCA921E for ; Sun, 9 Jan 2022 17:56:44 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1641750951.34c87461e60d34f97cd40b297065dcf612929ae7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/epoch/files/, sys-apps/epoch/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/epoch/epoch-1.3.0.ebuild sys-apps/epoch/epoch-9999.ebuild sys-apps/epoch/files/epoch-1.3.0-fix-main.patch X-VCS-Directories: sys-apps/epoch/ sys-apps/epoch/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 34c87461e60d34f97cd40b297065dcf612929ae7 X-VCS-Branch: master Date: Sun, 9 Jan 2022 17:56:44 +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: 13b52484-63ee-4009-bf1c-f28299055203 X-Archives-Hash: 96648531863e8c2c10f485b6980fd6a1 commit: 34c87461e60d34f97cd40b297065dcf612929ae7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 9 16:34:09 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 9 17:55:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c87461 sys-apps/epoch: EAPI-8 bump, fix postinst contact info Bug: https://bugs.gentoo.org/783738 Closes: https://bugs.gentoo.org/809224 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-apps/epoch/epoch-1.3.0.ebuild | 30 +++++++++++-------------- sys-apps/epoch/epoch-9999.ebuild | 26 +++++++++------------ sys-apps/epoch/files/epoch-1.3.0-fix-main.patch | 4 ++-- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/sys-apps/epoch/epoch-1.3.0.ebuild b/sys-apps/epoch/epoch-1.3.0.ebuild index a37c2f912f6a..835ef3b7d1e0 100644 --- a/sys-apps/epoch/epoch-1.3.0.ebuild +++ b/sys-apps/epoch/epoch-1.3.0.ebuild @@ -1,33 +1,29 @@ -# 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}" - pkg_pretend() { local CONFIG_CHECK="~PROC_FS" [[ ${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.