| 1 |
commit: 34c87461e60d34f97cd40b297065dcf612929ae7 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 9 16:34:09 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 9 17:55:51 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c87461 |
| 7 |
|
| 8 |
sys-apps/epoch: EAPI-8 bump, fix postinst contact info |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/783738 |
| 11 |
Closes: https://bugs.gentoo.org/809224 |
| 12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-apps/epoch/epoch-1.3.0.ebuild | 30 +++++++++++-------------- |
| 16 |
sys-apps/epoch/epoch-9999.ebuild | 26 +++++++++------------ |
| 17 |
sys-apps/epoch/files/epoch-1.3.0-fix-main.patch | 4 ++-- |
| 18 |
3 files changed, 26 insertions(+), 34 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-apps/epoch/epoch-1.3.0.ebuild b/sys-apps/epoch/epoch-1.3.0.ebuild |
| 21 |
index a37c2f912f6a..835ef3b7d1e0 100644 |
| 22 |
--- a/sys-apps/epoch/epoch-1.3.0.ebuild |
| 23 |
+++ b/sys-apps/epoch/epoch-1.3.0.ebuild |
| 24 |
@@ -1,33 +1,29 @@ |
| 25 |
-# Copyright 1999-2021 Gentoo Authors |
| 26 |
+# Copyright 1999-2022 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
-EAPI="5" |
| 30 |
+EAPI=8 |
| 31 |
|
| 32 |
-inherit epatch linux-info |
| 33 |
+inherit linux-info |
| 34 |
|
| 35 |
-MY_PV="${PV/rc/RC}" |
| 36 |
-MY_P="${PN}-${MY_PV}" |
| 37 |
- |
| 38 |
-DESCRIPTION="An init system, a /sbin/init replacement; designed for simplicity" |
| 39 |
-HOMEPAGE="http://universe2.us/epoch.html" |
| 40 |
-SRC_URI="http://universe2.us/${PN}_${PV}.tar.gz" |
| 41 |
+DESCRIPTION="Init system, /sbin/init replacement; designed for simplicity" |
| 42 |
+HOMEPAGE="https://universe2.us/epoch.html" |
| 43 |
+SRC_URI="https://universe2.us/${PN}_${PV}.tar.gz" |
| 44 |
+S="${WORKDIR}/${PN}_${PV/rc/RC}" |
| 45 |
|
| 46 |
LICENSE="public-domain" |
| 47 |
SLOT="0" |
| 48 |
KEYWORDS="~amd64 ~arm ~x86" |
| 49 |
|
| 50 |
-S="${WORKDIR}/${PN}_${PV}" |
| 51 |
- |
| 52 |
pkg_pretend() { |
| 53 |
local CONFIG_CHECK="~PROC_FS" |
| 54 |
|
| 55 |
[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config |
| 56 |
} |
| 57 |
|
| 58 |
-src_prepare() { |
| 59 |
- epatch "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch |
| 60 |
- epatch "${FILESDIR}"/${PN}-1.3.0-fix-main.patch |
| 61 |
-} |
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch |
| 64 |
+ "${FILESDIR}"/${PN}-1.3.0-fix-main.patch |
| 65 |
+) |
| 66 |
|
| 67 |
src_compile() { |
| 68 |
NEED_EMPTY_CFLAGS=1 sh ./buildepoch.sh || die "Cannot build epoch." |
| 69 |
@@ -68,7 +64,7 @@ pkg_postinst() { |
| 70 |
elog "" |
| 71 |
elog "Additional information about epoch is available at" |
| 72 |
elog "${HOMEPAGE} and configuration documentation at" |
| 73 |
- elog "http://universe2.us/epochconfig.html which is useful reading material." |
| 74 |
+ elog "https://universe2.us/epochconfig.html which is useful reading material." |
| 75 |
elog "" |
| 76 |
- elog "Its author Subsentient can be contacted at #epoch on irc.freenode.net." |
| 77 |
+ elog "Its author Subsentient can be contacted at #epoch on irc.libera.chat." |
| 78 |
} |
| 79 |
|
| 80 |
diff --git a/sys-apps/epoch/epoch-9999.ebuild b/sys-apps/epoch/epoch-9999.ebuild |
| 81 |
index 007de0c5e28b..8022520e994c 100644 |
| 82 |
--- a/sys-apps/epoch/epoch-9999.ebuild |
| 83 |
+++ b/sys-apps/epoch/epoch-9999.ebuild |
| 84 |
@@ -1,32 +1,28 @@ |
| 85 |
-# Copyright 1999-2021 Gentoo Authors |
| 86 |
+# Copyright 1999-2022 Gentoo Authors |
| 87 |
# Distributed under the terms of the GNU General Public License v2 |
| 88 |
|
| 89 |
-EAPI="5" |
| 90 |
+EAPI=8 |
| 91 |
|
| 92 |
-inherit epatch linux-info git-r3 |
| 93 |
+inherit linux-info git-r3 |
| 94 |
|
| 95 |
-MY_PV="${PV/rc/RC}" |
| 96 |
-MY_P="${PN}-${MY_PV}" |
| 97 |
- |
| 98 |
-DESCRIPTION="An init system, a /sbin/init replacement; designed for simplicity" |
| 99 |
-HOMEPAGE="http://universe2.us/epoch.html" |
| 100 |
+DESCRIPTION="Init system, /sbin/init replacement; designed for simplicity" |
| 101 |
+HOMEPAGE="https://universe2.us/epoch.html" |
| 102 |
EGIT_REPO_URI="https://github.com/Subsentient/epoch.git" |
| 103 |
+S="${WORKDIR}/${PN}-${PV/rc/RC}" |
| 104 |
|
| 105 |
LICENSE="public-domain" |
| 106 |
SLOT="0" |
| 107 |
KEYWORDS="" |
| 108 |
|
| 109 |
-S="${WORKDIR}/${MY_P}" |
| 110 |
- |
| 111 |
pkg_pretend() { |
| 112 |
local CONFIG_CHECK="~PROC_FS" |
| 113 |
|
| 114 |
[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config |
| 115 |
} |
| 116 |
|
| 117 |
-src_prepare() { |
| 118 |
- epatch "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch |
| 119 |
-} |
| 120 |
+PATCHES=( |
| 121 |
+ "${FILESDIR}"/${PN}-1.0-fix-CFLAGS.patch |
| 122 |
+) |
| 123 |
|
| 124 |
src_compile() { |
| 125 |
NEED_EMPTY_CFLAGS=1 sh ./buildepoch.sh || die "Cannot build epoch." |
| 126 |
@@ -67,7 +63,7 @@ pkg_postinst() { |
| 127 |
elog "" |
| 128 |
elog "Additional information about epoch is available at" |
| 129 |
elog "${HOMEPAGE} and configuration documentation at" |
| 130 |
- elog "http://universe2.us/epochconfig.html which is useful reading material." |
| 131 |
+ elog "https://universe2.us/epochconfig.html which is useful reading material." |
| 132 |
elog "" |
| 133 |
- elog "Its author Subsentient can be contacted at #epoch on irc.freenode.net." |
| 134 |
+ elog "Its author Subsentient can be contacted at #epoch on irc.libera.chat." |
| 135 |
} |
| 136 |
|
| 137 |
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 |
| 138 |
index b158ae2e3396..f6df7680ac29 100644 |
| 139 |
--- a/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch |
| 140 |
+++ b/sys-apps/epoch/files/epoch-1.3.0-fix-main.patch |
| 141 |
@@ -1,5 +1,5 @@ |
| 142 |
---- src/main.c.orig 2016-11-13 15:11:58.511021203 +0000 |
| 143 |
-+++ src/main.c 2016-11-13 15:12:21.096021358 +0000 |
| 144 |
+--- a/src/main.c |
| 145 |
++++ b/src/main.c |
| 146 |
@@ -1142,8 +1142,9 @@ static ReturnCode HandleEpochCommand(int |
| 147 |
ShutdownMemBus(false); //We're done with membus now. |
Archives