commit: 7d0650b0cb4ad082a59e49dba5a81e143470c907
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 1 23:11:55 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 1 23:13:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d0650b0
app-shells/bash: add 5.3_alpha_p20240628 (unkeyworded)
It can be useful to have snapshots in the pre-release period once
the first alpha is out, as various bugs get reported and fixed from
the alpha, and the next pre-release is usually quite far away.
i.e. if it's worth packaging the alpha, it's worth packaging a followup.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-shells/bash/Manifest | 1 +
...h-9999.ebuild => bash-5.3_alpha_p20240628.ebuild} | 20 +++++++++++++++-----
app-shells/bash/bash-9999.ebuild | 20 +++++++++++++++-----
3 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 57d7042f95a2..94a7059d688e 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -25,6 +25,7 @@ DIST bash-5.2.tar.gz 10950833 BLAKE2B
51b196e710794ebad8eac28c31c93eb99ac1a7db30
DIST bash-5.2.tar.gz.sig 95 BLAKE2B
2991b7c46ef1cdca08062f419be47fca7551f4c5d9aad8a5c1da74974f5e7707d23914b4cecf9b6c9610471146b2c49b611bb62a5d974f1c37cceb77b719851c
SHA512
a161664f124f906be32709f66702f8f780e6d52e558ea45e71ec60a959c9435ff68477ee65a0a9f6c0051d5592f5044fb3b410cf3cd3ae5a8a323789b01be258
DIST bash-5.3-alpha.tar.gz 11195025 BLAKE2B
b3325f6927d7dde86aae165891317b972f0b9814e134676b3d7d3aea81ce4d4cad1a01f160e290352072153ad3568ee21701a35190ef5e6274b3c03fc95c8d42
SHA512
52354eb7cd71330192ec76fdda04bcacf758a312e89b45558db5f5345f19b0d8e54732049934958cf89786f5bd7c538d88859eb8d8d22dabfc9ec7305263d10e
DIST bash-5.3-alpha.tar.gz.sig 95 BLAKE2B
69c8b33fe2a40498662ef084967701cff1926086785a41d6f49a3c2e2b9908499226d3d970bdb6397a74d3ccc22acb3651261ad2a421799eb135c64a78af8589
SHA512
c9587da66457e2010b0852c6dbf5949821a543b7f1b616a4d016df3477913e2a655c57289e83adeeb31b8b8afca22313e3af76cf727b93932d33a889c1263c20
+DIST bash-5.3_alpha_p20240628-5e28a1813ce7d08628c8df584ea36515091c6d9b.tar.xz
8528432 BLAKE2B
d920640b0ba0ae38dbb98b48a9e4dd6635a05d7f86fcf26a4f2c79f6a4338e4f25ff20119f9a1df451d23d9cc381862963dcf9c135050102e8159eccbe5f7314
SHA512
cc60f94083b378ac51fda973f834f10477ac6ebcfc682f934426db3fd6ca4506e5ed1c64311c67d5d9d70b62ab2bf9900ee66f1aa96a7bce7198d69edf9131ca
DIST bash205b-001 1132 BLAKE2B
0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6
SHA512
5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
DIST bash205b-002 755 BLAKE2B
6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d
SHA512
46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883
DIST bash205b-003 2356 BLAKE2B
b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7
SHA512
74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399
diff --git a/app-shells/bash/bash-9999.ebuild
b/app-shells/bash/bash-5.3_alpha_p20240628.ebuild
similarity index 94%
copy from app-shells/bash/bash-9999.ebuild
copy to app-shells/bash/bash-5.3_alpha_p20240628.ebuild
index 7ef121e1c56f..cbe731019ccf 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-5.3_alpha_p20240628.ebuild
@@ -17,13 +17,13 @@ MY_PATCHES=()
# Determine the patchlevel.
case ${PV} in
- *_p*)
- PLEVEL=${PV##*_p}
- ;;
9999|*_alpha*|*_beta*|*_rc*)
# Set a negative patchlevel to indicate that it's a pre-release.
PLEVEL=-1
;;
+ *_p*)
+ PLEVEL=${PV##*_p}
+ ;;
*)
PLEVEL=0
esac
@@ -39,6 +39,15 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git";
EGIT_BRANCH=devel
inherit git-r3
+elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+ # It can be useful to have snapshots in the pre-release period once
+ # the first alpha is out, as various bugs get reported and fixed from
+ # the alpha, and the next pre-release is usually quite far away.
+ #
+ # i.e. if it's worth packaging the alpha, it's worth packaging a
followup.
+ BASH_COMMIT="5e28a1813ce7d08628c8df584ea36515091c6d9b"
+
SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz
-> ${P}-${BASH_COMMIT}.tar.xz"
+ S=${WORKDIR}/${PN}-${BASH_COMMIT}
else
my_urls=(
{'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
@@ -52,6 +61,7 @@ else
done
SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
+ S=${WORKDIR}/${MY_P}
unset -v my_urls my_p my_patch_idx my_patch_ver
fi
@@ -60,8 +70,6 @@ if [[ ${GENTOO_PATCH_VER} ]]; then
SRC_URI+="
https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz";
fi
-S=${WORKDIR}/${MY_P}
-
LICENSE="GPL-3+"
SLOT="0"
if (( PLEVEL >= 0 )); then
@@ -114,6 +122,8 @@ src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
+ elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+ default
else
if use verify-sig; then
verify-sig_verify_detached
"${DISTDIR}/${MY_P}.tar.gz"{,.sig}
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 7ef121e1c56f..cbe731019ccf 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -17,13 +17,13 @@ MY_PATCHES=()
# Determine the patchlevel.
case ${PV} in
- *_p*)
- PLEVEL=${PV##*_p}
- ;;
9999|*_alpha*|*_beta*|*_rc*)
# Set a negative patchlevel to indicate that it's a pre-release.
PLEVEL=-1
;;
+ *_p*)
+ PLEVEL=${PV##*_p}
+ ;;
*)
PLEVEL=0
esac
@@ -39,6 +39,15 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git";
EGIT_BRANCH=devel
inherit git-r3
+elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+ # It can be useful to have snapshots in the pre-release period once
+ # the first alpha is out, as various bugs get reported and fixed from
+ # the alpha, and the next pre-release is usually quite far away.
+ #
+ # i.e. if it's worth packaging the alpha, it's worth packaging a
followup.
+ BASH_COMMIT="5e28a1813ce7d08628c8df584ea36515091c6d9b"
+
SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz
-> ${P}-${BASH_COMMIT}.tar.xz"
+ S=${WORKDIR}/${PN}-${BASH_COMMIT}
else
my_urls=(
{'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
@@ -52,6 +61,7 @@ else
done
SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
+ S=${WORKDIR}/${MY_P}
unset -v my_urls my_p my_patch_idx my_patch_ver
fi
@@ -60,8 +70,6 @@ if [[ ${GENTOO_PATCH_VER} ]]; then
SRC_URI+="
https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz";
fi
-S=${WORKDIR}/${MY_P}
-
LICENSE="GPL-3+"
SLOT="0"
if (( PLEVEL >= 0 )); then
@@ -114,6 +122,8 @@ src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
+ elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+ default
else
if use verify-sig; then
verify-sig_verify_detached
"${DISTDIR}/${MY_P}.tar.gz"{,.sig}
