| 1 |
commit: 5e86ab002036c49c873e8b3a3827c9d125d5e69c |
| 2 |
Author: Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name> |
| 3 |
AuthorDate: Fri Dec 30 04:21:28 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 30 20:02:02 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e86ab00 |
| 7 |
|
| 8 |
sys-libs/ncurses: don't install dangling symlinks |
| 9 |
|
| 10 |
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/28899 |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-libs/ncurses/ncurses-6.3_p20220924-r10.ebuild | 2 +- |
| 15 |
sys-libs/ncurses/ncurses-6.3_p20220924-r2.ebuild | 2 +- |
| 16 |
sys-libs/ncurses/ncurses-6.3_p20221203-r1.ebuild | 2 +- |
| 17 |
sys-libs/ncurses/ncurses-6.3_p20221203.ebuild | 2 +- |
| 18 |
4 files changed, 4 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220924-r10.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220924-r10.ebuild |
| 21 |
index 6f5ac7abdbc6..c506847fb1a2 100644 |
| 22 |
--- a/sys-libs/ncurses/ncurses-6.3_p20220924-r10.ebuild |
| 23 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20220924-r10.ebuild |
| 24 |
@@ -453,7 +453,7 @@ multilib_src_install_all() { |
| 25 |
elif use minimal ; then |
| 26 |
# Keep only the basic terminfo files |
| 27 |
find "${ED}"/usr/share/terminfo/ \ |
| 28 |
- -type f ${terms[*]/#/! -name } -delete , \ |
| 29 |
+ \( -type f -o -type l \) ${terms[*]/#/! -name } -delete , \ |
| 30 |
-type d -empty -delete || die |
| 31 |
fi |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220924-r2.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220924-r2.ebuild |
| 35 |
index 0f602578429d..22d5938e58da 100644 |
| 36 |
--- a/sys-libs/ncurses/ncurses-6.3_p20220924-r2.ebuild |
| 37 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20220924-r2.ebuild |
| 38 |
@@ -451,7 +451,7 @@ multilib_src_install_all() { |
| 39 |
elif use minimal ; then |
| 40 |
# Keep only the basic terminfo files |
| 41 |
find "${ED}"/usr/share/terminfo/ \ |
| 42 |
- -type f ${terms[*]/#/! -name } -delete , \ |
| 43 |
+ \( -type f -o -type l \) ${terms[*]/#/! -name } -delete , \ |
| 44 |
-type d -empty -delete || die |
| 45 |
fi |
| 46 |
|
| 47 |
|
| 48 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20221203-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20221203-r1.ebuild |
| 49 |
index a6358a7b4821..12ed888df557 100644 |
| 50 |
--- a/sys-libs/ncurses/ncurses-6.3_p20221203-r1.ebuild |
| 51 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20221203-r1.ebuild |
| 52 |
@@ -465,7 +465,7 @@ multilib_src_install_all() { |
| 53 |
elif use minimal ; then |
| 54 |
# Keep only the basic terminfo files |
| 55 |
find "${ED}"/usr/share/terminfo/ \ |
| 56 |
- -type f ${terms[*]/#/! -name } -delete , \ |
| 57 |
+ \( -type f -o -type l \) ${terms[*]/#/! -name } -delete , \ |
| 58 |
-type d -empty -delete || die |
| 59 |
fi |
| 60 |
|
| 61 |
|
| 62 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20221203.ebuild b/sys-libs/ncurses/ncurses-6.3_p20221203.ebuild |
| 63 |
index 102e2c4b61db..35c1a3c89826 100644 |
| 64 |
--- a/sys-libs/ncurses/ncurses-6.3_p20221203.ebuild |
| 65 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20221203.ebuild |
| 66 |
@@ -463,7 +463,7 @@ multilib_src_install_all() { |
| 67 |
elif use minimal ; then |
| 68 |
# Keep only the basic terminfo files |
| 69 |
find "${ED}"/usr/share/terminfo/ \ |
| 70 |
- -type f ${terms[*]/#/! -name } -delete , \ |
| 71 |
+ \( -type f -o -type l \) ${terms[*]/#/! -name } -delete , \ |
| 72 |
-type d -empty -delete || die |
| 73 |
fi |
Archives