[gentoo-commits] repo/gentoo:master commit in: dev-lang/jsonnet/, dev-lang/jsonnet/files/

[Georgy Yakovlev]

commit:     a7946570f909e0f1ab4b3d324be7708b0c8f6364
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 01:15:14 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 01:15:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7946570

dev-lang/jsonnet: don't de-reference symlinks

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-lang/jsonnet/files/jsonnet-0.16.0-cp-var.patch | 31 ++++++++++++++++++++++
 dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild          |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/dev-lang/jsonnet/files/jsonnet-0.16.0-cp-var.patch b/dev-lang/jsonnet/files/jsonnet-0.16.0-cp-var.patch
new file mode 100644
index 00000000000..cbbcd5776f2
--- /dev/null
+++ b/dev-lang/jsonnet/files/jsonnet-0.16.0-cp-var.patch
@@ -0,0 +1,31 @@
+From 47dfe49281d083951aa0e420686c3f683ffd6352 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@g.o>
+Date: Sun, 25 Oct 2020 18:12:05 -0700
+Subject: [PATCH] use CP var
+
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ffcd666..8eb31aa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -128,11 +128,11 @@ default: jsonnet jsonnetfmt
+ 
+ install: bins libs
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+-	cp $(BINS) $(DESTDIR)$(PREFIX)/bin/
++	$(CP) $(BINS) $(DESTDIR)$(PREFIX)/bin/
+ 	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
+-	cp $(LIBS) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
++	$(CP) $(LIBS) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
+ 	mkdir -p $(DESTDIR)$(PREFIX)/include
+-	cp $(INCS) $(DESTDIR)$(PREFIX)/include/
++	$(CP) $(INCS) $(DESTDIR)$(PREFIX)/include/
+ 
+ all: $(ALL)
+ 
+-- 
+2.29.1
+

diff --git a/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild b/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild
index 60961d97d63..b8788c9e269 100644
--- a/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild
@@ -35,6 +35,7 @@ PATCHES=(
 	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
 	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
 	"${FILESDIR}/jsonnet-0.16.0-libdir.patch"
+	"${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
 )
 
 distutils_enable_tests setup.py
@@ -61,7 +62,8 @@ src_test() {
 }
 
 src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" LIBDIR="$(get_libdir)" install
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" \
+		CP="cp -d" LIBDIR="$(get_libdir)" install
 	use python && distutils-r1_src_install
 	if use doc; then
 		find doc -name '.gitignore' -delete || die