| 1 |
commit: 3af14d6d35ff6cef88c5e21642f2b95d10d0bc44 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 9 12:38:48 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 9 12:39:19 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af14d6d |
| 7 |
|
| 8 |
sys-libs/ncurses: tweak patch logic |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild | 11 ++++++++--- |
| 13 |
sys-libs/ncurses/ncurses-6.3_p20220903.ebuild | 13 +++++++++---- |
| 14 |
2 files changed, 17 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild |
| 17 |
index c8f854c99411..9985db97618b 100644 |
| 18 |
--- a/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild |
| 19 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild |
| 20 |
@@ -14,6 +14,11 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz |
| 21 |
https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz |
| 22 |
verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )" |
| 23 |
|
| 24 |
+GENTOO_PATCH_DEV=sam |
| 25 |
+GENTOO_PATCH_PV=6.3_p20220903 |
| 26 |
+GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches |
| 27 |
+ |
| 28 |
+# Populated below in a loop. Do not add patches manually here. |
| 29 |
UPSTREAM_PATCHES=() |
| 30 |
|
| 31 |
if [[ ${PV} == *_p* ]] ; then |
| 32 |
@@ -103,7 +108,7 @@ if [[ ${PV} == *_p* ]] ; then |
| 33 |
unset my_patch_index |
| 34 |
fi |
| 35 |
|
| 36 |
- SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.3_p20220903-patches.tar.xz" |
| 37 |
+ SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz" |
| 38 |
fi |
| 39 |
|
| 40 |
LICENSE="MIT" |
| 41 |
@@ -134,7 +139,7 @@ PATCHES=( |
| 42 |
# |
| 43 |
# For the same reasons, please include the original configure.in changes, |
| 44 |
# NOT just the generated results! |
| 45 |
- "${WORKDIR}"/${PN}-6.3_p20220903-patches |
| 46 |
+ "${WORKDIR}"/${GENTOO_PATCH_NAME} |
| 47 |
) |
| 48 |
|
| 49 |
src_unpack() { |
| 50 |
@@ -145,7 +150,7 @@ src_unpack() { |
| 51 |
if [[ ${file} == ${MY_P}.tar.gz ]] ; then |
| 52 |
verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig |
| 53 |
else |
| 54 |
- [[ ${file} == @(patches.tar.xz|*.asc|*.sig) ]] && continue |
| 55 |
+ [[ ${file} == @(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue |
| 56 |
|
| 57 |
verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc |
| 58 |
fi |
| 59 |
|
| 60 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild |
| 61 |
index 389f5c864ed5..eb7e04b8ff07 100644 |
| 62 |
--- a/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild |
| 63 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild |
| 64 |
@@ -14,6 +14,11 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz |
| 65 |
https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz |
| 66 |
verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )" |
| 67 |
|
| 68 |
+GENTOO_PATCH_DEV=sam |
| 69 |
+GENTOO_PATCH_PV=6.3_p20220903 |
| 70 |
+GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches |
| 71 |
+ |
| 72 |
+# Populated below in a loop. Do not add patches manually here. |
| 73 |
UPSTREAM_PATCHES=() |
| 74 |
|
| 75 |
if [[ ${PV} == *_p* ]] ; then |
| 76 |
@@ -103,13 +108,13 @@ if [[ ${PV} == *_p* ]] ; then |
| 77 |
unset my_patch_index |
| 78 |
fi |
| 79 |
|
| 80 |
- SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.3_p20220903-patches.tar.xz" |
| 81 |
+ SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz" |
| 82 |
fi |
| 83 |
|
| 84 |
LICENSE="MIT" |
| 85 |
# The subslot reflects the SONAME. |
| 86 |
SLOT="0/6" |
| 87 |
-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" |
| 88 |
+#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" |
| 89 |
IUSE="ada +cxx debug doc gpm minimal profile +stack-realign static-libs test tinfo trace" |
| 90 |
RESTRICT="!test? ( test )" |
| 91 |
|
| 92 |
@@ -134,7 +139,7 @@ PATCHES=( |
| 93 |
# |
| 94 |
# For the same reasons, please include the original configure.in changes, |
| 95 |
# NOT just the generated results! |
| 96 |
- "${WORKDIR}"/${PN}-6.3_p20220903-patches |
| 97 |
+ "${WORKDIR}"/${GENTOO_PATCH_NAME} |
| 98 |
) |
| 99 |
|
| 100 |
src_unpack() { |
| 101 |
@@ -145,7 +150,7 @@ src_unpack() { |
| 102 |
if [[ ${file} == ${MY_P}.tar.gz ]] ; then |
| 103 |
verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig |
| 104 |
else |
| 105 |
- [[ ${file} == @(patches.tar.xz|*.asc|*.sig) ]] && continue |
| 106 |
+ [[ ${file} == @(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue |
| 107 |
|
| 108 |
verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc |
| 109 |
fi |
Archives