gentoo resync : 19.03.2019

5 files changed, 48 insertions, 38 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index d01c8b29f07b..0faa10f1ce88 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 12b7fc98055d..b94d0b2875c8 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1,6 +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
+DIST lua-cjson-2.1.0.7.tar.gz 76949 BLAKE2B 9189890f24885191001e79cf0f48aaee74026572eda3e767b0e5e63d44634156fd2b972287cb23e243b3fd0f44f8e87a1fcb0c0b8e26197c63e5e0ff30cb3a94 SHA512 c66fbb608dcd1b7daef8c70ad9a60ab442bf8b851b8d8c5e3b11854ab476dff115e2eef31f171a40ce364778682ce351114caf36c995521ec589bd9dd94415c5
 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 707 BLAKE2B cb106113b61f5e44d5ed58368b72e5d1b5832a82cf344d00b77ae12cc7bd45027e9e41326b322cbe75ff354629577ce6155788958b49f38855edcb46159dd566 SHA512 14d0e00ab5fcf0ae9780ee4b7c9e8c80b50230391f46babbb758869e97483e85b677c1de6e0475e05b5abd4d2aeb090030c0362204508bacd25a2435786d42fe
+EBUILD lua-cjson-2.1.0.7.ebuild 1024 BLAKE2B f9d94540e16acde7fc069d59aba199385bbd386557019ef2f4097c57581943774d27918e29c29d85cb4ab20d319716924d33662dd89575eb03e91d3c804a264f SHA512 80eaa499fb235553ed685e8011b2ce91a18a967fbc55fa32f5fbaf9622763dac5e7e1d334ed27fee9a3e9784807d12b55c908a5d4c6671b452125da90963868d
+MISC metadata.xml 678 BLAKE2B fa30839c521f01f875cc3eb8d0a4904975306436464e475acc0aee9acc2f856fc8895444344acda575a69be8d9e35a25f1bd8f4efccb0f174621f54aaa5e1775 SHA512 d4ed2bdea1df6a8ca3a0d4d1405f2e2c1ecd38d0229d6b5a3264c4ffabc4487a52e558fd56cf2903ff7ada9a7cb7204245bf5288a0834ff520a111c814b1e0a2
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
new file mode 100644
index 000000000000..d8443f9f6901
--- /dev/null
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.7.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/lua-cjson-2.1.0.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
deleted file mode 100644
index 7070319a3902..000000000000
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 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/mpx/lua-cjson/"
-SRC_URI="https://www.kyne.com.au/~mark/software/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-lang/lua-5.1:0"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-lang/perl )"
-
-DOCS=( NEWS THANKS )
-
-src_test() {
-	cd tests || die
-	ln -s "${BUILD_DIR}"/cjson.so ./ || die
-	ln -s "${S}"/lua/cjson ./ || die
-	./genutf8.pl || die
-	./test.lua || die
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( manual.html performance.html )
-	cmake-utils_src_install
-}
diff --git a/dev-lua/lua-cjson/metadata.xml b/dev-lua/lua-cjson/metadata.xml
index 351070af8a91..5b6408370bec 100644
--- a/dev-lua/lua-cjson/metadata.xml
+++ b/dev-lua/lua-cjson/metadata.xml
@@ -6,7 +6,7 @@
 		<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,
+			OpenResty fork of mpx/lua-cjson, includes a few bugfixes and improvements,
 			especially to facilitate the encoding of empty tables as JSON Arrays.
 	</longdescription>
 	<use>