gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2026-04-16 01:00:56 +00:00
parent 969a115375 29c0db1bfe
commit b487b73a1d
7 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dev-java/commons-lang/commons-lang-3.20.0.ebuild → dev-java/commons-lang/commons-lang-3.20.0-r1.ebuild
View File

@@ -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"

14
dev-java/commons-lang/files/commons-lang-3.20.0-ppc64le.patch Normal file
View File

@@ -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() {

2
media-gfx/gphoto2/gphoto2-2.5.32.ebuild
View File

@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
IUSE="aalib ncurses nls readline"
# aalib -> needs libjpeg

2
media-gfx/gphotofs/gphotofs-1.0.ebuild
View File

@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
PATCHES=(
"${FILESDIR}"/"${P}"-fuse-prototype.patch

2
media-libs/libgphoto2/libgphoto2-2.5.33.ebuild
View File

@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="GPL-2"
# FIXME: should we also bump for libgphoto2_port.so soname version?
SLOT="0/6" # libgphoto2.so soname version
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
# By default, drivers for all supported cameras will be compiled.
# If you want to only compile for specific camera(s), set CAMERAS

2
net-vpn/i2p/i2p-2.11.0.ebuild
View File

@@ -55,7 +55,7 @@ BDEPEND="
sys-apps/which
sys-devel/gettext
test? (
>=dev-java/ant-1.10.14-r3:0[junit4]
>=dev-java/ant-1.10.14-r3:0[junit,junit4]
)
"
RDEPEND="

2
sec-keys/openpgp-keys-marcusmeissner/openpgp-keys-marcusmeissner-20260415.ebuild
View File

@@ -13,4 +13,4 @@ DESCRIPTION="OpenPGP key used by Marcus Meissner"
HOMEPAGE="https://github.com/msmeissn"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"