gentoo resync : 22.01.2021

4 files changed, 0 insertions, 142 deletions

diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index f07a0d22a892..09017617bc96 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1,11 +1,6 @@
 AUX lua-cjson-2.1.0.8-lua52.patch 3588 BLAKE2B 989bd667dd62cf7b39c0188c1fcf94d6890e9839c662e75782bba26faf9fa35c7def97c172c74ec8cb3eb07a0413aa66e7b860d07c2caf459be52ec37450dd1f SHA512 9f16ae9d7885d835252a49208e00199ee8d4bf10790a9b2e696026171831b4a579938ecf7f980631f3fccee55f1d000212dfea80d1ebc22743550847d43f1d26
 AUX lua-cjson-2.1.0.8-sparse_array_test_fix.patch 1084 BLAKE2B 3f6e439b54602a8fb07badb87bd53ce8affbb53f7434a32677b1de0cfc92b6f9f75f21a7c09763649c5cbadf59a8647d704cce1e0e98207e72bb696c9cb8ddbe SHA512 31358192ecff4a06ef045cf8b3d8f717e65674752e1ae70a8e87a487e89a4819448285c537ef5393b05bbb285a0708be37bd7dafa9b8bacbf4bb0e8bdd9fdb67
-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.7.tar.gz 76949 BLAKE2B 9189890f24885191001e79cf0f48aaee74026572eda3e767b0e5e63d44634156fd2b972287cb23e243b3fd0f44f8e87a1fcb0c0b8e26197c63e5e0ff30cb3a94 SHA512 c66fbb608dcd1b7daef8c70ad9a60ab442bf8b851b8d8c5e3b11854ab476dff115e2eef31f171a40ce364778682ce351114caf36c995521ec589bd9dd94415c5
 DIST lua-cjson-2.1.0.8.tar.gz 77211 BLAKE2B 227171576318939ab48abe26e87fa905cf9a15e6ff44065c0713b6a6fedac571f1dbbb88526b957836a4368e71c4d19a748b2a3250221572f580f1d32ccf50a0 SHA512 577278ccb58a23ea56ea9ad34c5fb0a07c13c6691a3b666f58fa6427bca269aaec26271d7400dcd253c922d1bb0b3b322915a2ce139880c1ed4c1d2c15437580
-EBUILD lua-cjson-2.1.0.6.ebuild 1051 BLAKE2B d9bef905dc69033611379de72f7216e1766c659d4e0c12ad7875857bc8af1991b874880130acb0ef9e150a8f2028e1a94327727cbbe1bde3d9a2f477d37dfbf9 SHA512 e9d21719becf80e547404c1a28f2cc07197fff512df92b8535a91889dc5d57b0b95d7b5c744d2e11c6dae38f34934b0bdaeddeb59ec32fb8e1b49857f05d7771
-EBUILD lua-cjson-2.1.0.7.ebuild 1051 BLAKE2B d9bef905dc69033611379de72f7216e1766c659d4e0c12ad7875857bc8af1991b874880130acb0ef9e150a8f2028e1a94327727cbbe1bde3d9a2f477d37dfbf9 SHA512 e9d21719becf80e547404c1a28f2cc07197fff512df92b8535a91889dc5d57b0b95d7b5c744d2e11c6dae38f34934b0bdaeddeb59ec32fb8e1b49857f05d7771
 EBUILD lua-cjson-2.1.0.8-r100.ebuild 2011 BLAKE2B 5aafff2cd5201a5db81f1ba16f22f2a7e60a8ec94f352231d34fa0ff04b63f0e90b0714f42084ee9bfbdffba27f045eeec21319ac586b95833ebf17b7b9646de SHA512 08abb466a3e4fdf7a07ac8e64d9c86f76a99ccad21b7cacae3c13b1db0c09b832c1017589423dcfa2fc20ad1092982ea9c525d9703cd94a5be793adbb1a68fa2
 EBUILD lua-cjson-2.1.0.8.ebuild 1660 BLAKE2B 601d00a060462cafbc1107947387fd73c9ceefcb1aa8e901e16ee63d526192459ec900bdcea19a8f25aae3c87d53915c6a846bbaf5cc564ae15f14f0a352ca6e SHA512 2cacc3460386d732aa9be52ba12a165166d0634a2c8e74bf26c6dba156eccefe060bbe9648256c2dd7b1c0e664e4ccf5b2d3f1ed979ab9b565a400478c78ec0a
 MISC metadata.xml 779 BLAKE2B 605a71234ea6e3f8eb770b56cdd725cdc244b643c9676afa4552b3f2ef24d6a1c6d96c0468768b16412a8bbaf5ba29b177a57aec6c7a3c006f16da955d952dd7 SHA512 be9492a64cd4be16f395ec49aa031fed8dcddf844df243cd8456452f002098a2cb47ce1e99dffa0843661986ec5352f4feb749578ee5a63a8b47624c3ffae022
diff --git a/dev-lua/lua-cjson/files/sparse_array_test_fix.patch b/dev-lua/lua-cjson/files/sparse_array_test_fix.patch
deleted file mode 100644
index 0c1d138cbadf..000000000000
--- a/dev-lua/lua-cjson/files/sparse_array_test_fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 7170add189d9..000000000000
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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"
-RESTRICT="!test? ( test )"
-
-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/lua-cjson-2.1.0.7.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild
deleted file mode 100644
index 7170add189d9..000000000000
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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"
-RESTRICT="!test? ( test )"
-
-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
-}