summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/init-system-helpers')
-rw-r--r--sys-apps/init-system-helpers/Manifest2
-rw-r--r--sys-apps/init-system-helpers/files/revert-openrc-management.patch3
-rw-r--r--sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild (renamed from sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild)15
-rw-r--r--sys-apps/init-system-helpers/metadata.xml3
4 files changed, 15 insertions, 8 deletions
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index f74e73aee069..bd84e5746eb4 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1 +1 @@
-DIST init-system-helpers_1.49.tar.xz 42660 BLAKE2B 548711283b04e3df13e9287154e2648b99ac80c2cdc71a428b4496220cd7c319f8f7afccb1e611c07b9d801837ef8799a3295a0490aa62812d47b728ba5ddba9 SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16
+DIST init-system-helpers_1.60.tar.xz 40584 BLAKE2B ad21a65ef3c4bcec16b14fc4db890fb7f83df625d1038fe217c20e9391404914df189ae31506b9bbef0442cdd333f46bd9c4d9009b7d671d9ae2deb6b05eee8e SHA512 3739613fa8afa1fa6032f47f8cec67c526171987a7d1eae31d479db9cc1e49ae3cd397a858130c17680d62becb9c6499bd1da1268e9ed25b044337ab69f0dd88
diff --git a/sys-apps/init-system-helpers/files/revert-openrc-management.patch b/sys-apps/init-system-helpers/files/revert-openrc-management.patch
index 49b4916fab31..582b71d9b1c4 100644
--- a/sys-apps/init-system-helpers/files/revert-openrc-management.patch
+++ b/sys-apps/init-system-helpers/files/revert-openrc-management.patch
@@ -1,3 +1,6 @@
+Tries to manage started service instead of allowing OpenRC to do it.
+https://bugs.gentoo.org/641836
+https://bugs.gentoo.org/649014
--- a/script/service
+++ b/script/service
@@ -159,23 +160,6 @@ run_via_sysvinit() {
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild
index 97888bcce019..9e7c8156a3a1 100644
--- a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
+++ b/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="Helper scripts useful for both OpenRC and systemd"
HOMEPAGE="https://packages.debian.org/sid/init-system-helpers"
@@ -10,19 +10,22 @@ SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
LICENSE="BSD GPL-2+"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-DEPEND=""
+BDEPEND="dev-python/docutils"
RDEPEND="!<sys-apps/openrc-0.33"
-PATCHES=( "${FILESDIR}/revert-openrc-management.patch" )
+PATCHES=(
+ "${FILESDIR}/revert-openrc-management.patch"
+)
src_install() {
# We only care about 'service' script/manpage:
exeinto /sbin/
doexe script/service
+ rst2man.py man8/service.rst > man8/service.8 || die "Failed to generate man page"
+
# FIXME: need to patch to remove *rc.d references, which we don't ship
# And should probably add a list of supported options (e.g., start/stop/etc.)
doman man8/service.8
diff --git a/sys-apps/init-system-helpers/metadata.xml b/sys-apps/init-system-helpers/metadata.xml
index 7a38bb900964..c3bda71eefca 100644
--- a/sys-apps/init-system-helpers/metadata.xml
+++ b/sys-apps/init-system-helpers/metadata.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
+ <stabilize-allarches/>
</pkgmetadata>