From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F266C158020 for ; Mon, 19 Dec 2022 14:47:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93910E0AF7; Mon, 19 Dec 2022 14:47:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D43CE0AF7 for ; Mon, 19 Dec 2022 14:47:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA81A341786 for ; Mon, 19 Dec 2022 14:47:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46C027EF for ; Mon, 19 Dec 2022 14:47:07 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1671461097.f5c72e1c152c51ac7a31234b79f2a7df3006c1ef.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/jsonnet/files/, dev-lang/jsonnet/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/jsonnet/Manifest dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild X-VCS-Directories: dev-lang/jsonnet/files/ dev-lang/jsonnet/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f5c72e1c152c51ac7a31234b79f2a7df3006c1ef X-VCS-Branch: master Date: Mon, 19 Dec 2022 14:47:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8300d7ec-5e88-4864-be09-777dbdf208d3 X-Archives-Hash: 4a2a3f5d03abed8961a643d39c86cf32 commit: f5c72e1c152c51ac7a31234b79f2a7df3006c1ef Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 18 12:23:36 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 19 14:44:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c72e1c dev-lang/jsonnet: drop 0.18.0-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-lang/jsonnet/Manifest | 1 - dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch | 18 ---- dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild | 106 --------------------- 3 files changed, 125 deletions(-) diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest index 930a1961cc27..75e5c69186cb 100644 --- a/dev-lang/jsonnet/Manifest +++ b/dev-lang/jsonnet/Manifest @@ -1,3 +1,2 @@ -DIST jsonnet-0.18.0.tar.gz 22472162 BLAKE2B 4f931a44b0cbeea0dc7705c28ca49817e2b3abe19ba4fdcd550d5df1ce9ad6b06b1b740a9306d36caa3970c88df9d31700373e4997dd52c6c2219cdd9bf125c1 SHA512 08a64a4b132df1519292378cef93deb3c60d21636b2a71bce6c13e29cfd93cab465cad77e11f000fb984c5c75a4ca1c92504654fd2e5201343df767ea0e610d1 DIST jsonnet-0.19.0.tar.gz 22478380 BLAKE2B 0a1612ca0525342763099e70921181578fcf7ab25c2a3811ffede944953e4ce114f1949642038d6147c96d52193cf701473fab8581d50c3e74036139fbd5c19a SHA512 f4e30d977df7840a4f13c7ba75614badd964a5c4484fb264d7b05d6de04aa2a2d3c4c5161523d6fa6559460ea94b94562b07ea6590a34876545c529474c4b9fa DIST jsonnet-0.19.1.tar.gz 22480685 BLAKE2B 7d86bc963f5ced622e91adf015c250b8cae2e817b6af5d60820d8731e04caecc1b2b8142d320414d253ef1fa3558d61aeb1b59480eab0823915d2b15c5d87aab SHA512 21312de71f63f4a74005f563290d67fcc2d220f043291a123af2fc834f4118f8bbc311ea8acc5dd52b13eff8c32f026a5ce6bfe3d88b4c6c770e585dd1f0b688 diff --git a/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch b/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch deleted file mode 100644 index b2adca81a351..000000000000 --- a/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://github.com/google/jsonnet/pull/1020 -From: WANG Xuerui -Date: Thu, 6 Oct 2022 15:04:47 +0800 -Subject: [PATCH] Add #include for gcc-13 builds - -See https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes. - -This fixes Gentoo bug https://bugs.gentoo.org/875569. ---- a/include/libjsonnet++.h -+++ b/include/libjsonnet++.h -@@ -17,6 +17,7 @@ limitations under the License. - #ifndef CPP_JSONNET_H_ - #define CPP_JSONNET_H_ - -+#include - #include - #include - #include diff --git a/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild b/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild deleted file mode 100644 index 5d8c0d156382..000000000000 --- a/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( pypy3 python3_{7..10} ) - -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" -IUSE="custom-optimization doc examples python test" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" -RDEPEND=" - dev-cpp/rapidyaml:= - dev-cpp/nlohmann_json:= - python? ( ${PYTHON_DEPS} ) -" - -DEPEND=" - ${RDEPEND} - test? ( dev-cpp/gtest ) -" - -BDEPEND=" - python? ( - ${PYTHON_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" - "${FILESDIR}/jsonnet-0.18.0-gcc-13.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 -}