diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
| commit | a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7 (patch) | |
| tree | 0c52bbae1c242fbc296bd650fcd1167685f81492 /dev-java/guava | |
| parent | bfd9c39e4712ebdb442d4ca0673061faed1e70e1 (diff) | |
| download | baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.gz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.xz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.zip | |
Adding metadata
Diffstat (limited to 'dev-java/guava')
| -rw-r--r-- | dev-java/guava/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/guava/files/guava-33.5.0-allow-java26.patch | 59 | ||||
| -rw-r--r-- | dev-java/guava/guava-33.5.0.ebuild | 81 | ||||
| -rw-r--r-- | dev-java/guava/metadata.xml | 12 |
4 files changed, 0 insertions, 153 deletions
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest deleted file mode 100644 index 23326ed8ed77..000000000000 --- a/dev-java/guava/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST guava-33.5.0.tar.gz 5877617 BLAKE2B bcd6a7daa44ea03faf8adaed36e47d9a2c38e485a45c0ffac2d8f4355a67c2c36f1325189f585b0507c4f2a430af80ce05d1f96df026272cb0fded9eccd66be8 SHA512 95e744d60e1cd20553b2070cdde0f240065e7aa71b76c2174806fbaf756df2adca4388a25d24ce2b6b4da6fa65f1fa1285febe238caa812c7e43fa97731654d4 diff --git a/dev-java/guava/files/guava-33.5.0-allow-java26.patch b/dev-java/guava/files/guava-33.5.0-allow-java26.patch deleted file mode 100644 index 36f1a00fe26c..000000000000 --- a/dev-java/guava/files/guava-33.5.0-allow-java26.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9a406e7f461c27d141eb765d7992e767ee13427f Mon Sep 17 00:00:00 2001 -From: Liam Miller-Cushon <cushon@google.com> -Date: Thu, 25 Sep 2025 07:58:39 -0700 -Subject: [PATCH] Fix a compilation error caused by - https://bugs.openjdk.org/browse/JDK-8357219 - -RELNOTES=n/a -PiperOrigin-RevId: 811351810 ---- - android/guava/src/com/google/common/primitives/Booleans.java | 5 +++-- - guava/src/com/google/common/primitives/Booleans.java | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/android/guava/src/com/google/common/primitives/Booleans.java b/android/guava/src/com/google/common/primitives/Booleans.java -index dae0f3b028eb..38c0cbbdee67 100644 ---- a/android/guava/src/com/google/common/primitives/Booleans.java -+++ b/android/guava/src/com/google/common/primitives/Booleans.java -@@ -18,7 +18,6 @@ - import static com.google.common.base.Preconditions.checkElementIndex; - import static com.google.common.base.Preconditions.checkNotNull; - import static com.google.common.base.Preconditions.checkPositionIndexes; --import static java.lang.Math.min; - - import com.google.common.annotations.GwtCompatible; - import com.google.common.annotations.GwtIncompatible; -@@ -321,7 +320,9 @@ private enum LexicographicalComparator implements Comparator<boolean[]> { - - @Override - public int compare(boolean[] left, boolean[] right) { -- int minLength = min(left.length, right.length); -+ // do not static import Math.min due to https://bugs.openjdk.org/browse/JDK-8357219 -+ @SuppressWarnings("StaticImportPreferred") -+ int minLength = Math.min(left.length, right.length); - for (int i = 0; i < minLength; i++) { - int result = Boolean.compare(left[i], right[i]); - if (result != 0) { -diff --git a/guava/src/com/google/common/primitives/Booleans.java b/guava/src/com/google/common/primitives/Booleans.java -index dae0f3b028eb..38c0cbbdee67 100644 ---- a/guava/src/com/google/common/primitives/Booleans.java -+++ b/guava/src/com/google/common/primitives/Booleans.java -@@ -18,7 +18,6 @@ - import static com.google.common.base.Preconditions.checkElementIndex; - import static com.google.common.base.Preconditions.checkNotNull; - import static com.google.common.base.Preconditions.checkPositionIndexes; --import static java.lang.Math.min; - - import com.google.common.annotations.GwtCompatible; - import com.google.common.annotations.GwtIncompatible; -@@ -321,7 +320,9 @@ private enum LexicographicalComparator implements Comparator<boolean[]> { - - @Override - public int compare(boolean[] left, boolean[] right) { -- int minLength = min(left.length, right.length); -+ // do not static import Math.min due to https://bugs.openjdk.org/browse/JDK-8357219 -+ @SuppressWarnings("StaticImportPreferred") -+ int minLength = Math.min(left.length, right.length); - for (int i = 0; i < minLength; i++) { - int result = Boolean.compare(left[i], right[i]); - if (result != 0) { diff --git a/dev-java/guava/guava-33.5.0.ebuild b/dev-java/guava/guava-33.5.0.ebuild deleted file mode 100644 index 506a40921863..000000000000 --- a/dev-java/guava/guava-33.5.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.google.guava:guava:${PV}-jre" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A collection of Google's core Java libraries" -HOMEPAGE="https://github.com/google/guava" -SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -CP_DEPEND=" - >=dev-java/error-prone-annotations-2.42.0:0 - >=dev-java/j2objc-annotations-3.1:0 - dev-java/jspecify:0 -" - -DEPEND=" - ${CP_DEPEND} - >=dev-java/checker-framework-qual-3.51.1:0 - dev-java/jsr305:0 - >=virtual/jdk-11:* -" - -RDEPEND=" - ${CP_DEPEND} - >=virtual/jre-1.8:* -" - -PATCHES=( "${FILESDIR}/guava-33.5.0-allow-java26.patch" ) - -JAVA_CLASSPATH_EXTRA="jsr305" - -src_prepare() { - default # bug #780585 - java-pkg-2_src_prepare - - # Get module-info.class into versions/9 - mkdir -p futures/failureaccess/src9 || die "mkdir futures" - mv futures/failureaccess/src{,9}/module-info.java || die "mv futures" - mkdir -p guava/src9 || die "mkdir guava" - mv guava/src{,9}/module-info.java || die "mv guava" -} - -src_compile() { - einfo "Compiling failureaccess.jar" - JAVA_INTERMEDIATE_JAR_NAME="com.google.common.util.concurrent.internal" - JAVA_JAR_FILENAME="failureaccess.jar" - JAVA_RELEASE_SRC_DIRS=( ["9"]="futures/failureaccess/src9" ) - JAVA_SRC_DIR="futures/failureaccess/src" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":failureaccess.jar" - rm -r target || die - - einfo "Compiling guava.jar" - JAVA_CLASSPATH_EXTRA="checker-framework-qual" - JAVA_INTERMEDIATE_JAR_NAME="com.google.common" - JAVA_JAR_FILENAME="guava.jar" - JAVA_RELEASE_SRC_DIRS=( ["9"]="guava/src9" ) - JAVA_SRC_DIR="guava/src" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":guava.jar" - rm -r target || die - - JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}" - JAVADOC_SRC_DIRS=( {futures/failureaccess,guava}/src ) - use doc && ejavadoc -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dojar failureaccess.jar -} diff --git a/dev-java/guava/metadata.xml b/dev-java/guava/metadata.xml deleted file mode 100644 index e5b07e1d5d67..000000000000 --- a/dev-java/guava/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <longdescription lang="en">The Guava project contains several of Google's core libraries that we rely on in our Java-based projects: collections, caching, primitives support, concurrency libraries, common annotations, string processing, I/O, and so forth.</longdescription> - <upstream> - <remote-id type="github">google/guava</remote-id> - </upstream> -</pkgmetadata> |
