From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- dev-lang/jerryscript/Manifest | 4 +- .../files/jerryscript-2.4.0-python3.patch | 38 +++++++----- dev-lang/jerryscript/jerryscript-2.4.0-r2.ebuild | 70 --------------------- dev-lang/jerryscript/jerryscript-2.4.0-r3.ebuild | 71 ++++++++++++++++++++++ 4 files changed, 95 insertions(+), 88 deletions(-) delete mode 100644 dev-lang/jerryscript/jerryscript-2.4.0-r2.ebuild create mode 100644 dev-lang/jerryscript/jerryscript-2.4.0-r3.ebuild (limited to 'dev-lang/jerryscript') diff --git a/dev-lang/jerryscript/Manifest b/dev-lang/jerryscript/Manifest index e3571d39b121..e4c477bba7d8 100644 --- a/dev-lang/jerryscript/Manifest +++ b/dev-lang/jerryscript/Manifest @@ -1,4 +1,4 @@ -AUX jerryscript-2.4.0-python3.patch 5261 BLAKE2B 151fec7f496d2b2b4df90d7e922f9713cfe58a54770ec8c329d189ecf82f11c2061fd755edb5c518d1939ee2f63c476d8fa97149a3e67fdf8bda3e8f897ddd29 SHA512 b3b95a8aa1c238df8494e39c00596a3a63cf64bdef7c0a531ca8f76d7ebaba5884a7aceae293541830b37d2810f22e9c44940aa8beea141ad52c995c1de0a245 +AUX jerryscript-2.4.0-python3.patch 5463 BLAKE2B ad2fdaf83a2be714194c3ee6e6703211792a8a1dbe4bbb13914f37e50c9ade6cbad915236fae3a74eb2bfed22a640c1daf0958570c2e792450dd5d59a2e5eacc SHA512 445dabde9b8c5c48b6ceb3663b234a0a7f26c2f310a4a0673bdb7301409cd6e76dbedc590bbd1a27814021e8917a7ec55487070b39c2508d061c156e408063a7 DIST jerryscript-2.4.0.tar.gz 2802799 BLAKE2B 18a3f71e7d3e2fc43772cb94aa3b0d4d28d72c6cd174eb0195f09283c5da5140ef85e86c6ed7a82e672724563549294c26d870b55c8bd9d0a92251b1002c612a SHA512 e96e6c6a2207ff869474801a1f8bbd3ce453d4076e558736ebf6962ccab08540f57cf932ec43bcd40429e21f1c6453d77874dd0a467d91a15d8357257533c1ea -EBUILD jerryscript-2.4.0-r2.ebuild 1722 BLAKE2B 2d85fcaf531ce3cd0fcaa0939c67dc7b138c404a4129ac5ac5d6f6e389780b9e0706b12285c02699383c78cdef3103fb5f7186b0e18c27f730871fc5b602c7cc SHA512 38bdc6fd1e00f59c9a7b6f6a7043c42279f467720560a12a3067b449f929cdaec026b7620505795595ab74b74458204c3d1dc0661c206876315367db3cff6d03 +EBUILD jerryscript-2.4.0-r3.ebuild 1740 BLAKE2B 519e56171297f4044fb34a40cc0a17580ff1dcb83cc9bb34e3e50aece4b2457a78daa01dfb84ff839f860257fc02325c981ed7db605195f0405c654ec5b3fa35 SHA512 f19ad96f5260bfa2eb4b69644efcd47b21438d5fcead63ae18b2f96e46de7ec5b963fed5f057024baf4e7e791be2b185d5458bd0f7cadc47666c0ad1329bdbc4 MISC metadata.xml 488 BLAKE2B b302c1a73d8924475d95afb03c0e8547b65c0f90ac058f939ae419844e6120b066f604920c8c5d2cdebc237d51f9dafa71d979766af4e3a911e7a1e2e427f328 SHA512 c925c76d17d1436f5ac177510252961f6f22b6058a7d9692bc1c42dede0bf47fe5647c58faa6aa63d91722276e5b54565c17e17d5d5f5a34a9e6f92d8987bfd3 diff --git a/dev-lang/jerryscript/files/jerryscript-2.4.0-python3.patch b/dev-lang/jerryscript/files/jerryscript-2.4.0-python3.patch index 7da285c5d3cf..a7046b4b6453 100644 --- a/dev-lang/jerryscript/files/jerryscript-2.4.0-python3.patch +++ b/dev-lang/jerryscript/files/jerryscript-2.4.0-python3.patch @@ -16,12 +16,13 @@ JerryScript-DCO-1.0-Signed-off-by: Zac Medico 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/jerry-debugger/jerry_client_main.py b/jerry-debugger/jerry_client_main.py -index e65d0e14..e3176c86 100644 +index e65d0e14..b465955f 100644 --- a/jerry-debugger/jerry_client_main.py +++ b/jerry-debugger/jerry_client_main.py -@@ -151,2 +151,12 @@ def arguments_parse(): +@@ -151,2 +151,13 @@ def arguments_parse(): +if sys.version_info.major >= 3: ++ # pylint: disable=invalid-name + _ord_orig = ord + def _ord_compat(c): + if isinstance(c, int): @@ -32,16 +33,16 @@ index e65d0e14..e3176c86 100644 + + class JerryBreakpoint(object): -@@ -563,2 +573,3 @@ class JerryDebugger(object): +@@ -563,2 +574,3 @@ class JerryDebugger(object): def _send_string(self, args, message_type, index=0): + args = args.encode("utf8") -@@ -810,3 +821,3 @@ class JerryDebugger(object): +@@ -810,3 +822,3 @@ class JerryDebugger(object): elif buffer_type in [JERRY_DEBUGGER_SCOPE_VARIABLES, JERRY_DEBUGGER_SCOPE_VARIABLES_END]: - self.scope_vars += "".join(data[1:]) + self.scope_vars += "".join(data[1:].decode("utf8")) -@@ -866,5 +877,5 @@ class JerryDebugger(object): +@@ -866,5 +878,5 @@ class JerryDebugger(object): def _parse_source(self, data): - source_code = "" - source_code_name = "" @@ -50,7 +51,7 @@ index e65d0e14..e3176c86 100644 + source_code_name = b"" + function_name = b"" stack = [{"line": 1, -@@ -905,7 +916,7 @@ class JerryDebugger(object): +@@ -905,7 +917,7 @@ class JerryDebugger(object): - stack.append({"source": source_code, - "source_name": source_code_name, @@ -61,24 +62,28 @@ index e65d0e14..e3176c86 100644 - "name": function_name, + "name": function_name.decode("utf8"), "lines": [], -@@ -939,4 +950,4 @@ class JerryDebugger(object): +@@ -939,4 +951,4 @@ class JerryDebugger(object): if not stack: - func_desc["source"] = source_code - func_desc["source_name"] = source_code_name + func_desc["source"] = source_code.decode("utf8") + func_desc["source_name"] = source_code_name.decode("utf8") -@@ -1153,3 +1164,3 @@ class JerryDebugger(object): +@@ -1153,4 +1165,4 @@ class JerryDebugger(object): message = self.current_out + message - lines = message.split("\n") +- self.current_out = lines.pop() + lines = message.decode("utf8").split("\n") - self.current_out = lines.pop() -@@ -1162,3 +1173,3 @@ class JerryDebugger(object): ++ self.current_out = lines.pop().encode("utf8") + +@@ -1162,4 +1174,4 @@ class JerryDebugger(object): message = self.current_log + message - lines = message.split("\n") +- self.current_log = lines.pop() + lines = message.decode("utf8").split("\n") - self.current_log = lines.pop() -@@ -1171,7 +1182,7 @@ class JerryDebugger(object): ++ self.current_log = lines.pop().encode("utf8") + +@@ -1171,7 +1183,7 @@ class JerryDebugger(object): if subtype == JERRY_DEBUGGER_OUTPUT_WARNING: - return "%swarning: %s%s" % (self.yellow, self.nocolor, message) + return "%swarning: %s%s" % (self.yellow, self.nocolor, message.decode("utf8")) @@ -89,22 +94,23 @@ index e65d0e14..e3176c86 100644 - return "%strace: %s%s" % (self.blue, self.nocolor, message) + return "%strace: %s%s" % (self.blue, self.nocolor, message.decode("utf8")) -@@ -1180,2 +1191,3 @@ class JerryDebugger(object): +@@ -1180,2 +1192,3 @@ class JerryDebugger(object): + message = message.decode("utf8") if not message.endswith("\n"): diff --git a/jerry-debugger/jerry_client_websocket.py b/jerry-debugger/jerry_client_websocket.py -index fe2c761a..07c75e53 100644 +index fe2c761a..9c755966 100644 --- a/jerry-debugger/jerry_client_websocket.py +++ b/jerry-debugger/jerry_client_websocket.py @@ -17,2 +17,3 @@ import struct +import sys -@@ -22,2 +23,13 @@ WEBSOCKET_FIN_BIT = 0x80 +@@ -22,2 +23,14 @@ WEBSOCKET_FIN_BIT = 0x80 + +if sys.version_info.major >= 3: ++ # pylint: disable=invalid-name + _ord_orig = ord + def _ord_compat(c): + if isinstance(c, int): @@ -115,7 +121,7 @@ index fe2c761a..07c75e53 100644 + + class WebSocket(object): -@@ -94,3 +106,3 @@ class WebSocket(object): +@@ -94,3 +107,3 @@ class WebSocket(object): WEBSOCKET_BINARY_FRAME | WEBSOCKET_FIN_BIT, - WEBSOCKET_FIN_BIT + struct.unpack(byte_order + "B", packed_data[0])[0], + WEBSOCKET_FIN_BIT + struct.unpack(byte_order + "B", packed_data[0:1])[0], diff --git a/dev-lang/jerryscript/jerryscript-2.4.0-r2.ebuild b/dev-lang/jerryscript/jerryscript-2.4.0-r2.ebuild deleted file mode 100644 index 369fd92e37ca..000000000000 --- a/dev-lang/jerryscript/jerryscript-2.4.0-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=(python3_{7,8,9}) -inherit cmake python-any-r1 - -DESCRIPTION="Ultra-lightweight JavaScript engine for the Internet of Things" -HOMEPAGE="https://github.com/jerryscript-project/jerryscript" -SRC_URI="https://github.com/jerryscript-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debugger" -RDEPEND="debugger? ( ${PYTHON_DEPS} )" -BDEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/jerryscript-2.4.0-python3.patch" -) - -src_prepare() { - find . -name CMakeLists.txt -print0 | xargs -0 sed -i \ - -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:" \ - -e "s:DESTINATION lib):DESTINATION $(get_libdir)):" \ - || die - find . -name '*.pc.in' -print0 | xargs -0 sed -i \ - -e "s|/lib\$|/$(get_libdir)|" \ - || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_STRIP=OFF - -DJERRY_DEBUGGER=ON - -DJERRY_ERROR_MESSAGES=ON - -DJERRY_EXTERNAL_CONTEXT=ON - -DJERRY_LINE_INFO=ON - -DJERRY_LOGGING=ON - -DJERRY_PARSER_DUMP_BYTE_CODE=ON - -DJERRY_PARSER=ON - -DJERRY_REGEXP_DUMP_BYTE_CODE=ON - -DJERRY_SNAPSHOT_EXEC=ON - -DJERRY_SNAPSHOT_SAVE=ON - ) - cmake_src_configure -} - -src_install() { - local jerry_debugger_dir - cmake_src_install - - if use debugger; then - jerry_debugger_dir=/usr/$(get_libdir)/jerryscript/jerry-debugger - insinto "${jerry_debugger_dir}" - doins jerry-debugger/*.py - python_optimize "${ED}${jerry_debugger_dir}" - - cat <<-EOF > "${T}/jerry-debugger" - #!/bin/sh - export PYTHONPATH=${EPREFIX}${jerry_debugger_dir} - exec python "${jerry_debugger_dir}/jerry_client.py" "\$@" - EOF - - dobin "${T}"/jerry-debugger - fi -} diff --git a/dev-lang/jerryscript/jerryscript-2.4.0-r3.ebuild b/dev-lang/jerryscript/jerryscript-2.4.0-r3.ebuild new file mode 100644 index 000000000000..f7f6592c87ba --- /dev/null +++ b/dev-lang/jerryscript/jerryscript-2.4.0-r3.ebuild @@ -0,0 +1,71 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{7,8,9}) +inherit cmake python-any-r1 + +DESCRIPTION="Ultra-lightweight JavaScript engine for the Internet of Things" +HOMEPAGE="https://github.com/jerryscript-project/jerryscript" +SRC_URI="https://github.com/jerryscript-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debugger" +RDEPEND="debugger? ( ${PYTHON_DEPS} )" +BDEPEND="${RDEPEND}" +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}/jerryscript-2.4.0-python3.patch" +) + +src_prepare() { + find . -name CMakeLists.txt -print0 | xargs -0 sed -i \ + -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:" \ + -e "s:DESTINATION lib):DESTINATION $(get_libdir)):" \ + || die + find . -name '*.pc.in' -print0 | xargs -0 sed -i \ + -e "s|/lib\$|/$(get_libdir)|" \ + || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_STRIP=OFF + -DJERRY_DEBUGGER=ON + -DJERRY_ERROR_MESSAGES=ON + -DJERRY_EXTERNAL_CONTEXT=ON + -DJERRY_LINE_INFO=ON + -DJERRY_LOGGING=ON + -DJERRY_PARSER_DUMP_BYTE_CODE=ON + -DJERRY_PARSER=ON + -DJERRY_REGEXP_DUMP_BYTE_CODE=ON + -DJERRY_SNAPSHOT_EXEC=ON + -DJERRY_SNAPSHOT_SAVE=ON + ) + cmake_src_configure +} + +src_install() { + local jerry_debugger_dir + cmake_src_install + + if use debugger; then + jerry_debugger_dir=/usr/$(get_libdir)/jerryscript/jerry-debugger + insinto "${jerry_debugger_dir}" + doins jerry-debugger/*.py + python_optimize "${ED}${jerry_debugger_dir}" + + cat <<-EOF > "${T}/jerry-debugger" + #!/bin/sh + export PYTHONPATH=${EPREFIX}${jerry_debugger_dir} + exec python "${jerry_debugger_dir}/jerry_client.py" "\$@" + EOF + + dobin "${T}"/jerry-debugger + fi +} -- cgit v1.2.3