From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3DEBB1580E0 for ; Fri, 31 Jan 2025 23:17:21 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 264F7343156 for ; Fri, 31 Jan 2025 23:17:21 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1E8D91103B6; Fri, 31 Jan 2025 23:17:20 +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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 13ADB1103B6 for ; Fri, 31 Jan 2025 23:17:20 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF84F343155 for ; Fri, 31 Jan 2025 23:17:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B24F62082 for ; Fri, 31 Jan 2025 23:17:17 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1738365404.83e704b3296bd4e7e6346738e9b929f728b6dbfe.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/langkit/langkit-25.0.0-r1.ebuild dev-ada/langkit/langkit-25.0.0.ebuild X-VCS-Directories: dev-ada/langkit/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 83e704b3296bd4e7e6346738e9b929f728b6dbfe X-VCS-Branch: master Date: Fri, 31 Jan 2025 23:17:17 +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: 4633b277-cab6-4340-ac95-340835dde817 X-Archives-Hash: 0e7b4ec15d13b7e4e8b3cda7f16204de commit: 83e704b3296bd4e7e6346738e9b929f728b6dbfe Author: Alfredo Tupone gentoo org> AuthorDate: Fri Jan 31 21:32:17 2025 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Fri Jan 31 23:16:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e704b3 dev-ada/langkit: rm dead code Signed-off-by: Alfredo Tupone gentoo.org> ...gkit-25.0.0.ebuild => langkit-25.0.0-r1.ebuild} | 69 +++++----------------- 1 file changed, 15 insertions(+), 54 deletions(-) diff --git a/dev-ada/langkit/langkit-25.0.0.ebuild b/dev-ada/langkit/langkit-25.0.0-r1.ebuild similarity index 53% rename from dev-ada/langkit/langkit-25.0.0.ebuild rename to dev-ada/langkit/langkit-25.0.0-r1.ebuild index 3a0d853147fb..ca02fb21fe89 100644 --- a/dev-ada/langkit/langkit-25.0.0.ebuild +++ b/dev-ada/langkit/langkit-25.0.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..12} ) ADA_COMPAT=( gcc_12 gcc_13 gcc_14 ) DISTUTILS_USE_PEP517=setuptools @@ -33,80 +33,41 @@ RDEPEND="${PYTHON_DEPS} dev-python/docutils[${PYTHON_USEDEP}] dev-python/funcy[${PYTHON_USEDEP}] dev-python/mako[${PYTHON_USEDEP}] - dev-python/mypy[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/types-docutils[${PYTHON_USEDEP}] - dev-python/types-gdb[${PYTHON_USEDEP}]" + dev-python/mypy[${PYTHON_USEDEP}]" BDEPEND="${RDEPEND}" distutils_enable_sphinx doc -python_prepare_all() { - distutils-r1_python_prepare_all - cd testsuite/tests - - # missing gprbuild option to build libraries static/relocatable - rm -r {langkit_support,adalog,misc/link_two_libs} || die - rm -r misc/standalone || die - - # other failures - rm -r misc/docstrings_lkt_roles || die -} - python_compile_all() { build () { rm -f langkit/support/obj/dev/*lexch - gprbuild -j$(makeopts_jobs) -p -v \ - -XLIBRARY_TYPE=$1 -P langkit/support/langkit_support.gpr -XBUILD_MODE=dev \ + gprbuild -v -p -j$(makeopts_jobs) \ + -P langkit/support/langkit_support.gpr -XLIBRARY_TYPE=$1 \ -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" } + use shared && build relocatable + use static-libs && build static + use static-pic && build static-pic if use shared; then - build relocatable - fi - if use static-libs; then - build static - fi - if use static-pic; then - build static-pic + gprbuild -v -p -j$(makeopts_jobs) \ + -P sigsegv_handler/langkit_sigsegv_handler.gpr \ + -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" fi - gprbuild -j$(makeopts_jobs) -p -v \ - -P sigsegv_handler/langkit_sigsegv_handler.gpr -XBUILD_MODE=dev \ - -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" sphinx_compile_all } -python_test_all() { - export GPR_PROJECT_PATH="${S}"/langkit/support - ${EPYTHON} ./manage.py make --no-langkit-support || die - eval $(./manage.py setenv) - ${EPYTHON} ./manage.py test -v \ - --disable-ocaml \ - --disable-gdb \ - --disable-tear-up-builds \ - --restricted-env \ - --jobs $(makeopts_jobs) \ - |& tee langkit.testOut - grep -qw FAIL langkit.testOut && die -} - python_install_all() { build () { - gprinstall -v -P langkit/support/langkit_support.gpr -p -XBUILD_MODE=dev \ + gprinstall -v -P langkit/support/langkit_support.gpr -p \ --prefix="${D}"/usr --build-var=LIBRARY_TYPE \ --build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \ --sources-subdir=include/langkit_support \ -XLIBRARY_TYPE=$1 --build-name=$1 || die } - if use static-libs; then - build static - fi - if use static-pic; then - build static-pic - fi - if use shared; then - build relocatable - fi - gprinstall -v -P sigsegv_handler/langkit_sigsegv_handler.gpr -p -XBUILD_MODE=dev \ + use static-libs && build static + use static-pic && build static-pic + use shared && build relocatable + gprinstall -v -P sigsegv_handler/langkit_sigsegv_handler.gpr -p \ --prefix="${D}"/usr || die einstalldocs }