gentoo auto-resync : 05:04:2023 - 05:24:13

3 files changed, 135 insertions, 2 deletions

diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index f344151a010a..33123573d348 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -3,11 +3,13 @@ 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
 EBUILD man-pages-5.12-r3.ebuild 2240 BLAKE2B 4a1280b41226eb5b98c8572e37ec4458db2fdc86b1b6e9cf71b38b467505553c5365314ae9825a80c19cce0488e7f0404d5837b185dc0262109a1dad6449cd8b SHA512 b883eb20e28aa3d398cfa65c08d40c570302bc7646151313df5b1f2c82829285cb479e19509fb16bb7cbe666f2f3c22a26261b5ff3c62c0f3b7fa5e801ac8fff
 EBUILD man-pages-5.13-r2.ebuild 2248 BLAKE2B 500770a4a21b8d236eadda9eaac53e581d9020ecb07585083ab65c770349dd504ac0382d3092a44e75cccf426c393c32f6397e1e3b8d4d5804af4c943beee80e SHA512 c5da6cc30b978e1307ddcb2a8d2092b79f9b5ae4a8fb489404fb8e575273f2dd5ce2dbd1151e9347c5956efc266b879661b56a8aed4e193d85b3c50686322da2
 EBUILD man-pages-6.01.ebuild 3405 BLAKE2B c8130de04784669488dab75485aafa711a3c6f649a6b0f9a5ad6d45fe12f63847fb3b6690e4862381aa5ccb5b22c2be1641b992f4031ab57b9452d3159e10be5 SHA512 e8364c65c48a3f6fa3e2d36b5a8b3ea70c7bc090d1c4f4fe03d55ea538ee248d85fd9d92c19683760d0e8c2f4b2718ce9e22b143aba1e718e886cb9f8bbdb777
 EBUILD man-pages-6.02-r1.ebuild 3384 BLAKE2B 2dcb051a1bae08360839c923125f5783abba112c923e98e3d707ac9768895e4a24af132b6b469858c8fc00e0ee73362758fd8d800f25eaccc368ab7af90f437e SHA512 0d58e0b646a4949e750d4a0444278930302d453b3829d72c9dcbeef2fcfbfcc817529e1e04feb708b10e5410bd27e0c248b7de95ba61370c700f0f9b1def6455
 EBUILD man-pages-6.03.ebuild 3392 BLAKE2B 92a00f25351e729e06a329eb69132638ebb4db356b5d17fd2c93093b54b6c8202220961ea66770e5f006b5bac45eee1cac90f330d64066e37ac09b0df0f9a6c8 SHA512 137dd7d96ab5fc8e96fe03df4e5ff7a8320714a16b085187b1f53ecd3807011ef3c18c2431c0426966c1824489bc365d42eaec0505da5c1587b5f72ae0acd37e
-EBUILD man-pages-9999.ebuild 3344 BLAKE2B 9969dcb2e3068fe54d7db1b2f7ff168fb6fa49d2023b19267c268d928555da2654335e2d6e24064ee43582ecd68ed716fe28f096090ee9718d782e3951edab84 SHA512 1c569bb5a2a31e90bf3565b7ffaf20e763adf69964b691c0c11e4c3ca17a7dbaf7b9cf5b8dc3c010a6a6b87f4fdd1678fbd7f87644c47bd53cca77e4142b666d
+EBUILD man-pages-6.04.ebuild 3586 BLAKE2B 90622d78e50d167165c575a7c694f7c9b22f10ed3b57223dac98d6aee3bb5cb2bb5ad9d0bffa097abf18326a6bc8024c7c0ad17b1421a92a27357ea0047766f2 SHA512 9a5a4f711d58ddeba275092cc96e8c12607d4d38187254ffd6cacd65830fbfd3f53d037809e7c8ef82e40926ffb9b8bedcdb6275c49a97b52eab5b70803b4ebc
+EBUILD man-pages-9999.ebuild 3586 BLAKE2B 90622d78e50d167165c575a7c694f7c9b22f10ed3b57223dac98d6aee3bb5cb2bb5ad9d0bffa097abf18326a6bc8024c7c0ad17b1421a92a27357ea0047766f2 SHA512 9a5a4f711d58ddeba275092cc96e8c12607d4d38187254ffd6cacd65830fbfd3f53d037809e7c8ef82e40926ffb9b8bedcdb6275c49a97b52eab5b70803b4ebc
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-6.04.ebuild b/sys-apps/man-pages/man-pages-6.04.ebuild
new file mode 100644
index 000000000000..19396bc206bf
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-6.04.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintenance notes:
+# - Upstream are very friendly, do approach them if have any questions;
+#
+# - It's considered fine (and somewhat encouraged) for us to make snapshots
+#   if we want specific fixes, perhaps aligned with newer kernels, glibc, etc.
+#   Just generate it with 'make dist'. We can set DISTVERSION if we want a vanity
+#   name or if the comit hash is too long;
+#
+# - If we do use a snapshot, *don't* grab it directly from git and use it
+#   raw in the ebuild. Use 'make dist' as above;
+#
+# - Sometimes there's no dist tarball available post-release and upstream
+#   encourage distros to make their own. Set MAN_PAGES_GENTOO_DIST to 1 if none is
+#   available, 0 otherwise.
+MAN_PAGES_GENTOO_DIST=0
+GENTOO_PATCH=2
+
+DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
+HOMEPAGE="https://www.kernel.org/doc/man-pages/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git"
+	inherit git-r3
+elif [[ ${PV} == *_rc* ]] ; then
+	MY_P=${PN}-${PV/_/-}
+
+	SRC_URI="https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/snapshot/${MY_P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
+else
+	if [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] ; then
+		SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-gentoo.tar.xz"
+	else
+		SRC_URI="
+			https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
+			https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
+		"
+	fi
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
+fi
+
+SRC_URI+="
+	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+"
+
+LICENSE="man-pages GPL-2+ BSD"
+SLOT="0"
+# Keep the following in sync with app-i18n/man-pages-l10n
+MY_L10N=( cs da de el es fi fr hu id it mk nb nl pl pt-BR ro sr sv uk vi )
+IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}"
+RESTRICT="binchecks"
+
+BDEPEND="
+	sys-devel/bc
+"
+# Block packages that used to install colliding man pages:
+# bug #341953, bug #548900, bug #612640, bug #617462
+RDEPEND="
+	virtual/man
+	!<sys-apps/keyutils-1.5.9-r4
+	!<dev-libs/libbsd-0.8.3-r1
+"
+PDEPEND="
+	l10n_ja? ( app-i18n/man-pages-ja )
+	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
+	PDEPEND+=" l10n_${lang}? ( app-i18n/man-pages-l10n[l10n_${lang}(-)] )"
+done
+unset lang
+
+src_unpack() {
+	default
+
+	[[ ${PV} == 9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	default
+
+	# passwd.5 installed by sys-apps/shadow, bug #776787
+	rm man5/passwd.5 || die
+}
+
+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*
+
+	# Override with Gentoo specific or additional Gentoo pages
+	cd "${WORKDIR}"/man-pages-gentoo || die
+	doman */*
+	dodoc README.Gentoo
+}
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -lt 5.13-r2 ; then
+			# Avoid ACCEPT_LICENSE issues for users by default
+			# bug #871636
+			ewarn "This version of ${PN} no longer depends on sys-apps/man-pages-posix!"
+			ewarn "Please install sys-apps/man-pages-posix yourself if needed."
+			break
+		fi
+	done
+}
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*