| 1 |
commit: 55e7e5fa8971cfd51af245c415b07913845dd2f4 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 28 00:48:51 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 28 00:55:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e7e5fa |
| 7 |
|
| 8 |
sys-libs/ncurses: tidy up src_prepare |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild | 8 ++++++-- |
| 13 |
sys-libs/ncurses/ncurses-6.3_p20220423.ebuild | 8 ++++++-- |
| 14 |
2 files changed, 12 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild |
| 17 |
index 4b058013e9b3..1d04632af4e3 100644 |
| 18 |
--- a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild |
| 19 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild |
| 20 |
@@ -101,8 +101,12 @@ PATCHES=( |
| 21 |
|
| 22 |
src_prepare() { |
| 23 |
if [[ ${PV} == *_p* ]] ; then |
| 24 |
- #eapply "${WORKDIR}"/${P/_p/-}-patch.sh |
| 25 |
- eapply "${WORKDIR}"/ |
| 26 |
+ if [[ -z ${PATCH_DATES[@]} ]] ; then |
| 27 |
+ # If we have a rollup patch, use that instead of the individual ones. |
| 28 |
+ eapply "${WORKDIR}"/${P/_p/-}-patch.sh |
| 29 |
+ else |
| 30 |
+ eapply "${WORKDIR}"/ |
| 31 |
+ fi |
| 32 |
fi |
| 33 |
|
| 34 |
default |
| 35 |
|
| 36 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild |
| 37 |
index 7123b8237c1d..bcfee98f91ee 100644 |
| 38 |
--- a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild |
| 39 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild |
| 40 |
@@ -101,8 +101,12 @@ PATCHES=( |
| 41 |
|
| 42 |
src_prepare() { |
| 43 |
if [[ ${PV} == *_p* ]] ; then |
| 44 |
- #eapply "${WORKDIR}"/${P/_p/-}-patch.sh |
| 45 |
- eapply "${WORKDIR}"/ |
| 46 |
+ if [[ -z ${PATCH_DATES[@]} ]] ; then |
| 47 |
+ # If we have a rollup patch, use that instead of the individual ones. |
| 48 |
+ eapply "${WORKDIR}"/${P/_p/-}-patch.sh |
| 49 |
+ else |
| 50 |
+ eapply "${WORKDIR}"/ |
| 51 |
+ fi |
| 52 |
fi |
| 53 |
|
| 54 |
default |
Archives