diff --git a/dev-java/commons-lang/commons-lang-3.20.0.ebuild b/dev-java/commons-lang/commons-lang-3.20.0-r1.ebuild similarity index 92% rename from dev-java/commons-lang/commons-lang-3.20.0.ebuild rename to dev-java/commons-lang/commons-lang-3.20.0-r1.ebuild index a89c68a3023c6..d33c552fe7e4b 100644 --- a/dev-java/commons-lang/commons-lang-3.20.0.ebuild +++ b/dev-java/commons-lang/commons-lang-3.20.0-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI=9 JAVA_PKG_IUSE="doc source test" JAVA_TESTING_FRAMEWORKS="junit-jupiter" @@ -38,7 +38,10 @@ DEPEND=" RDEPEND=">=virtual/jre-1.8:*" -PATCHES=( "${FILESDIR}/commons-lang-3.19.0-skip-testGetJavaAwtHeadless.patch" ) +PATCHES=( + "${FILESDIR}/commons-lang-3.19.0-skip-testGetJavaAwtHeadless.patch" + "${FILESDIR}/commons-lang-3.20.0-ppc64le.patch" +) JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.lang3" JAVA_GENTOO_CLASSPATH_EXTRA="org.apache.commons.lang3.jar" @@ -50,11 +53,6 @@ JAVA_TEST_RESOURCE_DIRS="src/test/resources" JAVA_TEST_SRC_DIR="src/test/java" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" -src_prepare() { - default #780585 - java-pkg-2_src_prepare -} - src_test() { local vm_version="$(java-config -g PROVIDES_VERSION)" if ver_test "${vm_version}" -ge 17; then diff --git a/dev-java/commons-lang/files/commons-lang-3.20.0-ppc64le.patch b/dev-java/commons-lang/files/commons-lang-3.20.0-ppc64le.patch new file mode 100644 index 0000000000000..93d3cb54ce46e --- /dev/null +++ b/dev-java/commons-lang/files/commons-lang-3.20.0-ppc64le.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/972590 +https://github.com/apache/commons-lang/pull/1624 + +--- a/src/main/java/org/apache/commons/lang3/ArchUtils.java ++++ b/src/main/java/org/apache/commons/lang3/ArchUtils.java +@@ -117,7 +117,7 @@ public class ArchUtils { + } + + private static void init_PPC_64Bit() { +- addProcessors(new Processor(Processor.Arch.BIT_64, Processor.Type.PPC), "ppc64", "power64", "powerpc64", "power_pc64", "power_rs64"); ++ addProcessors(new Processor(Processor.Arch.BIT_64, Processor.Type.PPC), "ppc64", "ppc64le", "power64", "powerpc64", "power_pc64", "power_rs64"); + } + + private static void init_RISCV_32Bit() { diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest index 443ff0787939c..d34f1dd381cc4 100644 --- a/net-im/signal-desktop-bin/Manifest +++ b/net-im/signal-desktop-bin/Manifest @@ -1 +1 @@ -DIST signal-desktop_8.6.0_amd64.deb 106602952 BLAKE2B 46a9db1bae364b9f9d760575da9032303929185b700ae8c002251449427e27b4e8e444c256bc1212ce62659462230faa25f28cf2bb313bcd6fcf8911ebcf49bd SHA512 c0ebe4e071a44275af4d5a2277b2ef79eac989ea76e201dd9fe0c81c8aaa087253ea0b8f10c8b020f93f5ca94f58f08aaed6fde8baaea71365f2a3e0476e0c7c +DIST signal-desktop_8.6.1_amd64.deb 106583738 BLAKE2B 474d0dad431610e9d690905539ffeb4bcbbc04afe6ae613654d9db4f21549289468d0a57519ca3b376ecb6451bfdef33bcc9a5b69201b74caee00b47b788efd5 SHA512 fe30115f5dfde024d4e0b19c25925fa9277e40804d0e2fd7d031996cf6d11e83e3e350fa0292aa2d3d7113194cb0f69de5f48027b75eeb571114187b19abe9d4 diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-8.6.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-8.6.1.ebuild similarity index 99% rename from net-im/signal-desktop-bin/signal-desktop-bin-8.6.0.ebuild rename to net-im/signal-desktop-bin/signal-desktop-bin-8.6.1.ebuild index edbd5de4b1d87..a553e91e7be09 100644 --- a/net-im/signal-desktop-bin/signal-desktop-bin-8.6.0.ebuild +++ b/net-im/signal-desktop-bin/signal-desktop-bin-8.6.1.ebuild @@ -32,7 +32,7 @@ RDEPEND=" sys-apps/dbus virtual/udev x11-libs/cairo - x11-libs/gtk+:3[X] + x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon