gentoo auto-resync : 28:10:2022 - 22:00:04

4 files changed, 130 insertions, 1 deletions

diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 0da736e38385..aa0466692515 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -2,9 +2,12 @@ AUX jsonnet-0.12.1-dont-call-make-from-setuppy.patch 387 BLAKE2B 8c0223b10cf1b61
 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
+AUX jsonnet-0.18.0-gcc-13.patch 533 BLAKE2B 02d0b945f4a2fd9db923debff2c50f9f9ce3387f911022bba887fef42300b253cf006414351e77b931902cbe6a62a72ec0576621920e7fb0f611eda544386e8a SHA512 5926f6d15e5b2fd3a4db5787974ca26e7e7f59a3e3b30d49510d7ee47cb043bce220633c89c65b6be958c07874331e2d7484effd948ecffdd5e742b1936f61f0
 AUX jsonnet-0.18.0-unbundle.patch 2564 BLAKE2B 8945b6b17af162a99b7d561a68a48c218d0d939ba74784f35eaa8f8dbafe568e9b4db258d45cf9ce5d87504e3d265697f074d4202c8210e878daf07b56514ef5 SHA512 5bae8d02062ecd29d9650c2b623631e7f7a172148be052620a47ef42788ee272f795011ecc98df9d2000947f0ced4c76776e09f5143058b030cc61a54355bbbf
 DIST jsonnet-0.18.0.tar.gz 22472162 BLAKE2B 4f931a44b0cbeea0dc7705c28ca49817e2b3abe19ba4fdcd550d5df1ce9ad6b06b1b740a9306d36caa3970c88df9d31700373e4997dd52c6c2219cdd9bf125c1 SHA512 08a64a4b132df1519292378cef93deb3c60d21636b2a71bce6c13e29cfd93cab465cad77e11f000fb984c5c75a4ca1c92504654fd2e5201343df767ea0e610d1
 DIST jsonnet-0.19.0.tar.gz 22478380 BLAKE2B 0a1612ca0525342763099e70921181578fcf7ab25c2a3811ffede944953e4ce114f1949642038d6147c96d52193cf701473fab8581d50c3e74036139fbd5c19a SHA512 f4e30d977df7840a4f13c7ba75614badd964a5c4484fb264d7b05d6de04aa2a2d3c4c5161523d6fa6559460ea94b94562b07ea6590a34876545c529474c4b9fa
-EBUILD jsonnet-0.18.0-r1.ebuild 2076 BLAKE2B 84ce1cd4819f2fddfa26271f9311a1eb57e66936822c9e9dd94201935e985101a7e11e4a660db95178891053e99ba5079548a7584ef5f8896d15717bb03fff90 SHA512 41e4ddfc52a89de20852f91f0d615a1a01e47ea34f99a7ead2ad43a7e3e0210f67f8eb017a8922274db60334cfcd6681d8a023075dfc09a7508bf329da417350
+DIST jsonnet-0.19.1.tar.gz 22480685 BLAKE2B 7d86bc963f5ced622e91adf015c250b8cae2e817b6af5d60820d8731e04caecc1b2b8142d320414d253ef1fa3558d61aeb1b59480eab0823915d2b15c5d87aab SHA512 21312de71f63f4a74005f563290d67fcc2d220f043291a123af2fc834f4118f8bbc311ea8acc5dd52b13eff8c32f026a5ce6bfe3d88b4c6c770e585dd1f0b688
+EBUILD jsonnet-0.18.0-r1.ebuild 2119 BLAKE2B 38f132f1ec652aaca2280fe5f9e12094ef47b8b670373a5783a46932b5d1629b5d9cc1c5ab4f03baeb2ccbf64bcf5213ffa512d5571ad06da455ab5d4ff67dd1 SHA512 1125926a054884fcd213d5917288f65f19de60966bd2a9f6468de47046ead25fcb50ec4e0f097d771f90cd43d7b739577fd798c5cc2b32644c6e19fe9ce6b266
 EBUILD jsonnet-0.19.0-r1.ebuild 2128 BLAKE2B a4ff0c29853483e5093b469bb811305f7955561bff84349682cce40fcf9e31c4d03d7b974bf3d0227f3e6fcd308ade37911271df1464190c01c973eba0df64f8 SHA512 574237bf6c1992845d83749d00fb7c74bb01c42ae02e7e2b3fd1872a8a9c453117ecab0e81a2a6ff5210a4156ad456797f524cd0da71f5cf7f1a9b3e7365e79b
+EBUILD jsonnet-0.19.1.ebuild 2132 BLAKE2B a22914221574b5844057fb3718998187b15076def31ee6932efb3df954af3597c2c7a3c5fe366f14f4e75e302e9bfd64b4a79d2d1810eb5f732bf3dbfabdd607 SHA512 5a9c1b69fbd19f8c54247f42a801f1e2ba3adef7c6a419627abf3395fc1cf5e1f3be9094b41b26bb6cbfe1664e363b18b3967b2341fe1943a42e8f4713efb32b
 MISC metadata.xml 636 BLAKE2B b4f30bead9e90492366ba9d8fd393cfa6610efcb1dbe7cf11307445f2b7aa596585b576e550aa0df3bcfd14c7a8b068d09040ea94dc815db76d6d15e0f09fccb SHA512 a106617bce041fc24e1fab61d08add74f450742e7c1be14633cd49b5137c86cf52bd5baf9ea8f5f2f51a90619c7dfad7e6bf749894d8e4df8063857f29a0492a
diff --git a/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch b/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch
new file mode 100644
index 000000000000..b2adca81a351
--- /dev/null
+++ b/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch
@@ -0,0 +1,18 @@
+https://github.com/google/jsonnet/pull/1020
+From: WANG Xuerui <git@xen0n.name>
+Date: Thu, 6 Oct 2022 15:04:47 +0800
+Subject: [PATCH] Add #include <cstdint> for gcc-13 builds
+
+See https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes.
+
+This fixes Gentoo bug https://bugs.gentoo.org/875569.
+--- a/include/libjsonnet++.h
++++ b/include/libjsonnet++.h
+@@ -17,6 +17,7 @@ limitations under the License.
+ #ifndef CPP_JSONNET_H_
+ #define CPP_JSONNET_H_
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <functional>
+ #include <map>
diff --git a/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild b/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild
index 9411530afa9b..5d8c0d156382 100644
--- a/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}/jsonnet-0.16.0-libdir.patch"
 	"${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
 	"${FILESDIR}/jsonnet-0.18.0-unbundle.patch"
+	"${FILESDIR}/jsonnet-0.18.0-gcc-13.patch"
 )
 
 distutils_enable_tests unittest
diff --git a/dev-lang/jsonnet/jsonnet-0.19.1.ebuild b/dev-lang/jsonnet/jsonnet-0.19.1.ebuild
new file mode 100644
index 000000000000..586f1b3b4915
--- /dev/null
+++ b/dev-lang/jsonnet/jsonnet-0.19.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit cmake 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 test"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+RDEPEND="
+	dev-cpp/rapidyaml:=
+	dev-cpp/nlohmann_json:=
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${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"
+	"${FILESDIR}/jsonnet-0.18.0-unbundle.patch"
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	cmake_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	use custom-optimization || replace-flags '-O*' -O3
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		-DUSE_SYSTEM_JSON=ON
+		-DBUILD_STATIC_LIBS=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_TESTS=ON
+			-DUSE_SYSTEM_GTEST=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_TESTS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_compile
+}
+
+src_test() {
+	cmake_src_test
+	use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_test
+}
+
+python_test() {
+	LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}" "${EPYTHON}" -m unittest python._jsonnet_test -v \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	cmake_src_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
+}