diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/Manifest index 92588e499c..a78295e76a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/Manifest @@ -1,6 +1,7 @@ -DIST man-pages-6.05.01.tar.xz 2194472 BLAKE2B edc40828bc9c75f655a8352f10c214d68b64f90815cc947f65d49794e0b588b103cae28b3644e41bedd8caaa6cef3c77b02525d8c2ccc91ccf887a10b2f2c32a SHA512 ad3f6dc28bb83824faf8c855a5db8983dc0f5ac3b5702624033ed320a6f39a7f1f0845acf0bc62a0a10cdfe42eb66ba9596e2796ba2683cfb29e480710da3d70 -DIST man-pages-6.06.tar.sign 833 BLAKE2B 7198f7a024731fcaeb97c131ff02611cefc60cf26fa8bac013c82d90f1f9dcd39230adc6ad94c97488c7a8d844b0bb31db6fea2528d84084dec54454a073f3c1 SHA512 21304778df56f079c8b3ff38cf42453697a2b155964069bf6837b9c89b32c3a80eef9cfd0c2f9e3feeee12889cb4e6dd1d4ef1fae75cc646fed84289c5862578 -DIST man-pages-6.06.tar.xz 2166012 BLAKE2B 49c022204f8ce82fafd6f34a590a310beb6618d884290123a755efd38a71c974aa2e49d729655fcf82df0b96db8f782c1b2eac5174b319b6a383740e715fa11a SHA512 c50b5a47cff5172e46752b61af4dd9f54ee0be88ab69bcc5914bd8ce5ddfaf7358143bea9f69bd6a45f0420eb5eb4596c2200109b23fe98a5221dd01e4a8ea15 DIST man-pages-6.10.tar.sign 833 BLAKE2B 039863e6bcdc7c522ebd7b516c8c0c797dc6838dea59129da3830fa88cc19916c9e67a05bda03d05b5dda17c034bbc9035a9f98d53cde618b74f177e0e90e268 SHA512 484d9d32f9e0e26fb31251d7ca357854b240f5ea19fe8a0816706fa9671d72346eed2fb65735f45d08694fad34164e429e8f561c5a56c194e92d096535726db8 DIST man-pages-6.10.tar.xz 1878432 BLAKE2B 8f4e46616692aef9aafafb7c48353478ba5d7143710401e6c0987bcb9e6a2847c5955d50dcf9e98a288b9e052b4df9d0dae3b40648b53b8e39a7b382bfefe051 SHA512 8e42a950504f6fb77c4121627a40fe9486bf66520ed363eb852eaa75a428184b2d4312936dd7fdf4463109e23aa4550dffe344a31d93afb6774f6fadf41949ee +DIST man-pages-6.16.tar.sign 833 BLAKE2B c2bba3189f91c7104f201e7e91abe7647e436d32bc9777927eec412dbc5f70c19a8f911df512a12f9a8e4b80d006e4866f4c2f2bdaa790e6c972d29571b07aa2 SHA512 f08ca029abc450460da4445b10ce76f50307e1b57e7febdc3e78c745c8e671724c9e54af26a9f89fbf66008c3e9b45ea439a5b128251e2fd9f96efcde1692d99 +DIST man-pages-6.16.tar.xz 1880288 BLAKE2B b6b4a4969b725d61e6dae70960d8380695e782b6133a876b7dc9c36e6adc1f0d12e884a819508e4ceef2608dee2010006570a3798bc69e2357b51c7b473fe4c4 SHA512 f28c6684809735550838952194e05558b12d2322dabbc1c43cc36b8a1bcbc7f7512db260d6371eb3a804c0bdcbf9049d097e8d75a6902370b75ff90b2270d6f3 +DIST man-pages-6.17.tar.sign 833 BLAKE2B 0804716378d101dfce1cd76b3a3dd94e174dd395ff9766d8e7af29e2d38d1517208d1905be40a32d4a775f077a73e5f5c647ee056df639075ad2f1f11cdb6ba0 SHA512 f079623b637fe79bfd4efc3e7bfa8794c13750efc5c7db9292341d14ba36d0c3840c00387d4cb28c23cf65da428269d32de9af1a11644ef8beee0e1323322f5a +DIST man-pages-6.17.tar.xz 1896604 BLAKE2B c167bb2023c5401624c18ae5445b2fb93a11aa298baa0e69bf6a817d8e715d7277429e759f60fcd72536e1a0d904982c0b81e26dc60130d691820227f822d5b2 SHA512 c037ddf5db3afac6e70649b7bd82f8c69e82fc0402f9cc6977b45931948d31fb38a7c836bae074f102ec646f4baf348607e4fede967e566ed79af43003857ebc DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.10.ebuild index 3e45cc7f04..d7e366850c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -67,9 +67,6 @@ MY_L10N=( cs da de el es fi fr hu id it ko mk nb nl pl pt-BR ro ru sr sv uk vi ) IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}" RESTRICT="binchecks" -BDEPEND+=" - app-alternatives/bc -" # Block packages that used to install colliding man pages: # bug #341953, bug #548900, bug #612640, bug #617462 RDEPEND=" @@ -97,11 +94,8 @@ src_unpack() { fi if [[ ${PV} != *_rc* ]] && ! [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] && use verify-sig ; then - # Upstream sign the decompressed .tar - einfo "Unpacking ${P}.tar.xz ..." - verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \ - < <(xz -cd "${DISTDIR}"/${P}.tar.xz | tee >(tar -xf -)) - assert "Unpack failed" + verify-sig_uncompress_verify_unpack "${DISTDIR}"/${P}.tar.xz \ + "${DISTDIR}"/${P}.tar.sign unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 else diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.06.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.16-r2.ebuild similarity index 70% rename from sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.06.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.16-r2.ebuild index d12c33c6ad..777f15252d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.06.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.16-r2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit eapi9-ver + # Maintenance notes: # - Upstream are very friendly, do approach them if have any questions; # @@ -47,10 +49,10 @@ else ) " - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-alejandro-colomar )" + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-alejandro-colomar-20260122 )" fi - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos" fi SRC_URI+=" @@ -61,19 +63,12 @@ SRC_URI+=" 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 ) +MY_L10N=( cs da de el es fi fr hu id it ko mk nb nl pl pt-BR ro ru sr sv uk vi ) IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}" RESTRICT="binchecks" -BDEPEND+=" - app-alternatives/bc -" -# Block packages that used to install colliding man pages: -# bug #341953, bug #548900, bug #612640, bug #617462 RDEPEND=" virtual/man - !(tar -xf -)) - assert "Unpack failed" - + unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 + elif [[ ${PV} != *_rc* ]] && ! [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] && use verify-sig ; then + verify-sig_uncompress_verify_unpack "${DISTDIR}"/${P}.tar.xz \ + "${DISTDIR}"/${P}.tar.sign unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 else default @@ -110,20 +99,29 @@ src_unpack() { src_prepare() { default + # installed by sys-libs/libxcrypt + rm man/man3/crypt{,_r}.3 || die + # passwd.5 installed by sys-apps/shadow, bug #776787 - rm man5/passwd.5 || die + rm man/man5/passwd.5 || die } -src_compile() { :; } +src_configure() { + export prefix="${EPREFIX}/usr" +} + +src_compile() { + emake -R +} 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 + emake -R lint-man-tbl } src_install() { - emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" + emake -R DESTDIR="${D}" install dodoc README Changes* # Override with Gentoo specific or additional Gentoo pages @@ -133,13 +131,10 @@ src_install() { } 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 + if ver_replacing -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." + fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.05.01.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.17.ebuild similarity index 64% rename from sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.05.01.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.17.ebuild index c338b04f97..777f15252d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.05.01.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.17.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit eapi9-ver + # Maintenance notes: # - Upstream are very friendly, do approach them if have any questions; # @@ -22,6 +24,7 @@ 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 @@ -34,13 +37,22 @@ else if [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] ; then SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-gentoo.tar.xz" else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alejandro-colomar.asc + inherit verify-sig + 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 + verify-sig? ( + https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.sign + https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.sign + ) " + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-alejandro-colomar-20260122 )" fi - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos" fi SRC_URI+=" @@ -51,19 +63,12 @@ SRC_URI+=" 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 ) +MY_L10N=( cs da de el es fi fr hu id it ko mk nb nl pl pt-BR ro ru sr sv uk vi ) IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}" RESTRICT="binchecks" -BDEPEND=" - app-alternatives/bc -" -# Block packages that used to install colliding man pages: -# bug #341953, bug #548900, bug #612640, bug #617462 RDEPEND=" virtual/man - !(tar -xf -)) - assert "Unpack failed" - + unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 + elif [[ ${PV} != *_rc* ]] && ! [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] && use verify-sig ; then + verify-sig_uncompress_verify_unpack "${DISTDIR}"/${P}.tar.xz \ + "${DISTDIR}"/${P}.tar.sign unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 else default @@ -112,20 +99,29 @@ src_unpack() { src_prepare() { default + # installed by sys-libs/libxcrypt + rm man/man3/crypt{,_r}.3 || die + # passwd.5 installed by sys-apps/shadow, bug #776787 - rm man5/passwd.5 || die + rm man/man5/passwd.5 || die } -src_compile() { :; } +src_configure() { + export prefix="${EPREFIX}/usr" +} + +src_compile() { + emake -R +} 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 + emake -R lint-man-tbl } src_install() { - emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" + emake -R DESTDIR="${D}" install dodoc README Changes* # Override with Gentoo specific or additional Gentoo pages