[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2023-07-02 Thread Conrad Kostecki 
commit: bc3742abecf4a9aad206a424796fe2106793
Author: Marcin Deranek  booking  com>
AuthorDate: Fri Jun 30 20:17:55 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Jul  2 19:36:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc3742ab

dev-lua/lua-cjson: correct library path

Closes: https://bugs.gentoo.org/909417
Signed-off-by: Marcin Deranek  slonko.net>
Closes: https://github.com/gentoo/gentoo/pull/31680
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../{lua-cjson-2.1.0.10.ebuild => lua-cjson-2.1.0.10-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.10.ebuild 
b/dev-lua/lua-cjson/lua-cjson-2.1.0.10-r1.ebuild
similarity index 97%
rename from dev-lua/lua-cjson/lua-cjson-2.1.0.10.ebuild
rename to dev-lua/lua-cjson/lua-cjson-2.1.0.10-r1.ebuild
index 22b79720590f..dd196fb7ded8 100644
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.10.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.10-r1.ebuild
@@ -77,7 +77,7 @@ lua_src_install() {
 
local myemakeargs=(
"DESTDIR=${D}"
-   "LUA_CMODULE_DIR=$(lua_get_lmod_dir)"
+   "LUA_CMODULE_DIR=$(lua_get_cmod_dir)"
"LUA_MODULE_DIR=$(lua_get_lmod_dir)"
"PREFIX=${EPREFIX}/usr"
)

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/files/, dev-lua/lua-cjson/

2022-12-15 Thread Conrad Kostecki 
commit: c2e3f6ea330492f79bb40b7b1c7a5ed98e522faf
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Dec 15 21:11:36 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Dec 15 21:11:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e3f6ea

dev-lua/lua-cjson: drop 2.1.0.8-r1

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/lua-cjson/Manifest |   1 -
 .../lua-cjson/files/lua-cjson-2.1.0.8-lua52.patch  | 143 -
 .../lua-cjson-2.1.0.8-sparse_array_test_fix.patch  |  31 -
 dev-lua/lua-cjson/lua-cjson-2.1.0.8-r1.ebuild  | 105 ---
 4 files changed, 280 deletions(-)

diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index 03695f44513d..d07c1321b4b4 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1,2 +1 @@
 DIST lua-cjson-2.1.0.10.tar.gz 78651 BLAKE2B 
c215f0a78ba306831a9aa147df9edcb693164a82a0b0505265425124adb40c918da826d128c2dcd048e2c3040d191e177c78b143abb28608b38b3c2b21760539
 SHA512 
889761b6381b2d10b7aa2e5687e5059705352c0f7fbbca9bc5f7c9d89aed8b1e283c18e217183042cc6f1ec4f19d1c4cf720e3efc6f5a06e81aa1bec8a6b93c4
-DIST lua-cjson-2.1.0.8.tar.gz 77211 BLAKE2B 
227171576318939ab48abe26e87fa905cf9a15e6ff44065c0713b6a6fedac571f1dbbb88526b957836a4368e71c4d19a748b2a3250221572f580f1d32ccf50a0
 SHA512 
577278ccb58a23ea56ea9ad34c5fb0a07c13c6691a3b666f58fa6427bca269aaec26271d7400dcd253c922d1bb0b3b322915a2ce139880c1ed4c1d2c15437580

diff --git a/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-lua52.patch 
b/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-lua52.patch
deleted file mode 100644
index 8f8c98243f1f..
--- a/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-lua52.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From e8dddaf2c9c370f3676441304955d81543c5cceb Mon Sep 17 00:00:00 2001
-From: leaf corcoran 
-Date: Sat, 21 Sep 2019 17:31:38 -0700
-Subject: [PATCH 1/5] support lua 5.2 with LUA_COMPAT_ALL
-

- lua_cjson.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lua_cjson.c b/lua_cjson.c
-index 2a69699..83118b1 100644
 a/lua_cjson.c
-+++ b/lua_cjson.c
-@@ -36,6 +36,9 @@
-  *   difficult to know object/array sizes ahead of time.
-  */
- 
-+
-+#define LUA_COMPAT_ALL 1
-+
- #include 
- #include 
- #include 
-
-From 2b3c3c866701a0110a6ac50a9bec9f23adc2956e Mon Sep 17 00:00:00 2001
-From: leaf corcoran 
-Date: Sat, 21 Sep 2019 18:01:05 -0700
-Subject: [PATCH 2/5] support lua 5.3 with LUA_COMPAT_5_1
-

- lua_cjson.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lua_cjson.c b/lua_cjson.c
-index 83118b1..9d25f7c 100644
 a/lua_cjson.c
-+++ b/lua_cjson.c
-@@ -38,6 +38,7 @@
- 
- 
- #define LUA_COMPAT_ALL 1
-+#define LUA_COMPAT_5_1 1
- 
- #include 
- #include 
-
-From 639c4a38bf0b1bddef4bfdb22bb6a3f8493cc3fe Mon Sep 17 00:00:00 2001
-From: leaf corcoran 
-Date: Sat, 21 Sep 2019 18:18:27 -0700
-Subject: [PATCH 3/5] Lua 5.2+ unpack support
-

- lua/cjson/util.lua | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lua/cjson/util.lua b/lua/cjson/util.lua
-index 5d80106..48fa33c 100644
 a/lua/cjson/util.lua
-+++ b/lua/cjson/util.lua
-@@ -1,5 +1,7 @@
- local json = require "cjson"
- 
-+local unpack = unpack or table.unpack
-+
- -- Various common routines used by the Lua CJSON package
- --
- -- Mark Pulford 
-
-From 9163dd3c431bd7ab45bdb218c32c8c9633ddf2cc Mon Sep 17 00:00:00 2001
-From: leaf corcoran 
-Date: Sat, 21 Sep 2019 18:43:47 -0700
-Subject: [PATCH 4/5] Lua 5.2+ maxn support
-

- lua/cjson/util.lua | 12 +++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/lua/cjson/util.lua b/lua/cjson/util.lua
-index 48fa33c..2405257 100644
 a/lua/cjson/util.lua
-+++ b/lua/cjson/util.lua
-@@ -2,6 +2,16 @@ local json = require "cjson"
- 
- local unpack = unpack or table.unpack
- 
-+local maxn = table.maxn or function(t)
-+local max = 0
-+for k,v in pairs(t) do
-+if type(k) == "number" and k > max then
-+max = k
-+end
-+end
-+return max
-+end
-+
- -- Various common routines used by the Lua CJSON package
- --
- -- Mark Pulford 
-@@ -194,7 +204,7 @@ local function run_test(testname, func, input, 
should_work, output)
- local result = {}
- local tmp = { pcall(func, unpack(input)) }
- local success = tmp[1]
--for i = 2, table.maxn(tmp) do
-+for i = 2, maxn(tmp) do
- result[i - 1] = tmp[i]
- end
- 
-
-From c390998582b959389d0fc039743c96e861902587 Mon Sep 17 00:00:00 2001
-From: leaf corcoran 
-Date: Sun, 22 Sep 2019 13:43:18 -0700
-Subject: [PATCH 5/5] use macro instead of header defines for Lua 5.2+ support
-

- lua_cjson.c | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lua_cjson.c b/lua_cjson.c
-index 9d25f7c..718a5b9 100644
 a/lua_cjson.c
-+++ b/lua_cjson.c
-@@ -36,10 +36,6 @@
-  *   difficult to know object/array sizes ahead of time.
-  */
- 
--
--#define LUA_COMPAT_ALL 1
--#define

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2022-12-15 Thread Conrad Kostecki 
commit: 1ab9d7259395157be0ceaa17708d7e40abac33bc
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Dec 15 20:57:12 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Dec 15 20:57:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab9d725

dev-lua/lua-cjson: add 2.1.0.10

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/lua-cjson/Manifest  |  1 +
 dev-lua/lua-cjson/lua-cjson-2.1.0.10.ebuild | 94 +
 2 files changed, 95 insertions(+)

diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index d81f4631b59f..03695f44513d 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1 +1,2 @@
+DIST lua-cjson-2.1.0.10.tar.gz 78651 BLAKE2B 
c215f0a78ba306831a9aa147df9edcb693164a82a0b0505265425124adb40c918da826d128c2dcd048e2c3040d191e177c78b143abb28608b38b3c2b21760539
 SHA512 
889761b6381b2d10b7aa2e5687e5059705352c0f7fbbca9bc5f7c9d89aed8b1e283c18e217183042cc6f1ec4f19d1c4cf720e3efc6f5a06e81aa1bec8a6b93c4
 DIST lua-cjson-2.1.0.8.tar.gz 77211 BLAKE2B 
227171576318939ab48abe26e87fa905cf9a15e6ff44065c0713b6a6fedac571f1dbbb88526b957836a4368e71c4d19a748b2a3250221572f580f1d32ccf50a0
 SHA512 
577278ccb58a23ea56ea9ad34c5fb0a07c13c6691a3b666f58fa6427bca269aaec26271d7400dcd253c922d1bb0b3b322915a2ce139880c1ed4c1d2c15437580

diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.10.ebuild 
b/dev-lua/lua-cjson/lua-cjson-2.1.0.10.ebuild
new file mode 100644
index ..22b79720590f
--- /dev/null
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.10.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua toolchain-funcs
+
+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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+internal-fpconv test +threads"
+REQUIRED_USE="
+   threads? ( internal-fpconv )
+   ${LUA_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-lang/perl )"
+
+DOCS=( "manual.txt" "NEWS" "performance.txt" "README.md" "THANKS" )
+
+src_prepare() {
+   default
+
+   # Don't install tests
+   sed -e '/cd tests/d' -i Makefile || die
+
+   lua_copy_sources
+}
+
+lua_src_compile() {
+   pushd "${BUILD_DIR}" || die
+
+   local myemakeargs=(
+   "CC=$(tc-getCC)"
+   "CFLAGS=${CFLAGS}"
+   "LDFLAGS=${LDFLAGS}"
+   "LUA_INCLUDE_DIR=$(lua_get_include_dir)"
+   )
+
+   emake "${myemakeargs[@]}"
+
+   popd
+}
+
+src_compile() {
+   lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+   pushd "${BUILD_DIR}" || die
+   cd tests || die
+
+   ln -s "${BUILD_DIR}"/cjson.so ./ || die
+   ln -s "${S}"/lua/cjson ./ || die
+
+   ./genutf8.pl || die
+   ./test.lua || die
+
+   popd
+}
+
+src_test() {
+   lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+   pushd "${BUILD_DIR}" || die
+
+   local myemakeargs=(
+   "DESTDIR=${D}"
+   "LUA_CMODULE_DIR=$(lua_get_lmod_dir)"
+   "LUA_MODULE_DIR=$(lua_get_lmod_dir)"
+   "PREFIX=${EPREFIX}/usr"
+   )
+
+   emake "${myemakeargs[@]}" install install-extra
+
+   popd
+}
+
+src_install() {
+   lua_foreach_impl lua_src_install
+
+   einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2022-12-14 Thread Georgy Yakovlev 
commit: 7f8c261d6b1eb7899951662802d3ac07b17e5aa7
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Dec 14 09:51:07 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Dec 14 09:51:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8c261d

dev-lua/lua-cjson: drop myself as a maintainer

Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-lua/lua-cjson/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-lua/lua-cjson/metadata.xml b/dev-lua/lua-cjson/metadata.xml
index 827eb6bf8819..b87098d6b587 100644
--- a/dev-lua/lua-cjson/metadata.xml
+++ b/dev-lua/lua-cjson/metadata.xml
@@ -1,10 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   gyakov...@gentoo.org
-   Georgy Yakovlev
-   

conik...@gentoo.org
Conrad Kostecki

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2021-04-21 Thread Conrad Kostecki 
commit: d4b82f45c6606522bfc2a547b93c56424a69d0d2
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Apr 21 20:17:31 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Apr 21 20:29:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b82f45

dev-lua/lua-cjson: add ~ppc ~ppc64 keyword

Bug: https://bugs.gentoo.org/783423
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild 
b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
index e443289eeef..bd1135eaef0 100644
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+internal-fpconv test +threads"
 REQUIRED_USE="
threads? ( internal-fpconv )

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2021-04-20 Thread Sergei Trofimovich 
commit: 9c21b9717fd662867be777ae8df4fa8399b90f12
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Apr 20 21:15:43 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Apr 20 21:20:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c21b971

dev-lua/lua-cjson: keyworded 2.1.0.8-r100 for ia64

keyworded wrt bug #783420

Package-Manager: Portage-3.0.18, Repoman-3.0.3
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild 
b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
index d976fe1b44a..e443289eeef 100644
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86"
 IUSE="+internal-fpconv test +threads"
 REQUIRED_USE="
threads? ( internal-fpconv )

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2021-04-19 Thread Sergei Trofimovich 
commit: cc50cc5c1fa54bf05e9ae12cb64a463af5a27d8f
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Apr 19 15:09:12 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Apr 19 18:32:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc50cc5c

dev-lua/lua-cjson: keyworded 2.1.0.8-r100 for sparc, bug #783420

Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild 
b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
index a8ad51740ad..d976fe1b44a 100644
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE="+internal-fpconv test +threads"
 REQUIRED_USE="
threads? ( internal-fpconv )

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2021-04-18 Thread Sergei Trofimovich 
commit: 68fef0c93274ec14d0920157c32e042b31a41919
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Apr 18 18:14:32 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr 18 19:41:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fef0c9

dev-lua/lua-cjson: keyworded 2.1.0.8-r100 for hppa, bug #783420

Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild 
b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
index c6ca85c8396..a8ad51740ad 100644
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 IUSE="+internal-fpconv test +threads"
 REQUIRED_USE="
threads? ( internal-fpconv )

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2021-02-21 Thread Conrad Kostecki 
commit: 1f3c547fafb4c20f152ef86ad9155e1c5947fbe6
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Feb 21 21:17:02 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Feb 21 21:21:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f3c547f

dev-lua/lua-cjson: add lua5-4 support

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild 
b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
index c7ff3172c0b..c6ca85c8396 100644
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua toolchain-funcs
 
@@ -61,7 +61,7 @@ src_compile() {
 }
 
 lua_src_test() {
-   if ! [[ ${ELUA} == "lua5.3" ]]; then
+   if ! [[ ${ELUA} == "lua5.3" || ${ELUA} == "lua5.4" ]]; then
pushd "${BUILD_DIR}" || die
cd tests || die

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2021-01-27 Thread Conrad Kostecki 
commit: 4b7e790de3436efa0ce50f2332ac44347fc8b2e5
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Jan 24 17:57:54 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Jan 27 19:40:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7e790d

dev-lua/lua-cjson: drop old version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild | 70 --
 1 file changed, 70 deletions(-)

diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild 
b/dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild
deleted file mode 100644
index 2b119941749..000
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-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 ~arm ~arm64 ~x86"
-IUSE="+internal-fpconv luajit test +threads"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="threads? ( internal-fpconv )"
-
-RDEPEND="
-   luajit? ( dev-lang/luajit:2 )
-   !luajit? ( dev-lang/lua:0 )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-lang/perl )"
-
-DOCS=( "manual.txt" "NEWS" "performance.txt" "README.md" "THANKS" )
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.0.8-sparse_array_test_fix.patch" )
-
-src_prepare() {
-   default
-
-   # Don't install tests
-   sed -e '/cd tests/d' -i Makefile || die
-}
-
-src_compile() {
-   local myemakeargs=(
-   "CC=$(tc-getCC)"
-   "CFLAGS=${CFLAGS}"
-   "LDFLAGS=${LDFLAGS}"
-   "LUA_INCLUDE_DIR=$($(tc-getPKG_CONFIG) --variable $(usex luajit 
'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))"
-   )
-
-   emake "${myemakeargs[@]}"
-}
-
-src_test() {
-   cd tests || die
-
-   ln -s "${S}"/cjson.so ./ || die
-   ln -s "${S}"/lua/cjson ./ || die
-
-   ./genutf8.pl || die
-   ./test.lua || die
-}
-
-src_install() {
-   local myemakeargs=(
-   "DESTDIR=${D}"
-   "LUA_CMODULE_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD 
$(usex luajit 'luajit' 'lua'))"
-   "LUA_MODULE_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD 
$(usex luajit 'luajit' 'lua'))"
-   "PREFIX=${EPREFIX}/usr"
-   )
-
-   emake "${myemakeargs[@]}" install install-extra
-
-   einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/files/, dev-lua/lua-cjson/

2021-01-09 Thread Conrad Kostecki 
commit: bf814bfaa3bc60d422c13ee2992040645e67b36b
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Jan  9 13:51:12 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jan  9 14:29:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf814bfa

dev-lua/lua-cjson: drop old version

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/lua-cjson/Manifest |  2 -
 .../lua-cjson/files/sparse_array_test_fix.patch| 47 --
 dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild | 45 -
 dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild | 45 -
 4 files changed, 139 deletions(-)

diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index 71e8c4e7823..d81f4631b59 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1,3 +1 @@
-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

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 0c1d138cbad..000
--- 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 
-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 7170add189d..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/files/

2020-12-01 Thread Conrad Kostecki 
commit: cc00f3b7bf26f9e01cd30180139bea6bbc6f2444
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Tue Dec  1 16:51:25 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Dec  1 16:51:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc00f3b7

dev-lua/lua-cjson: add missing patch

Closes: https://bugs.gentoo.org/757888
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../lua-cjson/files/lanes-3.13.0-makefile.patch| 93 --
 .../lua-cjson-2.1.0.8-sparse_array_test_fix.patch  | 31 
 2 files changed, 31 insertions(+), 93 deletions(-)

diff --git a/dev-lua/lua-cjson/files/lanes-3.13.0-makefile.patch 
b/dev-lua/lua-cjson/files/lanes-3.13.0-makefile.patch
deleted file mode 100644
index 178a3c5c5ec..000
--- a/dev-lua/lua-cjson/files/lanes-3.13.0-makefile.patch
+++ /dev/null
@@ -1,93 +0,0 @@
 a/Makefile
-+++ b/Makefile
-@@ -33,7 +33,7 @@
- 
- # Autodetect LUA
- #
--LUA=$(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) 
lua$(_LUAEXT))
-+LUA ?= $(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which 
lua51$(_LUAEXT)) lua$(_LUAEXT))
- 
- _TARGET_SO=$(_TARGET_DIR)/core.$(_SO)
- 
 lanes-3.13.0.old/src/Makefile  2018-11-30 13:28:50.0 +0100
-+++ lanes-3.13.0/src/Makefile  2020-11-30 21:40:06.399382894 +0100
-@@ -15,7 +15,7 @@
- #
- LIBFLAG=-shared
- 
--OPT_FLAGS=-O2
-+OPT_FLAGS ?=
- # -O0 -g
- 
- _SO=so
-@@ -38,50 +38,8 @@
- LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc
- LIBFLAG=-shared -Wl,-Map,lanes.map
-   else
--# Autodetect LUA_FLAGS and/or LUA_LIBS
--#
--ifneq "$(shell which pkg-config)" ""
--  ifeq "$(shell pkg-config --exists luajit && echo 1)" "1"
--LUA_FLAGS:=$(shell pkg-config --cflags luajit)
--LUA_LIBS:=$(shell pkg-config --libs luajit)
--  #
--  # Debian: -I/usr/include/luajit-2.0
--  # -lluajit-5.1
--  else
--ifeq "$(shell pkg-config --exists lua5.1 && echo 1)" "1"
--  LUA_FLAGS:=$(shell pkg-config --cflags lua5.1)
--  LUA_LIBS:=$(shell pkg-config --libs lua5.1)
--#
--# Ubuntu: -I/usr/include/lua5.1 
--# -llua5.1
--else
--  ifeq "$(shell pkg-config --exists lua && echo 1)" "1"
--LUA_FLAGS:=$(shell pkg-config --cflags lua)
--LUA_LIBS:=$(shell pkg-config --libs lua)
--  #
--  # OS X fink with pkg-config:
--  #  -I/sw/include 
--  #  -L/sw/lib -llua -lm
--  else
--$(warning *** 'pkg-config' existed but did not know of 'lua[5.1]' 
- Good luck!)
--LUA_FLAGS:=
--LUA_LIBS:=-llua
--  endif
--endif
--  endif
--else
--  # No 'pkg-config'; try defaults
--  #
--  ifeq "$(shell uname -s)" "Darwin"
--$(warning *** Assuming 'fink' at default path)
--LUA_FLAGS:=-I/sw/include
--LUA_LIBS:=-L/sw/lib -llua
--  else
--$(warning *** Assuming an arbitrary Lua installation; try installing 
'pkg-config')
--LUA_FLAGS:=
--LUA_LIBS:=-llua
--  endif
--endif
-+LUA_FLAGS ?= $(shell pkg-config --cflags lua)
-+LUA_LIBS ?= $(shell pkg-config --libs lua)
-   endif
- 
-   ifeq "$(shell uname -s)" "Darwin"
-@@ -92,7 +50,7 @@
- LIBFLAG = -bundle -undefined dynamic_lookup
-   endif
-   
--  CFLAGS=-Wall -Werror $(OPT_FLAGS) $(LUA_FLAGS)
-+  CFLAGS=-Wall $(OPT_FLAGS) $(LUA_FLAGS)
-   LIBS=$(LUA_LIBS)
- endif
- 
-@@ -125,7 +83,7 @@
- #
- $(MODULE_DIR)/core.$(_SO): $(OBJ)
-   mkdir -p $(MODULE_DIR)
--  $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
-+  $(CC) $(LDFLAGS) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
- 
- clean:
-   -rm -rf $(MODULE)/core.$(_SO) *.o *.map

diff --git 
a/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-sparse_array_test_fix.patch 
b/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-sparse_array_test_fix.patch
new file mode 100644
index 000..e031672dae3
--- /dev/null
+++ b/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-sparse_array_test_fix.patch
@@ -0,0 +1,31 @@
+--- a/tests/test.lua
 b/tests/test.lua
+@@ -10,6 +10,17 @@
+ 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 @@
+   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

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/, dev-lua/lua-cjson/files/

2020-12-01 Thread Conrad Kostecki 
commit: de890203c4ffbac72bd789fe67cac6746eb28a2b
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Mon Nov 30 22:44:42 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Dec  1 10:15:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de890203

dev-lua/lua-cjson: bump to version 2.1.0.8

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lua/lua-cjson/Manifest |  1 +
 .../lua-cjson/files/lanes-3.13.0-makefile.patch| 93 ++
 dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild | 70 
 dev-lua/lua-cjson/metadata.xml |  6 +-
 4 files changed, 169 insertions(+), 1 deletion(-)

diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index 5543b65fbe3..71e8c4e7823 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-lua/lua-cjson/files/lanes-3.13.0-makefile.patch 
b/dev-lua/lua-cjson/files/lanes-3.13.0-makefile.patch
new file mode 100644
index 000..178a3c5c5ec
--- /dev/null
+++ b/dev-lua/lua-cjson/files/lanes-3.13.0-makefile.patch
@@ -0,0 +1,93 @@
+--- a/Makefile
 b/Makefile
+@@ -33,7 +33,7 @@
+ 
+ # Autodetect LUA
+ #
+-LUA=$(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) 
lua$(_LUAEXT))
++LUA ?= $(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which 
lua51$(_LUAEXT)) lua$(_LUAEXT))
+ 
+ _TARGET_SO=$(_TARGET_DIR)/core.$(_SO)
+ 
+--- lanes-3.13.0.old/src/Makefile  2018-11-30 13:28:50.0 +0100
 lanes-3.13.0/src/Makefile  2020-11-30 21:40:06.399382894 +0100
+@@ -15,7 +15,7 @@
+ #
+ LIBFLAG=-shared
+ 
+-OPT_FLAGS=-O2
++OPT_FLAGS ?=
+ # -O0 -g
+ 
+ _SO=so
+@@ -38,50 +38,8 @@
+ LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc
+ LIBFLAG=-shared -Wl,-Map,lanes.map
+   else
+-# Autodetect LUA_FLAGS and/or LUA_LIBS
+-#
+-ifneq "$(shell which pkg-config)" ""
+-  ifeq "$(shell pkg-config --exists luajit && echo 1)" "1"
+-LUA_FLAGS:=$(shell pkg-config --cflags luajit)
+-LUA_LIBS:=$(shell pkg-config --libs luajit)
+-  #
+-  # Debian: -I/usr/include/luajit-2.0
+-  # -lluajit-5.1
+-  else
+-ifeq "$(shell pkg-config --exists lua5.1 && echo 1)" "1"
+-  LUA_FLAGS:=$(shell pkg-config --cflags lua5.1)
+-  LUA_LIBS:=$(shell pkg-config --libs lua5.1)
+-#
+-# Ubuntu: -I/usr/include/lua5.1 
+-# -llua5.1
+-else
+-  ifeq "$(shell pkg-config --exists lua && echo 1)" "1"
+-LUA_FLAGS:=$(shell pkg-config --cflags lua)
+-LUA_LIBS:=$(shell pkg-config --libs lua)
+-  #
+-  # OS X fink with pkg-config:
+-  #  -I/sw/include 
+-  #  -L/sw/lib -llua -lm
+-  else
+-$(warning *** 'pkg-config' existed but did not know of 'lua[5.1]' 
- Good luck!)
+-LUA_FLAGS:=
+-LUA_LIBS:=-llua
+-  endif
+-endif
+-  endif
+-else
+-  # No 'pkg-config'; try defaults
+-  #
+-  ifeq "$(shell uname -s)" "Darwin"
+-$(warning *** Assuming 'fink' at default path)
+-LUA_FLAGS:=-I/sw/include
+-LUA_LIBS:=-L/sw/lib -llua
+-  else
+-$(warning *** Assuming an arbitrary Lua installation; try installing 
'pkg-config')
+-LUA_FLAGS:=
+-LUA_LIBS:=-llua
+-  endif
+-endif
++LUA_FLAGS ?= $(shell pkg-config --cflags lua)
++LUA_LIBS ?= $(shell pkg-config --libs lua)
+   endif
+ 
+   ifeq "$(shell uname -s)" "Darwin"
+@@ -92,7 +50,7 @@
+ LIBFLAG = -bundle -undefined dynamic_lookup
+   endif
+   
+-  CFLAGS=-Wall -Werror $(OPT_FLAGS) $(LUA_FLAGS)
++  CFLAGS=-Wall $(OPT_FLAGS) $(LUA_FLAGS)
+   LIBS=$(LUA_LIBS)
+ endif
+ 
+@@ -125,7 +83,7 @@
+ #
+ $(MODULE_DIR)/core.$(_SO): $(OBJ)
+   mkdir -p $(MODULE_DIR)
+-  $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
++  $(CC) $(LDFLAGS) $(LIBFLAG) $^

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2019-03-12 Thread Georgy Yakovlev 
commit: 7ec581b1ec5f234578b04214c7c720397a6f04d3
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Mar 13 03:13:41 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Mar 13 03:13:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec581b1

dev-lua/lua-cjson: drop old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-lua/lua-cjson/Manifest   |  1 -
 dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild | 34 
 2 files changed, 35 deletions(-)

diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index e87bc35a16c..5543b65fbe3 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1,3 +1,2 @@
 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.tar.gz 86024 BLAKE2B 
21dbf84cda2c973088dc9ba165351f3af35d4f604ef465abd91f37807a6c037f612f36c87b9458abef9afa06e1738e933fcce7be9edd2f9a5e301985f413a1db
 SHA512 
4343513b942f2ed98dc1ea6d7e852303bc1263f8acc5c70c8d674aec7adfc8279c5af7d5173a417b6f9a74543b8f6c8f98742d002f4f75832bbf23bb5a30ad2f

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 7070319a390..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2019-03-12 Thread Georgy Yakovlev 
commit: 724feaedd952c1dbeea34dcde2abc0fe574977c9
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Mar 13 03:08:53 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Mar 13 03:08:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724feaed

dev-lua/lua-cjson: bump to 2.1.0.7

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-lua/lua-cjson/Manifest |  1 +
 dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild | 44 ++
 2 files changed, 45 insertions(+)

diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index e22ea3d3d87..e87bc35a16c 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1,2 +1,3 @@
 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.tar.gz 86024 BLAKE2B 
21dbf84cda2c973088dc9ba165351f3af35d4f604ef465abd91f37807a6c037f612f36c87b9458abef9afa06e1738e933fcce7be9edd2f9a5e301985f413a1db
 SHA512 
4343513b942f2ed98dc1ea6d7e852303bc1263f8acc5c70c8d674aec7adfc8279c5af7d5173a417b6f9a74543b8f6c8f98742d002f4f75832bbf23bb5a30ad2f

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 000..d8443f9f690
--- /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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2019-03-12 Thread Georgy Yakovlev 
commit: 18797d336818d3b900b13b5bac5fb9e91c9aa1c4
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Mar 13 03:10:09 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Mar 13 03:10:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18797d33

dev-lua/lua-cjson: update metadata.xml

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-lua/lua-cjson/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/lua-cjson/metadata.xml b/dev-lua/lua-cjson/metadata.xml
index 351070af8a9..5b6408370be 100644
--- a/dev-lua/lua-cjson/metadata.xml
+++ b/dev-lua/lua-cjson/metadata.xml
@@ -6,7 +6,7 @@
Georgy Yakovlev


-   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.

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/, dev-lua/lua-cjson/files/

2019-02-12 Thread Georgy Yakovlev 
commit: 49c1855687a1f95cefbf9d97baf1479950c16991
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Feb 12 23:36:23 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Feb 12 23:41:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c18556

dev-lua/lua-cjson: switch to fork, bump to 2.1.0.6

Openresty fork is maintained, has more features.

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-lua/lua-cjson/Manifest |  1 +
 .../lua-cjson/files/sparse_array_test_fix.patch| 47 ++
 dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild | 44 
 dev-lua/lua-cjson/metadata.xml |  9 -
 4 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index 136a3200bc4..e22ea3d3d87 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1 +1,2 @@
+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

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 000..0c1d138cbad
--- /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 
+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 000..d8443f9f690
--- /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

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2019-02-12 Thread Georgy Yakovlev 
commit: d768d5004f36758885e12a3c7c0fb38176ba7768
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Feb 12 23:34:33 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Feb 12 23:41:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d768d500

dev-lua/lua-cjson: update metadata.xml

Adopting a package.

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-lua/lua-cjson/metadata.xml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-lua/lua-cjson/metadata.xml b/dev-lua/lua-cjson/metadata.xml
index 441a4c3c312..117a96f008a 100644
--- a/dev-lua/lua-cjson/metadata.xml
+++ b/dev-lua/lua-cjson/metadata.xml
@@ -1,8 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-  
-mpx/lua-cjson
-  
+   
+   gyakov...@gentoo.org
+   Georgy Yakovlev
+   
+   
+   mpx/lua-cjson
+

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2018-12-31 Thread Andreas Sturmlechner 
commit: 896ac22e0b767cd3464a9176051b782a49c35aa3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 31 23:09:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 31 23:09:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=896ac22e

dev-lua/lua-cjson: EAPI-7 bump

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild 
b/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
index 1dd13c83607..7070319a390 100644
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit cmake-utils
 
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-lang/lua-5.1:0"
-DEPEND="${RDEPEND}
-   test? ( dev-lang/perl )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-lang/perl )"
 
 DOCS=( NEWS THANKS )
 
@@ -29,6 +29,6 @@ src_test() {
 }
 
 src_install() {
+   use doc && local HTML_DOCS=( manual.html performance.html )
cmake-utils_src_install
-   use doc && dohtml manual.html performance.html
 }

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-cjson/

2017-06-12 Thread Michael Palimaka 
commit: 4d8ea59a2b96b71f17221eb78479a6441c8709bd
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Jun 12 11:06:59 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jun 12 11:34:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d8ea59a

dev-lua/lua-cjson: use HTTPS

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild 
b/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
index f3c6f62f51f..1dd13c83607 100644
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 DESCRIPTION="A fast JSON encoding/parsing module for Lua"
-HOMEPAGE="http://www.kyne.com.au/~mark/software/lua-cjson.php 
https://github.com/mpx/lua-cjson/;
-SRC_URI="http://www.kyne.com.au/~mark/software/download/${P}.tar.gz;
+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"