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 57D87158091 for ; Sat, 11 Jun 2022 15:27:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E43DE07E0; Sat, 11 Jun 2022 15:27:05 +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 6B68EE07E0 for ; Sat, 11 Jun 2022 15:27:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 279113417CD for ; Sat, 11 Jun 2022 15:27:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 919C244B for ; Sat, 11 Jun 2022 15:27:02 +0000 (UTC) From: "Yuan Liao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuan Liao" Message-ID: <1654960055.a3e016713e82c7036e89b671f6bb77f6c2d24d27.liaoyuan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-util/blueprint-compiler/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild X-VCS-Directories: dev-util/blueprint-compiler/ X-VCS-Committer: liaoyuan X-VCS-Committer-Name: Yuan Liao X-VCS-Revision: a3e016713e82c7036e89b671f6bb77f6c2d24d27 X-VCS-Branch: dev Date: Sat, 11 Jun 2022 15:27:02 +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: 0537de82-ba89-4eeb-bcd2-5876e8ba3b5a X-Archives-Hash: 3254e91d1d5a0d88910ddf37384dd720 commit: a3e016713e82c7036e89b671f6bb77f6c2d24d27 Author: Yuan Liao gmail com> AuthorDate: Sat Jun 11 15:07:35 2022 +0000 Commit: Yuan Liao gmail com> CommitDate: Sat Jun 11 15:07:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a3e01671 dev-util/blueprint-compiler: Sync live ebuild Signed-off-by: Yuan Liao gmail.com> .../blueprint-compiler-9999.ebuild | 61 +++++----------------- 1 file changed, 12 insertions(+), 49 deletions(-) diff --git a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild index 219419000..0fc9a3e31 100644 --- a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild +++ b/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild @@ -5,21 +5,15 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..10} ) -inherit meson python-r1 +inherit meson python-single-r1 if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler.git" else - # Upstream has not started to tag releases yet, so each keyworded (normal) - # ebuild is to be based on a Git commit snapshot at this moment. - # Live ebuild: Might be intentionally left blank - # Normal ebuild: Fill in commit SHA-1 object name to this variable's value - GIT_COMMIT="" + SRC_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/v${PV}/blueprint-compiler-v${PV}.tar.bz2" + S="${WORKDIR}/${PN}-v${PV}" KEYWORDS="~amd64" - - SRC_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/${GIT_COMMIT}/blueprint-compiler-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${GIT_COMMIT}" fi DESCRIPTION="Compiler for Blueprint, a markup language for GTK user interfaces" @@ -35,8 +29,10 @@ RESTRICT="!test? ( test )" BDEPEND=" ${PYTHON_DEPS} doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/furo[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/furo[${PYTHON_USEDEP}] + ') ) " @@ -54,45 +50,12 @@ src_configure() { local emesonargs=( $(meson_use doc docs) ) - python_foreach_impl meson_src_configure -} - -src_compile() { - python_foreach_impl meson_src_compile -} - -src_test() { - python_foreach_impl meson_src_test + meson_src_configure } src_install() { - my_src_install() { - local exe="${ED}/usr/bin/${PN}" - - # Meson installs a Python script at ${ED}/usr/bin/${PN}; on - # Gentoo, the script should go into ${ED}/usr/lib/python-exec, - # and ${ED}/usr/bin/${PN} should be a symbolic link to - # ${ED}/usr/lib/python-exec/python-exec2. - # - # When multiple PYTHON_TARGETS are enabled, then after the - # package has been installed for one Python implementation, - # Meson will follow the ${ED}/usr/bin/${PN} symbolic link and - # install the script at ${ED}/usr/lib/python-exec/python-exec2 - # for the remaining implementations, leading to file collision. - if [[ -L "${exe}" ]]; then - rm -v "${exe}" || die "Failed to remove symbolic link ${exe}" - fi - - meson_src_install - python_doscript "${exe}" - python_optimize - - # Install Sphinx-generated documentation only once - # since the documentation is supposed to be identical - # between different Python implementations - use doc && HTML_DOCS=( "${BUILD_DIR}/docs"/* ) - } - - python_foreach_impl my_src_install - einstalldocs + use doc && HTML_DOCS=( "${BUILD_DIR}/docs"/* ) + meson_src_install + python_optimize "${D}/usr/share/${PN}" + python_fix_shebang "${D}/usr/bin/${PN}" }