summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-benchmarks/stress-ng/Manifest2
-rw-r--r--app-benchmarks/stress-ng/stress-ng-0.18.05.ebuild (renamed from app-benchmarks/stress-ng/stress-ng-0.18.04.ebuild)0
-rw-r--r--app-dicts/aspell-pl/Manifest1
-rw-r--r--app-dicts/aspell-pl/aspell-pl-6.0.20241001.0.ebuild21
-rw-r--r--app-dicts/myspell-pl/Manifest1
-rw-r--r--app-dicts/myspell-pl/myspell-pl-20241001.ebuild23
-rw-r--r--app-emulation/faudio/Manifest1
-rw-r--r--app-emulation/faudio/faudio-24.10.ebuild37
-rw-r--r--dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch20
-rw-r--r--dev-libs/level-zero/Manifest1
-rw-r--r--dev-libs/level-zero/level-zero-1.17.45.ebuild36
-rw-r--r--dev-vcs/git-cola/files/git-cola-4.2.1-fix-setuptools.patch24
-rw-r--r--media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch28
-rw-r--r--media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch95
-rw-r--r--media-libs/assimp/files/assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch143
-rw-r--r--media-libs/assimp/files/assimp-5.2.5-fix-version.patch33
-rw-r--r--www-servers/nginx/Manifest4
-rw-r--r--www-servers/nginx/nginx-1.26.2-r3.ebuild (renamed from www-servers/nginx/nginx-1.26.2-r2.ebuild)2
-rw-r--r--www-servers/nginx/nginx-1.27.2.ebuild (renamed from www-servers/nginx/nginx-1.27.1-r2.ebuild)6
19 files changed, 128 insertions, 350 deletions
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index ca28e254734d..33186a921338 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1 @@
-DIST stress-ng-0.18.04.tar.gz 6649901 BLAKE2B 13ba5d177c21ec4ac7932a74bd28853e10a0f423b57454e6a2011ba5b8d7870e6a3d59240596bde2aefd95929f2eb538271df19eee28342980f9844bd1a05fc9 SHA512 5725e55e9b6fe03f75f2772b752a0c3ecb150c1f1215e44548f4d4dad1b027cd79abb6fd1f7db257a9398d0d5b8ecfd1a0a7eb10be087b75a8cf7723ce2760e0
+DIST stress-ng-0.18.05.tar.gz 6662550 BLAKE2B df32cedb1316627bcab92577f010c4978c9db3d7b636188b9c9519e0afbc1e68755f0012805bdaaf0d29b95e9338e712eba56bb7c941f13cd0b0621a12388ef2 SHA512 7b2f989e172b304eb47a92fae1ae3b3e048e56cd54811b0df8e7452c38b523a2a16e82a63ed0845c10cc19fb94d8ad9c099a2e0253cebe15f5bc6f7dd1f2c52e
diff --git a/app-benchmarks/stress-ng/stress-ng-0.18.04.ebuild b/app-benchmarks/stress-ng/stress-ng-0.18.05.ebuild
index 0dcbc1e87678..0dcbc1e87678 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.18.04.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.18.05.ebuild
diff --git a/app-dicts/aspell-pl/Manifest b/app-dicts/aspell-pl/Manifest
index fc9787c99ff4..87d889d45920 100644
--- a/app-dicts/aspell-pl/Manifest
+++ b/app-dicts/aspell-pl/Manifest
@@ -1,2 +1,3 @@
DIST aspell-pl-6.0.20240901.0.tar.bz2 662091 BLAKE2B 4cc31bfc174c583369546b48384b86137e497fe1ff14ebc639576f2a2bf5b6b391fb8873330a9bc0d7e9651339069fbc18bc8383a28aed34f5c63aed68cada5c SHA512 fffec9ed2360d063a631a0167da70b92a0931eb772b5ed8b06e275cb7dfecb90a59fd70b993b8bce79fc108afbbdac24599981389b9383555d337a570aea0b6f
+DIST aspell-pl-6.0.20241001.0.tar.bz2 661658 BLAKE2B 13dbcba6e364003a121a532fa5c90b1c19e38623c46cbe1402ac02cc0bfbfc3b06cb6083e240ac58b77b602e8fa13ebfadcc82253820819f9a86b8abbcc4025d SHA512 d62b2f1c7df39b2d784219a287b30134a482da2649cab049b99d71557c772269408b2250c19281581ec2056a097c524163243beb27f6a136c843f3f0edf39ff1
DIST sjp-aspell6-pl-6.0_20240301-0.tar.bz2 658890 BLAKE2B 6b4b5fa979aaf1e6d04d8e6efda375e88f3d6c1ce0ec1ad7c518e2ad2aedd69d5ed78488c317fa60cda82d8460b535973684e8571577167beb4c284ff605389f SHA512 81f11538195cca3faa42a6dd7f7f1f674f08126203347f3a2803cb0ea80e272013800e1986ebcc99b7c65003b156db6ceca953f64509d39120024140a848be9c
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20241001.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20241001.0.ebuild
new file mode 100644
index 000000000000..1d39d73a3a77
--- /dev/null
+++ b/app-dicts/aspell-pl/aspell-pl-6.0.20241001.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: bump togeter with myspell-pl
+
+EAPI=8
+
+ASPELL_LANG="Polish"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-$(ver_rs 2 _ 3 -)"
+
+HOMEPAGE="https://sjp.pl/sl/en/"
+SRC_URI="https://sjp.pl/sl/ort/sjp-${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 Apache-2.0 CC-BY-4.0" # upstream's order
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/myspell-pl/Manifest b/app-dicts/myspell-pl/Manifest
index 68e76bbd03d4..cac9150a5e88 100644
--- a/app-dicts/myspell-pl/Manifest
+++ b/app-dicts/myspell-pl/Manifest
@@ -1,3 +1,4 @@
DIST myspell-pl-20230101.zip 1275977 BLAKE2B d272c2f42f63a8622f72a05674a76a6d9191e53a8b9a057b595cbed7892c739b070b447b00c5c5b4c1aad8a1b41645923de9dcdcc8b56f8edea9895ea637aebd SHA512 1e5212413b9b1481664dd04ad5d436b5780bc457f771e4221d8a878709894fee71e894f870d95538729586e6f6745f8bbda49db3a4c960321049898a739e5e88
DIST myspell-pl-20240801.zip 1287237 BLAKE2B 2404a8c0fd3f4608c38bb6b184b4f0b56674e85aa8c416e5678e10a00b69949843e942102feec10d13d9fb5fe14f4a9399851291d4b2488abce9c8e1545c3ed3 SHA512 2f681ba0a8c67a5405f557339e0711974d4aaf186bd3692f3540e51db8fad6d02c34317becabe07f13e154dd1a9660452f6e789e6e1d0f1900085da673413418
DIST myspell-pl-20240901.zip 1292501 BLAKE2B 7ecdd3441620988fcd9ce806318b0917d0d377b9bf9cc875803e11c1b2faf57329f2989c5d70303f428c68aed2e575c88549c9e73d0d241cd32458903cf2e951 SHA512 0640f46384ce37537a47b54e22671d38252d3561abca31582ea45a8b45f440885e358fc1b60cc87b0028960d1e8b9bb53715bf142e5d0cfd5c7c1f3951c22f03
+DIST myspell-pl-20241001.zip 1276871 BLAKE2B cf67e1a3035ecac5d01e07237cf79deff49a822d651e4e8bf779da8651036f5e3745bfc1227c7b4353d9c8319dce4f9015c0113741215603e7bd97b9794884df SHA512 0eb6632e2639cdff54409833622e33d7070e922db5d554a90b19dc30058d6219713fcd0a113ec66b1dc032f230160f72e09430bf9a4353b69946985ff9794e21
diff --git a/app-dicts/myspell-pl/myspell-pl-20241001.ebuild b/app-dicts/myspell-pl/myspell-pl-20241001.ebuild
new file mode 100644
index 000000000000..ed9d6781d463
--- /dev/null
+++ b/app-dicts/myspell-pl/myspell-pl-20241001.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: bump together with aspell-pl
+
+EAPI=8
+
+MYSPELL_DICT=( "pl_PL.aff" "pl_PL.dic" )
+
+inherit myspell-r2 unpacker
+
+DESCRIPTION="Polish dictionaries for myspell/hunspell"
+HOMEPAGE="https://sjp.pl/sl/en/"
+SRC_URI="https://sjp.pl/sl/ort/sjp-${P}.zip -> ${P}.zip"
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 Apache-2.0 CC-BY-4.0" # upstream's order
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+src_prepare() {
+ default
+ unpack_zip pl_PL.zip
+}
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index b3efbac2f782..492e8eba0a77 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,2 +1,3 @@
DIST faudio-24.08.tar.gz 1125131 BLAKE2B a76da292ec74662413aa287147b83978f422d68077b62e3c8d5ad8a324ac1838d130d46ba8e7d32551221e55e73970ddc47ec06e20de905a6dc7cedacafc34fb SHA512 29777408b65ddc77e31d284730a0f3a08a973e29f6a492a7a9af5208b78279d40967ca593a55542aa3de7dd41deb82a31a6291a6bdffd56f04a91674276f95c6
DIST faudio-24.09.tar.gz 1125248 BLAKE2B 5aad42653d4242df21fbf6d807176dd9db0820f5dfb708ca584b8e7cb234f7a65e68806f96dee8620d5a356c60ab0317099470ebdac9ab00444646c321e67099 SHA512 f74282a7df749f50026bb07309ca20fb12b098cc24b003f8b93f4f6868a3d6f4343d4bd06b947b17d9ec6c1d08f88e477da259397d745f9cc41321f7c5722448
+DIST faudio-24.10.tar.gz 1125385 BLAKE2B 1179139403621302c238b1ba4dfd691b64541c2b23919cfb86f9cad587e1fbd68be18c62c00fc3a9c408d7c580e2ce63392d362ad32a60957bc102b5a1189c51 SHA512 e0b2031ba8452aa0696bc841013db5558c97f87a0071cf5fb48dd668363980d6d7d1adbc22d051e5019f32ee4aaf5553ebb80d37b87e9bcde153b828be5ff127
diff --git a/app-emulation/faudio/faudio-24.10.ebuild b/app-emulation/faudio/faudio-24.10.ebuild
new file mode 100644
index 000000000000..e372ae484496
--- /dev/null
+++ b/app-emulation/faudio/faudio-24.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Accuracy-focused XAudio reimplementation for open platforms"
+HOMEPAGE="https://fna-xna.github.io/"
+SRC_URI="https://github.com/FNA-XNA/FAudio/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/FAudio-${PV}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dumpvoices test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="media-libs/libsdl2[sound]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ append-cppflags -D_DEFAULT_SOURCE # usleep() in tests
+ use debug || append-cppflags -DFAUDIO_DISABLE_DEBUGCONFIGURATION
+
+ local mycmakeargs=(
+ -DBUILD_TESTS=$(usex test)
+ -DDUMP_VOICES=$(usex dumpvoices)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ einfo "Running faudio_tests, this may take some time without output..."
+ SDL_AUDIODRIVER=dummy "${BUILD_DIR}"/faudio_tests || die
+}
diff --git a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch
deleted file mode 100644
index dc0ab96dde0c..000000000000
--- a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/compute-runtime-22.24.23453/CMakeLists.txt b/compute-runtime-22.24.23453/CMakeLists.txt
-index f227808..83075f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -702,7 +702,6 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- else()
- if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=2")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
- else()
- # gcc, g++ only
-@@ -711,7 +710,6 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
- endif()
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=2")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
- set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,-z,noexecstack")
- set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,-z,relro")
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 55cb032044cd..83f161b3529a 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1 +1,2 @@
DIST level-zero-1.17.42.tar.gz 1152554 BLAKE2B a9b2054a620735490d1ff0f0a7e35e96bfe80531cf738e11ae3316bc0ce06108304e6f55ca57c2392a7854d7015bf2bcab93aa9778784ec546da41e174a08298 SHA512 c16c8269c82888c80c226e2e67641a3dbe0dd49b7e00ce5b2b8f90ab1233ac4bba1032f0b00c9dd702b85e1f635210bc383ec0c7e74651514ac104f5d9e8300c
+DIST level-zero-1.17.45.tar.gz 1152376 BLAKE2B 24ed5569431cd116808f48f2b718666baa8ecbdf0f69b56e7ca5a25fe5266cba48ba05c06946abd4a57562c8342aefc7f9c34b707435b793fe723412f64180d6 SHA512 83d97ffe43c21286a845bb9d11504414972c944d9b06975ba9e7680802a92a260b6246f3605ed32e5e5dec358972fbb5cab49543559dc36cb164a9c3b6a69d73
diff --git a/dev-libs/level-zero/level-zero-1.17.45.ebuild b/dev-libs/level-zero/level-zero-1.17.45.ebuild
new file mode 100644
index 000000000000..4034c8711d28
--- /dev/null
+++ b/dev-libs/level-zero/level-zero-1.17.45.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="oneAPI Level Zero headers, loader and validation layer"
+HOMEPAGE="https://github.com/oneapi-src/level-zero"
+SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/spdlog:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # Don't hardcore -Werror
+ sed -e 's/-Werror//g' -i CMakeLists.txt || die
+
+ cmake_src_prepare
+
+ # According to upstream, release tarballs should contain this file but at least
+ # some of them do not. Fortunately it is trivial to make one ourselves.
+ echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSYSTEM_SPDLOG="ON"
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-vcs/git-cola/files/git-cola-4.2.1-fix-setuptools.patch b/dev-vcs/git-cola/files/git-cola-4.2.1-fix-setuptools.patch
deleted file mode 100644
index d1453c3f163e..000000000000
--- a/dev-vcs/git-cola/files/git-cola-4.2.1-fix-setuptools.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b53983c7fa7d29dd6f474177015fcb6f2ee0e6d1 Mon Sep 17 00:00:00 2001
-From: David Aguilar <davvid@gmail.com>
-Date: Thu, 2 Nov 2023 01:33:16 -0700
-Subject: [PATCH] pyproject.toml: list dependencies and optional-dependencies
- as dynamic
-
-Signed-off-by: David Aguilar <davvid@gmail.com>
----
- pyproject.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 20b3008e0..97cdf79b4 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -13,7 +13,7 @@ classifiers = [
- "Topic :: Software Development :: Version Control :: Git",
- ]
- description = "A sleek and powerful Git GUI"
--dynamic = ["version"]
-+dynamic = ["dependencies", "optional-dependencies", "version"]
- license = {file = "COPYING"}
- readme = "README.md"
-
diff --git a/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch b/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch
deleted file mode 100644
index 971578f0016f..000000000000
--- a/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3bd65679f7db2ec95abb22fef7a30a15dcc1c297 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 23 Jan 2023 19:54:23 +0100
-Subject: [PATCH] disable collada tests
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -63,7 +63,6 @@ SET( COMMON
- unit/utSimd.cpp
- unit/utIOSystem.cpp
- unit/utIOStreamBuffer.cpp
-- unit/utIssues.cpp
- unit/utAnim.cpp
- unit/AssimpAPITest.cpp
- unit/AssimpAPITest_aiMatrix3x3.cpp
-@@ -137,8 +136,6 @@ SET( IMPORTERS
- unit/utBlendImportMaterials.cpp
- unit/utBlenderWork.cpp
- unit/utBVHImportExport.cpp
-- unit/utColladaExport.cpp
-- unit/utColladaImportExport.cpp
- unit/utCSMImportExport.cpp
- unit/utB3DImportExport.cpp
- #unit/utM3DImportExport.cpp
---
-2.39.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch b/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch
deleted file mode 100644
index 92936e6442eb..000000000000
--- a/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From aaace4ca2e2d4f46b7dce0940af6e332563c5a21 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 24 Dec 2022 11:19:17 +0100
-Subject: [PATCH] disable failing tests
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-@@ -127,25 +127,9 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3RotationZTest) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromRotationAroundAxisTest) {
-- const float angle(RandPI.next());
-- const auto axis = random_unit_vec3();
-- aiMatrix3x3::Rotation(angle, axis, result_cpp);
-- aiMatrix3FromRotationAroundAxis(&result_c, &axis, angle);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3TranslationTest) {
- const auto axis = random_vec2();
- aiMatrix3x3::Translation(axis, result_cpp);
- aiMatrix3Translation(&result_c, &axis);
- EXPECT_EQ(result_cpp, result_c);
- }
--
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromToTest) {
-- // Use predetermined vectors to prevent running into division by zero.
-- const auto from = aiVector3D(1,2,1).Normalize(), to = aiVector3D(-1,1,1).Normalize();
-- aiMatrix3x3::FromToMatrix(from, to, result_cpp);
-- aiMatrix3FromTo(&result_c, &from, &to);
-- EXPECT_EQ(result_cpp, result_c);
--}
---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-@@ -228,14 +228,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4RotationZTest) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromRotationAroundAxisTest) {
-- const float angle(RandPI.next());
-- const auto axis = random_unit_vec3();
-- aiMatrix4x4::Rotation(angle, axis, result_cpp);
-- aiMatrix4FromRotationAroundAxis(&result_c, &axis, angle);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4TranslationTest) {
- const auto axis = random_vec3();
- aiMatrix4x4::Translation(axis, result_cpp);
-@@ -249,11 +241,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) {
- aiMatrix4Scaling(&result_c, &scaling);
- EXPECT_EQ(result_cpp, result_c);
- }
--
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromToTest) {
-- // Use predetermined vectors to prevent running into division by zero.
-- const auto from = aiVector3D(1,2,1).Normalize(), to = aiVector3D(-1,1,1).Normalize();
-- aiMatrix4x4::FromToMatrix(from, to, result_cpp);
-- aiMatrix4FromTo(&result_c, &from, &to);
-- EXPECT_EQ(result_cpp, result_c);
--}
---- a/test/unit/AssimpAPITest_aiQuaternion.cpp
-+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
-@@ -84,13 +84,6 @@ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromAxisAngleTest) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromNormalizedQuaternionTest) {
-- const auto qvec3 = random_unit_vec3();
-- result_cpp = aiQuaternion(qvec3);
-- aiQuaternionFromNormalizedQuaternion(&result_c, &qvec3);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionAreEqualTest) {
- result_c = result_cpp = random_quat();
- EXPECT_EQ(result_cpp == result_c,
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -68,10 +68,6 @@ TEST_F( utVersion, aiGetCompileFlagsTest ) {
- EXPECT_NE( aiGetCompileFlags(), 0U );
- }
-
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
-- EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
- TEST_F( utVersion, aiGetBranchNameTest ) {
- EXPECT_NE( nullptr, aiGetBranchName() );
- }
---
-2.39.0
-
diff --git a/media-libs/assimp/files/assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch
deleted file mode 100644
index 1ee315ab28be..000000000000
--- a/media-libs/assimp/files/assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From f3d40e0bd8b7134f963adc08b8c2bb043a385c6f Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 25 Dec 2022 09:46:58 +0100
-Subject: [PATCH] drop failing tests for abi_x86_32
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-@@ -68,13 +68,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromMatrix4Test) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromQuaternionTest) {
-- const auto q = random_quat();
-- result_cpp = q.GetMatrix();
-- aiMatrix3FromQuaternion(&result_c, &q);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3AreEqualTest) {
- result_c = result_cpp = random_mat3();
- EXPECT_EQ(result_cpp == result_c,
-@@ -102,18 +95,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiTransposeMatrix3Test) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3InverseTest) {
-- // Use a predetermined matrix to prevent arbitrary
-- // cases where it could have a null determinant.
-- result_c = result_cpp = aiMatrix3x3(
-- 5, 2, 7,
-- 4, 6, 9,
-- 1, 8, 3);
-- result_cpp.Inverse();
-- aiMatrix3Inverse(&result_c);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3DeterminantTest) {
- result_c = result_cpp = random_mat3();
- EXPECT_EQ(result_cpp.Determinant(),
---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-@@ -78,15 +78,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromMatrix3Test) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromScalingQuaternionPositionTest) {
-- const aiVector3D s = random_vec3();
-- const aiQuaternion q = random_quat();
-- const aiVector3D t = random_vec3();
-- result_cpp = aiMatrix4x4(s, q, t);
-- aiMatrix4FromScalingQuaternionPosition(&result_c, &s, &q, &t);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4AddTest) {
- const aiMatrix4x4 temp = random_mat4();
- result_c = result_cpp = random_mat4();
-@@ -135,12 +126,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4InverseTest) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DeterminantTest) {
-- result_c = result_cpp = random_mat4();
-- EXPECT_EQ(result_cpp.Determinant(),
-- aiMatrix4Determinant(&result_c));
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4IsIdentityTest) {
- EXPECT_EQ(result_cpp.IsIdentity(),
- (bool)aiMatrix4IsIdentity(&result_c));
---- a/test/unit/AssimpAPITest_aiQuaternion.cpp
-+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
-@@ -54,19 +54,6 @@ protected:
- aiQuaternion result_c, result_cpp;
- };
-
--TEST_F(AssimpAPITest_aiQuaternion, aiCreateQuaternionFromMatrixTest) {
-- // Use a predetermined transformation matrix
-- // to prevent running into division by zero.
-- aiMatrix3x3 m, r;
-- aiMatrix3x3::Translation(aiVector2D(14,-25), m);
-- aiMatrix3x3::RotationZ(Math::aiPi<float>() / 4.0f, r);
-- m = m * r;
--
-- result_cpp = aiQuaternion(m);
-- aiCreateQuaternionFromMatrix(&result_c, &m);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromEulerAnglesTest) {
- const float x(RandPI.next()),
- y(RandPI.next()),
-@@ -115,14 +102,3 @@ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionMultiplyTest) {
- aiQuaternionMultiply(&result_c, &temp);
- EXPECT_EQ(result_cpp, result_c);
- }
--
--TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionInterpolateTest) {
-- // Use predetermined quaternions to prevent division by zero
-- // during slerp calculations.
-- const float INTERPOLATION(0.5f);
-- const auto q1 = aiQuaternion(aiVector3D(-1,1,1).Normalize(), Math::aiPi<float>() / 4.0f);
-- const auto q2 = aiQuaternion(aiVector3D(1,2,1).Normalize(), Math::aiPi<float>() / 2.0f);
-- aiQuaternion::Interpolate(result_cpp, q1, q2, INTERPOLATION);
-- aiQuaternionInterpolate(&result_c, &q1, &q2, INTERPOLATION);
-- EXPECT_EQ(result_cpp, result_c);
--}
---- a/test/unit/AssimpAPITest_aiVector2D.cpp
-+++ b/test/unit/AssimpAPITest_aiVector2D.cpp
-@@ -74,28 +74,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2AddTest) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiVector2D, aiVector2SubtractTest) {
-- result_c = result_cpp = random_vec2();
-- result_cpp -= temp;
-- aiVector2Subtract(&result_c, &temp);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2ScaleTest) {
-- const float FACTOR = RandNonZero.next();
-- result_c = result_cpp = random_vec2();
-- result_cpp *= FACTOR;
-- aiVector2Scale(&result_c, FACTOR);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
-- result_c = result_cpp = random_vec2();
-- result_cpp = result_cpp.SymMul(temp);
-- aiVector2SymMul(&result_c, &temp);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByScalarTest) {
- const float DIVISOR = RandNonZero.next();
- result_c = result_cpp = random_vec2();
---
-2.39.0
-
diff --git a/media-libs/assimp/files/assimp-5.2.5-fix-version.patch b/media-libs/assimp/files/assimp-5.2.5-fix-version.patch
deleted file mode 100644
index 71b58c4808d1..000000000000
--- a/media-libs/assimp/files/assimp-5.2.5-fix-version.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/assimp/assimp/pull/4730
-
-From b526d7a4b82be6d8c1481459975350b94384e805 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 17 Sep 2022 15:15:58 +0200
-Subject: [PATCH] fix version
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED)
- add_definitions(-DASSIMP_USE_HUNTER)
- ENDIF()
-
--PROJECT(Assimp VERSION 5.2.4)
-+PROJECT(Assimp VERSION 5.2.5)
-
- # All supported options ###############################################
-
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) {
- }
-
- TEST_F( utVersion, aiGetVersionPatchTest ) {
-- EXPECT_EQ(aiGetVersionPatch(), 4U );
-+ EXPECT_EQ(aiGetVersionPatch(), 5U );
- }
-
- TEST_F( utVersion, aiGetCompileFlagsTest ) {
---
-2.37.3
-
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 8be6d80e4a9a..a1a8b28e0e2b 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,6 @@
DIST modsecurity-nginx-1.0.3.tar.gz 34063 BLAKE2B 859a29eb7f67d53a818578f1008f0d0debbe37c205bb7c6e79594d8b1a6a0d93988880d35f607ef05ef6d73c9aa887baebfd2c54aca894969beeed4bfe576f37 SHA512 20495884c6b3594edf879a19fd7445f2e74a1628789decd146b3c712764b0507e440a84a64aab619461b044f98b8d641913cfad57a6d0002e7061716bdfe84fc
DIST nginx-1.26.2.tar.gz 1244789 BLAKE2B f054deb47bf21bf963fedc8f980d29c92325bbfcb39c5a2cc67cce15add32036f0b771c7abac018ded6354a0df0850ed5843d26e0cf5d9577b70ca3fa89a206c SHA512 470efe9ae5d6150ecbf133979c6c36415679a2156499a3b6820a85eb8f3038a8aa06f7b28ddd834cffb0e982f3ddc89e4b1649d536eba4f84019a72d4cfa3539
-DIST nginx-1.27.1.tar.gz 1245244 BLAKE2B d31dac0ced22604a3e8d3b054b3fe560aef4e29b56346466e09e39316ce21ff4b107233a50e58d20419551fd8b9cc530f855445efd88b8497b492676e10de3d8 SHA512 9bbdfcd7b9524f48e96b2ce6cc74bab20242885f208d1ad4117336a24642f3355d1c379e6041a4c341e31fb15faea39fc4410b6523164e3179594bbfb5fc35f5
+DIST nginx-1.27.2.tar.gz 1258098 BLAKE2B f3a68e0f5f89cdbae2f79dc71ecf9074cf39bbee114c3bdc59892baec54eb44fc4fdb1e0aa7f3f688ae28386a2371d2301fa12fba93e4a08ed05ebfd3d481952 SHA512 5e2e0ccba596c5fa67571095e7c9b34e0a8a44f12d72c5cc714360926a192a09810e08f653b16112b5a3223e8cddc5a61f9f8dba026fb0854ec7a0d440666cf2
DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
DIST nginx-tests-0b5ec15c62ed.tar.gz 282652 BLAKE2B af41397f88f7aa969749c6dd9a77c58d1835bca24fe764dd0af328d621817f5fb89b3f5b5c0fbd1e7db53d51365e9098b020005e27a531649bd8a51a05b3cbb0 SHA512 c376d23c7001c5203428b664c388e97956cdda8365eb7df57db0da5146d0806f5c35cd1352260d6803d55542f46a90da4a604ebf971055caa77dd6106930558e
DIST nginx-vod-module-1.33.tar.gz 471858 BLAKE2B fa5cb9fd185b30c5c53b25a6f103213b3d04dac5d2d81db72f9749a51548e09e3e17dccc636d748aff8d21c6623484c77fdeb10d70854480759665d140d42e0e SHA512 29ef77f1bbdb2410ff317ebdd7434f31b8ec370ae6b617b92e745e87c11bc820b451181d1d2b57156b414348da14ac448b689b32b17ab418144292eda094512d
@@ -26,4 +26,4 @@ DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1
DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
DIST ngx_rtmp-1.2.2.tar.gz 519934 BLAKE2B 8745816b879f506720955d6c7e5e8af036e88b3601a680071ffb255a3ec31d69e132b5cc8b493202fa985eb30b8529428f683b5154a0054c0ee990d3185c7abf SHA512 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
-DIST njs-0.8.5.tar.gz 844437 BLAKE2B 3f8a601370fbe2bfbe0e1748f71b1793985fd2736f4b94a65ec564d5ac4a653faf28a86469cef36bc312ff53287ea4afd43edda503e36c8797947827a902a10d SHA512 09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c
+DIST njs-0.8.6.tar.gz 879028 BLAKE2B cd6ef50feeeeeb66ac927a9373bac9612e1bd47ec1a6bf4115feac0c15f2e67a1970c19b1bc0fa751395b98eda303dc91547bffde648958935cca4ed531a0728 SHA512 418fb54cf4924a38a1cde661432e9432853a643289c299c347aa9e9b393013e504ea4f15698c885ecde7e7ccb249c51b6b1c2bab96024f82b9acb271d2d4acb9
diff --git a/www-servers/nginx/nginx-1.26.2-r2.ebuild b/www-servers/nginx/nginx-1.26.2-r3.ebuild
index fe6db3b44206..657fa2679891 100644
--- a/www-servers/nginx/nginx-1.26.2-r2.ebuild
+++ b/www-servers/nginx/nginx-1.26.2-r3.ebuild
@@ -166,7 +166,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.8.5"
+NJS_MODULE_PV="0.8.6"
NJS_MODULE_P="njs-${NJS_MODULE_PV}"
NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
diff --git a/www-servers/nginx/nginx-1.27.1-r2.ebuild b/www-servers/nginx/nginx-1.27.2.ebuild
index bfc1a4a791b6..922754bbbec8 100644
--- a/www-servers/nginx/nginx-1.27.1-r2.ebuild
+++ b/www-servers/nginx/nginx-1.27.2.ebuild
@@ -166,7 +166,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.8.5"
+NJS_MODULE_PV="0.8.6"
NJS_MODULE_P="njs-${NJS_MODULE_PV}"
NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
@@ -222,8 +222,6 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
SLOT="mainline"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-RESTRICT="!test? ( test )"
-
NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
proxy referer rewrite scgi ssi split_clients upstream_hash
@@ -264,6 +262,8 @@ NGINX_MODULES_3RD="
stream_javascript
"
+RESTRICT="!test? ( test )"
+
IUSE="aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl test threads vim-syntax"
for mod in $NGINX_MODULES_STD; do