gentoo resync : 08.06.2019

4 files changed, 74 insertions, 1 deletions

diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index bf7667cd7e53..f3789894e12d 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -1,5 +1,8 @@
 AUX jsonnet-0.12.1-dont-call-make-from-setuppy.patch 387 BLAKE2B 8c0223b10cf1b61707b10361cfb96a01f492d234b3318554628dfc51a49728022db2f6573cf78d66a38cae0f59e2054e985e189268254563c0bf9e6854b3c129 SHA512 287a17a6b3aaf8c9a971874ff2a507c8d301caf84d243bd1d063d58e21e93bbecc2b417767e0d56d87f300cef9811f7aec0caa8616292950b11eb3103f7bebbb
 AUX jsonnet-0.12.1-makefile.patch 1609 BLAKE2B a896703a118b194ed97a3c487e8e8a3d6ae1ae0f3989183cac0540b4ad09aeb5a4f2508b8a6f455f7eb077e4378cedaee5538e22f05a07844ea998f39825d93b SHA512 4f92e11f42ed90dcac5e55f12e50e6ffba305d3d691da79282d72059f18223aabb38d9f1420ce586de5e16e735b85174fb49b2ee48739864c47c292690030127
+AUX jsonnet-0.13.0-glibc-2.29.patch 656 BLAKE2B 3594b56bcb77e205bf218afd79374f92f146aeac2dd65c8abff4ce2e86f4b448bc2f3d3f1a15c5b41ded0fb396a77768d106026f5ed6ac47c02e4679bcf94cb8 SHA512 905e95ae51c66e65ddc8761cf4c029c0912e61f4c19297e4b3d5da4df4c7c9d2fd365ea6b24bd6335a0fbe92e8252d8b1cf13155f19ee7b62faa502d92fb9771
 DIST jsonnet-0.12.1.tar.gz 21839349 BLAKE2B 8601a35263003723b435d0075fe60f5301a49bddf63cdd55958df3eb7474569c28dbf54e0ba9d07fb6ade395af725193d1432b2c43fb2b271531af179e850df4 SHA512 25523dd19b4209a5ca39275ab3d3726b934442dd83a965ab0b79f0c67bd8ae85c438b2a63990b8eec921b137f908f946696be331b08cef92f15b6b8fa548cb0d
-EBUILD jsonnet-0.12.1.ebuild 1184 BLAKE2B 2e9d3004f0bd47aa490a89730cde004eef708c5fee45d9508a436d2690166e5b4551842b41296fc3f14c987dc4a6ecccb79a2656a649498a5ea6cf4f8dbd8419 SHA512 9d2a5eb1cefdae88af4ecbdf40f3316958e92b3d53727e87d38661f8610765bf5f44cb41cfb081e80a5eabb8aa730c49db66529785deda9dd265c43106844b2c
+DIST jsonnet-0.13.0.tar.gz 21850449 BLAKE2B fa0665d63b09dfc01a7454268d6edd467524cdfdb5d53e838665f046f1f08608c493503a88d7af7e26c3dc07e0ae4323753affab90c5ac41c27ebe8b7b39a4a0 SHA512 d19e5398763e37b79b0ef02368f6bd6215d2df234b5ff7a6d98e2306a0d47290600061c9f868c0c262570b4f0ee9eee6c309bcc93937b12f6c14f8d12339a7d5
+EBUILD jsonnet-0.12.1.ebuild 1231 BLAKE2B d7c80ff07e3b4aa52ee476d3dae220ef537e448dd21b00c501b8a101349bc764dec8aae88f69f09812d94b1630a4db60cc14f1df4f3c687f8480f3973b084b58 SHA512 6b3529bf3f6d4d0031f3339a8bd0b8380e4148f65248b2b4750785085f6ba75d0da19e6f35ccf74837df8cefaf11e58db97fb6dece2c275e804a494521f1d4a1
+EBUILD jsonnet-0.13.0.ebuild 1299 BLAKE2B 30422852af84e0d7e4db60f47f4108f2bc53b9fc227a738742b5e060285993d07e651572d2b41d99094def01a7b0275756e54dd3426034c1306cbb6f6382b93e SHA512 b20ff2c918393d06164670321a1f4fe1e8c8acb9f72b6f862987a57598a943dc654ee3ddd5ed42775931d43c2832ec1a60175a10b34259dd34f1364f051feff4
 MISC metadata.xml 453 BLAKE2B 826e11d7714e4630a4d23ba46313ef7412af5815b39b60db8c4161d71ded81e023d8c605c1cc86ef0622dd3e2d97ca6b276ae1ba146458cfd20d5c4a80caf3bc SHA512 d621bb14cfd5106fb4e5f88d20dc84aab11c078348b4b605a0a3019b8fa09b55e011062a47fac55e3c8e5383770ca696807b4c97c1ae372b8b909c4bf25af024
diff --git a/dev-lang/jsonnet/files/jsonnet-0.13.0-glibc-2.29.patch b/dev-lang/jsonnet/files/jsonnet-0.13.0-glibc-2.29.patch
new file mode 100644
index 000000000000..f63a246fd882
--- /dev/null
+++ b/dev-lang/jsonnet/files/jsonnet-0.13.0-glibc-2.29.patch
@@ -0,0 +1,8 @@
+diff --git a/test_suite/error.import_folder.jsonnet.golden_regex b/test_suite/error.import_folder.jsonnet.golden_regex
+index bc468fb..c472b23 100644
+--- a/test_suite/error.import_folder.jsonnet.golden_regex
++++ b/test_suite/error.import_folder.jsonnet.golden_regex
+@@ -1,2 +1,2 @@
+-(STATIC ERROR: lib:1:1: unexpected end of file.|RUNTIME ERROR: couldn't open import "lib": basic_filebuf::underflow error reading the file(: iostream error)?
++(STATIC ERROR: lib:1:1: unexpected end of file.|RUNTIME ERROR: couldn't open import "lib": basic_filebuf::underflow error reading the file(: iostream error|: Is a directory)?
+ 	error.import_folder.jsonnet:17:1-13	)
diff --git a/dev-lang/jsonnet/jsonnet-0.12.1.ebuild b/dev-lang/jsonnet/jsonnet-0.12.1.ebuild
index ba69cbeb09ac..4ba4fd82bda9 100644
--- a/dev-lang/jsonnet/jsonnet-0.12.1.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.12.1.ebuild
@@ -27,6 +27,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 PATCHES=(
 	"${FILESDIR}/jsonnet-0.12.1-makefile.patch"
 	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
+	"${FILESDIR}/jsonnet-0.13.0-glibc-2.29.patch"
 )
 
 src_compile() {
diff --git a/dev-lang/jsonnet/jsonnet-0.13.0.ebuild b/dev-lang/jsonnet/jsonnet-0.13.0.ebuild
new file mode 100644
index 000000000000..bb16ecea1cd1
--- /dev/null
+++ b/dev-lang/jsonnet/jsonnet-0.13.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit toolchain-funcs 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="python"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~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.12.1-makefile.patch"
+	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
+	"${FILESDIR}/jsonnet-0.13.0-glibc-2.29.patch"
+)
+
+src_prepare() {
+	default
+	use python && distutils-r1_src_prepare
+}
+
+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() {
+	esetup.py test || die
+}
+
+src_install() {
+	dolib.so libjsonnet*.so
+	dobin jsonnet
+
+	use python && distutils-r1_src_install
+}