gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 3 insertions, 162 deletions

diff --git a/media-gfx/netgen/Manifest b/media-gfx/netgen/Manifest
index 841d88a58e5a..b7f5bbb3f667 100644
--- a/media-gfx/netgen/Manifest
+++ b/media-gfx/netgen/Manifest
@@ -6,8 +6,6 @@ AUX netgen-6.2.2204-use-system-catch.patch 1521 BLAKE2B 34ee6fedced5381a1e2152fd
 AUX netgen-6.2.2204-use-system-spdlog.patch 1390 BLAKE2B 541725d179a0b3f9f9430f1268478adfdf378940b4503e962dd59071e8ac0dba60c5445d036d73103f6ec25017a1335f6eb7bfc38debb0ccff810229d5466890 SHA512 1519ce3628f2c5f17afea34bd4ebf102f2688c9440504f6828c611b749b0ae5b7d80b2b688c13769f6bd911faeb3d9d4f83e1ba663d8d5bdb2ef5bc2076f873c
 AUX netgen-6.2.2301-find-libjpeg-turbo-library.patch 1280 BLAKE2B 47cbb27914badd316078acbf57d0ec13da80ade19c6f20602dec1bb42d9b6929cd017ee9120c651dfffcfb2e9c925798a327bd07561823f50702536487343a06 SHA512 c0c774d47bc405357c09454c528391062cec9d2f4a39757409894407bca28a8bf2332bfa60bdba3f99948d5d8871833cc56123ba212e97862f6cc7d09dedb3a8
 AUX netgen-6.2.2301-fix-nullptr-deref-in-archive.patch 1012 BLAKE2B 2de4195438ce6dec88d1bc0d05f841bb959690b271cb1a40464ae81cc056e4520246c49533a2dc90ee88a29f450b9bf89a285342f9e8a08f0b9a44cee1933ec2 SHA512 3f28bce676c3db1d0dd05ff21716745dfc01b8d9f5cc6c278baed76f10514d283e78012f04fca956f71337f4a34287f949b06881a12cb84ae812a61bd1ff79ea
-DIST netgen-6.2.2301.tar.gz 3394480 BLAKE2B 358b0cf7ff4d372a9ede8ab9b7df24435a75bcad880cc83607443707ae096f2bafa35d8cd581533917d1aae85a18ac0ca902876a1c68f11664a0a3ef1ae00593 SHA512 7aebbc5cc3e3227b455ac9c5538e1f0110d5621e6ca7315f6811733bd93e88ccca467296b7915894a45202ed375b45d9387a1d113a720d4199eff782afb43070
 DIST netgen-6.2.2302.tar.gz 3398683 BLAKE2B 7cf4626ee8163898864af0346cf2c4fa73dcca3ac2068d67f80b05ee926024b36552b33013c2ef8f74026ab942ae08c0628af0ce0c0dac2d004ba26e18bf4619 SHA512 da6e8e43d73af6b7bfae2e3c771d46e34601ff481c251924673f7330bae032a743fb9d5ff2792855e91ed5addb4d22fd4bf9cd7a9dcfb53f476e22a30f1eedb3
-EBUILD netgen-6.2.2301.ebuild 4088 BLAKE2B 68e73af9c8a437a9441f37efae478bf15b245f804604350804ca5fe021cec6ccd3d141b6d07f83ebcaf288e3f5c3cc6fb867c4e7b043abb20b8764fefcf79e28 SHA512 d4750c6ae2575d332b4b7896f10d646c646eaec12879fb764bbc067cf7f4a2fc77b536a488bcb062d4e29d441b5b0256a6dd7cdaf90f9b1100ac0af5689aeb9b
-EBUILD netgen-6.2.2302.ebuild 4088 BLAKE2B cc6607345e707b548f225e5cdffbee9f8fc3a4faa830de84f736952f91853745624c5205b97f6a24205917b36929f10a2d500b9ea3fab6e0b7d47564bd0c7fce SHA512 04c2ee32c5debc39b3a8a7b6287e8ba5c49023a127d602fa3f727c14019df622707de1fca6ec720bbec8b3b6aa55461e65fa293cda7b16a41f5ed142263c8ecd
+EBUILD netgen-6.2.2302.ebuild 4089 BLAKE2B 1d663d3a6d22a2b2c6196719b26a61d300735a917bb7493a76779dcd183526650f3ed2739405439988642b2c41af9eadee169e1104c7cbb0efe0747a57895d4c SHA512 3a8f4dd92088288330d4f63390d04bc867724766d12798ee35e7caa7e8691d74619c5cabead75cf24ae07c8cfc0f26bc4ad30e2683420f7f36ba4833e9b4a68f
 MISC metadata.xml 648 BLAKE2B 8011d98cf84e88a045f2ace8e31e48b06f9c7555d73f1220a1a877f36c579ea4829568837b31077e84ecf2eff932d3290032479b3eabf824c0c7e4f95a42c485 SHA512 f78534e481c213ecd3091ca2b09bfd62a654c1c5a1b6129db108a94e974b9d44090ccb3d89e8750a96b29ef182978bca65939b7c1a4b117e563c7c8503ebdb4b
diff --git a/media-gfx/netgen/netgen-6.2.2301.ebuild b/media-gfx/netgen/netgen-6.2.2301.ebuild
deleted file mode 100644
index 0975a50189e0..000000000000
--- a/media-gfx/netgen/netgen-6.2.2301.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10,11} )
-inherit cmake desktop python-single-r1 xdg
-
-DESCRIPTION="Automatic 3d tetrahedral mesh generator"
-HOMEPAGE="https://ngsolve.org/ https://github.com/NGSolve/netgen"
-SRC_URI="https://github.com/NGSolve/netgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~x86"
-
-IUSE="ffmpeg gui jpeg logging mpi opencascade python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ffmpeg? ( gui )
-	jpeg? ( gui )
-	python? ( gui )
-"
-
-DEPEND="
-	sys-libs/zlib
-	ffmpeg? ( media-video/ffmpeg:= )
-	gui? (
-		dev-lang/tcl:0/8.6
-		dev-lang/tk:0/8.6
-		media-libs/glu
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libxcb:=
-	)
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	logging? ( dev-libs/spdlog:= )
-	mpi? (
-		sci-libs/metis
-		virtual/mpi
-	)
-	opencascade? ( sci-libs/opencascade:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pybind11[${PYTHON_USEDEP}]
-			'
-		)
-		mpi? (
-			$(python_gen_cond_dep 'dev-python/mpi4py[${PYTHON_USEDEP}]' )
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	gui? ( virtual/imagemagick-tools[png] )
-	test? (
-		<dev-cpp/catch-3:0
-		python? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.2.2204-find-Tk-include-directories.patch"
-	"${FILESDIR}/${PN}-6.2.2204-link-against-ffmpeg.patch"
-	"${FILESDIR}/${PN}-6.2.2204-use-system-spdlog.patch"
-	"${FILESDIR}/${PN}-6.2.2204-use-system-catch.patch"
-	"${FILESDIR}/${PN}-6.2.2204-disable-failing-tests.patch"
-	"${FILESDIR}/${PN}-6.2.2204-disable-python-tests.patch"
-	"${FILESDIR}/${PN}-6.2.2301-find-libjpeg-turbo-library.patch"
-	"${FILESDIR}/${PN}-6.2.2301-fix-nullptr-deref-in-archive.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# NOTE: need to manually check and update this string on version bumps!
-	# git describe --tags --match "v[0-9]*" --long --dirty
-	cat <<- EOF > "${S}/version.txt" || die
-		v${PV}-0-g26d12898
-	EOF
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# currently not working in a sandbox, expects netgen to be installed
-		# see https://github.com/NGSolve/netgen/issues/132
-		-DBUILD_STUB_FILES=OFF
-		-DENABLE_UNIT_TESTS=$(usex test)
-		-DINSTALL_PROFILES=OFF
-		-DNG_INSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
-		-DNG_INSTALL_DIR_INCLUDE="include/${PN}"
-		-DNG_INSTALL_DIR_LIB="$(get_libdir)"
-		-DUSE_CCACHE=OFF
-		# doesn't build with this version
-		-DUSE_CGNS=OFF
-		-DUSE_GUI=$(usex gui)
-		-DUSE_INTERNAL_TCL=OFF
-		-DUSE_JPEG=$(usex jpeg)
-		-DUSE_MPEG=$(usex ffmpeg)
-		# respect users -march= choice
-		-DUSE_NATIVE_ARCH=OFF
-		-DUSE_MPI=$(usex mpi)
-		-DUSE_OCC=$(usex opencascade)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_SPDLOG=$(usex logging)
-		-DUSE_SUPERBUILD=OFF
-	)
-	# no need to set this, if we only build the library
-	if use gui; then
-		mycmakeargs+=( -DTK_INCLUDE_PATH="/usr/$(get_libdir)/tk8.6/include" )
-	fi
-	if use python; then
-		mycmakeargs+=(
-			-DPREFER_SYSTEM_PYBIND11=ON
-			# needed, so the value gets passed to NetgenConfig.cmake instead of ${T}/pythonX.Y
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	if use mpi && use python; then
-		mycmakeargs+=( -DUSE_MPI4PY=ON )
-	else
-		mycmakeargs+=( -DUSE_MPI4PY=OFF )
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-
-	local NETGENDIR="/usr/share/${PN}"
-	echo -e "NETGENDIR=${NETGENDIR}" > ./99netgen || die
-	doenvd 99netgen
-
-	if use gui; then
-		mv "${ED}"/usr/bin/{*.tcl,*.ocf} "${ED}${NETGENDIR}" || die
-
-		convert -deconstruct "${S}/windows/${PN}.ico" netgen.png || die
-		newicon -s 32 "${S}"/${PN}-2.png ${PN}.png
-		newicon -s 16 "${S}"/${PN}-3.png ${PN}.png
-		make_desktop_entry ${PN} "Netgen" netgen Graphics
-	fi
-
-	mv "${ED}"/usr/share/${PN}/doc/ng4.pdf "${ED}"/usr/share/doc/${PF} || die
-	dosym -r /usr/share/doc/${PF}/ng4.pdf /usr/share/${PN}/doc/ng4.pdf
-
-	use python || rm -r "${ED}${NETGENDIR}"/py_tutorials || die
-}
diff --git a/media-gfx/netgen/netgen-6.2.2302.ebuild b/media-gfx/netgen/netgen-6.2.2302.ebuild
index b28b9244b838..5a86024f6f64 100644
--- a/media-gfx/netgen/netgen-6.2.2302.ebuild
+++ b/media-gfx/netgen/netgen-6.2.2302.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10,11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake desktop python-single-r1 xdg
 
 DESCRIPTION="Automatic 3d tetrahedral mesh generator"