[gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/

[Sam James]

commit:     55e7e5fa8971cfd51af245c415b07913845dd2f4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 00:48:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 00:55:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e7e5fa

sys-libs/ncurses: tidy up src_prepare

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild | 8 ++++++--
 sys-libs/ncurses/ncurses-6.3_p20220423.ebuild    | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild 
b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild
index 4b058013e9b3..1d04632af4e3 100644
--- a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild
@@ -101,8 +101,12 @@ PATCHES=(
 
 src_prepare() {
        if [[ ${PV} == *_p* ]] ; then
-               #eapply "${WORKDIR}"/${P/_p/-}-patch.sh
-               eapply "${WORKDIR}"/
+               if [[ -z ${PATCH_DATES[@]} ]] ; then
+                       # If we have a rollup patch, use that instead of the 
individual ones.
+                       eapply "${WORKDIR}"/${P/_p/-}-patch.sh
+               else
+                       eapply "${WORKDIR}"/
+               fi
        fi
 
        default

diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild 
b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild
index 7123b8237c1d..bcfee98f91ee 100644
--- a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild
+++ b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild
@@ -101,8 +101,12 @@ PATCHES=(
 
 src_prepare() {
        if [[ ${PV} == *_p* ]] ; then
-               #eapply "${WORKDIR}"/${P/_p/-}-patch.sh
-               eapply "${WORKDIR}"/
+               if [[ -z ${PATCH_DATES[@]} ]] ; then
+                       # If we have a rollup patch, use that instead of the 
individual ones.
+                       eapply "${WORKDIR}"/${P/_p/-}-patch.sh
+               else
+                       eapply "${WORKDIR}"/
+               fi
        fi
 
        default