From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/
Date: Tue, 29 Mar 2022 11:49:39 +0000 (UTC) [thread overview]
Message-ID: <1648554565.cccaac2fdf7f1256c6cf5273fac824d24fdde777.ulm@gentoo> (raw)
commit: cccaac2fdf7f1256c6cf5273fac824d24fdde777
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 11:46:53 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 11:49:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cccaac2f
Revert "sys-apps/sysvinit: drop translations again"
And revision bump to -r3.
This reverts commit e18dcba3744bdbd1ef1700183c71a6a6703fed40.
Bug: https://bugs.gentoo.org/836362#c4
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
...init-3.02-r2.ebuild => sysvinit-3.02-r3.ebuild} | 37 +++++++++++++++++++---
1 file changed, 32 insertions(+), 5 deletions(-)
diff --git a/sys-apps/sysvinit/sysvinit-3.02-r2.ebuild b/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
similarity index 82%
rename from sys-apps/sysvinit/sysvinit-3.02-r2.ebuild
rename to sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
index c05001372e26..689e5a124a48 100644
--- a/sys-apps/sysvinit/sysvinit-3.02-r2.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.02-r3.ebuild
@@ -3,8 +3,9 @@
EAPI=7
+PLOCALES="de es fi fr hu id pl"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
-inherit toolchain-funcs flag-o-matic verify-sig
+inherit toolchain-funcs flag-o-matic plocale verify-sig
DESCRIPTION="/sbin/init - parent of all processes"
HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
@@ -17,7 +18,7 @@ SLOT="0"
if [[ ${PV} != *beta* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
-IUSE="selinux ibm static"
+IUSE="selinux ibm nls static"
COMMON_DEPEND="
selinux? (
@@ -30,9 +31,9 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!<sys-apps/openrc-0.13
selinux? ( sec-policy/selinux-shutdown )"
-# We did have po4a for translations for a bit but clashes with i18n package
-# Leave it for now. bug #836362
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sysvinit )"
+# po4a is for man page translations
+BDEPEND="nls? ( app-text/po4a )
+ verify-sig? ( sec-keys/openpgp-keys-sysvinit )"
PATCHES=(
# bug #80220
@@ -92,6 +93,17 @@ src_prepare() {
if [[ ${#insert[@]} -gt 0 ]] ; then
printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
fi
+
+ delete_unused_locale() {
+ local locale=${1}
+
+ einfo "Deleting non-requested man page translations for locale=${locale}"
+ rm "${S}"/man/po/${locale}.po || die
+
+ sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
+ }
+
+ plocale_for_each_disabled_locale delete_unused_locale
}
src_compile() {
@@ -105,6 +117,11 @@ src_compile() {
use static && append-ldflags -static
emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
+
+ if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+ cd man/po || die
+ po4a po4a.cfg || die
+ fi
}
src_install() {
@@ -122,6 +139,16 @@ src_install() {
keepdir /etc/inittab.d
+ if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+ install_locale_man_pages() {
+ local locale=${1}
+
+ doman -i18n=${locale} man/po/${locale}/*
+ }
+
+ plocale_for_each_locale install_locale_man_pages
+ fi
+
# Dead symlink
find "${ED}" -xtype l -delete || die
next reply other threads:[~2022-03-29 11:49 UTC|newest]
Thread overview: 146+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-29 11:49 Ulrich Müller [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-22 9:38 [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/ Ulrich Müller
2025-02-09 7:09 Sam James
2024-12-23 3:22 Sam James
2024-10-29 2:48 Sam James
2024-09-18 0:12 Sam James
2024-06-01 3:46 Ionen Wolkens
2024-05-11 15:19 Sam James
2024-04-29 8:10 Arthur Zamarin
2024-04-29 8:10 Arthur Zamarin
2024-04-29 8:10 Arthur Zamarin
2024-04-29 8:10 Arthur Zamarin
2024-04-29 8:10 Arthur Zamarin
2024-04-29 8:10 Arthur Zamarin
2024-03-28 4:47 Sam James
2024-02-26 21:27 Mike Gilbert
2024-01-18 8:06 Florian Schmaus
2024-01-03 2:20 Ionen Wolkens
2023-12-21 0:07 Ionen Wolkens
2023-12-14 4:15 Sam James
2023-08-17 19:26 Ulrich Müller
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-06-09 16:38 Arthur Zamarin
2023-05-01 9:11 Ulrich Müller
2023-05-01 3:48 Sam James
2023-03-04 5:42 Arthur Zamarin
2023-03-04 5:42 Arthur Zamarin
2023-03-04 5:42 Arthur Zamarin
2023-03-04 5:42 Arthur Zamarin
2023-03-04 5:42 Arthur Zamarin
2023-03-04 5:42 Arthur Zamarin
2023-03-04 5:42 Arthur Zamarin
2023-03-04 5:42 Arthur Zamarin
2023-01-18 12:34 Andreas K. Hüttel
2023-01-09 7:32 Sam James
2022-12-18 6:30 Sam James
2022-10-29 21:32 Sam James
2022-09-26 6:24 Arthur Zamarin
2022-09-25 7:44 Arthur Zamarin
2022-09-25 6:25 Agostino Sarubbo
2022-09-25 6:24 Agostino Sarubbo
2022-09-25 6:20 Agostino Sarubbo
2022-09-25 6:20 Agostino Sarubbo
2022-09-25 4:54 Sam James
2022-09-25 4:54 Sam James
2022-07-27 5:30 Sam James
2022-05-04 4:01 Sam James
2022-04-27 3:46 Sam James
2022-04-17 17:06 Sam James
2022-04-13 23:52 Sam James
2022-04-09 19:29 Arthur Zamarin
2022-04-02 12:04 Arthur Zamarin
2022-04-02 8:03 Agostino Sarubbo
2022-04-01 6:53 Arthur Zamarin
2022-03-30 11:46 Agostino Sarubbo
2022-03-29 23:33 Sam James
2022-03-29 23:33 Sam James
2022-03-29 17:13 Ulrich Müller
2022-03-29 16:20 Ionen Wolkens
2022-03-29 14:07 Ulrich Müller
2022-03-29 10:46 Sam James
2022-03-29 5:31 Sam James
2022-03-29 5:29 Sam James
2022-01-04 3:29 Sam James
2021-12-14 9:42 Lars Wendler
2021-09-20 23:05 Lars Wendler
2021-05-13 19:02 Sam James
2021-05-13 18:56 Sam James
2021-05-13 16:59 Sam James
2021-05-13 16:55 Sam James
2021-05-13 16:54 Sam James
2021-05-13 16:44 Sam James
2021-05-13 16:29 Sam James
2021-04-12 22:08 Sam James
2021-04-12 22:08 Sam James
2021-04-12 17:33 Sam James
2021-04-07 22:44 Sam James
2021-04-07 22:42 Sam James
2021-02-01 18:04 Sergei Trofimovich
2020-11-23 8:01 Sergei Trofimovich
2020-11-18 15:07 Agostino Sarubbo
2020-11-18 15:07 Agostino Sarubbo
2020-11-18 0:41 Sam James
2020-11-18 0:39 Sam James
2020-11-17 20:43 Thomas Deutschmann
2020-11-17 18:55 Agostino Sarubbo
2020-11-17 18:50 Agostino Sarubbo
2020-11-17 18:45 Agostino Sarubbo
2020-11-10 11:18 Lars Wendler
2020-07-07 9:22 Lars Wendler
2020-07-07 9:22 Lars Wendler
2020-05-02 11:29 Ulrich Müller
2019-09-12 7:52 Lars Wendler
2019-09-12 7:52 Lars Wendler
2019-08-23 21:21 Lars Wendler
2019-06-16 9:58 Lars Wendler
2019-05-04 0:03 Mikle Kolyada
2019-04-20 22:44 Aaron Bauman
2019-04-08 6:42 Mikle Kolyada
2019-03-15 13:19 Lars Wendler
2019-03-11 22:42 Sergei Trofimovich
2019-03-11 19:58 Sergei Trofimovich
2019-03-10 22:17 Sergei Trofimovich
2019-03-10 21:38 Matt Turner
2019-03-10 21:38 Matt Turner
2019-03-10 14:44 Mikle Kolyada
2019-03-10 14:44 Mikle Kolyada
2019-03-10 14:44 Mikle Kolyada
2019-03-10 14:22 Mikle Kolyada
2019-03-09 19:18 Thomas Deutschmann
2019-03-09 8:57 Mikle Kolyada
2019-02-25 12:01 Lars Wendler
2019-02-18 16:18 Lars Wendler
2019-01-28 0:48 Matt Turner
2019-01-28 0:48 Matt Turner
2019-01-18 9:49 Mart Raudsepp
2018-12-28 7:10 Mikle Kolyada
2018-11-30 11:13 Tobias Klausmann
2018-11-27 9:09 Lars Wendler
2018-11-26 19:04 Mikle Kolyada
2018-11-24 10:45 Sergei Trofimovich
2018-11-24 10:39 Sergei Trofimovich
2018-11-23 21:32 Lars Wendler
2018-11-23 20:30 Thomas Deutschmann
2018-11-23 17:28 Mikle Kolyada
2018-11-23 16:49 Sergei Trofimovich
2018-11-23 13:47 Lars Wendler
2018-10-21 11:44 Lars Wendler
2018-06-19 7:46 Lars Wendler
2018-03-30 20:42 William Hubbs
2018-03-30 17:21 Mike Gilbert
2018-03-30 10:58 Lars Wendler
2017-01-04 21:54 Mike Gilbert
2016-11-10 6:20 Mike Frysinger
2016-09-15 16:24 William Hubbs
2016-06-06 13:33 Agostino Sarubbo
2016-05-25 23:36 Matt Turner
2016-05-24 20:08 Markus Meier
2016-05-23 4:17 Jeroen Roovers
2016-02-03 15:18 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1648554565.cccaac2fdf7f1256c6cf5273fac824d24fdde777.ulm@gentoo \
--to=ulm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox