gentoo resync : 15.12.2019

5 files changed, 12 insertions, 107 deletions

diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 55d91ea980db..03d0bfe879ac 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -1,11 +1,6 @@
 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
 AUX jsonnet-0.14.0-makefile.patch 752 BLAKE2B 5acf8e07cd0f1b9af658015e6ee560f31a25b4b17402e0516bc8a861db4f31d9cb23e86943389d36f0885f4afc179b433764a331aea7a0164368e3561490da61 SHA512 18230b761ec3d3d106e06d02680b54229eb20c681b7591209dbb7d5ee138edc3a5015d1e53d3238dd9c86753bcc3f5ef3352a733e9a950fca4b37af8d83c9888
-DIST jsonnet-0.12.1.tar.gz 21839349 BLAKE2B 8601a35263003723b435d0075fe60f5301a49bddf63cdd55958df3eb7474569c28dbf54e0ba9d07fb6ade395af725193d1432b2c43fb2b271531af179e850df4 SHA512 25523dd19b4209a5ca39275ab3d3726b934442dd83a965ab0b79f0c67bd8ae85c438b2a63990b8eec921b137f908f946696be331b08cef92f15b6b8fa548cb0d
-DIST jsonnet-0.13.0.tar.gz 21850449 BLAKE2B fa0665d63b09dfc01a7454268d6edd467524cdfdb5d53e838665f046f1f08608c493503a88d7af7e26c3dc07e0ae4323753affab90c5ac41c27ebe8b7b39a4a0 SHA512 d19e5398763e37b79b0ef02368f6bd6215d2df234b5ff7a6d98e2306a0d47290600061c9f868c0c262570b4f0ee9eee6c309bcc93937b12f6c14f8d12339a7d5
 DIST jsonnet-0.14.0.tar.gz 21857157 BLAKE2B 93de74fa07efa300097ccb9503b41543beb749d5aff130ad9a6139a3ceb0a07b404aa50877d4cbacd9eb26b2194d8cd9bf578521f17f84a3480655b179525663 SHA512 e09fb27202a34e88134d98d59fdccd4f1ee777e7c8090c3687cb5c11b9ada3bfe7b878322e0274743694ff77457215484470ccf90d03d9d36159288e5a18ab0b
-EBUILD jsonnet-0.12.1.ebuild 1231 BLAKE2B d7c80ff07e3b4aa52ee476d3dae220ef537e448dd21b00c501b8a101349bc764dec8aae88f69f09812d94b1630a4db60cc14f1df4f3c687f8480f3973b084b58 SHA512 6b3529bf3f6d4d0031f3339a8bd0b8380e4148f65248b2b4750785085f6ba75d0da19e6f35ccf74837df8cefaf11e58db97fb6dece2c275e804a494521f1d4a1
-EBUILD jsonnet-0.13.0.ebuild 1299 BLAKE2B 30422852af84e0d7e4db60f47f4108f2bc53b9fc227a738742b5e060285993d07e651572d2b41d99094def01a7b0275756e54dd3426034c1306cbb6f6382b93e SHA512 b20ff2c918393d06164670321a1f4fe1e8c8acb9f72b6f862987a57598a943dc654ee3ddd5ed42775931d43c2832ec1a60175a10b34259dd34f1364f051feff4
+EBUILD jsonnet-0.14.0-r1.ebuild 1362 BLAKE2B 9ee289a3802cac0f51b3b4e8e57a0a2f02a65d693ae15b9f58eca243948f96d4c40af416b3e9d27872f69a9d3893a259172bb23444cb5425358ca66c66336512 SHA512 066de4f82c9a415291f7bf3f2f9721ea49a5a00aecc51ac8ab2afc1751546bb665d19235d76759fe923dbc4b919e6c50127ced0505b005b37b4705f152748208
 EBUILD jsonnet-0.14.0.ebuild 1367 BLAKE2B 488583ee08348f1bb75fe187574db7d3f5c3fa6142252dfa730ddd0936115ea5550cb93cb95e31d1a6de55b538374aa68034ed2dd91d2eb938a612347cb15b92 SHA512 3ac0c8e6ef1a75382a21fb15e00ee93c03886d37214f8dd102c59e61f1d81a46032f7ce4ec1330ca165e2b4957665e27e4c9f6d4381c1a7b1e42f5500b24f17f
 MISC metadata.xml 621 BLAKE2B cf9e06f9981b454578c1769425dc15a7a271063b2a95c296db1326c4b4ce0f93ff96a2df42143d9d6fb8e1e196039a26119c35a4881c7d6b2241b58b01cdc948 SHA512 ea583ea6df7d0994e13bf01fff4b99b65ac288e734d41f52bffa4ae8a83d27196622074a6a29bfbbf190125a9cf29e6602f5b4a55ccec76c6324f3ac0b1f50ef
diff --git a/dev-lang/jsonnet/files/jsonnet-0.12.1-makefile.patch b/dev-lang/jsonnet/files/jsonnet-0.12.1-makefile.patch
deleted file mode 100644
index b52c899aa77c..000000000000
--- a/dev-lang/jsonnet/files/jsonnet-0.12.1-makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c6d38e5..8dbaa9f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -29,8 +29,8 @@ OD ?= od
- 
- OPT ?= -O3
- 
--CXXFLAGS ?= -g $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC -Iinclude -Ithird_party/md5 -Ithird_party/json
--CFLAGS ?= -g $(OPT) -Wall -Wextra -pedantic -std=c99 -fPIC -Iinclude
-+CXXFLAGS += -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC -Iinclude -Ithird_party/md5 -Ithird_party/json
-+CFLAGS += -Wall -Wextra -pedantic -std=c99 -fPIC -Iinclude
- MAKEDEPENDFLAGS ?= -Iinclude -Ithird_party/md5 -Ithird_party/json
- EMCXXFLAGS = $(CXXFLAGS) -g0 -Os --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 -s OUTLINING_LIMIT=10000 -s RESERVED_FUNCTION_POINTERS=20 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1
- EMCFLAGS = $(CFLAGS) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1
-@@ -123,10 +123,10 @@ jsonnet: cmd/jsonnet.cpp $(LIB_OBJ)
- 
- # C binding.
- libjsonnet.so: $(LIB_OBJ)
--	$(CXX) $(LDFLAGS) $(LIB_OBJ) $(SHARED_LDFLAGS) -o $@
-+	$(CXX) $(LDFLAGS) $(LIB_OBJ) $(SHARED_LDFLAGS) -Wl,-soname,libjsonnet.so -o $@
- 
- libjsonnet++.so: $(LIB_CPP_OBJ)
--	$(CXX) $(LDFLAGS) $(LIB_CPP_OBJ) $(SHARED_LDFLAGS) -o $@
-+	$(CXX) $(LDFLAGS) $(LIB_CPP_OBJ) $(SHARED_LDFLAGS) -Wl,-soname,libjsonnet++.so -o $@
- 
- # JavaScript build of C binding
- JS_EXPORTED_FUNCTIONS = 'EXPORTED_FUNCTIONS=["_jsonnet_make", "_jsonnet_evaluate_snippet", "_jsonnet_fmt_snippet", "_jsonnet_ext_var", "_jsonnet_ext_code", "_jsonnet_tla_var", "_jsonnet_tla_code", "_jsonnet_realloc", "_jsonnet_destroy", "_jsonnet_import_callback"]'
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
deleted file mode 100644
index f63a246fd882..000000000000
--- a/dev-lang/jsonnet/files/jsonnet-0.13.0-glibc-2.29.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 4ba4fd82bda9..000000000000
--- a/dev-lang/jsonnet/jsonnet-0.12.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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_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
-}
diff --git a/dev-lang/jsonnet/jsonnet-0.13.0.ebuild b/dev-lang/jsonnet/jsonnet-0.14.0-r1.ebuild
index bb16ecea1cd1..ea949946fb6a 100644
--- a/dev-lang/jsonnet/jsonnet-0.13.0.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.14.0-r1.ebuild
@@ -4,14 +4,14 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_{7,8} )
 
-inherit toolchain-funcs distutils-r1
+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="python"
+IUSE="custom-optimization python"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -25,16 +25,22 @@ BDEPEND="python? ( ${PYTHON_DEPS}
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
-	"${FILESDIR}/jsonnet-0.12.1-makefile.patch"
+	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
 	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
-	"${FILESDIR}/jsonnet-0.13.0-glibc-2.29.patch"
 )
 
+distutils_enable_tests setup.py
+
 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 \
@@ -49,10 +55,6 @@ src_test() {
 	use python && distutils-r1_src_test
 }
 
-python_test() {
-	esetup.py test || die
-}
-
 src_install() {
 	dolib.so libjsonnet*.so
 	dobin jsonnet