commit: 687b880f5830a360a002c00cf535be4808d3e7b5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 23:42:01 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 00:04:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687b880f
sys-apps/man-pages: use now-released upstream tarball for 6.00
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/man-pages/Manifest | 2 +-
sys-apps/man-pages/man-pages-6.00.ebuild | 12 ++++++++----
sys-apps/man-pages/man-pages-9999.ebuild | 4 ++--
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 462284747bb9..27edd4de0db3 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.00.tar.xz 1797552 BLAKE2B
11b0b402200557b40df9d619b93f7f6b0dab03c1fc76ab382d715bf82f00526cedc5984e5dabe933d1ff59b882dffadfdfb290099fa106073d20bd7de5ac774d
SHA512
f761a75bc5e8ec18d89db3ecfe254c74228598aa95d6201d5985bd5a12ed73ca703028085ea303534f595ff37bd20de1893b2004131bb17b1bae56956e154b20
+DIST man-pages-6.00-upstream.tar.xz 1787416 BLAKE2B
a61a6b771fc3a5f4412d460f53bcb9a3424f29bf1d0001caea2df1f20340da30e0ee89a35da6b9dad7ed910e00262dbc89aeba770ebbf0d13670b5f618a7a586
SHA512
c0286146fed800175316610998ea887568c168bcf3ec9a401209c6c159cedd9258c1e77e513cbe835268b563dd766b3ecc24751c6ab49ebb7ace8c84d8b83e68
DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B
c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e
SHA512
6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
diff --git a/sys-apps/man-pages/man-pages-6.00.ebuild
b/sys-apps/man-pages/man-pages-6.00.ebuild
index 14b792cd94b2..f2cbce53efb1 100644
--- a/sys-apps/man-pages/man-pages-6.00.ebuild
+++ b/sys-apps/man-pages/man-pages-6.00.ebuild
@@ -5,9 +5,13 @@ 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
+MAN_PAGES_GENTOO_DIST=0
GENTOO_PATCH=2
+if [[ ${PV} != 6.00 ]] ; then
+ die "Please use 9999 as a template for the next bump for SRC_URI fixes."
+fi
+
DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
HOMEPAGE="https://www.kernel.org/doc/man-pages/";
if [[ ${PV} == 9999 ]] ; then
@@ -20,11 +24,11 @@ elif [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}"/${MY_P}
else
if [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] ; then
-
SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz";
+
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
+
https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz ->
${P}-upstream.tar.xz
+
https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz ->
${P}-upstream.tar.xz
"
fi
diff --git a/sys-apps/man-pages/man-pages-9999.ebuild
b/sys-apps/man-pages/man-pages-9999.ebuild
index 14b792cd94b2..ee0ddfecfa15 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.ebuild
@@ -5,7 +5,7 @@ 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
+MAN_PAGES_GENTOO_DIST=0
GENTOO_PATCH=2
DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
@@ -20,7 +20,7 @@ elif [[ ${PV} == *_rc* ]] ; then
S="${WORKDIR}"/${MY_P}
else
if [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] ; then
-
SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz";
+
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
