diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
| commit | a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7 (patch) | |
| tree | 0c52bbae1c242fbc296bd650fcd1167685f81492 /dev-lua/luajson | |
| parent | bfd9c39e4712ebdb442d4ca0673061faed1e70e1 (diff) | |
| download | baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.gz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.xz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.zip | |
Adding metadata
Diffstat (limited to 'dev-lua/luajson')
| -rw-r--r-- | dev-lua/luajson/Manifest | 1 | ||||
| -rw-r--r-- | dev-lua/luajson/files/luajson-1.3.4-lpeg-1.1.patch | 75 | ||||
| -rw-r--r-- | dev-lua/luajson/luajson-1.3.4-r1.ebuild | 41 | ||||
| -rw-r--r-- | dev-lua/luajson/metadata.xml | 11 |
4 files changed, 0 insertions, 128 deletions
diff --git a/dev-lua/luajson/Manifest b/dev-lua/luajson/Manifest deleted file mode 100644 index 5f2473690bc4..000000000000 --- a/dev-lua/luajson/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST luajson-1.3.4.tar.gz 46941 BLAKE2B 50c8c20c487f92fd19b3e080a87eec58c2cb30d83dfc6acd7aca3f155a04f85a194c069f735a2881e14b0eb3fd3b16e4a75ea625ac81c65b9e25cb1c3601673c SHA512 d24dc8399337b96cde3254a83e5cc1fa995b76f0e1fae54ad91a490f0a6f4c5d0927919320f99d7bc4238ac5529d0ea57435c6be2519fb52e2a83f5005fbc4f7 diff --git a/dev-lua/luajson/files/luajson-1.3.4-lpeg-1.1.patch b/dev-lua/luajson/files/luajson-1.3.4-lpeg-1.1.patch deleted file mode 100644 index 78b48f37468c..000000000000 --- a/dev-lua/luajson/files/luajson-1.3.4-lpeg-1.1.patch +++ /dev/null @@ -1,75 +0,0 @@ -https://github.com/harningt/luajson/issues/47 -https://github.com/harningt/luajson/pull/48 -https://github.com/harningt/luajson/pull/49 - -From 473d61d262a1c86a69ad9b4882352d122e42f3fa Mon Sep 17 00:00:00 2001 -From: Josh <jokajak@gmail.com> -Date: Thu, 20 Jul 2023 15:49:33 -0400 -Subject: [PATCH] feat: support lpeg 1.1 - -This changeset adds support for lpeg 1.1 which updated the lpeg.version from a function to a string. - -Therefore we have to check the type of the value. - -Refs: #47 ---- - lua/json/decode/util.lua | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lua/json/decode/util.lua b/lua/json/decode/util.lua -index 2493bf3..8b23751 100644 ---- a/lua/json/decode/util.lua -+++ b/lua/json/decode/util.lua -@@ -17,6 +17,8 @@ local table_concat = require("table").concat - - local merge = require("json.util").merge - -+local type = type -+ - local _ENV = nil - - local function get_invalid_character_info(input, index) -@@ -94,7 +96,8 @@ local unicode_ignored = (unicode_space + comment)^0 - - -- Parse the lpeg version skipping patch-values - -- LPEG <= 0.7 have no version value... so 0.7 is value --local DecimalLpegVersion = lpeg.version and tonumber(lpeg.version():match("^(%d+%.%d+)")) or 0.7 -+-- LPEG >= 1.1 uses a string for the version instead of function -+local DecimalLpegVersion = lpeg.version and tonumber((type(lpeg.version) == "string" and lpeg.version or lpeg.version()):match("^(%d+%.%d+)")) or 0.7 - - local function setObjectKeyForceNumber(t, key, value) - key = tonumber(key) or key - -From f23e38fc35cea8db78df124f1bd6d3d56e6c9ab1 Mon Sep 17 00:00:00 2001 -From: Josh <jokajak@gmail.com> -Date: Wed, 4 Oct 2023 17:24:30 -0400 -Subject: [PATCH] fix: fix lpeg version detection - -This changeset fixes the lpeg version detection to properly handle -version > 1.1. - -The original fix did not properly parse the string because it search for -the number to start the string instead of being part of the string. - -Refs: #47 ---- - lua/json/decode/util.lua | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lua/json/decode/util.lua b/lua/json/decode/util.lua -index 8b23751..4815650 100644 ---- a/lua/json/decode/util.lua -+++ b/lua/json/decode/util.lua -@@ -97,7 +97,11 @@ local unicode_ignored = (unicode_space + comment)^0 - -- Parse the lpeg version skipping patch-values - -- LPEG <= 0.7 have no version value... so 0.7 is value - -- LPEG >= 1.1 uses a string for the version instead of function --local DecimalLpegVersion = lpeg.version and tonumber((type(lpeg.version) == "string" and lpeg.version or lpeg.version()):match("^(%d+%.%d+)")) or 0.7 -+local DecimalLpegVersion = lpeg.version -+ and tonumber( -+ (type(lpeg.version) == "string" and lpeg.version or lpeg.version()):match("(%d+%.%d+)") -+ ) -+ or 0.7 - - local function setObjectKeyForceNumber(t, key, value) - key = tonumber(key) or key diff --git a/dev-lua/luajson/luajson-1.3.4-r1.ebuild b/dev-lua/luajson/luajson-1.3.4-r1.ebuild deleted file mode 100644 index 4565d7ca28bf..000000000000 --- a/dev-lua/luajson/luajson-1.3.4-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1,3,4} luajit ) - -inherit lua - -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 arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86" - -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND="dev-lua/lpeg[${LUA_USEDEP}]" - -# Require lunitx, which is not in the tree yet -RESTRICT="test" - -DOCS=( README.md docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.4-lpeg-1.1.patch -) - -# nothing to compile -src_compile() { :; } - -lua_src_install() { - emake DESTDIR="${ED}" INSTALL_LMOD="$(lua_get_lmod_dir)" install -} - -src_install() { - lua_foreach_impl lua_src_install - einstalldocs -} diff --git a/dev-lua/luajson/metadata.xml b/dev-lua/luajson/metadata.xml deleted file mode 100644 index b201c0bb4186..000000000000 --- a/dev-lua/luajson/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>conikost@gentoo.org</email> - <name>Conrad Kostecki</name> - </maintainer> - <upstream> - <remote-id type="github">harningt/luajson</remote-id> - </upstream> -</pkgmetadata> |
