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 B6DAC15808B for ; Mon, 21 Feb 2022 16:18:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D56EBE07A9; Mon, 21 Feb 2022 16:18:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 BC239E07A9 for ; Mon, 21 Feb 2022 16:18:45 +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 B581B343623 for ; Mon, 21 Feb 2022 16:18:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED190D0 for ; Mon, 21 Feb 2022 16:18:42 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1645460316.24d49d50d85c465cabe555d7185fc9f1eed12a59.junghans@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/votca/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-chemistry/votca/votca-2022.ebuild sci-chemistry/votca/votca-9999.ebuild X-VCS-Directories: sci-chemistry/votca/ X-VCS-Committer: junghans X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 24d49d50d85c465cabe555d7185fc9f1eed12a59 X-VCS-Branch: master Date: Mon, 21 Feb 2022 16:18:42 +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: a5906701-a87f-4aa1-9dd6-1145d5b92ca1 X-Archives-Hash: a2c6244a8a32d8b1ae054ba2882efa43 commit: 24d49d50d85c465cabe555d7185fc9f1eed12a59 Author: Christoph Junghans gentoo org> AuthorDate: Mon Feb 21 16:18:20 2022 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Mon Feb 21 16:18:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24d49d50 sci-chemistry/votca: fix python dep Closes: https://bugs.gentoo.org/833818 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Christoph Junghans gentoo.org> sci-chemistry/votca/votca-2022.ebuild | 12 +++++++++++- sci-chemistry/votca/votca-9999.ebuild | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/sci-chemistry/votca/votca-2022.ebuild b/sci-chemistry/votca/votca-2022.ebuild index a60728a6a6a9..0962e065f91d 100644 --- a/sci-chemistry/votca/votca-2022.ebuild +++ b/sci-chemistry/votca/votca-2022.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 cmake +inherit bash-completion-r1 cmake python-single-r1 if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -25,12 +26,14 @@ HOMEPAGE="https://www.votca.org/" LICENSE="Apache-2.0" SLOT="0" IUSE="+gromacs test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" RDEPEND=" !sci-libs/votca-tools !sci-chemistry/votca-csg !sci-chemistry/votca-xtp + ${PYTHON_DEPS} app-shells/bash:* >=dev-cpp/eigen-3.3 dev-libs/boost:= @@ -47,6 +50,13 @@ BDEPEND="virtual/pkgconfig" DOCS=( README.rst NOTICE.rst CHANGELOG.rst ) +src_prepare() { + # espressopp was removed from gentoo + rm -r ./csg-tutorials/spce/ibi_espressopp || die + python_fix_shebang . + cmake_src_prepare +} + src_configure() { local mycmakeargs=( -DENABLE_TESTING=$(usex test) diff --git a/sci-chemistry/votca/votca-9999.ebuild b/sci-chemistry/votca/votca-9999.ebuild index a60728a6a6a9..0962e065f91d 100644 --- a/sci-chemistry/votca/votca-9999.ebuild +++ b/sci-chemistry/votca/votca-9999.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 cmake +inherit bash-completion-r1 cmake python-single-r1 if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -25,12 +26,14 @@ HOMEPAGE="https://www.votca.org/" LICENSE="Apache-2.0" SLOT="0" IUSE="+gromacs test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" RDEPEND=" !sci-libs/votca-tools !sci-chemistry/votca-csg !sci-chemistry/votca-xtp + ${PYTHON_DEPS} app-shells/bash:* >=dev-cpp/eigen-3.3 dev-libs/boost:= @@ -47,6 +50,13 @@ BDEPEND="virtual/pkgconfig" DOCS=( README.rst NOTICE.rst CHANGELOG.rst ) +src_prepare() { + # espressopp was removed from gentoo + rm -r ./csg-tutorials/spce/ibi_espressopp || die + python_fix_shebang . + cmake_src_prepare +} + src_configure() { local mycmakeargs=( -DENABLE_TESTING=$(usex test)