commit: d6f9cebe09f5419c12d368d1d2b32c00bec3fabe Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Oct 13 00:14:49 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Oct 13 00:15:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f9cebe
sys-apps/man-pages: add 6.00, drop 6.0_rc1 Upstream said we should just make our own dist tarball for now, see https://lore.kernel.org/linux-man/364ecc74-4e97-a1a3-7480-7914f28dcba3 <AT> gmail.com/T/#u. Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/man-pages/Manifest | 2 +- .../{man-pages-6.0_rc1.ebuild => man-pages-6.00.ebuild} | 15 +++++++++++---- sys-apps/man-pages/man-pages-9999.ebuild | 15 +++++++++++---- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest index bd2e2ab38be7..462284747bb9 100644 --- a/sys-apps/man-pages/Manifest +++ b/sys-apps/man-pages/Manifest @@ -1,4 +1,4 @@ DIST man-pages-5.12.tar.xz 1778220 BLAKE2B 347c5ef63cb80134018f322f810545354ccc7afdb8acb62f83e3b06ef15d7fbe6c0c68db37f52ce9727682a856a7810a5e64f1dcbe1cc11b22f83fb0273f7add SHA512 455794ed6e3bf20649f78b464300d5c1adad5000668a82a1194c1af8bdcbd064e4d930696cbe534481368d6526c7cda69927e958b9a868d95891202476fb4608 DIST man-pages-5.13.tar.xz 1788980 BLAKE2B 7cca88b7f201d177b087893f60e6a87fd3ed8c78a183bd6ebcd0c28961f5f5d24aa2ba9d3a1d9cec4e0fc9cc0b26489c91e991a2d4420c28e1f61b850b882752 SHA512 a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499 -DIST man-pages-6.0-rc1.tar.gz 2636606 BLAKE2B adeaa325669631125fe55fd140abe25309b287c03a377aa665e39b4279241fc1e711199493498e97c03c8af9c5a3370a47991f88d7c602e7fc54e5f6ef61ff55 SHA512 61be0a14e5ffb9c89bdbdb3a83967c65a6fae15a6f46f5c2e7304205646bf8ab6d10f954a4ea003f3d75bc2775fcb0a88b5cd6ad15e6beed3dd56a25f395342e +DIST man-pages-6.00.tar.xz 1797552 BLAKE2B 11b0b402200557b40df9d619b93f7f6b0dab03c1fc76ab382d715bf82f00526cedc5984e5dabe933d1ff59b882dffadfdfb290099fa106073d20bd7de5ac774d SHA512 f761a75bc5e8ec18d89db3ecfe254c74228598aa95d6201d5985bd5a12ed73ca703028085ea303534f595ff37bd20de1893b2004131bb17b1bae56956e154b20 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 diff --git a/sys-apps/man-pages/man-pages-6.0_rc1.ebuild b/sys-apps/man-pages/man-pages-6.00.ebuild similarity index 83% rename from sys-apps/man-pages/man-pages-6.0_rc1.ebuild rename to sys-apps/man-pages/man-pages-6.00.ebuild index ca09d48f31f6..066f23c22b8e 100644 --- a/sys-apps/man-pages/man-pages-6.0_rc1.ebuild +++ b/sys-apps/man-pages/man-pages-6.00.ebuild @@ -3,6 +3,9 @@ EAPI=8 +# Sometimes there's no dist tarball available post-release and upstream +# encourage distros to make their own. Set to 1 if none is available, 0 otherwise. +MAN_PAGES_GENTOO_DIST=1 GENTOO_PATCH=2 DESCRIPTION="A somewhat comprehensive collection of Linux man pages" @@ -16,10 +19,14 @@ elif [[ ${PV} == *_rc* ]] ; then SRC_URI="https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/snapshot/${MY_P}.tar.gz"; S="${WORKDIR}"/${MY_P} 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 - " + if [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] ; then + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.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" fi diff --git a/sys-apps/man-pages/man-pages-9999.ebuild b/sys-apps/man-pages/man-pages-9999.ebuild index ca09d48f31f6..066f23c22b8e 100644 --- a/sys-apps/man-pages/man-pages-9999.ebuild +++ b/sys-apps/man-pages/man-pages-9999.ebuild @@ -3,6 +3,9 @@ EAPI=8 +# Sometimes there's no dist tarball available post-release and upstream +# encourage distros to make their own. Set to 1 if none is available, 0 otherwise. +MAN_PAGES_GENTOO_DIST=1 GENTOO_PATCH=2 DESCRIPTION="A somewhat comprehensive collection of Linux man pages" @@ -16,10 +19,14 @@ elif [[ ${PV} == *_rc* ]] ; then SRC_URI="https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/snapshot/${MY_P}.tar.gz"; S="${WORKDIR}"/${MY_P} 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 - " + if [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] ; then + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.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" fi
