Merge updates from master

This commit is contained in:
Repository mirror & CI
2022-12-09 16:31:46 +00:00
28 changed files with 167 additions and 273 deletions

View File

@@ -1 +1 @@
DIST himitsu-0.1.tar.gz 33462 BLAKE2B 67f7000290b8b52bdfb319519d26ccdbc6a02e66dcf6660515b06577a2d0b9723ed6707210400ccdb0da8311f293582150445a11b9640c262529e2335e7faf80 SHA512 0e6192e6a50a80e597acc162f211eb8372470d7ebf7a9d016dc1bb7235b82d48d2148576585a663b094b86eea63e5f504a7782dd824fb21a15f4103f5fa9efb2
DIST himitsu-0.2.tar.gz 33506 BLAKE2B acf764de4aba2d28b9f9e20c4b44cbe7a3c98068c9a323cf8d7e0bfd7f048202bec3360ef0e640ae5109c4ba972a75ae0839b3d4a19a095b7c197ea2e76c064f SHA512 89ae0a363721f67e1ce0f4c5cdae179544c20d5e52a2217854114ec0245aac51484697d3d298af58cb4621d077d359e924e2285a73b4be618a2e924a9220f518

View File

@@ -1,2 +1,2 @@
DIST olm-3.2.12.tar.bz2 2742680 BLAKE2B 47c3bacaf05cc0bb6088da34e6a031f9c770893771ddcf9f13bc0e10a050139f14969dfc91f38684336872089b4cbf9d66e4bd85692989eba5fc3df966da3cd2 SHA512 a25db4c72910512beca9120db59ebeeefc5fff6a381e88ae7cf261bc5ab896edc2cfe25ece57b7b28b2e3d8bc66367c457133c147e1a3514f926714159b5cf6f
DIST olm-3.2.13.tar.bz2 2742762 BLAKE2B 8c18fbcfe53b414f33f567d337e7b30dd1f358b0d7aee55738ff5461b926967fa5c0c172311b017a8c05ecbce5cce22b4b4c69c8cad4c947d19eea7f9262661b SHA512 e6d386644f800710afc5a641d6a3a619b193f08cbe31495c6978446e71e3f38ca6a0aab9fff18725c653723c07755467b8785062bf2cbfef8a4f68406f73e4f3
DIST olm-3.2.14.tar.bz2 2743089 BLAKE2B 8b8cd2a6b5bd14191ee6604221449ae1472078e3c2a1286e9e3aed433bb77e6a9a88de6ca4c92295cd281e10d76a161905b12207079f457b099f43864317cac7 SHA512 47a19ae2290dbf0ac2b4539806a5e5a22be824ce163233b61680506a8eae341e312e8f169285e342c2277764d4bfa5eaf0417d36e04fbf4e358de01730e302b4

View File

@@ -1,4 +1,4 @@
DIST bash-language-server-3.2.1-deps.tar.xz 3465976 BLAKE2B 9b2b2b4e9f4dad02869d7f88ab672111579864025510e4fa23a966495324dd2f5cf7e2861615407d5f4d12f244402fa07c7ba9b68e92fc04a1603dfb75d645e4 SHA512 f7600f229b96c7cf87d80dbc361331a112d1711bd3649440753c276ca63b7d7c65ba381022eb3699c557968f935860d9293c75a20c4d13705639bd58f6f14901
DIST bash-language-server-3.2.1.tgz 141222 BLAKE2B f984dd50bc1e8c5643109cb42b635240db671770413db6ce47eacbb716f09a37a147743b15681a7e6cb5af0714e950f99f3b42ebf8735b9890fac2979475337a SHA512 e1ee2ec4956e733567f25bfd8b82ff5ccb66aa44735c583f9acf85a4c58331038c63637a50ecded40b13e72fbe0a73031efbe1dab15c1ce454532f304403cffe
DIST bash-language-server-3.3.1-deps.tar.xz 3557556 BLAKE2B 4c231bcb7d21951d5244e883fce825c955f81dba6711a4ddc372d0d457165d659fcf5bd04d723256335e33dca9635abbf20a0a2fdc9094307c20d1c35c987d08 SHA512 d0e9369f5f6eef94897859ce78811bf4b1b80a857ee73e6e75a367bea0aff485a68a4c39cb731e8650fa47081beab159e883e6646bbdd39b31e4b4a8a5c6808f
DIST bash-language-server-3.3.1.tgz 142732 BLAKE2B 40d60cf875c0c60c49a3600c6b3488c95c16cb1088f07d3a35c46ab78fd077db5de71ddd321b7b8cb2d03867fb2a8ffa8f4e2179f0dd1d1d469cfebf979b3e4e SHA512 f774eceab41310ff2bbc66775cf4b2d74e4633842ceb2bc8b8252f4620c8c7480c2c57a6b1c0a4bf2aeb8a10c43249a36f44f74da459c855e0a1993911af1b97
DIST bash-language-server-4.0.1-deps.tar.xz 2160812 BLAKE2B bbf8f1d88c4be377c650bd379d557a67fdfcf560149b639f402c7682152c12ea00fa19f127574d26f6cf72ceee160894ccc35ca119fe9c8fde7cafe4725d5e9c SHA512 f87219c7df50d0062e8babbef100ce4a547c9b3d390daedbc37571e06ca0d8586d6c2e67f4cd369f4eb20932d641ffa78365742ba5cda628213b67832f8214c4
DIST bash-language-server-4.0.1.tgz 151418 BLAKE2B 93989871476092a7e7fd244fb9237811f84c1eb80dbd25138292006c160991a85c49df1f91d85460b5ec78ee689a58c87956b3c1f8c61e77a6fda1404ed1d7ad SHA512 c40b384edaa55e7395e81aa33397c64761601524a32f218bbf3dc51095deddddaf11a336a4e8022dfa07ca843720852d64a6442f4d9d367f26aff21f8698fbe2

View File

@@ -178,7 +178,7 @@ dotnet-utils_src_prepare() {
dotnet-utils_src_compile() {
debug-print-function ${FUNCNAME} "${@}"
local publist_args=(
local publish_args=(
--no-restore
--configuration Release
-p:Version=${PV}
@@ -186,7 +186,7 @@ dotnet-utils_src_compile() {
--self-contained
)
edotnet publish "${publish_args}" || die "'dotnet publish' failed"
edotnet publish "${publish_args[@]}" || die "'dotnet publish' failed"
}
fi

View File

@@ -259,7 +259,7 @@ src_install() {
insinto opt/xivlauncher
doins -r *
fperms +x /opt/xivlauncher/XIVLauncher.Core
dosym /opt/xivlauncher/XIVLauncher.Core usr/bin/xivlauncher
dosym ../../opt/xivlauncher/XIVLauncher.Core usr/bin/${PN}
}
pkg_postinst() {

View File

@@ -1,2 +1,3 @@
DIST tokodon-21.11.1.tar.xz 165120 BLAKE2B 240e3028deeb7b15b62344c7e0a66f593f92a6b716c435eed4d402ec3b4ab2816c421e8054cc086d37930706889448ae72a5d7989344b6bcb4731552a2f04213 SHA512 059c760f749e006365464bfcbc13aef420991b3047c398d5cb2dbea2b76ba211428e112594402c558f9ec742d532c74ff7fc7739a27357d61c6bcd416c19403d
DIST tokodon-22.09.tar.xz 144752 BLAKE2B 9c3a68f28e9c919a7441b2c9174cc2b52e42afa5c243b09526ba3b8d62e68a1989d4221b28e56d99877a3c55b043644ec48555f749746586f3de67f9587d616c SHA512 f37ed6cb792dfe4835ce280fd1c905c97ca2584803a04fde5cec4384b237393009b8e90a6b3db045838ac58f4420fd7b90f6aef87fcd56b43ac2f14fe50d2e90
DIST tokodon-22.11.tar.xz 155412 BLAKE2B d8f24a45d7dc74a7a349aa556c3d52f480e230fb5222ac482570daf9fb106a066072d4ff74349bab066bf2187c0100ef6719c0d926498c8532b9b37076d2155f SHA512 f37688315ad8edea0b7c2ab8ab64ccf3e0c087ef2dde876179412d6bbf5c657fa6f5af29f02ad013f1b38ed784a90b2e4a55010e861593df99593a0f362e9e19

View File

@@ -0,0 +1,49 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
KFMIN=5.77.0
QTMIN=5.15.0
ECM_TEST=optional
inherit ecm
MY_P="${PN}-21.11.1" # upstream mistake
DESCRIPTION="Mastodon client for Plasma and Plasma Mobile"
HOMEPAGE="https://invent.kde.org/network/tokodon"
SRC_URI="mirror://kde/unstable/${PN}/${MY_P}.tar.xz"
S="${WORKDIR}/${MY_P}"
LICENSE="|| ( GPL-2 GPL-3 ) AGPL-3+ CC-BY-SA-4.0 CC0-1.0 GPL-2+ GPL-3 GPL-3+ LGPL-2+ LGPL-2.1+ MIT"
SLOT="5"
KEYWORDS="~amd64 ~x86"
DEPEND="
dev-libs/qtkeychain[qt5(+)]
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtmultimedia-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwebsockets-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/kirigami-addons-0.6:5
>=kde-frameworks/kitemmodels-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
"
RDEPEND="${DEPEND}"
src_test() {
local -x QT_QPA_PLATFORM=offscreen
ecm_src_test
}

View File

@@ -1,107 +0,0 @@
**Alliance for Open Media Patent License 1.0**
1. **License Terms.**
**Patent License.** Subject to the terms and conditions of this License, each
Licensor, on behalf of itself and successors in interest and assigns,
grants Licensee a non-sublicensable, perpetual, worldwide, non-exclusive,
no-charge, royalty-free, irrevocable (except as expressly stated in this
License) patent license to its Necessary Claims to make, use, sell, offer
for sale, import or distribute any Implementation.
**Conditions.**
*Availability.* As a condition to the grant of rights to Licensee to make,
sell, offer for sale, import or distribute an Implementation under
Section 1.1, Licensee must make its Necessary Claims available under
this License, and must reproduce this License with any Implementation
as follows:
a. For distribution in source code, by including this License in the
root directory of the source code with its Implementation.
b. For distribution in any other form (including binary, object form,
and/or hardware description code (e.g., HDL, RTL, Gate Level Netlist,
GDSII, etc.)), by including this License in the documentation, legal
notices, and/or other written materials provided with the
Implementation.
*Additional Conditions.* This license is directly from Licensor to
Licensee. Licensee acknowledges as a condition of benefiting from it
that no rights from Licensor are received from suppliers, distributors,
or otherwise in connection with this License.
**Defensive Termination**. If any Licensee, its Affiliates, or its agents
initiates patent litigation or files, maintains, or voluntarily
participates in a lawsuit against another entity or any person asserting
that any Implementation infringes Necessary Claims, any patent licenses
granted under this License directly to the Licensee are immediately
terminated as of the date of the initiation of action unless 1) that suit
was in response to a corresponding suit regarding an Implementation first
brought against an initiating entity, or 2) that suit was brought to
enforce the terms of this License (including intervention in a third-party
action by a Licensee).
**Disclaimers.** The Reference Implementation and Specification are provided
"AS IS" and without warranty. The entire risk as to implementing or
otherwise using the Reference Implementation or Specification is assumed
by the implementer and user. Licensor expressly disclaims any warranties
(express, implied, or otherwise), including implied warranties of
merchantability, non-infringement, fitness for a particular purpose, or
title, related to the material. IN NO EVENT WILL LICENSOR BE LIABLE TO
ANY OTHER PARTY FOR LOST PROFITS OR ANY FORM OF INDIRECT, SPECIAL,
INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER FROM ANY CAUSES OF
ACTION OF ANY KIND WITH RESPECT TO THIS LICENSE, WHETHER BASED ON BREACH
OF CONTRACT, TORT (INCLUDING NEGLIGENCE), OR OTHERWISE, AND WHETHER OR
NOT THE OTHER PARTRY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2. **Definitions.**
**Affiliate.** "Affiliate" means an entity that directly or indirectly
Controls, is Controlled by, or is under common Control of that party.
**Control.** "Control" means direct or indirect control of more than 50% of
the voting power to elect directors of that corporation, or for any other
entity, the power to direct management of such entity.
**Decoder.** "Decoder" means any decoder that conforms fully with all
non-optional portions of the Specification.
**Encoder.** "Encoder" means any encoder that produces a bitstream that can
be decoded by a Decoder only to the extent it produces such a bitstream.
**Final Deliverable.** "Final Deliverable" means the final version of a
deliverable approved by the Alliance for Open Media as a Final
Deliverable.
**Implementation.** "Implementation" means any implementation, including the
Reference Implementation, that is an Encoder and/or a Decoder. An
Implementation also includes components of an Implementation only to the
extent they are used as part of an Implementation.
**License.** "License" means this license.
**Licensee.** "Licensee" means any person or entity who exercises patent
rights granted under this License.
**Licensor.** "Licensor" means (i) any Licensee that makes, sells, offers
for sale, imports or distributes any Implementation, or (ii) a person
or entity that has a licensing obligation to the Implementation as a
result of its membership and/or participation in the Alliance for Open
Media working group that developed the Specification.
**Necessary Claims.** "Necessary Claims" means all claims of patents or
patent applications, (a) that currently or at any time in the future,
are owned or controlled by the Licensor, and (b) (i) would be an
Essential Claim as defined by the W3C Policy as of February 5, 2004
(https://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential)
as if the Specification was a W3C Recommendation; or (ii) are infringed
by the Reference Implementation.
**Reference Implementation.** "Reference Implementation" means an Encoder
and/or Decoder released by the Alliance for Open Media as a Final
Deliverable.
**Specification.** "Specification" means the specification designated by
the Alliance for Open Media as a Final Deliverable for which this
License was issued.

View File

@@ -1,2 +0,0 @@
DIST svt-hevc-1.5.0.tar.gz 1218974 BLAKE2B 0922688ae159cba3316728344f729a2216d196c2935e865118b4e24c543c276606f63bcb09353aace3308c9051012172529fc509429e37fb408bd22420d5459e SHA512 e24c48b05c09f348ff39515b8eaa9723d012157ec395520d21adf5654f4e56082a8d46a9ba8c38ee536e78b59cf48d2eb93fadb6e8416a27541003a08593580c
DIST svt-hevc-1.5.1.tar.gz 1220295 BLAKE2B e70dc07f74746cb69561818b642d8ce5efd9e731b3376889556ddea0f647f8deaa4edf7a4993d86a5b1100db37d02f928d53eeaa594b7d5c582b92c30761e470 SHA512 f5b9d9a090cb04ada0a3f310522f00b619ae628b8474fe7e1c7f562a017b5a9d0c8c58ab9a35b43cb19f2568fbc59e0395dcd517b7983924b175393ad2ba4299

View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>telans@posteo.de</email>
<name>James Beddek</name>
</maintainer>
<upstream>
<remote-id type="github">OpenVisualCloud/SVT-HEVC</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,28 +0,0 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic cmake
DESCRIPTION="Scalable Video Technology for HEVC (SVT-HEVC Encoder)"
HOMEPAGE="https://github.com/OpenVisualCloud/SVT-HEVC"
if [ ${PV} = "9999" ]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/OpenVisualCloud/SVT-HEVC.git"
else
SRC_URI="https://github.com/OpenVisualCloud/SVT-HEVC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64"
S="${WORKDIR}/SVT-HEVC-${PV}"
fi
LICENSE="AOM BSD-2"
SLOT="0/1"
BDEPEND="dev-lang/nasm"
src_prepare() {
append-ldflags -Wl,-z,noexecstack
cmake_src_prepare
}

View File

@@ -1,28 +0,0 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic cmake
DESCRIPTION="Scalable Video Technology for HEVC (SVT-HEVC Encoder)"
HOMEPAGE="https://github.com/OpenVisualCloud/SVT-HEVC"
if [ ${PV} = "9999" ]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/OpenVisualCloud/SVT-HEVC.git"
else
SRC_URI="https://github.com/OpenVisualCloud/SVT-HEVC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64"
S="${WORKDIR}/SVT-HEVC-${PV}"
fi
LICENSE="AOM BSD-2"
SLOT="0/1"
BDEPEND="dev-lang/nasm"
src_prepare() {
append-ldflags -Wl,-z,noexecstack
cmake_src_prepare
}

View File

@@ -1,28 +0,0 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic cmake
DESCRIPTION="Scalable Video Technology for HEVC (SVT-HEVC Encoder)"
HOMEPAGE="https://github.com/OpenVisualCloud/SVT-HEVC"
if [ ${PV} = "9999" ]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/OpenVisualCloud/SVT-HEVC.git"
else
SRC_URI="https://github.com/OpenVisualCloud/SVT-HEVC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64"
S="${WORKDIR}/SVT-HEVC-${PV}"
fi
LICENSE="AOM BSD-2"
SLOT="0/1"
BDEPEND="dev-lang/nasm"
src_prepare() {
append-ldflags -Wl,-z,noexecstack
cmake_src_prepare
}

View File

@@ -1 +0,0 @@
DIST Tooth 216473 BLAKE2B 6247280fb34db9709bb52faa5032b766487ea516d6d3069dc72f0dcab1415dd68bcbb47532c45083b4debc41d7f108b1637e793955307a21f144432d391bcdf7 SHA512 27ec83fea519dc0e58b703e3b0ae8d4a15ed8d2cef5daa22bc1e294aa402bac62536838b7884cb846db85e0055b605d63edc3342a44fe62b4fe93e91e5ac8f15

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
<remote-id type="github">GeopJr/Tooth</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -7,11 +7,10 @@ inherit git-r3 vala meson gnome2-utils
DESCRIPTION="Tooth is a fork of the now archived Tootle, a gtk Mastodon client."
HOMEPAGE="https://github.com/GeopJr/Tooth"
SRC_URI="${HOMEPAGE}"
EGIT_REPO_URI="https://github.com/GeopJr/Tooth.git"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND=">=dev-util/meson-0.50
>=dev-lang/vala-0.48
@@ -28,7 +27,6 @@ BDEPEND="
virtual/pkgconfig
"
EGIT_REPO_URI="${SRC_URI}"
VALA_MIN_API_VERSION=0.48
src_prepare() {

View File

@@ -1,5 +1,4 @@
GPL-COMPATIBLE GPL-2+-with-Pyinstaller-Bootloader-exception
MISC-FREE AOM Unicode_Fonts_for_Ancient_Scripts canfep noweb powell sunpro
MISC-FREE Unicode_Fonts_for_Ancient_Scripts canfep noweb powell sunpro
OPEN-CONTENT CC-BY-2.0 CC-BY-2.5 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0
OPEN-DEFINITION @OPEN-CONTENT FDL-1.1 FDL-1.1+ FDL-1.2 FDL-1.2+ FDL-1.3 FDL-1.3+ Free-Art-1.2 Free-Art-1.3 MirOS OAL-1.0.1 ODC-By-1.0
FREE @FREE-SOFTWARE @OPEN-DEFINITION

View File

@@ -3,6 +3,10 @@
# New entries go on top.
# Torokhov Sergey <torokhov-s-a@yandex.ru> (2022-12-09)
# Masked due to infinite run of tests with USE="openmp"
~sci-physics/SU2-7.2.0 openmp
# Anna Vyalkova <cyber+gentoo@sysrq.in> (2022-11-25)
# Depends on masked dev-python/zake
dev-python/tooz test

View File

@@ -29,20 +29,15 @@ RDEPEND="
cgns? ( >=sci-libs/cgnslib-4 )
librom? ( sci-libs/libROM )
mkl? ( sci-libs/mkl )
mpi? (
sci-libs/metis
virtual/mpi[cxx]
)
mpi? ( virtual/mpi[cxx] )
mpp? ( sci-libs/Mutationpp:= )
openblas? ( sci-libs/openblas )
parmetis? ( sci-libs/parmetis )
pastix? (
<sci-libs/pastix-6[mpi?]
sci-libs/scotch
)
python? ( $(python_gen_cond_dep '
dev-python/mpi4py[${PYTHON_USEDEP}]
dev-python/wxpython[${PYTHON_USEDEP}]
dev-python/xlwt[${PYTHON_USEDEP}]
dev-python/matplotlib[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
@@ -52,9 +47,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
dev-cpp/catch:0
dev-cpp/cli11:=
autodiff? (
sci-libs/CoDiPack:=
mpi? ( >sci-libs/MeDiPack-1.2:= )
@@ -65,7 +58,7 @@ DEPEND="
mpi? ( >sci-libs/MeDiPack-1.2:= )
)
tecio? ( >=dev-libs/boost-1.76.0:= )
test? ( dev-cpp/catch:0 )
test? ( <dev-cpp/catch-3:0 )
"
BDEPEND="
python? ( dev-lang/swig )
@@ -85,7 +78,7 @@ REQUIRED_USE="
mpi
|| ( openblas mkl )
)
test? ( mpi python )
test? ( mpi python tutorials )
?? ( openblas mkl )
?? ( directdiff pastix )
"
@@ -111,7 +104,7 @@ src_unpack() {
}
src_prepare(){
rm -rf externals/{CLI11,autotools,catch2,cgns,codi,medi,meson,metis,ninja,parmetis} || die
rm -rf externals/{CLI11,autotools,catch2,cgns,codi,medi,meson,ninja,opdi} || die
default
# boost Geometry requires c++14 since >=boost-1.75
@@ -120,8 +113,14 @@ src_prepare(){
# Force Disable parmetis support in meson.build (configure.ac has optional switch)
use !parmetis && { sed -i -e "/parmetis/Id" meson.build || die ; }
# Disable python-wrapper tests
sed -i "/append(pywrapper_/s/./#&/" TestCases/parallel_regression.py || die
# Disable failed tests
sed -i "/append(dyn_fsi/s/./#&/" TestCases/parallel_regression.py || die
sed -i "/append(fd_sp_pinArray_cht_2d_dp_hf/s/./#&/" TestCases/parallel_regression.py || die
if ! use directdiff ; then
# Disable TestCase('unsteady_cylinder_windowed_average')
sed -i "217s/./#&/" TestCases/parallel_regression_AD.py || die
fi
sed -i "/append(dyn_discadj_fsi/s/./#&/" TestCases/parallel_regression_AD.py || die
# Copy absence mesh file
if use test ; then
@@ -161,6 +160,16 @@ src_test() {
ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT || die
ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO || die
ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL || die
ln -s ../../${P}-build/SU2_PY/pySU2/pysu2.py SU2_PY/pysu2.py || die
ln -s ../../${P}-build/SU2_PY/pySU2/_pysu2.so SU2_PY/_pysu2.so || die
if use autodiff ; then
ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD_AD SU2_PY/SU2_CFD_AD || die
ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT_AD SU2_PY/SU2_DOT_AD || die
ln -s ../../${P}-build/SU2_PY/pySU2/_pysu2ad.so SU2_PY/_pysu2ad.so || die
if use directdiff ; then
ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD_DIRECTDIFF SU2_PY/SU2_CFD_DIRECTDIFF || die
fi
fi
export SU2_RUN="${S}/SU2_PY"
export SU2_HOME="${S}"
@@ -171,13 +180,22 @@ src_test() {
../${P}-build/UnitTests/test_driver || die
pushd TestCases/ || die
# Currently Tests always use mpi
if use mpi ; then
# if use tutorials ; then
# ${EPYTHON} tutorials.py || die
# fi
${EPYTHON} parallel_regression.py || die
if use tutorials ; then
${EPYTHON} tutorials.py || die
fi
if use autodiff ; then
${EPYTHON} parallel_regression_AD.py || die
else
${EPYTHON} parallel_regression.py || die
fi
else
${EPYTHON} serial_regression.py || die
if use autodiff ; then
${EPYTHON} serial_regression_AD.py || die
else
${EPYTHON} serial_regression.py || die
fi
fi
popd || die
}

View File

@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..9} )
PYTHON_COMPAT=( python3_{8..10} )
inherit meson python-single-r1
@@ -11,7 +11,6 @@ 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
mpp? ( https://github.com/mutationpp/Mutationpp/archive/v1.0.1.tar.gz -> mutationpp-1.0.1.tar.gz )
test? ( https://github.com/su2code/TestCases/archive/v${PV}.tar.gz -> ${P}-TestCases.tar.gz )
tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz )
"
@@ -22,7 +21,7 @@ LICENSE="Apache-2.0 LGPL-2.1 LGPL-3 ZLIB all-rights-reserved free-noncomm"
SLOT="0"
KEYWORDS="~amd64"
# cgns, metis, parmetis are bundled;
# metis, parmetis are bundled;
# omp is disable as it's experimental;
# pastix is disabled as it's require additional external bundled libs;
# autodiff (medi), directdiff (opti) features require additional external bundled libs.
@@ -37,33 +36,38 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
mkl? ( !openblas )
parmetis? ( mpi )
test? ( parmetis tutorials )
"
RDEPEND="
${PYTHON_DEPS}
mpi? ( || ( >=sys-cluster/openmpi-1.10.7[cxx] >=sys-cluster/mpich-3.3[cxx] ) )
cgns? ( >=sci-libs/cgnslib-4 )
mkl? ( sci-libs/mkl )
mpi? ( virtual/mpi[cxx] )
mpp? ( sci-libs/Mutationpp:= )
openblas? ( sci-libs/openblas )
"
DEPEND="
${RDEPEND}
dev-cpp/cli11:=
tecio? ( >=dev-libs/boost-1.76.0:= )
test? ( <dev-cpp/catch-3:0 )
"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch"
"${FILESDIR}/${PN}-7.1.0-fix-env.patch"
"${FILESDIR}/${PN}-7.2.0-system-libraries.patch"
"${FILESDIR}/${PN}-7.2.0-DESTDIR.patch"
"${FILESDIR}/${PN}-7.2.0-fix-headers.patch"
)
DOCS=( "README.md" "SU2_PY/documentation.txt" )
src_unpack() {
unpack "${P}.tar.gz"
if use mpp ; then
einfo "Unpacking mutationpp-1.0.1.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/subprojects/Mutationpp"
tar -C "${P}"/subprojects/Mutationpp --strip-components=1 -xzf "${DISTDIR}/mutationpp-1.0.1.tar.gz" || die
fi
if use test ; then
einfo "Unpacking ${P}-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases"
tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${P}-TestCases.tar.gz" || die
@@ -77,6 +81,9 @@ src_unpack() {
src_prepare(){
default
rm -rf externals/{CLI11,autotools,catch2,cgns,codi,medi,meson,ninja,opdi} || die
# boost Geometry requires c++14 since >=boost-1.75
sed -i -e 's:cpp_std=c++11:cpp_std=c++14:' meson.build || die
@@ -85,6 +92,9 @@ src_prepare(){
# Disable python-wrapper tests
sed -i "/append(pywrapper_/s/./#&/" TestCases/parallel_regression.py || die
# Disable failed tests
sed -i "/append(dyn_fsi/s/./#&/" TestCases/parallel_regression.py || die
sed -i "/append(fd_sp_pinArray_cht_2d_dp_hf/s/./#&/" TestCases/parallel_regression.py || die
# Copy absence mesh file
if use test ; then
@@ -125,8 +135,8 @@ src_test() {
export SU2_RUN="${S}/SU2_PY"
export SU2_HOME="${S}"
export PATH=$PATH:$SU2_RUN
export PYTHONPATH=$PYTHONPATH:$SU2_RUN
export PATH="${PATH}:${SU2_RUN}"
export PYTHONPATH="${PYTHONPATH}:${SU2_RUN}"
einfo "Running UnitTests ..."
../${P}-build/UnitTests/test_driver || die
@@ -144,13 +154,14 @@ src_test() {
}
src_install() {
meson_src_install
DESTDIR="${D}" meson_src_install
mkdir -p "${D}$(python_get_sitedir)" || die
mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran,*.py} -t "${D}$(python_get_sitedir)" || die
python_optimize "${D}/$(python_get_sitedir)"
if use tutorials ; then
insinto "/usr/share/${P}"
insinto "/usr/share/${PN}"
doins -r Tutorials
fi
}

View File

@@ -28,26 +28,7 @@
su2_deps += cgns_dep
su2_cpp_args += '-DHAVE_CGNS'
endif
@@ -91,23 +92,19 @@
su2_deps += mpi_dep
su2_cpp_args += '-DHAVE_MPI'
- # compile metis
- subdir('externals/metis')
-
# add metis dependency
+ metis_dep = dependency('metis')
su2_deps += metis_dep
su2_cpp_args += '-DHAVE_METIS'
- # compile parmetis
- subdir('externals/parmetis')
-
# add parmetis dependency
+ parmetis_dep = dependency('parmetis')
su2_deps += parmetis_dep
su2_cpp_args += '-DHAVE_PARMETIS'
@@ -108,6 +108,6 @@
# add medi dependency
if get_option('enable-autodiff') or get_option('enable-directdiff')
- codi_dep += declare_dependency(include_directories: ['externals/medi/include', 'externals/medi/src'])
@@ -81,12 +62,14 @@
su2_deps += librom_dep
@@ -205,19 +198,17 @@
@@ -205,19 +202,19 @@
endif
endforeach
-catch2_dep = declare_dependency(include_directories: 'externals/catch2/')
+catch2_dep = declare_dependency(include_directories: '/usr/include/catch2/')
+if get_option('enable-tests')
+ catch2_dep = declare_dependency(include_directories: '/usr/include/catch2/')
+endif
if get_option('enable-mpp')
- cmake = import('cmake')
@@ -104,7 +87,8 @@
if p.returncode() != 0
error(p.stdout())
endif
@@ -280,21 +271,3 @@
@@ -279,21 +274,3 @@
'''.format(get_option('prefix')+'/bin', meson.source_root(), get_option('enable-tecio'), get_option('enable-cgns'),
get_option('enable-autodiff'), get_option('enable-directdiff'), get_option('enable-pywrapper'), get_option('enable-mkl'),
get_option('enable-openblas'), get_option('enable-pastix'), get_option('enable-mixedprec'), get_option('enable-librom'), meson.build_root().split('/')[-1]))
-

View File

@@ -0,0 +1 @@
DIST fcode-utils-1.0.3.tar.gz 4304237 BLAKE2B 9b6ebf8bb63e2def5022ca75aa163a9a57fa11a144d40563aa7b9c202feb906b145006ef645947a393d50afc6451d225c1dbd8594edeb267e6ea078cdf7d73a4 SHA512 7f64d3ac5c10184efc0993a748a5dcbf9aa0b71dee059c9b97b3656e61cdd7ed9395e830435eab5878ece80df001cf9420065b1611e8bb011274e26aad20f3f0

View File

@@ -0,0 +1,18 @@
# Copyright 2022 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="Set of utilities to process FCODE, OpenFirmware's byte code"
HOMEPAGE="https://www.openfirmware.info/FCODE_suite"
SRC_URI="https://github.com/openbios/fcode-utils/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2 CPL-1.0"
SLOT="0"
KEYWORDS="~amd64"
DOCS=( documentation/ )
src_prepare() {
default
sed -i 's;^STRIP\b.*;STRIP = true;' toke/Makefile detok/Makefile romheaders/Makefile || die
}

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>contact@hacktivis.me</email>
<name>Haelwenn (lanodan) Monnier</name>
</maintainer>
</pkgmetadata>

View File

@@ -3,7 +3,7 @@
EAPI=8
# inherit autotools
inherit autotools
DESCRIPTION="Thin wrapper over POSIX syscalls"
HOMEPAGE="https://github.com/sionescu/libfixposix"
@@ -18,6 +18,6 @@ DEPEND="${RDEPEND}"
src_prepare(){
einfo "Generating autotools files..."
autoreconf -i -f
default
eautoreconf -i -f
}