| 1 |
commit: 7c5037f318142d9c012a6e8b31402f5a46e1d9cd |
| 2 |
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Apr 14 12:55:12 2021 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 15 06:38:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5037f3 |
| 7 |
|
| 8 |
x11-misc/xkeycaps: fix build with -native-symlinks |
| 9 |
|
| 10 |
Also swapped DEPEND with BDEPEND to put imake in the right block. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/726240 |
| 13 |
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com> |
| 14 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 15 |
|
| 16 |
x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 9 +++++---- |
| 17 |
1 file changed, 5 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild |
| 20 |
index bef2b91b62d..cbac2508a67 100644 |
| 21 |
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild |
| 22 |
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild |
| 23 |
@@ -23,11 +23,11 @@ RDEPEND=" |
| 24 |
x11-libs/libXt |
| 25 |
x11-misc/xbitmaps |
| 26 |
" |
| 27 |
-DEPEND=" |
| 28 |
- ${RDEPEND} |
| 29 |
+DEPEND="${RDEPEND}" |
| 30 |
+BDEPEND=" |
| 31 |
>=sys-apps/sed-4 |
| 32 |
x11-base/xorg-proto |
| 33 |
- x11-misc/imake |
| 34 |
+ >=x11-misc/imake-1.0.8-r1 |
| 35 |
" |
| 36 |
|
| 37 |
DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt ) |
| 38 |
@@ -46,7 +46,8 @@ src_prepare() { |
| 39 |
} |
| 40 |
|
| 41 |
src_configure() { |
| 42 |
- xmkmf || die |
| 43 |
+ CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ |
| 44 |
+ IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die |
| 45 |
sed -i \ |
| 46 |
-e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \ |
| 47 |
Makefile || die |
Archives