commit: 409c094dc9163499a855dc8b03b43049384913f3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 02:46:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 03:05:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=409c094d
sys-libs/ncurses: add 6.3_p20220917
.. and fix 6.3_p20220910-r1.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/ncurses/Manifest | 2 +
...0-r1.ebuild => ncurses-6.3_p20220910-r2.ebuild} | 14 ++++---
...0-r1.ebuild => ncurses-6.3_p20220917-r1.ebuild} | 49 ++++++++++++----------
...0910-r1.ebuild => ncurses-6.3_p20220917.ebuild} | 35 +++++++++-------
4 files changed, 56 insertions(+), 44 deletions(-)
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index eaca327fec56..e0fabd4514d9 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -94,6 +94,8 @@ DIST ncurses-6.3-20220903.patch.gz 4814 BLAKE2B
668041aef48d9ce37474edc6d70e0725
DIST ncurses-6.3-20220903.patch.gz.asc 729 BLAKE2B
2f076ce9d390ee02edc0b58ecf3a6881897062e34a5f4c09b503c4b306ee70fb0f08e38518029eae4933508a48bda92716dd4b76159a0aa3d7bbd3835d2695ff
SHA512
18cb1a77f67b6fddc9f83366487cb547fe1439e7edcd4fc27632702cd3ffc79622dd1421d32454489d08acec7403a04239b34794e81750b703385189a4534b04
DIST ncurses-6.3-20220910.patch.gz 120984 BLAKE2B
69ad11c6d31d4bb97737e6ede506bac81cd65cf262c1bf6528d4844e8beb4cb353fa7e390d3817c181fead42b268688f8898e9fabf5f98bbef007355ec4b0b7b
SHA512
269c376d494e3a82915436d6fbe1bb69dfe70c0330c6f2a8f6a9e49180a332b7fd8ccda0448db723a50c6f5a250391f05c974bc60a9355d3a94380c7afd4192b
DIST ncurses-6.3-20220910.patch.gz.asc 729 BLAKE2B
55c87ac9edd67abf2c39823acc37a9c8dce6852344d38b442bc2e4693a44412383c2ea710d3030b079607824877f6a1f5efc50970ccd51086c62ebed23e7ee05
SHA512
887031e5248665c79abbc35f4c1e63cffa3b271359188e266372c624b1ac2ce6bb269823c16ea0f6662e4e4acf592179db8f0030fdd9b03ed531d37d5fb7b44e
+DIST ncurses-6.3-20220917.patch.gz 7833 BLAKE2B
338ddfc2b660cff6248bcb2fc39ef13baf3d622c9f68b47c2da4d94e21a12dec7f6d98f7125a154f1e4dbe612cde9172de9d78851bba1fe4e9106dc1cd9e0a26
SHA512
5b2de00087211b9e599aecbe94870504c4bd312d9f0ab4959e706f784700e6e3095beeb8283ed8df9911f5e841f1004a2ef5184ee2c04762a63d84c47c2f4cfe
+DIST ncurses-6.3-20220917.patch.gz.asc 729 BLAKE2B
c952f018cee490635809fa3a4ead27964a639289db16db42768c545e85b56033b01ea45b9251cd14f4d0cff97673566a4c8d04f93a1539392b676baeecc0307c
SHA512
57de37e7c0fe70b0c1abdabe77b36a95b2845b423f167dd4d5acf5999a7152d69193f707c41f88d6e4210934c120d8c72a93830c6f2f9cb49832266e02314588
DIST ncurses-6.3.tar.gz 3583550 BLAKE2B
b2c174ac48d587b4d3aa054f04e4ec8bffd8a657a4aff5f090104965c741901e600712c8f8e5e98f3b8a26bc558996a1e14a746f113854832853b855e9d406c3
SHA512
5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105
DIST ncurses-6.3.tar.gz.sig 438 BLAKE2B
d7f9852292110fe7a048a9e38611ea06564b5142cb4cbeb8d99bba752d5df8eeffa3b57e5ca315c14024520bc008b30650e99669c995dca05a798399a0c85d39
SHA512
b9a2a25e0b1854c272bf89c610c81fc0ba061f0296eca5c0079a79cfe310e44eb16c46eb5a0dd018f1ca9114d569c9d5087a2b8e60b0344f1eb97f7c5addafc6
DIST ncurses-6.3_p20220903-patches.tar.xz 76908 BLAKE2B
a5afb3a5c016ad6b602e6af77cc4fc067692f1e1245cf006feb2b74e69be13b2ffb2b14c7b5de48780965d6b596621cc399c316657ae63afbe5ea9ff2d9715fa
SHA512
11ae7458f925a68bf6d482f204e9e57ef23cf456ea9827c713787f635bd11621c3612651a90f3f3a3c7c2742f95fde4bc87d6500115ef74300b9a4d240ff74ad
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220910-r1.ebuild
b/sys-libs/ncurses/ncurses-6.3_p20220910-r2.ebuild
similarity index 96%
copy from sys-libs/ncurses/ncurses-6.3_p20220910-r1.ebuild
copy to sys-libs/ncurses/ncurses-6.3_p20220910-r2.ebuild
index 3a999786f58d..ec3eb25b4e2d 100644
--- a/sys-libs/ncurses/ncurses-6.3_p20220910-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.3_p20220910-r2.ebuild
@@ -129,7 +129,7 @@ fi
LICENSE="MIT"
# The subslot reflects the SONAME.
SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ada +cxx debug doc gpm minimal profile +stack-realign static-libs test
tinfo trace"
RESTRICT="!test? ( test )"
@@ -385,11 +385,6 @@ multilib_src_install() {
$(usex tinfo 'tinfow tinfo' '')
fi
- if ! tc-is-static-only ; then
- # Provide a link for -lcurses.
- ln -sf libncurses$(get_libname)
"${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
- fi
-
# Don't delete '*.dll.a', needed for linking, bug #631468
if ! use static-libs; then
find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
@@ -402,6 +397,13 @@ multilib_src_install() {
# -FIXME-
dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
/usr/$(get_libdir)/terminfo
+
+ # Remove obsolete libcurses symlink that is created by the build
+ # system. Technically, this could be also achieved
+ # via --disable-overwrite but it also moves headers implicitly,
+ # and we do not want to do this yet.
+ # bug #836696
+ rm "${ED}"/usr/$(get_libdir)/libcurses* || die
}
multilib_src_install_all() {
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220910-r1.ebuild
b/sys-libs/ncurses/ncurses-6.3_p20220917-r1.ebuild
similarity index 91%
copy from sys-libs/ncurses/ncurses-6.3_p20220910-r1.ebuild
copy to sys-libs/ncurses/ncurses-6.3_p20220917-r1.ebuild
index 3a999786f58d..f412a82933aa 100644
--- a/sys-libs/ncurses/ncurses-6.3_p20220910-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.3_p20220917-r1.ebuild
@@ -11,10 +11,12 @@ MY_P="${PN}-${MY_PV}"
DESCRIPTION="Console display library"
HOMEPAGE="https://www.gnu.org/software/ncurses/
https://invisible-island.net/ncurses/";
# Keep invisible-mirror.net here as some users reported 403 forbidden with
invisible-island.net
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz
+SRC_URI="
+ mirror://gnu/ncurses/${MY_P}.tar.gz
https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz
- verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )"
+ verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )
+"
GENTOO_PATCH_DEV=sam
GENTOO_PATCH_PV=6.3_p20220910
@@ -85,6 +87,7 @@ if [[ ${PV} == *_p* ]] ; then
20220820
20220827
20220903
+ 20220910
# Latest patch is just _pN = $(ver_cut 4)
$(ver_cut 4)
@@ -100,27 +103,27 @@ if [[ ${PV} == *_p* ]] ; then
patch_url=
my_patch_index=
- for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}";
my_patch_index++)); do
- patch_url="$(printf
"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
${PATCH_DATES[${my_patch_index}]}.patch.gz)"
- # TODO: replace with loop
- SRC_URI+=" ${patch_url}"
- SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
-
- patch_url="$(printf
"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
${PATCH_DATES[${my_patch_index}]}.patch.gz)"
- # TODO: replace with loop
- SRC_URI+=" ${patch_url}"
- SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
+ # We keep a bunch of mirrors here as we've had reports of
invisible*.net
+ # being 403 forbidden for some users.
+ urls=(
+
"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
+
"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
+
"https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${MY_P}-%s";
+ )
- patch_url="$(printf
"https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-%s";
${PATCH_DATES[${my_patch_index}]}.patch.gz)"
- # TODO: replace with loop
- SRC_URI+=" ${patch_url}"
- SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
+ for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}";
my_patch_index++)); do
+ for url in "${urls[@]}" ; do
+ patch_url="$(printf ${urls}
${PATCH_DATES[${my_patch_index}]}.patch.gz)"
+ SRC_URI+=" ${patch_url}"
+ SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
+ done
UPSTREAM_PATCHES+=(
"${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
done
unset patch_url
unset my_patch_index
+ unset urls
fi
SRC_URI+="
https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz";
@@ -129,7 +132,7 @@ fi
LICENSE="MIT"
# The subslot reflects the SONAME.
SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ada +cxx debug doc gpm minimal profile +stack-realign static-libs test
tinfo trace"
RESTRICT="!test? ( test )"
@@ -385,11 +388,6 @@ multilib_src_install() {
$(usex tinfo 'tinfow tinfo' '')
fi
- if ! tc-is-static-only ; then
- # Provide a link for -lcurses.
- ln -sf libncurses$(get_libname)
"${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
- fi
-
# Don't delete '*.dll.a', needed for linking, bug #631468
if ! use static-libs; then
find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
@@ -402,6 +400,13 @@ multilib_src_install() {
# -FIXME-
dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
/usr/$(get_libdir)/terminfo
+
+ # Remove obsolete libcurses symlink that is created by the build
+ # system. Technically, this could be also achieved
+ # via --disable-overwrite but it also moves headers implicitly,
+ # and we do not want to do this yet.
+ # bug #836696
+ rm "${ED}"/usr/$(get_libdir)/libcurses* || die
}
multilib_src_install_all() {
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220910-r1.ebuild
b/sys-libs/ncurses/ncurses-6.3_p20220917.ebuild
similarity index 93%
rename from sys-libs/ncurses/ncurses-6.3_p20220910-r1.ebuild
rename to sys-libs/ncurses/ncurses-6.3_p20220917.ebuild
index 3a999786f58d..ac56ad1e72d6 100644
--- a/sys-libs/ncurses/ncurses-6.3_p20220910-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.3_p20220917.ebuild
@@ -11,10 +11,12 @@ MY_P="${PN}-${MY_PV}"
DESCRIPTION="Console display library"
HOMEPAGE="https://www.gnu.org/software/ncurses/
https://invisible-island.net/ncurses/";
# Keep invisible-mirror.net here as some users reported 403 forbidden with
invisible-island.net
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz
+SRC_URI="
+ mirror://gnu/ncurses/${MY_P}.tar.gz
https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz
- verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )"
+ verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )
+"
GENTOO_PATCH_DEV=sam
GENTOO_PATCH_PV=6.3_p20220910
@@ -85,6 +87,7 @@ if [[ ${PV} == *_p* ]] ; then
20220820
20220827
20220903
+ 20220910
# Latest patch is just _pN = $(ver_cut 4)
$(ver_cut 4)
@@ -100,27 +103,27 @@ if [[ ${PV} == *_p* ]] ; then
patch_url=
my_patch_index=
- for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}";
my_patch_index++)); do
- patch_url="$(printf
"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
${PATCH_DATES[${my_patch_index}]}.patch.gz)"
- # TODO: replace with loop
- SRC_URI+=" ${patch_url}"
- SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
-
- patch_url="$(printf
"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
${PATCH_DATES[${my_patch_index}]}.patch.gz)"
- # TODO: replace with loop
- SRC_URI+=" ${patch_url}"
- SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
+ # We keep a bunch of mirrors here as we've had reports of
invisible*.net
+ # being 403 forbidden for some users.
+ urls=(
+
"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
+
"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s";
+
"https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${MY_P}-%s";
+ )
- patch_url="$(printf
"https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-%s";
${PATCH_DATES[${my_patch_index}]}.patch.gz)"
- # TODO: replace with loop
- SRC_URI+=" ${patch_url}"
- SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
+ for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}";
my_patch_index++)); do
+ for url in "${urls[@]}" ; do
+ patch_url="$(printf ${urls}
${PATCH_DATES[${my_patch_index}]}.patch.gz)"
+ SRC_URI+=" ${patch_url}"
+ SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
+ done
UPSTREAM_PATCHES+=(
"${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
done
unset patch_url
unset my_patch_index
+ unset urls
fi
SRC_URI+="
https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz";
