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 49A4D158094 for ; Sun, 18 Sep 2022 15:06:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B7FFE086D; Sun, 18 Sep 2022 15:06:46 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 2FF0AE086D for ; Sun, 18 Sep 2022 15:06:46 +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 09E9A335D60 for ; Sun, 18 Sep 2022 15:06:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50D0E580 for ; Sun, 18 Sep 2022 15:06:43 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1663513600.7bec1238b70d17e71a5425726aee7e44b91db125.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/chemex/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild sci-chemistry/chemex/chemex-2021.4.0_p6.ebuild sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild sci-chemistry/chemex/chemex-2022.0.1.ebuild X-VCS-Directories: sci-chemistry/chemex/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7bec1238b70d17e71a5425726aee7e44b91db125 X-VCS-Branch: master Date: Sun, 18 Sep 2022 15:06:43 +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: c4cd7343-be15-48cc-b023-5e1bd1ee15ba X-Archives-Hash: 5f3bab5dad5714bf8b6ca2f616e24d15 commit: 7bec1238b70d17e71a5425726aee7e44b91db125 Author: Michał Górny gentoo org> AuthorDate: Sun Sep 18 15:05:30 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Sep 18 15:06:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bec1238 sci-chemistry/chemex: Use PEP517 build Signed-off-by: Michał Górny gentoo.org> ...mex-2021.4.0_p6.ebuild => chemex-2021.4.0_p6-r1.ebuild} | 14 ++++---------- .../{chemex-2022.0.1.ebuild => chemex-2022.0.1-r1.ebuild} | 12 +++--------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/sci-chemistry/chemex/chemex-2021.4.0_p6.ebuild b/sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild similarity index 83% rename from sci-chemistry/chemex/chemex-2021.4.0_p6.ebuild rename to sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild index 62c958f646d3..3b5a05f349d5 100644 --- a/sci-chemistry/chemex/chemex-2021.4.0_p6.ebuild +++ b/sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild @@ -1,16 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 + DISTUTILS_SINGLE_IMPL="yes" +DISTUTILS_USE_PEP517=poetry PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_SETUPTOOLS=pyproject.toml inherit distutils-r1 DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data" HOMEPAGE="https://github.com/gbouvignies/chemex" SRC_URI="https://github.com/gbouvignies/chemex/archive/${PV/_p/-dev}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/ChemEx-${PV/_p/-dev}" SLOT="0" LICENSE="BSD" @@ -28,7 +30,6 @@ RDEPEND=" >=dev-python/lmfit-1.0.3[${PYTHON_USEDEP}] >=dev-python/matplotlib-3.4.3[${PYTHON_USEDEP}] >=dev-python/numpy-1.21.2[${PYTHON_USEDEP}] - dev-python/setuptools_scm[${PYTHON_USEDEP}] >=dev-python/scipy-1.7.0[${PYTHON_USEDEP}] >=dev-python/tomlkit-0.7.2[${PYTHON_USEDEP}] >=dev-python/tqdm-4.61.1[${PYTHON_USEDEP}] @@ -37,10 +38,3 @@ RDEPEND=" DEPEND="${RDEPEND}" distutils_enable_tests pytest - -S="${WORKDIR}/ChemEx-${PV/_p/-dev}" - -src_prepare() { - export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}" - distutils-r1_src_prepare -} diff --git a/sci-chemistry/chemex/chemex-2022.0.1.ebuild b/sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild similarity index 87% rename from sci-chemistry/chemex/chemex-2022.0.1.ebuild rename to sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild index 073cdcbe2dac..9abd2a6493fb 100644 --- a/sci-chemistry/chemex/chemex-2022.0.1.ebuild +++ b/sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild @@ -2,15 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 + DISTUTILS_SINGLE_IMPL="yes" +DISTUTILS_USE_PEP517=poetry PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=pyproject.toml inherit distutils-r1 DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data" HOMEPAGE="https://github.com/gbouvignies/chemex" SRC_URI="https://github.com/gbouvignies/ChemEx/archive/refs/tags/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/ChemEx-${PV/_p/-dev}" SLOT="0" LICENSE="BSD" @@ -31,7 +33,6 @@ RDEPEND=" >=dev-python/pydantic-1.10.2[${PYTHON_USEDEP}] >=dev-python/rapidfuzz-2.8.0[${PYTHON_USEDEP}] >=dev-python/rich-12.5.1[${PYTHON_USEDEP}] - dev-python/setuptools_scm[${PYTHON_USEDEP}] >=dev-python/scipy-1.9.1[${PYTHON_USEDEP}] >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] ') @@ -39,10 +40,3 @@ RDEPEND=" DEPEND="${RDEPEND}" distutils_enable_tests pytest - -S="${WORKDIR}/ChemEx-${PV/_p/-dev}" - -src_prepare() { - export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}" - distutils-r1_src_prepare -}