gentoo resync : 25.11.2020

6 files changed, 225 insertions, 2 deletions

diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 7879b7ceffa7..69933f5f4adc 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -1,7 +1,12 @@
 AUX jsonnet-0.12.1-dont-call-make-from-setuppy.patch 387 BLAKE2B 8c0223b10cf1b61707b10361cfb96a01f492d234b3318554628dfc51a49728022db2f6573cf78d66a38cae0f59e2054e985e189268254563c0bf9e6854b3c129 SHA512 287a17a6b3aaf8c9a971874ff2a507c8d301caf84d243bd1d063d58e21e93bbecc2b417767e0d56d87f300cef9811f7aec0caa8616292950b11eb3103f7bebbb
 AUX jsonnet-0.14.0-makefile.patch 752 BLAKE2B 5acf8e07cd0f1b9af658015e6ee560f31a25b4b17402e0516bc8a861db4f31d9cb23e86943389d36f0885f4afc179b433764a331aea7a0164368e3561490da61 SHA512 18230b761ec3d3d106e06d02680b54229eb20c681b7591209dbb7d5ee138edc3a5015d1e53d3238dd9c86753bcc3f5ef3352a733e9a950fca4b37af8d83c9888
+AUX jsonnet-0.16.0-cp-var.patch 824 BLAKE2B 111fff8e8b897864e14defa677c1a9b8589ef6a859b2344b24e16a940d90cdeff1affde6cd53c0a1a443a82553ee90d554990160f07c49e98c15a5fc7ea3e03a SHA512 96ecfb8a6b49d31e6a827ed401566b5eef39deb8a3542a6f1b3a5df148bfd93479038468585dc47a76fbb9e7953bf9a6c7161abc7acaff7b81cb8dffe3de2f6d
+AUX jsonnet-0.16.0-libdir.patch 963 BLAKE2B c4b71c01230710bf81fca03b1411bbd21ee02d9957b12997f629c9b4c8e543889658308868d48fe20e0bb9647848bd1b1fa2100c58426785bab1c9bfbbaa8bcb SHA512 9a85c5b8d80f6975ddd3e3c369adb44f6f49382a1e50e9848129c53f81846e69f60a44f401a8a1042657a03f94daaaeb5747632414fa7cb0dc9e2f014ec17a1d
 DIST jsonnet-0.15.0.tar.gz 21826038 BLAKE2B 722a844c00ec31b662d932a4481a71197adad680181c6a56a49dfa3e9b63696d29320c5278024d44c0ab3d7d80569514792f815ac7fa3a3cc08c7756fb6f08ad SHA512 b63c1bf82e4fc9ba3f1009ed4e4ba1010e3e7f81bd816a234e48d35607eae3cba95cab57813d35daa9f024e316bae5256340a6f8d6d884f9136cdbf062a2b351
 DIST jsonnet-0.16.0.tar.gz 21828911 BLAKE2B d6e9648e259b94513507ba5a6e305f705541904d7755dc5521b7fc2940b761f413bfaba39521af54eb428337be2e75f07d12038edcf7e8a5ba95feccc8dd4a02 SHA512 80e0403ec8008cbacff8d9e8fe0e2b5d3bfa306d92c2c11d472e5721015ce4c11be745df10d25715f22f8d8594df69fabf2fe617bdded462ffc5b21f8923606f
+DIST jsonnet-0.17.0.tar.gz 21854054 BLAKE2B 91561f2cffb5c711d4ba58aceef90bbcd654997872936bcf475d397a7b831b833d349c828271e58795cca10c915ab4ec0a517dc0fc2f563673ba7a6e74cfea3f SHA512 d3ee6947163d8abced504ff37ecf365c0311164cbf243d4c635d34944f0831ca9fce2470acf00eb9a218f82a2e553b3f885db9bd21bb9dcefbd707fa0202925d
 EBUILD jsonnet-0.15.0.ebuild 1362 BLAKE2B c964f25e046778eebe7b12a3a9f72e057849c33a61b2bdfbc8e188000b4ecd81529000cc88abe04a69b440ced1ab9453bb1db462e5ae4ed7a72426e4d4f0ad3b SHA512 a4a3610b032b23d3a1344813233f174d90096a26d2fc13742b9509899267038bef5833b7c8f74ac4da7756e40378ca2def4fccde72144971b4edb63dea2f9f55
-EBUILD jsonnet-0.16.0.ebuild 1364 BLAKE2B e2457a34a2d0e3df89afd4674e8237630f5c301a0884aa34b9ea1d904fee3a7a1a92d16c3fddf9666697b3ab2e5354c2724e3697aad8a6b44c7d31e4a9b39b94 SHA512 653a4cb502766bde4d744b7260618c2eb388641a55ff5370833cf1adde07feaf59dd50a77a93451e5ff21b4794c0dac68e20a09fcc872d673119450ce9d1dd3e
+EBUILD jsonnet-0.16.0-r2.ebuild 1602 BLAKE2B d7ba07b9662666004038acb58c03c0d28363d9d6d97696b264660e4f1e447b17cde2a9e5a55745a6b27d1885fc8be653db971bb80404ef72dc2c388ab3ce0614 SHA512 4ef957e74620e6e8aed5ca5e02fc08bfc6bfd28d8ac091fe37a15790546f048a2eb5f2585958ea3672c2961bea22787349fdf53b4120f1e1a75ac5b040d95e6c
+EBUILD jsonnet-0.16.0.ebuild 1378 BLAKE2B e8fc96ff886b9a5dc5897aa16217db15db8f1af1aeb53d14dbd0c2fb41f9dfa4dbb73ce3b1713a449d50b3118a15118fa3ce2b6a6b238e2eab437ff7189bf474 SHA512 e8756691fd5cfaff0f81cf499f909fe98eeb05a9951bb2a237cc4afad5d530042de88f914a0e971a44f17bfa3dcf733d77520b3a7760482a739026e43375b1dc
+EBUILD jsonnet-0.17.0.ebuild 1489 BLAKE2B 1b7074b2d42f0ffd14e09d07fe8964a48b631f443f5b9da3626060730e76ee19697502051c60c4f9acf12fe9d9331cac4bbcb95256ceddd0c71a273a6680f80a SHA512 b5aebc387ef33682fff935bc70ec99373fa59db490ef69e688a1aea4aa95610185955876adf27f1c455170d1edfd1701b739eacddadd392dddb40e22883cf58d
 MISC metadata.xml 621 BLAKE2B cf9e06f9981b454578c1769425dc15a7a271063b2a95c296db1326c4b4ce0f93ff96a2df42143d9d6fb8e1e196039a26119c35a4881c7d6b2241b58b01cdc948 SHA512 ea583ea6df7d0994e13bf01fff4b99b65ac288e734d41f52bffa4ae8a83d27196622074a6a29bfbbf190125a9cf29e6602f5b4a55ccec76c6324f3ac0b1f50ef
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 000000000000..cbbcd5776f21
--- /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@gentoo.org>
+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/files/jsonnet-0.16.0-libdir.patch b/dev-lang/jsonnet/files/jsonnet-0.16.0-libdir.patch
new file mode 100644
index 000000000000..552837112d59
--- /dev/null
+++ b/dev-lang/jsonnet/files/jsonnet-0.16.0-libdir.patch
@@ -0,0 +1,35 @@
+From 94d25e4845e46b27d0e425dc923480abc81a95ae Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 25 Oct 2020 16:21:56 -0700
+Subject: [PATCH] respect libdir
+
+---
+ Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 52c674a..ffcd666 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,6 +30,7 @@ OD ?= od
+ OPT ?= -O3
+ 
+ PREFIX ?= /usr/local
++LIBDIR ?= lib
+ 
+ CXXFLAGS += -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC
+ CXXFLAGS += -Iinclude -Ithird_party/md5 -Ithird_party/json
+@@ -128,8 +129,8 @@ default: jsonnet jsonnetfmt
+ install: bins libs
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	cp $(BINS) $(DESTDIR)$(PREFIX)/bin/
+-	mkdir -p $(DESTDIR)$(PREFIX)/lib
+-	cp $(LIBS) $(DESTDIR)$(PREFIX)/lib/
++	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	cp $(LIBS) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
+ 	mkdir -p $(DESTDIR)$(PREFIX)/include
+ 	cp $(INCS) $(DESTDIR)$(PREFIX)/include/
+ 
+-- 
+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
new file mode 100644
index 000000000000..d4d1373fa872
--- /dev/null
+++ b/dev-lang/jsonnet/jsonnet-0.16.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit toolchain-funcs flag-o-matic distutils-r1
+
+DESCRIPTION="A data templating language for app and tool developers "
+HOMEPAGE="https://jsonnet.org/"
+SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="custom-optimization doc examples python"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc64 x86"
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+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
+
+src_prepare() {
+	default
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	use custom-optimization || replace-flags '-O*' -O3
+	tc-export CC CXX
+	default
+}
+
+src_compile() {
+	emake bins libs
+	use python && distutils-r1_src_compile
+}
+
+src_test() {
+	emake test
+	use python && distutils-r1_src_test
+}
+
+src_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
+		docinto html
+		dodoc -r doc/.
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+}
diff --git a/dev-lang/jsonnet/jsonnet-0.16.0.ebuild b/dev-lang/jsonnet/jsonnet-0.16.0.ebuild
index 6de0f83af2cb..54be993393d9 100644
--- a/dev-lang/jsonnet/jsonnet-0.16.0.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.16.0.ebuild
@@ -15,7 +15,7 @@ IUSE="custom-optimization python"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 DEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
diff --git a/dev-lang/jsonnet/jsonnet-0.17.0.ebuild b/dev-lang/jsonnet/jsonnet-0.17.0.ebuild
new file mode 100644
index 000000000000..67a0000cab80
--- /dev/null
+++ b/dev-lang/jsonnet/jsonnet-0.17.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit toolchain-funcs flag-o-matic distutils-r1
+
+DESCRIPTION="A data templating language for app and tool developers "
+HOMEPAGE="https://jsonnet.org/"
+SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="custom-optimization python"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
+	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	default
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	use custom-optimization || replace-flags '-O*' -O3
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		jsonnet \
+		libjsonnet.so \
+		libjsonnet++.so
+
+	use python && distutils-r1_src_compile
+}
+
+src_test() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" test
+	use python && distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest python._jsonnet_test -v \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	dolib.so libjsonnet*.so
+	dobin jsonnet
+
+	use python && distutils-r1_src_install
+}