gentoo resync : 16.02.1018

10 files changed, 115 insertions, 41 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 32833817529d..18a134f852c8 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index f56776b59c14..12b7fc98055d 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1,3 +1,6 @@
+AUX sparse_array_test_fix.patch 1643 BLAKE2B 6967eefee4a1bf3bdf14f7c2cd56814642adf4321007fc3a9b7f5e4022f468006e8674e6832d3a5fe1ef995b360de6e60bf738a6c3664f78d80d1000380939ae SHA512 597a4eeb180177ccb72f025b9abefe339b845ad188cd6287036905ab613aa36df24f0b51a515bb1718a0286e64b5b12a0cb8864dea2203b69407f9bc665ce393
+DIST lua-cjson-2.1.0.6.tar.gz 76820 BLAKE2B 1056fefc8d9c802e068e1e7801cc1eb3a0279371ab72e4e8517e22ad68224dd4892f4e4cbfe0a407af71f1008affded41d7bcc05d89c4ddb0c437d93d67708a7 SHA512 71d25f4ec82641d56e33e13c0ecd8c60186b3c4faf3d30de81706d1305d4e61691a1e84210462942674e50ca2ff19e126cb04025d9645d5d26ef3b3b0e46f64b
 DIST lua-cjson-2.1.0.tar.gz 86024 BLAKE2B 21dbf84cda2c973088dc9ba165351f3af35d4f604ef465abd91f37807a6c037f612f36c87b9458abef9afa06e1738e933fcce7be9edd2f9a5e301985f413a1db SHA512 4343513b942f2ed98dc1ea6d7e852303bc1263f8acc5c70c8d674aec7adfc8279c5af7d5173a417b6f9a74543b8f6c8f98742d002f4f75832bbf23bb5a30ad2f
+EBUILD lua-cjson-2.1.0.6.ebuild 1024 BLAKE2B f9d94540e16acde7fc069d59aba199385bbd386557019ef2f4097c57581943774d27918e29c29d85cb4ab20d319716924d33662dd89575eb03e91d3c804a264f SHA512 80eaa499fb235553ed685e8011b2ce91a18a967fbc55fa32f5fbaf9622763dac5e7e1d334ed27fee9a3e9784807d12b55c908a5d4c6671b452125da90963868d
 EBUILD lua-cjson-2.1.0.ebuild 784 BLAKE2B 4a64cbd26700a4ad9240862f9c5beb708a97f1a6fa51141f05bd4a1bad80212fd07cc822715b34f6d38f6b6c83b13f366b43bea18f8ef2e8be8065f38eb91a6b SHA512 2b10a5c31ba56e72920049081060433ecb93f0832b795c50ee60e06e44ce4544ea41edad71c9f6418ce89f7b0326a53b676c0ac34c396b2c31ab6e6141aa3b2d
-MISC metadata.xml 250 BLAKE2B b6882e74d55aa6fb27d372e6b27adc8751cd6bcbc6bbddf7b60b8a666d866a9ea95675b1ea1f0ab644eeeef2ca0ca599fadade594d80b649b2914b0581d805c2 SHA512 c9d378944a0bf99a43e176e333e565fe0e7af8000dbeac1b65e5d0f850eba07d88b15917d3b9bcbe05e927a94b36e310aff905e2147707b674a62f67bb048da5
+MISC metadata.xml 707 BLAKE2B cb106113b61f5e44d5ed58368b72e5d1b5832a82cf344d00b77ae12cc7bd45027e9e41326b322cbe75ff354629577ce6155788958b49f38855edcb46159dd566 SHA512 14d0e00ab5fcf0ae9780ee4b7c9e8c80b50230391f46babbb758869e97483e85b677c1de6e0475e05b5abd4d2aeb090030c0362204508bacd25a2435786d42fe
diff --git a/dev-lua/lua-cjson/files/sparse_array_test_fix.patch b/dev-lua/lua-cjson/files/sparse_array_test_fix.patch
new file mode 100644
index 000000000000..0c1d138cbadf
--- /dev/null
+++ b/dev-lua/lua-cjson/files/sparse_array_test_fix.patch
@@ -0,0 +1,47 @@
+From 75678e4b0d1b25fc15f0399f1496db6e0287b72f Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 12 Feb 2019 13:32:38 -0800
+Subject: [PATCH] Fix Encode sparse array as object test
+
+Port of this commit from upstream
+https://github.com/mpx/lua-cjson/commit/98eb1d01e952fc60a36f47846f905b86c92a4f58
+---
+ tests/test.lua | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test.lua b/tests/test.lua
+index d1bf7e4..be5e19c 100755
+--- a/tests/test.lua
++++ b/tests/test.lua
+@@ -10,6 +10,17 @@ local json = require "cjson"
+ local json_safe = require "cjson.safe"
+ local util = require "cjson.util"
+ 
++local function json_encode_output_type(value)
++    local text = json.encode(value)
++    if string.match(text, "{.*}") then
++        return "object"
++    elseif string.match(text, "%[.*%]") then
++        return "array"
++    else
++        return "scalar"
++    end
++end
++
+ local function gen_raw_octets()
+     local chars = {}
+     for i = 0, 255 do chars[i + 1] = string.char(i) end
+@@ -292,8 +303,8 @@ local cjson_tests = {
+       json.encode, { { [1] = "one", [4] = "sparse test" } },
+       true, { '["one",null,null,"sparse test"]' } },
+     { "Encode sparse array as object",
+-      json.encode, { { [1] = "one", [5] = "sparse test" } },
+-      true, { '{"5":"sparse test","1":"one"}' } },
++      json_encode_output_type, { { [1] = "one", [5] = "sparse test" } },
++      true, { 'object' } },
+     { "Encode table with numeric string key as object",
+       json.encode, { { ["2"] = "numeric string key test" } },
+       true, { '{"2":"numeric string key test"}' } },
+-- 
+2.20.1
+
diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild
new file mode 100644
index 000000000000..d8443f9f6901
--- /dev/null
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="A fast JSON encoding/parsing module for Lua"
+HOMEPAGE="https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/openresty/lua-cjson"
+SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+internal-fpconv luajit test +threads"
+
+REQUIRED_USE="threads? ( internal-fpconv )"
+
+RDEPEND=">=dev-lang/lua-5.1:0"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-lang/perl )"
+
+DOCS=( NEWS README.md THANKS manual.txt performance.txt )
+
+PATCHES=(
+	"${FILESDIR}"/sparse_array_test_fix.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_INTERNAL_FPCONV="$(usex internal-fpconv)"
+		-DMULTIPLE_THREADS="$(usex threads)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd tests || die
+	ln -s "${BUILD_DIR}"/cjson.so ./ || die
+	ln -s "${S}"/lua/cjson ./ || die
+	./genutf8.pl || die
+	./test.lua || die
+}
diff --git a/dev-lua/lua-cjson/metadata.xml b/dev-lua/lua-cjson/metadata.xml
index 441a4c3c3128..351070af8a91 100644
--- a/dev-lua/lua-cjson/metadata.xml
+++ b/dev-lua/lua-cjson/metadata.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">mpx/lua-cjson</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+			Fork of mpx/lua-cjson is included in the OpenResty bundle and includes a few bugfixes and improvements,
+			especially to facilitate the encoding of empty tables as JSON Arrays.
+	</longdescription>
+	<use>
+		<flag name="internal-fpconv">Enable internal number conversion routines, can increase overall performance by up to 50%</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">openresty/lua-cjson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luajson/Manifest b/dev-lua/luajson/Manifest
index 5beb30c0a918..ed1d332c7ad9 100644
--- a/dev-lua/luajson/Manifest
+++ b/dev-lua/luajson/Manifest
@@ -1,5 +1,3 @@
-DIST luajson-1.3.2.tar.gz 42139 BLAKE2B 6c8557d0a01c7c4fa3fab325f2efaeb1a7199d193be8cea255881028102dbcae78c6e7ac50ba4d6a5cd9560767e3e4997b7acf348321336eca81140b64564cf0 SHA512 502fc5b221128b1af291619ffaebdfc8bb4ee6bbfd041b6e18974aee09c3e73fe0aaaf650bbded818f690c332cb1f74de3e28f11ac2b5f18b751bc6259a07633
 DIST luajson-1.3.3.tar.gz 42653 BLAKE2B 2bc7310317a1279906681c2de284dc7b9d50766c0c21c606da746d0e709168e5364c3a821798f3ce423dfdd246162212525c1fee7c13cb5f0999db56d1e5e3c3 SHA512 9b507148afaf59871f97e7cf78ad35dc01497d553699d1d1a928543fad6a375aebc3852da86d51d744f10ab2ec24c7b1d7c380852da8134ae05f2f22f6f200c2
-EBUILD luajson-1.3.2.ebuild 682 BLAKE2B 2157f0615bb0055660dc883178fea7c3d9e6729c7d08d98b352134c435067b3a770767f0b794b395ea3ec0202f04626a682d070e6706c480f2d9706c3b037ee7 SHA512 86cb9beab05981538a8298ce4e5c8b97442ae495209fcc7defe806bdd535471f0ab3f97b10abfc89870ce3dc767a88827809130847af5ab0a924b5e61aa945d1
-EBUILD luajson-1.3.3.ebuild 708 BLAKE2B 7ccacb9ef4a878d6e04fff805a7a55aae67fe2e9c69c1db9e43df6ce952940befb5dd01f4a85eecda65042a20b67b6c7baa71123ef83bdd9202fb108540ae2a6 SHA512 1dc490b724fd26cd4c1d1536716aa01915a5324afeb231a3c2ed653317b7d9c3a4c4a8ed1a141690313013f4a572cf4779d57dce5fb7b16075677c445a520e70
+EBUILD luajson-1.3.3.ebuild 703 BLAKE2B c70cb25e3cb06d2577abfb8c2ac9494de6a595008e14718f6e690f74ff1c4d87b686a8004546bf329199ff9205d66d77a6ac64878df0e5a13624a65849cfdd09 SHA512 c44bdd39573ba281e6972ccf749385a2172d6353ebbe4784a2ff577ff718c894109aa203d980eb98488719e52b9eeb49c45f79e65ec5cc88562c4bbf1db3c37f
 MISC metadata.xml 253 BLAKE2B 9a21f2ec285f683bc6766396dc836716c6cb52b0b6829a18144d50010d199b93bd0e47216e958f08e23e7c047b11446f4aa127a8b8ca425ce61b247b0593b6d9 SHA512 0ffb4892273cb493c3afaa3adebb9757669fce7e4135ebbefe066511f4319f1e1b60f306e9a9a2a7ea64bcab53515cd342f8e677c232c1966e02c04599bfb75c
diff --git a/dev-lua/luajson/luajson-1.3.2.ebuild b/dev-lua/luajson/luajson-1.3.2.ebuild
deleted file mode 100644
index cee2aa1cf414..000000000000
--- a/dev-lua/luajson/luajson-1.3.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="JSON Parser/Constructor for Lua"
-HOMEPAGE="https://www.eharning.us/wiki/luajson/"
-SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips x86"
-IUSE="test"
-
-RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
-	dev-lua/lpeg"
-DEPEND="test? ( dev-lua/luafilesystem )"
-
-# lunit not in the tree yet
-RESTRICT="test"
-
-# nothing to compile
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-	dodoc README docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt
-}
diff --git a/dev-lua/luajson/luajson-1.3.3.ebuild b/dev-lua/luajson/luajson-1.3.3.ebuild
index f38c914fbd8a..78c00286a7b2 100644
--- a/dev-lua/luajson/luajson-1.3.3.ebuild
+++ b/dev-lua/luajson/luajson-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
index 437e6cf41664..f56a7e6b035e 100644
--- a/dev-lua/luvit/Manifest
+++ b/dev-lua/luvit/Manifest
@@ -2,6 +2,6 @@ AUX luvit-0.7.0-unbundle-http-parser.patch 1383 BLAKE2B 7b28d44ff91b9f599db4fc22
 DIST luvit-0.7.0.tar.gz 6440621 BLAKE2B 03cde753f19441bf408c3985704d9042bdbb217368d2effdb494c650038dd2f6a01acd81a73c8bd6e2ef5648d017eb27a8728f4ea568d62f9a94812cf19fe767 SHA512 9a2366d7033f685bdaed9d8fc22b74e570a6b2b5f0c2e5ecdea6b92776e12fed7ec8fa6c84ff457bdfc8849a7ee79c27803577857b3263e20c1fc53b87383b12
 DIST luvit-0.8.2.tar.gz 7126452 BLAKE2B fc08b9964883ad0708cfeec0740171936daa8e58b43ff587eecbe3986f86e46d850a67b47e7a14880c67b9abe650b5cac3bcffab1c6fb2a42f965f38663aa292 SHA512 46ce9e99d1a002697bb777000d97849135805c3b36344880c1d5cb48c648c7252ec440af35a78eb595d7706d11dc85f76e72c72569e2b3d26e2747b870f98c2b
 EBUILD luvit-0.7.0.ebuild 2161 BLAKE2B ebed8a111f87384bdc048c737ee3a2a683ab793431e3bfdd38ea06914f83b0ae657826236d2d5ef8ed9622c790884293d2ca1c280e32c3c873f157ea2316264d SHA512 35aa95945973679b6d8eff916bd7d93071432d4c25c23729a7339cd68d5bab4258db8909aa7974c4e9db31681d07d5dc0f551d99c1b1cf2c7f910373e7d6ecff
-EBUILD luvit-0.8.2.ebuild 2231 BLAKE2B f4e8a1beb75015dc374e6e464280c56a146553532366f10fac7fef0f10c5771b17ad21b33d670d2a024b3a19b41022f6f03a538cfc35c1afce6947a91990eff6 SHA512 dfe469e0683498610a0dae6999c82e0d98f83374d636b72b48f503e5ab53803786d58c8da65ec2e81888ff082b17eea7eafa6418e070ea157952ce54fedb98c5
+EBUILD luvit-0.8.2.ebuild 2230 BLAKE2B e44a7f12373881c8da98efa37a416229e5d687dc2f2b368f720433c774cf5864432a386d1b04528b13f0f81394d10fd5149928551dd81e506f29f306fb373092 SHA512 8f0d9e56e3e3ed4a27c06b6fa9b7e879f5ce1f12fd0498a9ecffdfb9b6567dd09cd7a37015f428c86697a0bc840e0219e8c55a1b519dd6686f788e1735dc95a7
 EBUILD luvit-9999.ebuild 2425 BLAKE2B b625935d72facd0934674d6b6b93c8588ede4ad0baa87288fddd8b73acea37add5ca008c9993995bb96c0d9a3dcb1cd5f3523b56c620b71a7c830404abbf9d5c SHA512 082c7144b04be678eecbb1424a97b182d51730c5cf293c89c36d3cc1f36a8c0558be43c19c72ad6b6090194cb393836761f6a3926003366c704b4df647835ec2
 MISC metadata.xml 256 BLAKE2B 4770083294f5244f4cbac3512b31f2842b85efbe2d31a801f8937e0f0e616e8940c5f3c32836ab5404a29d4c07cb048a871360487d308eb68d01b7d97970ada6 SHA512 a8a13bfb63fbe12ba3f7753aff5fcd7711dcc1e5918d17fa67d0a9daaead72657f180538137148dfa70319ca0bb852c9c24416f9248564611caf75f68fa6f1eb
diff --git a/dev-lua/luvit/luvit-0.8.2.ebuild b/dev-lua/luvit/luvit-0.8.2.ebuild
index 69f8e85872ef..d9e9031f671a 100644
--- a/dev-lua/luvit/luvit-0.8.2.ebuild
+++ b/dev-lua/luvit/luvit-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="Takes node.js' architecture and dependencies and fits it in the Lua
 HOMEPAGE="https://luvit.io/"
 SRC_URI="https://luvit.io/dist/latest/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 SLOT="0"
 IUSE="bundled-libs examples libressl"
 # luvit Apache-2.0