[gentoo-commits] repo/gentoo:master commit in: sys-apps/man-pages/

["Sam James" <sam@gentoo.org>]

commit:     c68c258a80eac2bac708d2097f33470870cf109f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 01:31:20 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 01:32:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68c258a

sys-apps/man-pages: add 6.04

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/man-pages/Manifest                                   |  1 +
 .../{man-pages-9999.ebuild => man-pages-6.04.ebuild}          | 11 ++++++++++-
 sys-apps/man-pages/man-pages-9999.ebuild                      | 11 ++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 5e28005eff53..1e24c1995d80 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -3,4 +3,5 @@ DIST man-pages-5.13.tar.xz 1788980 BLAKE2B 7cca88b7f201d177b087893f60e6a87fd3ed8
 DIST man-pages-6.01.tar.xz 1789204 BLAKE2B 37005b45af798315992fe4836457982d4203245eb546a6f1dcb02b67d63db1ba7e872b1259ebb58ee01178c726fff5f2276ec548ba768f73683edaee9a3233ca SHA512 93d09380a08c36740dbb2f3f246d190e5467147344b584253a2e0248fa764559008c21bb567f379f6166952ee1635ae3c2145e2a63aaf6d30728ca680d7b57a9
 DIST man-pages-6.02.tar.xz 1800876 BLAKE2B 005bc57d2abca18516502faa7ea31798e6fb992d4a2fa1ce83dbba2992d9cc29e3b48fef97f1faa55bc40eafcb4eedbafb113dc2561f4a438f0a7fa711e259f0 SHA512 124e5157c25b5a3c62d225be1da2879f436d7fd8fe2f116c11982178e34085d1e50ef47e13fde413a7bf16d1177cbe744d00b2a178be3dfe4c4828371812ea5a
 DIST man-pages-6.03.tar.xz 2184824 BLAKE2B 16eba629c5fcbac7b52fa0ecf32d30d0e07308653d3617d1edf7503b6f983aa3f5145b1af7c5fcc96cb5a64ad425af7fe9be9a0da74c92c52d2d9b8fc60c9661 SHA512 df9de826c8289869fb27928f14eb28040b0f5bdae18247dc2ea847e660dd8bff9eee5656f6b2b38330abc64b69cad7cd44681bdf49173dd49a53877eaf725dba
+DIST man-pages-6.04.tar.xz 2188236 BLAKE2B 741ff7e279c9bd961a1d39e432599a985d010516c03eb13978c5bda46a26ef914053c511bce923d49eb9111b3a1f7537e4418df3b5abd2eb0c051faf9f39c7fb SHA512 3f95d15dda419e824f902947a268d8021e9e04c5ba8503e4fe9f96a9ab8363fde8088b2712cc9c795638163ad8432bc5f8c6a3ea320293ec6aa79bb748e85b9e
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770

diff --git a/sys-apps/man-pages/man-pages-9999.ebuild b/sys-apps/man-pages/man-pages-6.04.ebuild
similarity index 92%
copy from sys-apps/man-pages/man-pages-9999.ebuild
copy to sys-apps/man-pages/man-pages-6.04.ebuild
index da81a23a404a..19396bc206bf 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-6.04.ebuild
@@ -67,7 +67,10 @@ RDEPEND="
 "
 PDEPEND="
 	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_ru? ( || (
+		app-i18n/man-pages-l10n[l10n_ru(-)]
+		app-i18n/man-pages-ru
+	) )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 "
 for lang in "${MY_L10N[@]}"; do
@@ -90,6 +93,12 @@ src_prepare() {
 
 src_compile() { :; }
 
+src_test() {
+	# We don't use the 'check' target right now because of known errors
+	# https://lore.kernel.org/linux-man/0dfd5319-2d22-a8ad-f085-d635eb6d0678@gmail.com/T/#t
+	emake lint-man-tbl
+}
+
 src_install() {
 	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
 	dodoc README Changes*

diff --git a/sys-apps/man-pages/man-pages-9999.ebuild b/sys-apps/man-pages/man-pages-9999.ebuild
index da81a23a404a..19396bc206bf 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.ebuild
@@ -67,7 +67,10 @@ RDEPEND="
 "
 PDEPEND="
 	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_ru? ( || (
+		app-i18n/man-pages-l10n[l10n_ru(-)]
+		app-i18n/man-pages-ru
+	) )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 "
 for lang in "${MY_L10N[@]}"; do
@@ -90,6 +93,12 @@ src_prepare() {
 
 src_compile() { :; }
 
+src_test() {
+	# We don't use the 'check' target right now because of known errors
+	# https://lore.kernel.org/linux-man/0dfd5319-2d22-a8ad-f085-d635eb6d0678@gmail.com/T/#t
+	emake lint-man-tbl
+}
+
 src_install() {
 	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
 	dodoc README Changes*