public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/
@ 2022-04-28  0:55 99% Sam James
  0 siblings, 0 replies; 1+ results
From: Sam James @ 2022-04-28  0:55 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2022-04-28  0:55 99% [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/ Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox