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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21B641382C5 for ; Tue, 5 Jan 2021 13:54:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F15D0E083D; Tue, 5 Jan 2021 13:54:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D106AE0844 for ; Tue, 5 Jan 2021 13:54:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69C7E340BC9 for ; Tue, 5 Jan 2021 13:54:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DEA1147F for ; Tue, 5 Jan 2021 13:54:52 +0000 (UTC) From: "Sergey Torokhov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Torokhov" Message-ID: <1609854362.66db3c61843e58a56d2855f7b9445e3f19620bae.SergeyTorokhov@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/SU2/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-physics/SU2/SU2-7.0.8-r1.ebuild sci-physics/SU2/SU2-7.0.8.ebuild X-VCS-Directories: sci-physics/SU2/ X-VCS-Committer: SergeyTorokhov X-VCS-Committer-Name: Sergey Torokhov X-VCS-Revision: 66db3c61843e58a56d2855f7b9445e3f19620bae X-VCS-Branch: dev Date: Tue, 5 Jan 2021 13:54:52 +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: 2a1f7fa9-c946-449e-b96f-eb058798150d X-Archives-Hash: ae28234def989aaad8c9240bb854e594 commit: 66db3c61843e58a56d2855f7b9445e3f19620bae Author: Sergey Torokhov yandex ru> AuthorDate: Tue Jan 5 13:46:02 2021 +0000 Commit: Sergey Torokhov yandex ru> CommitDate: Tue Jan 5 13:46:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=66db3c61 sci-physics/SU2: 7.0.8-r1, mv fix-python-optimize.patch to external repo Due to large size of "SU2-7.0.8-fix-python-optimize.patch" move it to external repository to fetch separately. This patch is required only to generate ".pyc" files during execution "python_optimize" command on "src_install()" phase to fix "TabError: inconsistent use of tabs and spaces in indentation". Signed-off-by: Sergey Torokhov yandex.ru> sci-physics/SU2/{SU2-7.0.8.ebuild => SU2-7.0.8-r1.ebuild} | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sci-physics/SU2/SU2-7.0.8.ebuild b/sci-physics/SU2/SU2-7.0.8-r1.ebuild similarity index 90% rename from sci-physics/SU2/SU2-7.0.8.ebuild rename to sci-physics/SU2/SU2-7.0.8-r1.ebuild index 30feedd4..f7e5b83f 100644 --- a/sci-physics/SU2/SU2-7.0.8.ebuild +++ b/sci-physics/SU2/SU2-7.0.8-r1.ebuild @@ -11,6 +11,7 @@ DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design" HOMEPAGE="https://su2code.github.io/" SRC_URI=" https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/band-a-prend/gentoo-overlay/raw/master/sci-physics/${PN}/files/${P}-fix-python-optimize.patch test? ( https://github.com/su2code/TestCases/archive/v7.0.7.tar.gz -> ${PN}-7.0.7-TestCases.tar.gz ) tutorials? ( https://github.com/su2code/Tutorials/archive/v7.0.7.tar.gz -> ${PN}-7.0.7-Tutorials.tar.gz ) " @@ -42,12 +43,12 @@ DEPEND=" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${P}-fix-env.patch" "${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch" - "${FILESDIR}/${P}-fix-python-optimize.patch" + "${FILESDIR}/${P}-fix-env.patch" + "${DISTDIR}/${P}-fix-python-optimize.patch" ) -DOCS=( "LICENSE.md" "README.md" "SU2_PY/documentation.txt" ) +DOCS=( "README.md" "SU2_PY/documentation.txt" ) src_unpack() { unpack "${P}.tar.gz" @@ -57,7 +58,7 @@ src_unpack() { fi if use tutorials ; then einfo "Unpacking ${PN}-7.0.7-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}" - mkdir "${P}"/Tutorials + mkdir "${P}"/Tutorials || die tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${PN}-7.0.7-Tutorials.tar.gz" || die fi } @@ -103,8 +104,8 @@ src_test() { src_install() { meson_src_install - mkdir -p "${ED}$(python_get_sitedir)" - mv "${ED}"/usr/bin/{FSI,SU2,*.py} -t "${ED}$(python_get_sitedir)" + mkdir -p "${ED}$(python_get_sitedir)" || die + mv "${ED}"/usr/bin/{FSI,SU2,*.py} -t "${ED}$(python_get_sitedir)" || die python_optimize "${D}/$(python_get_sitedir)" if use tutorials ; then