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

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2024-01-19 12:49:59 +00:00
parent ebd20af2bb 4bb60d24ec
commit 8f2c59a19c
9 changed files with 17 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app-emacs/flim/flim-1.14.9_p20231218.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="oauth2 test"
RESTRICT="!test? ( test )"

4
app-emacs/oauth2/oauth2-0.16.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,6 +13,6 @@ S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 sparc x86"
SITEFILE="50${PN}-gentoo.el"

1
dev-java/icu4j/Manifest
View File

@@ -1,2 +1 @@
DIST icu-74.1.tar.gz 65889935 BLAKE2B e9dc354a795b69cf22152db437027f099e65b02f352e3ec9f0203b465b4f01a7844229ed5a7954e9b7f7f55f0d2d93a8e1f984c70de47555c230ec8b42cb7949 SHA512 eec8858cb37200fffce9bc60a8bd0c56d7024d9e2574d030c7e726aa4b2a105b1362548c0be163c720048bd7a7bfe9374b3c5954ba14e2e34beab346a8af8df4
DIST icu-74.2.tar.gz 65888936 BLAKE2B 81d5acddbfc58a859906cb61660b6f230b88f4a1b1cfd56838843e9445b5858d3dd4888707026340581322143f6a4b7b81f53b6431fd5d4cc3fb90531c4d82fb SHA512 728ae0f09ffc802d675bcf5b849e3081472de8417736bf8b7df0f4db9d1fb8073779be76536764c9111f7cb0e5ab2d2af6c644cc24be432b9eeae9063802ad6c

198
dev-java/icu4j/icu4j-74.1.ebuild
View File

@@ -1,198 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
MAVEN_PROVIDES="
com.ibm.icu:icu4j:${PV}
com.ibm.icu:icu4j-charset:${PV}
com.ibm.icu:icu4j-localespi:${PV}
"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
HOMEPAGE="https://icu.unicode.org"
SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz"
S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
LICENSE="icu"
SLOT="70"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
test? ( dev-java/junitparams:0 )
"
RDEPEND=">=virtual/jre-1.8:*"
DOCS=( ../../{CONTRIBUTING,README,SECURITY}.md )
HTML_DOCS=( ../{APIChangeReport,readme}.html )
src_prepare() {
default
java-pkg-2_src_prepare
}
src_compile() {
JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar"
einfo "Compiling icu4j.jar"
JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu"
JAVA_JAR_FILENAME="icu4j.jar"
JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo"
JAVA_RESOURCE_DIRS=(
collate/src/main/resources
core/src/main/resources
currdata/src/main/resources
langdata/src/main/resources
regiondata/src/main/resources
translit/src/main/resources
)
JAVA_SRC_DIR=(
collate/src/main/java
core/src/main/java
currdata/src/main/java
langdata/src/main/java
regiondata/src/main/java
translit/src/main/java
)
java-pkg-simple_src_compile
rm -r target || die
einfo "Compiling icu4j-charset.jar"
JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset"
JAVA_JAR_FILENAME="icu4j-charset.jar"
JAVA_MAIN_CLASS=""
JAVA_RESOURCE_DIRS=( charset/src/main/resources )
JAVA_SRC_DIR=( charset/src/main/java )
java-pkg-simple_src_compile
rm -r target || die
einfo "Compiling icu4j-localespi.jar"
JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi"
JAVA_JAR_FILENAME="icu4j-localespi.jar"
JAVA_RESOURCE_DIRS=( localespi/src/main/resources )
JAVA_SRC_DIR=( localespi/src/main/java )
java-pkg-simple_src_compile
rm -r target || die
# javadocs
if use doc; then
einfo "Compiling javadocs"
JAVA_JAR_FILENAME="ignoreme.jar"
JAVA_SRC_DIR=(
collate/src/main/java
core/src/main/java
currdata/src/main/java
langdata/src/main/java
regiondata/src/main/java
translit/src/main/java
charset/src/main/java
localespi/src/main/java
)
java-pkg-simple_src_compile
fi
}
src_test () {
# TZ needed for some tests in com/ibm/icu/dev/test/format/DateFormatTest
export LC_ALL="en_US.UTF-8" TZ="US/Pacific"
JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI"
JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams"
einfo "Compiling framework-tests.jar"
JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.framework"
JAVA_JAR_FILENAME="framework-tests.jar"
JAVA_MAIN_CLASS="com.ibm.icu.dev.test.TestAll"
JAVA_RESOURCE_DIRS=( framework/src/test/resources )
JAVA_SRC_DIR=( framework/src/test/java )
java-pkg-simple_src_compile
JAVA_GENTOO_CLASSPATH_EXTRA+=":framework-tests.jar"
einfo "Testing core aka icu4j.jar"
JAVA_TEST_RESOURCE_DIRS="core/src/test/resources"
JAVA_TEST_SRC_DIR="core/src/test/java"
pushd "${JAVA_TEST_SRC_DIR}" || die
# exclude invalid tests, not run by "mvn test"
local JAVA_TEST_RUN_ONLY=$(find * \
-name "*Test*.java" \
! -name "ChineseTestCase.java" \
! -name "DataDrivenNumberFormatTestUtility.java" \
! -name "*Helper.java" \
! -name "ModuleTest.java" \
! -name "*Sample.java" \
! -name "TestCase.java" \
! -name "*TestData*.java" \
! -name "*TestFmwk.java" \
! -name "TestMessages.java" \
! -name "TestUtils.java" \
)
popd
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
java-pkg-simple_src_test
einfo "Creating core-tests.jar"
jar cvf core-tests.jar -C target/test-classes .
JAVA_GENTOO_CLASSPATH_EXTRA+=":core-tests.jar"
JAVA_TEST_RUN_ONLY=""
einfo "Testing collate"
JAVA_TEST_RESOURCE_DIRS="collate/src/test/resources"
JAVA_TEST_SRC_DIR="collate/src/test/java"
java-pkg-simple_src_test
einfo "Testing translit"
JAVA_TEST_EXCLUDES=(
# Invalid test classes, No runnable methods
com.ibm.icu.dev.test.TestBoilerplate
com.ibm.icu.dev.test.translit.TestUtility
)
JAVA_TEST_RESOURCE_DIRS="translit/src/test/resources"
JAVA_TEST_SRC_DIR="translit/src/test/java"
java-pkg-simple_src_test
einfo "Testing charset"
JAVA_TEST_RESOURCE_DIRS=""
JAVA_TEST_SRC_DIR="charset/src/test/java"
java-pkg-simple_src_test
einfo "Testing common_tests"
# "mvn test" runs only 90 tests here, Gentoo runs 99 but 9 of them fail.
# coverage tests fail because test handlers for the parametrized tests
# are not defined so the tests are broken and cannot succeed
JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.serializable.CoverageTest )
JAVA_TEST_RESOURCE_DIRS=""
JAVA_TEST_SRC_DIR="common_tests/src/test/java"
java-pkg-simple_src_test
einfo "Testing localespi"
JAVA_TEST_RESOURCE_DIRS=""
JAVA_TEST_SRC_DIR="localespi/src/test/java"
# Invalid test classes, No runnable methods
JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.localespi.TestUtil )
# https://bugs.gentoo.org/827212, "mvn test" does not run it at all
local vm_version="$(java-config -g PROVIDES_VERSION)"
if [[ "${vm_version}" != "1.8" ]] ; then
java-pkg-simple_src_test
fi
}
src_install() {
default
java-pkg_dojar "icu4j.jar"
java-pkg_dojar "icu4j-charset.jar"
java-pkg_dojar "icu4j-localespi.jar"
if use doc; then
java-pkg_dojavadoc target/api
fi
if use source; then
java-pkg_dosrc "classes"
fi
}

1
dev-java/jmh-core/Manifest
View File

@@ -1,2 +1 @@
DIST jmh-1.37.tar.gz 658673 BLAKE2B 696997907f3505f84ed400d75f46625b9f2aa9faf8a6d4250e6380db9088a8d6a61792eed8163703cb0003dba6ee5a2061d08a1b09bed5c058612142cd594469 SHA512 a3aac7d2e774dd7e7457cc1dce9edbe5923fcdae266854d709b926580638a28057bd6b32b8d7dedc4707ab2ae9aa7d5cda04eb72b0116f1cb98480a8b8b02707
DIST jmh-core-1.35.tar.gz 645087 BLAKE2B ce33167a58c2eaf64c38148f27493c86ac9c0084cb58a438b49148b41d3e2db66d8a78e0be8a78db39aebf06fc0b5767be61100b22ce77e018ac8ca29c05c17f SHA512 53ce7300f5e10f1efcb639f0d4d01adad48cadc8daea2e00db34113e42b192e49a6a04cc2b5fd4d291ac81a73a5b30613d22390722d35f54139f14ebbb01013c

42
dev-java/jmh-core/jmh-core-1.35.ebuild
View File

@@ -1,42 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
MAVEN_ID="org.openjdk.jmh:jmh-core:1.35"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks"
HOMEPAGE="https://openjdk.java.net/projects/code-tools/jmh/"
SRC_URI="https://github.com/openjdk/jmh/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
dev-java/commons-math:3
dev-java/jopt-simple:0"
DEPEND=">=virtual/jdk-1.8:*
${CP_DEPEND}"
RDEPEND=">=virtual/jre-1.8:*
${CP_DEPEND}"
S="${WORKDIR}/jmh-${PV}"
JAVA_SRC_DIR="jmh-core/src/main/java"
JAVA_RESOURCE_DIRS="jmh-core/src/main/resources"
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="jmh-core/src/test/java"
JAVA_TEST_RESOURCE_DIRS="jmh-core/src/test/resources"
src_install() {
default # https://bugs.gentoo.org/789582
java-pkg-simple_src_install
}

20
eclass/java-pkg-simple.eclass
View File

@@ -1,4 +1,4 @@
# Copyright 2004-2023 Gentoo Authors
# Copyright 2004-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: java-pkg-simple.eclass
@@ -367,12 +367,13 @@ java-pkg-simple_src_compile() {
# gather sources
# if target < 9, we need to compile module-info.java separately
# as this feature is not supported before Java 9
if [[ java-pkg_get-target -lt 9 ]]; then
local target="$(java-pkg_get-target)"
if [[ ${target#1.} -lt 9 ]]; then
find "${JAVA_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${sources}
moduleinfo=$(find "${JAVA_SRC_DIR[@]}" -name module-info.java)
else
find "${JAVA_SRC_DIR[@]}" -name \*.java > ${sources}
fi
moduleinfo=$(find "${JAVA_SRC_DIR[@]}" -name module-info.java)
# create the target directory
mkdir -p ${classes} || die "Could not create target directory"
@@ -382,7 +383,7 @@ java-pkg-simple_src_compile() {
java-pkg-simple_getclasspath
java-pkg-simple_prepend_resources ${classes} "${JAVA_RESOURCE_DIRS[@]}"
if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then
if [[ -z ${moduleinfo} ]] || [[ ${target#1.} -lt 9 ]]; then
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources}
else
@@ -392,7 +393,7 @@ java-pkg-simple_src_compile() {
fi
# handle module-info.java separately as it needs at least JDK 9
if [[ -n ${moduleinfo} ]]; then
if [[ -n ${moduleinfo} ]] && [[ ${target#1.} -lt 9 ]]; then
if java-pkg_is-vm-version-ge "9" ; then
local tmp_source=${JAVA_PKG_WANT_SOURCE} tmp_target=${JAVA_PKG_WANT_TARGET}
@@ -528,16 +529,17 @@ java-pkg-simple_src_test() {
# gathering sources for testing
# if target < 9, we need to compile module-info.java separately
# as this feature is not supported before Java 9
if [[ java-pkg_get-target -lt 9 ]]; then
local target="$(java-pkg_get-target)"
if [[ ${target#1.} -lt 9 ]]; then
find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${test_sources}
moduleinfo=$(find "${JAVA_TEST_SRC_DIR[@]}" -name module-info.java)
else
find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java > ${test_sources}
fi
moduleinfo=$(find "${JAVA_TEST_SRC_DIR[@]}" -name module-info.java)
# compile
if [[ -s ${test_sources} ]]; then
if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then
if [[ -z ${moduleinfo} ]] || [[ ${target#1.} -lt 9 ]]; then
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${test_sources}
else
@@ -548,7 +550,7 @@ java-pkg-simple_src_test() {
fi
# handle module-info.java separately as it needs at least JDK 9
if [[ -n ${moduleinfo} ]]; then
if [[ -n ${moduleinfo} ]] && [[ ${target#1.} -lt 9 ]]; then
if java-pkg_is-vm-version-ge "9" ; then
local tmp_source=${JAVA_PKG_WANT_SOURCE} tmp_target=${JAVA_PKG_WANT_TARGET}

2
media-gfx/graphviz/graphviz-9.0.0.ebuild
View File

@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
LICENSE="CPL-1.0"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
REQUIRED_USE="

2
sys-process/cronie/cronie-1.7.1-r1.ebuild
View File

@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cronie-crond/cronie/releases/download/${P}/${P}.tar.
LICENSE="ISC BSD BSD-2 GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+anacron +inotify pam selinux"
DEPEND="