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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C3B215813A for ; Tue, 07 Jan 2025 21:30:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC637E07D0; Tue, 07 Jan 2025 21:30:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id BCB1DE07D0 for ; Tue, 07 Jan 2025 21:30:36 +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 E20E8340BEA for ; Tue, 07 Jan 2025 21:30:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4ACF21870 for ; Tue, 07 Jan 2025 21:30:34 +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: <1736285406.427b04ff33c3488adcaee3fea5415bc9daeee2b1.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/gprbuild/gprbuild-25.0.0-r1.ebuild dev-ada/gprbuild/gprbuild-25.0.0-r2.ebuild X-VCS-Directories: dev-ada/gprbuild/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 427b04ff33c3488adcaee3fea5415bc9daeee2b1 X-VCS-Branch: master Date: Tue, 07 Jan 2025 21:30:34 +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: cddecbb0-6b28-4442-a27b-4baa4df34cb9 X-Archives-Hash: bc290e539ecd51a13e8ef5b6b21f8003 commit: 427b04ff33c3488adcaee3fea5415bc9daeee2b1 Author: Alfredo Tupone gentoo org> AuthorDate: Tue Jan 7 21:30:06 2025 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Tue Jan 7 21:30:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427b04ff dev-ada/gprbuild: use python-any-r1 Signed-off-by: Alfredo Tupone gentoo.org> ...-25.0.0-r1.ebuild => gprbuild-25.0.0-r2.ebuild} | 33 ++++++++++++---------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-25.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-25.0.0-r2.ebuild similarity index 82% rename from dev-ada/gprbuild/gprbuild-25.0.0-r1.ebuild rename to dev-ada/gprbuild/gprbuild-25.0.0-r2.ebuild index 82f8651e0b1a..e4b4ece9db50 100644 --- a/dev-ada/gprbuild/gprbuild-25.0.0-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-25.0.0-r2.ebuild @@ -4,8 +4,8 @@ EAPI=8 ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 ) - -inherit ada multiprocessing +PYTHON_COMPAT=( python3_{10..13} pypy3 ) +inherit ada python-any-r1 multiprocessing XMLADA=xmlada-${PV} @@ -24,11 +24,24 @@ IUSE="doc" DEPEND="${ADA_DEPS} dev-ada/gprconfig_kb[${ADA_USEDEP}]" RDEPEND="${DEPEND}" -BDEPEND="doc? ( dev-python/sphinx )" +BDEPEND="doc? ( + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ') +)" REQUIRED_USE="${ADA_REQUIRED_USE}" PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch ) +python_check_deps() { + python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup + ada_pkg_setup +} + src_prepare() { default sed -i \ @@ -62,12 +75,7 @@ src_compile() { gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \ -largs ${LDFLAGS} gpr_imports.o || die done - if use doc; then - emake -C doc txt - emake -C doc info - emake -C doc html - emake -C doc pdf - fi + use doc && emake -C doc html } src_install() { @@ -76,12 +84,7 @@ src_install() { doexe ${lib_progs} insinto /usr/share/gpr doins share/_default.gpr - local HTML_DOCS= local DOCS=README.md - if use doc; then - DOCS+=" examples doc/txt/gprbuild_ug.txt doc/pdf/gprbuild_ug.pdf" - HTML_DOCS+="doc/html/*" - doinfo doc/info/gprbuild_ug.info - fi + use doc && HTML_DOCS="doc/html/*" einstalldocs }