Merge updates from master

games-action/netrek-brmh/netrek-brmh-2.6.0.ebuild

@@ -29,7 +29,7 @@ BDEPEND="
 
 src_configure() {
 	xmkmf || die
-	make depend || die
+	emake depend || die
 }
 
 src_compile() {

games-action/netrek-cow/Manifest

@@ -0,0 +1 @@
+DIST netrek-cow-3.3.2.tar.gz 2630673 BLAKE2B 1a54b58d112f0893275b57967573ce308e69b99e42a660670f3a5fc7f15f2dc110f2008e496282a58da181252a196feb8218a87f52db16444f1f50cef2a6809f SHA512 9a0ab78ed86d174f52d35d30a409efd985bd2d39062a993c3790f36ade1fa0a9b95b9d914f5c1fa57497f281e88ece0f6bc86abc962bd87ff44f68c1416f07f0

games-action/netrek-cow/metadata.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>brian.gloyer@gmail.com</email>
+    <name>brian gloyer</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>brian.gloyer@gmail.com</email>
+      <name>brian gloyer</name>
+    </maintainer>
+    <bugs-to>https://github.com/quozl/netrek-client-cow/issues/</bugs-to>
+    <remote-id type="github">quozl/netrek-client-cow</remote-id>
+  </upstream>
+</pkgmetadata>

games-action/netrek-cow/netrek-cow-3.3.2.ebuild

@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="cow client for netrek"
+HOMEPAGE="https://netrek.org"
+SRC_URI="https://github.com/quozl/netrek-client-cow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/netrek-client-cow-${PV}"
+
+RDEPEND="
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	x11-libs/libXmu
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	default
+	./autogen.sh
+	eautoreconf
+}
+
+src_install() {
+	dobin netrek-client-cow
+}

media-plugins/qt-avif-image-plugin/qt-avif-image-plugin-9999.ebuild

@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake xdg-utils
+inherit cmake
 
 DESCRIPTION="Qt plug-in to allow Qt and KDE based applications to read/write AVIF images."
 HOMEPAGE="https://github.com/novomesk/qt-avif-image-plugin"
@@ -22,20 +22,9 @@ IUSE=""
 
 DEPEND=">=dev-qt/qtgui-5.12.3:5
 	>=media-libs/libavif-0.8.0
+	>=x11-misc/shared-mime-info-2.0-r1
 "
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-5.70:5"
 
 RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/mime/packages/
-	doins share/mime/packages/avif.xml
-	doins share/mime/packages/avifs.xml
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}

sci-physics/SU2/Manifest

@@ -1,3 +1,6 @@
 DIST SU2-7.0.4-TestCases.tar.gz 437960103 BLAKE2B 2469edc23f62589fa18be5fff6e036965f6b5f6e2be207642d318aac4d2044c07f0891568f86c1a3ab065e79afce50cc73ad0857b82093d79ac28a4d0451a4ad SHA512 f21d963815e024582e99647a21ebae0b17fc69f75bc34bb72cc3a86cc9ff8502342b31755b5da73e7088b4d0ce430bdd6b4efefc03583cbfcf5156c1849328e1
 DIST SU2-7.0.4-Tutorials.tar.gz 64282233 BLAKE2B b0d13a0988d5617868fad6098fe8110e3600415f05784ff04416cb23162fadc8c1d06d50c5200b14f65afb3e97ee766b21dfdcd4ec8ded9026baf510ca829e48 SHA512 604a05e15a8eae1c7255016261a6576a97fc364f66004ecaccaae932e3a97624c2599d354dd874562824caa8f8ea3dac2f03e0105b1c27d66ec0bf59e3a27105
 DIST SU2-7.0.4.tar.gz 20516147 BLAKE2B 21f45e4918bbc6a72bf47ad61d3301abed50a7cf569e9e8d4040201ff653e583d50a547853365302671922f023d0cc6f3735c1afcd0f3b6bf3c3fc92dc807787 SHA512 8e69f0e1d335adef0bd98666c98e29bc15ee0d7a0fcbbbc91a1ba02275ca52fda7f8f47434547f7982ce0e73a6ff78bd2ed57ca328d1e87b8afdd3b0a698d262
+DIST SU2-7.0.5-TestCases.tar.gz 444209661 BLAKE2B a7b14a3ee679a28a3a4530ddca45f39fdc2c0bc5f29fe20e6c9f04d03dee6ca08f98648989b0160ee8742621b539e2f4af9e8bdfb802c3e460a9f3b7e1be3dda SHA512 f21acbaccce66685323566a3f856ceb5fbd36764a8dea875af839520b46be8f7e26491ccb855243f93e4ae948534574080e986faafc2a84c86754fe39f74e240
+DIST SU2-7.0.5-Tutorials.tar.gz 64282246 BLAKE2B 9c8823df5bbda1be80f03dfa6d9de4b4263904acbee15f6928d3758a9b25c84ace59bf02847798838cbf3236961f51589e851e342f288961b2f2a62e28de216c SHA512 2b7c98cc4d060c850572e45418d4ddf38843ced3349a3fb807c1d32f0e5aabf578f8944918e3fc63a32161385eaf69b4742d24ef41d21b43006d5b881a89953b
+DIST SU2-7.0.5.tar.gz 20526328 BLAKE2B 0c3b16269f9d8356eaecde991853fe184188b98df62186c56780ee34b26995763adbac0acca53db1625ac9b0dfadc3348eac792e700e66be00a174ff056e017d SHA512 283da35aa4f6bac4d7451506c6b84d98a18dfe7630adfc17764511fba8171b15c36ee80807bbfc1c55e39e196f8ed304fff3eb1182dfac15aa6a86a9613e51ad

sci-physics/SU2/SU2-7.0.5.ebuild

@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson python-single-r1
+
+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
+	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 )
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# cgns, metis, parmetis are bundled;
+# omp is disable as it's experimental;
+# pastix is disabled as it's try to find bundled libs;
+IUSE="cgns -mkl +mpi openblas tecio test tutorials"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	mkl? ( !openblas )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	mpi? ( virtual/mpi[cxx] )
+	mkl? ( sci-libs/mkl )
+	openblas? ( sci-libs/openblas )
+"
+DEPEND="
+	${RDEPEND}
+	tecio? ( dev-libs/boost:= )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-env.patch"
+	"${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch"
+	"${FILESDIR}/${PN}-7.0.4-fix-python-optimize.patch"
+)
+
+DOCS=( "LICENSE.md" "README.md" "SU2_PY/documentation.txt" )
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	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
+	fi
+	if use tutorials ; then
+		einfo "Unpacking ${P}-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}"
+		mkdir "${P}"/Tutorials
+		tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${P}-Tutorials.tar.gz" || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable-autodiff=false
+		-Denable-directdiff=false
+		-Denable-pastix=false
+		-Denable-pywrapper=false
+		-Dwith-omp=false
+		$(meson_feature mpi with-mpi)
+		$(meson_use cgns enable-cgns)
+		$(meson_use mkl enable-mkl)
+		$(meson_use openblas enable-openblas)
+		$(meson_use tecio enable-tecio)
+		$(meson_use test enable-tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD
+	ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF
+	ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT
+	ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO
+	ln -s ../../${P}-build/SU2_MSH/src/SU2_MSH SU2_PY/SU2_MSH
+	ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL
+
+	export SU2_RUN="${S}/SU2_PY"
+	export SU2_HOME="${S}"
+	export PATH=$PATH:$SU2_RUN
+	export PYTHONPATH=$PYTHONPATH:$SU2_RUN
+
+	einfo "Running UnitTests ..."
+	../${P}-build/UnitTests/test_driver
+
+	pushd TestCases/
+	use mpi && python parallel_regression.py
+	use mpi || python serial_regression.py
+	use tutorials && use mpi && python tutorials.py
+	popd
+}
+
+src_install() {
+	meson_src_install
+	mkdir -p "${ED}$(python_get_sitedir)"
+	mv "${ED}"/usr/bin/{FSI,SU2,*.py} -t "${ED}$(python_get_sitedir)"
+	python_optimize "${D}/$(python_get_sitedir)"
+
+	if use tutorials ; then
+		insinto "/usr/share/${P}"
+		doins -r Tutorials
+	fi
+}

sci-physics/SU2/files/SU2-7.0.5-fix-env.patch

@@ -0,0 +1,12 @@
+diff -Naur old_env/UnitTests/meson.build new_env/UnitTests/meson.build
+--- old_env/UnitTests/meson.build	2020-06-15 17:03:43.000000000 +0300
++++ new_env/UnitTests/meson.build	2020-06-15 17:04:35.000000000 +0300
+@@ -24,7 +24,7 @@
+     test_driver = executable(
+         'test_driver',
+         unit_test_files,
+-        install : true,
++        install : false,
+         dependencies : [su2_cfd_dep, common_dep, su2_deps, catch2_dep],
+         cpp_args: ['-fPIC', default_warning_flags, su2_cpp_args]
+     )