dev-lang/jsonnet: drop 0.20.0-r1

Last consumer of dev-cpp/rapidyaml, dropping to allow last-riting
wrt bug #963014 comment #10

Bug: https://bugs.gentoo.org/963014
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2025-09-18 03:51:48 -04:00
parent 46613381f3
commit dea45f936e
4 changed files with 0 additions and 199 deletions

View File

@@ -1,2 +1 @@
DIST jsonnet-0.20.0.tar.gz 22481277 BLAKE2B 65d6a45a903d6f494bbb79fb92c484b2a5167fc5fc379f4acb131778e1779aa580fd249baf3309fd00fa9b2a3b129360bf9d2cb0a3a738bd03c5fcec7dc6bd32 SHA512 d46d2521d4389d05f91a16ecd9f181be1853f674a9264e9fac23e413f1084dee947e80682af59603e15e443061a0beb50a30c14c858853e10ed1ae7187d09730
DIST jsonnet-0.21.0.tar.gz 22128398 BLAKE2B 622363bf16bb96ab9e51138edd7b1d0a1ca4e75c947f5b91248cff0dffe82dc7c91c376414a0643b080e6bdbf6c22ce6c5bb3ce4259610e7d90714307c26539a SHA512 4fc39bd5e138623ba1ac7cf88594ea7957e9c3bcb952f0e9e346059a9de08eac3f60788376c31a70b34d6d522737a67ad4a122fadcd9621868722c23d9361d05

View File

@@ -1,14 +0,0 @@
diff --git a/setup.py b/setup.py
index bfad34a..cfb30c3 100644
--- a/setup.py
+++ b/setup.py
@@ -68,9 +68,6 @@ setup(name='jsonnet',
author='David Cunningham',
author_email='dcunnin@google.com',
version=get_version(),
- cmdclass={
- 'build_ext': BuildJsonnetExt,
- },
ext_modules=[jsonnet_ext],
test_suite="python._jsonnet_test",
)

View File

@@ -1,75 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5df20ca..9e60fae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,7 +121,6 @@ endif()
add_subdirectory(include)
add_subdirectory(stdlib)
add_subdirectory(third_party/md5)
-add_subdirectory(third_party/rapidyaml/rapidyaml ryml)
add_subdirectory(core)
add_subdirectory(cpp)
add_subdirectory(cmd)
diff --git a/core/vm.cpp b/core/vm.cpp
index 4617363..e328df5 100644
--- a/core/vm.cpp
+++ b/core/vm.cpp
@@ -23,7 +23,7 @@ limitations under the License.
#include "desugarer.h"
#include "json.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
#include "md5.h"
#include "parser.h"
#include "ryml_std.hpp" // include this before any other ryml header
diff --git a/setup.py b/setup.py
index 0a2748a..356915d 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@
# limitations under the License.
import os
+import sys
from setuptools import setup
from setuptools import Extension
from setuptools.command.build_ext import build_ext as BuildExt
@@ -22,28 +23,6 @@ DIR = os.path.abspath(os.path.dirname(__file__))
# NOTE: If you are editing the array below then you probably also need
# to change MANIFEST.in.
LIB_OBJECTS = [
- 'core/desugarer.o',
- 'core/formatter.o',
- 'core/libjsonnet.o',
- 'core/lexer.o',
- 'core/parser.o',
- 'core/pass.o',
- 'core/static_analysis.o',
- 'core/string_utils.o',
- 'core/vm.o',
- 'third_party/md5/md5.o',
- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/char_traits.o',
- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/base64.o',
- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/language.o',
- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/memory_util.o',
- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/format.o',
- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/time.o',
- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/memory_resource.o',
- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/error.o',
- 'third_party/rapidyaml/rapidyaml/src/c4/yml/parse.o',
- 'third_party/rapidyaml/rapidyaml/src/c4/yml/preprocess.o',
- 'third_party/rapidyaml/rapidyaml/src/c4/yml/common.o',
- 'third_party/rapidyaml/rapidyaml/src/c4/yml/tree.o',
]
MODULE_SOURCES = ['python/_jsonnet.c']
@@ -72,6 +51,8 @@ jsonnet_ext = Extension(
'_jsonnet',
sources=MODULE_SOURCES,
extra_objects=LIB_OBJECTS,
+ libraries = ['md5', 'jsonnet', 'ryml'],
+ library_dirs = [os.environ.get('CMAKE_BUILD_DIR')],
include_dirs = ['include'],
language='c++'
)

View File

@@ -1,109 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_OPTIONAL=1
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_EXT=1
PYTHON_COMPAT=( pypy3_11 python3_{11..12} )
inherit cmake toolchain-funcs flag-o-matic distutils-r1
DESCRIPTION="A data templating language for app and tool developers"
HOMEPAGE="https://jsonnet.org/"
SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 arm64 ppc64 ~riscv ~x86"
IUSE="custom-optimization doc examples python test"
RDEPEND="
dev-cpp/rapidyaml:=
dev-cpp/nlohmann_json:=
python? ( ${PYTHON_DEPS} )
"
DEPEND="
${RDEPEND}
test? ( dev-cpp/gtest )
"
BDEPEND="
python? (
${PYTHON_DEPS}
${DISTUTILS_DEPS}
dev-python/setuptools[${PYTHON_USEDEP}]
)
"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
"${FILESDIR}/jsonnet-0.16.0-libdir.patch"
"${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
"${FILESDIR}/jsonnet-0.18.0-unbundle.patch"
)
distutils_enable_tests unittest
src_prepare() {
cmake_src_prepare
use python && distutils-r1_src_prepare
}
src_configure() {
use custom-optimization || replace-flags '-O*' -O3
tc-export CC CXX
local mycmakeargs=(
-DUSE_SYSTEM_JSON=ON
-DBUILD_STATIC_LIBS=OFF
)
if use test; then
mycmakeargs+=(
-DBUILD_TESTS=ON
-DUSE_SYSTEM_GTEST=ON
)
else
mycmakeargs+=(
-DBUILD_TESTS=OFF
)
fi
cmake_src_configure
}
src_compile() {
cmake_src_compile
use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_compile
}
src_test() {
cmake_src_test
use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_test
}
python_test() {
LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}" "${EPYTHON}" -m unittest python._jsonnet_test -v \
|| die "Tests failed with ${EPYTHON}"
}
src_install() {
cmake_src_install
use python && distutils-r1_src_install
if use doc; then
find doc -name '.gitignore' -delete || die
docinto html
dodoc -r doc/.
fi
if use examples; then
docinto examples
dodoc -r examples/.
fi
}