[gentoo-dev] [PATCH 3/3] java-pkg-2.eclass: remove unused eclass functions java-pkg-2_src_{compile,test}
The last ebuild using these functions was net-vpn/i2p-2.5.2-r1 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-2.eclass | 92 +--- 1 file changed, 1 insertion(+), 91 deletions(-) diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index 6da4efd222c2..2b2a298cfe74 100644 --- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -59,96 +59,6 @@ java-pkg-2_src_prepare() { java-utils-2_src_prepare } - -# @FUNCTION: java-pkg-2_src_compile -# @DEPRECATED: none -# @DESCRIPTION: -# Default src_compile for java packages -# -# @CODE -# Variables: -# EANT_BUILD_XML - controls the location of the build.xml (default: ./build.xml) -# EANT_FILTER_COMPILER - Calls java-pkg_filter-compiler with the value -# EANT_BUILD_TARGET - the ant target/targets to execute (default: jar) -# EANT_DOC_TARGET - the target to build extra docs under the doc use flag -# (default: javadoc; declare empty to disable completely) -# EANT_GENTOO_CLASSPATH - @see eant documentation in java-utils-2.eclass -# EANT_EXTRA_ARGS - extra arguments to pass to eant -# EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment -# @CODE -java-pkg-2_src_compile() { - if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then - # auto generate classpath - java-pkg_gen-cp EANT_GENTOO_CLASSPATH - - [[ "${EANT_FILTER_COMPILER}" ]] && \ - java-pkg_filter-compiler ${EANT_FILTER_COMPILER} - local antflags="${EANT_BUILD_TARGET:=jar}" - if has doc ${IUSE} && [[ -n "${EANT_DOC_TARGET=javadoc}" ]]; then - antflags="${antflags} $(use_doc ${EANT_DOC_TARGET})" - fi - local tasks - [[ ${EANT_ANT_TASKS} ]] && tasks="${ANT_TASKS} ${EANT_ANT_TASKS}" - ANT_TASKS="${tasks:-${ANT_TASKS}}" \ - eant ${antflags} -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS} "${@}" - else - echo "${FUNCNAME}: ${EANT_BUILD_XML} not found so nothing to do." - fi -} - -# @FUNCTION: java-pkg-2_src_test -# @DEPRECATED: none -# @DESCRIPTION: -# src_test, not exported. -java-pkg-2_src_test() { - [[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return - - if [[ ${EANT_TEST_TARGET} ]] || < "${EANT_BUILD_XML}" tr -d "\n" | grep -Eq "]*\bname=[\"']test[\"']"; then - local opts task_re junit_re pkg - - if [[ ${EANT_TEST_JUNIT_INTO} ]]; then - java-pkg_jar-from --into "${EANT_TEST_JUNIT_INTO}" junit - fi - - if [[ ${EANT_TEST_GENTOO_CLASSPATH} ]]; then - EANT_GENTOO_CLASSPATH="${EANT_TEST_GENTOO_CLASSPATH}" - fi - - ANT_TASKS=${EANT_TEST_ANT_TASKS:-${ANT_TASKS:-${EANT_ANT_TASKS}}} - - task_re="\bdev-java/ant-junit(4)?(-[^:]+)?(:\S+)\b" - junit_re="\bdev-java/junit(-[^:]+)?(:\S+)\b" - - if [[ ${DEPEND} =~ ${task_re} ]]; then - pkg="ant-junit${BASH_REMATCH[1]}${BASH_REMATCH[3]}" - pkg="${pkg%:0}" - - if [[ ${ANT_TASKS} && "${ANT_TASKS}" != none ]]; then - ANT_TASKS="${ANT_TASKS} ${pkg}" - else - ANT_TASKS="${pkg}" - fi - elif [[ ${DEPEND} =~ ${junit_re} ]]; then - pkg="junit${BASH_REMATCH[2]}" - pkg="${pkg%:0}" - - opts="-Djunit.jar=\"$(java-pkg_getjar ${pkg} junit.jar)\"" - - if [[ ${EANT_GENTOO_CLASSPATH} ]]; then - EANT_GENTOO_CLASSPATH+=",${pkg}" - else - EANT_GENTOO_CLASSPATH="${pkg}" - fi - fi - - eant ${opts} -f "${EANT_BUILD_XML}" \ - ${EANT_EXTRA_ARGS} ${EANT_TEST_EXTRA_ARGS} ${EANT_TEST_TARGET:-test} - - else - echo "${FUNCNAME}: No test target in ${EANT_BUILD_XML}" - fi -} - # @FUNCTION: java-pkg-2_pkg_preinst # @DESCRIPTION: # wrapper for java-utils-2_pkg_preinst @@ -158,4 +68,4 @@ java-pkg-2_pkg_preinst() { fi -EXPORT_FUNCTIONS pkg_setup src_prepare src_compile pkg_preinst +EXPORT_FUNCTIONS pkg_setup src_prepare pkg_preinst -- 2.41.0
[gentoo-dev] [PATCH 2/3] java-utils-2.eclass: remove java-pkg_check-jikes
Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 13 ++--- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 50e4e422db1e..aa69cce14cae 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -203,9 +203,9 @@ JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/com # # Useful for local testing. # -# Use jikes and javac, in that order +# Use and javac, in that order # @CODE -# JAVA_PKG_FORCE_COMPILER="jikes javac" +# JAVA_PKG_FORCE_COMPILER=" javac" # @CODE # @ECLASS_VARIABLE: JAVA_PKG_FORCE_ANT_TASKS @@ -2306,9 +2306,6 @@ java-pkg_init() { # TODO we will probably want to set JAVAC and JAVACFLAGS - # Do some QA checks - java-pkg_check-jikes - # Can't use unset here because Portage does not save the unset # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11 @@ -2966,12 +2963,6 @@ java-pkg_check-versioned-jar() { fi } -java-pkg_check-jikes() { - if has jikes ${IUSE}; then - java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" - fi -} - java-pkg_announce-qa-violation() { local nodie if [[ ${1} == "--nodie" ]]; then -- 2.41.0
[gentoo-dev] [PATCH 1/3] java-utils-2.eclass: stop mentioning java-ant-2 eclass
Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 43d9b749ba3d..50e4e422db1e 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -9,13 +9,12 @@ # @SUPPORTED_EAPIS: 6 7 8 # @BLURB: Base eclass for Java packages # @DESCRIPTION: -# This eclass provides functionality which is used by java-pkg-2.eclass, -# java-pkg-opt-2.eclass and java-ant-2 eclass, as well as from ebuilds. +# This eclass provides functionality which is used by java-pkg-2.eclass and +# java-pkg-opt-2.eclass as well as from ebuilds. # # This eclass should not be inherited this directly from an ebuild. Instead, # you should inherit java-pkg-2 for Java packages or java-pkg-opt-2 for packages -# that have optional Java support. In addition you can inherit java-ant-2 for -# Ant-based packages. +# that have optional Java support. if [[ -z ${_JAVA_UTILS_2_ECLASS} ]] ; then _JAVA_UTILS_2_ECLASS=1 @@ -101,7 +100,7 @@ JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"} # @DEFAULT_UNSET # @DESCRIPTION: # Specify a non-standard Java source version for compilation (via javac -source -# parameter or Ant equivalent via build.xml rewriting done by java-ant-2 eclass). +# parameter). # Normally this is determined from the jdk version specified in DEPEND. # See java-pkg_get-source function below. # -- 2.41.0
[gentoo-dev] [PATCH] java-utils-2.eclass: remove unused eclass fuction use_doc
Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 24 1 file changed, 24 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 481c9b7df081..43d9b749ba3d 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2254,30 +2254,6 @@ java-pkg_force-compiler() { JAVA_PKG_FORCE_COMPILER="$@" } -# @FUNCTION: use_doc -# @DEPRECATED: none -# @DESCRIPTION: -# -# Helper function for getting ant to build javadocs. If the user has USE=doc, -# then 'javadoc' or the argument are returned. Otherwise, there is no return. -# -# The output of this should be passed to ant. -# @CODE -# Parameters: -# $@ - Option value to return. Defaults to 'javadoc' -# -# Examples: -# build javadocs by calling 'javadoc' target -# eant $(use_doc) -# -# build javadocs by calling 'apidoc' target -# eant $(use_doc apidoc) -# @CODE -# @RETURN string - Name of the target to create javadocs -use_doc() { - use doc && echo ${@:-javadoc} -} - # @FUNCTION: java-pkg_init # @INTERNAL -- 2.41.0
[gentoo-dev] [PATCH 2/4] java-pkg-2.eclass: remove unused for commons.apache.org packages
removes a condition which used to provide SRC_URI and HOMEPAGE for packages from commons.apache.org but is completely unused due to not providing verify-sig. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-2.eclass | 6 -- 1 file changed, 6 deletions(-) diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index 0409a7c70e0e..df024bbadf51 100644 --- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -39,12 +39,6 @@ DEPEND="${JAVA_PKG_E_DEPEND}" # Nothing special for RDEPEND... just the same as DEPEND. RDEPEND="${DEPEND}" -# Commons packages follow the same rules so do it here -if [[ ${CATEGORY} = dev-java && ${PN} = commons-* ]]; then - HOMEPAGE="http://commons.apache.org/${PN#commons-}/"; - SRC_URI="mirror://apache/${PN/-///}/source/${P}-src.tar.gz" -fi - # @FUNCTION: java-pkg-2_pkg_setup # @DESCRIPTION: -- 2.41.0
[gentoo-dev] [PATCH] java-pkg-2.eclass: remove unused for commons.apache.org packages
removes a condition which used to provide SRC_URI and HOMEPAGE for packages from commons.apache.org but is completely unused due to not providing verify-sig. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-2.eclass | 6 -- 1 file changed, 6 deletions(-) diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index 0409a7c70e0e..df024bbadf51 100644 --- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -39,12 +39,6 @@ DEPEND="${JAVA_PKG_E_DEPEND}" # Nothing special for RDEPEND... just the same as DEPEND. RDEPEND="${DEPEND}" -# Commons packages follow the same rules so do it here -if [[ ${CATEGORY} = dev-java && ${PN} = commons-* ]]; then - HOMEPAGE="http://commons.apache.org/${PN#commons-}/"; - SRC_URI="mirror://apache/${PN/-///}/source/${P}-src.tar.gz" -fi - # @FUNCTION: java-pkg-2_pkg_setup # @DESCRIPTION: -- 2.41.0
[gentoo-dev] [PATCH 3/4] java-utils-2.eclass: remove 'ant -lib' from comment of java-pkg_jarfrom
since it is already advised to not use it Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 9c657cc4c1f9..647f25e2c987 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1140,7 +1140,7 @@ java-pkg_jarfrom() { # @USAGE: [--build-only] [--runtime-only] [--with-dependencies] [,...] # @DESCRIPTION: # Get the classpath provided by any number of packages -# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. +# Among other things, this can be passed to 'javac -classpath'. # The providing packages are recorded as dependencies into package.env DEPEND # line, unless "--build-only" is passed as the very first argument, for jars # that have to be present only at build time and are not needed on runtime -- 2.41.0
[gentoo-dev] [PATCH 4/4] java-ant-2.eclass: mark java-ant-2 eclass as deprecated
Signed-off-by: Volkmar W. Pogatzki --- eclass/java-ant-2.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index b0d2fb216b10..1ed8b23ee6cd 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-ant-2.eclass +# @DEPRECATED: none # @MAINTAINER: # j...@gentoo.org # @AUTHOR: -- 2.41.0
[gentoo-dev] [PATCH 1/4] java-pkg-2.eclass: mark functions as deprecated which depend on java-ant-2.eclass
Deprecating java-ant-2.eclass would be the next step. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-2.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index c17a9db26b3b..0409a7c70e0e 100644 --- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -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-2.eclass @@ -63,6 +63,7 @@ java-pkg-2_src_prepare() { # @FUNCTION: java-pkg-2_src_compile +# @DEPRECATED: none # @DESCRIPTION: # Default src_compile for java packages # @@ -98,6 +99,7 @@ java-pkg-2_src_compile() { } # @FUNCTION: java-pkg-2_src_test +# @DEPRECATED: none # @DESCRIPTION: # src_test, not exported. java-pkg-2_src_test() { -- 2.41.0
[gentoo-dev] [PATCH] java-utils-2.eclass: etestng use java-pkg_getjars --build-only
Closes: https://bugs.gentoo.org/936812 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 559342068cc0..9c657cc4c1f9 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1926,7 +1926,7 @@ etestng() { local runner=org.testng.TestNG if [[ ${PN} != testng ]]; then - local cp=$(java-pkg_getjars --with-dependencies testng) + local cp=$(java-pkg_getjars --build-only --with-dependencies testng) else local cp=testng.jar fi -- 2.41.0
[gentoo-dev] Last rites: dev-lang/scala, dev-lang/mozart, dev-lang/mozart-stdlib, app-emacs/scala-mode
# Volkmar W. Pogatzki (2024-0r73-27) # Stable version stuck on EAPI=6. # Lacks maintainer capacity for dev-lang/scala. # Removal on 2024-08-26. Bugs #932012, #932737, #933607. dev-lang/scala dev-lang/mozart dev-lang/mozart-stdlib app-emacs/scala-mode
[gentoo-dev] [PATCH] java-utils-2.eclass: fix ejunit_(), java-pkg_getjars --build-only
Closes: https://bugs.gentoo.org/936557 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 91f8fba8790b..8a062f2ad87e 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1838,7 +1838,7 @@ ejunit_() { local junit=${1} shift 1 - local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs}) + local cp=$(java-pkg_getjars --build-only --with-dependencies ${junit}${pkgs}) if [[ ${1} = -cp || ${1} = -classpath ]]; then cp="${2}:${cp}" shift 2 -- 2.41.0
[gentoo-dev] [PATCH v2] java-pkg-simple.eclass: allow java-pkg-opt-2
Presently, "java-pkg-simple eclass can only be inherited AFTER java-pkg-2". This prevents packages with optional Java like dev-lang/cxprolog to be built with java-pkg-simple. This patch allows to inherit java-pkg-simple after any of java-pkg-2 and java-pkg-opt-2. Poposed by Alfred Wingate on #gentoo-dev-help on 2024-04-25 Closes: https://bugs.gentoo.org/930550 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 6b473ed768ed..5ed7e3e5b78e 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -26,8 +26,12 @@ _JAVA_PKG_SIMPLE_ECLASS=1 inherit java-utils-2 -if ! has java-pkg-2 ${INHERITED}; then - eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2" +if has java-pkg-2 ${INHERITED}; then + JAVA_PKG_OPT=0 +elif has java-pkg-opt-2 ${INHERITED}; then + JAVA_PKG_OPT=1 +else + eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2 or java-pkg-opt-2" fi # We are only interested in finding all java source files, wherever they may be. @@ -50,7 +54,12 @@ if has test ${JAVA_PKG_IUSE}; then test_deps+=" dev-java/testng:0";; esac done - [[ ${test_deps} ]] && DEPEND="test? ( ${test_deps} )" + if [[ ${JAVA_PKG_OPT} == 1 ]]; then + [[ ${test_deps} ]] && DEPEND="test? ( ${JAVA_PKG_OPT_USE}? ( ${test_deps} ) )" + else + [[ ${test_deps} ]] && DEPEND="test? ( ${test_deps} )" + fi + unset test_deps fi @@ -347,6 +356,7 @@ java-pkg-simple_prepend_resources() { # If USE FLAG 'binary' exists and is set, it will just copy # ${JAVA_BINJAR_FILENAME} to ${S} and skip the rest of src_compile. java-pkg-simple_src_compile() { + [[ ${JAVA_PKG_OPT} == 1 ]] && ! use ${JAVA_PKG_OPT_USE} && return local sources=sources.lst classes=target/classes apidoc=target/api moduleinfo # do not compile if we decide to install binary jar @@ -461,6 +471,7 @@ java-pkg-simple_src_compile() { # ${JAVA_JAR_FILENAME}. It will also install a launcher if # ${JAVA_MAIN_CLASS} is set. Also invokes einstalldocs. java-pkg-simple_src_install() { + [[ ${JAVA_PKG_OPT} == 1 ]] && ! use ${JAVA_PKG_OPT_USE} && return local sources=sources.lst classes=target/classes apidoc=target/api # install the jar file that we need @@ -503,6 +514,7 @@ java-pkg-simple_src_install() { # in the "generated-test" directory as content of this directory is preserved, # whereas content of target/test-classes is removed. java-pkg-simple_src_test() { + [[ ${JAVA_PKG_OPT} == 1 ]] && ! use ${JAVA_PKG_OPT_USE} && return local test_sources=test_sources.lst classes=target/test-classes moduleinfo local tests_to_run classpath -- 2.41.0
[gentoo-dev] [PATCH] java-pkg-simple.eclass: allow java-pkg-opt-2
Presently, "java-pkg-simple eclass can only be inherited AFTER java-pkg-2". This prevents packages with optional Java like dev-lang/cxprolog to be build with java-pkg-simple. This patch allows to inherit java-pkg-simple after either of java-pkg-2 and java-pkg-opt-2. Poposed by Alfred Wingate on #gentoo-dev-help on 2024-04-25 Closes: https://bugs.gentoo.org/930550 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 6b473ed768ed..181b4f3606ec 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -26,8 +26,12 @@ _JAVA_PKG_SIMPLE_ECLASS=1 inherit java-utils-2 -if ! has java-pkg-2 ${INHERITED}; then - eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2" +if has java-pkg-2 ${INHERITED}; then + JAVA_PKG_OPT=0 +elif has java-pkg-opt-2 ${INHERITED}; then + JAVA_PKG_OPT=1 +else + eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2 or java-pkg-opt-2" fi # We are only interested in finding all java source files, wherever they may be. @@ -50,7 +54,12 @@ if has test ${JAVA_PKG_IUSE}; then test_deps+=" dev-java/testng:0";; esac done - [[ ${test_deps} ]] && DEPEND="test? ( ${test_deps} )" + if [[ ${JAVA_PKG_OPT} ]]; then + [[ ${test_deps} ]] && DEPEND="test? ( ${JAVA_PKG_OPT_USE}? ( ${test_deps} ) )" + else + [[ ${test_deps} ]] && DEPEND="test? ( ${test_deps} )" + fi + unset test_deps fi @@ -347,6 +356,7 @@ java-pkg-simple_prepend_resources() { # If USE FLAG 'binary' exists and is set, it will just copy # ${JAVA_BINJAR_FILENAME} to ${S} and skip the rest of src_compile. java-pkg-simple_src_compile() { + [[ ${JAVA_PKG_OPT} ]] && ! use ${JAVA_PKG_OPT_USE} && return local sources=sources.lst classes=target/classes apidoc=target/api moduleinfo # do not compile if we decide to install binary jar @@ -461,6 +471,7 @@ java-pkg-simple_src_compile() { # ${JAVA_JAR_FILENAME}. It will also install a launcher if # ${JAVA_MAIN_CLASS} is set. Also invokes einstalldocs. java-pkg-simple_src_install() { + [[ ${JAVA_PKG_OPT} ]] && ! use ${JAVA_PKG_OPT_USE} && return local sources=sources.lst classes=target/classes apidoc=target/api # install the jar file that we need @@ -503,6 +514,7 @@ java-pkg-simple_src_install() { # in the "generated-test" directory as content of this directory is preserved, # whereas content of target/test-classes is removed. java-pkg-simple_src_test() { + [[ ${JAVA_PKG_OPT} ]] && ! use ${JAVA_PKG_OPT_USE} && return local test_sources=test_sources.lst classes=target/test-classes moduleinfo local tests_to_run classpath -- 2.41.0
[gentoo-dev] [PATCH] java-utils-2.eclass: allow eant without java-ant-2_src_configure
Packages which can build without BSFIX need not inherit java-ant-2. To allow using eant without inheriting java-ant-2 we enhance the eant function with a condition which controls calling java-ant-2_src_configure. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 22 -- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index adbc5242053a..2527819d7315 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2029,13 +2029,23 @@ java-utils-2_pkg_preinst() { eant() { debug-print-function ${FUNCNAME} $* - if [[ ${EBUILD_PHASE} = compile ]]; then - java-ant-2_src_configure - fi + if [[ ${!JAVA_PKG_BSFIX*} ]] \ + || [[ ${JAVA_ANT_BSFIX_EXTRA_ARGS} ]] \ + || [[ ${JAVA_ANT_CLASSPATH_TAGS} ]] \ + || [[ ${JAVA_ANT_JAVADOC_INPUT_DIRS} ]] \ + || [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] \ + || [[ ${EANT_BUILD_XML} ]] \ + || [[ ${!EANT_GENTOO_CLASSPATH*} ]] \ + || [[ ${EANT_TEST_GENTOO_CLASSPATH} ]] + then + if [[ ${EBUILD_PHASE} = compile ]]; then + java-ant-2_src_configure + fi - if ! has java-ant-2 ${INHERITED}; then - local msg="You should inherit java-ant-2 when using eant" - java-pkg_announce-qa-violation "${msg}" + if ! has java-ant-2 ${INHERITED}; then + local msg="You should inherit java-ant-2 when using eant" + java-pkg_announce-qa-violation "${msg}" + fi fi local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore" -- 2.41.0
[gentoo-dev] Last rites: dev-java/icedtea-bin, dev-java/gin, dev-java/gwt, dev-java/validation-api
# Volkmar W. Pogatzki (2024-04-08) # Obsolete java-vm, bugs #848804 #830248. # Removal on 2024-05-08 dev-java/icedtea-bin # Volkmar W. Pogatzki (2024-04-08) # Java libraries without consumers. # Removal on 2024-05-08, bugs #853100 #716228. dev-java/gin dev-java/gwt dev-java/validation-api
[gentoo-dev] Last rites: dev-java/ant-apache-regexp, dev-java/ant-apache-log4j, dev-java/ant-apache-xalan2, dev-java/ant-commons-logging, dev-java/ant-swing, dev-java/ant-junit4, dev-java/ant-testutil
# Volkmar W. Pogatzki (2024-03-10) # Unused java libraries. The ant tasks are now provided by dev-java/ant. # Removal on 2024-04-09. dev-java/ant-apache-regexp dev-java/ant-apache-log4j dev-java/ant-apache-xalan2 dev-java/ant-commons-logging dev-java/ant-swing dev-java/ant-junit4 dev-java/ant-testutil dev-java/ant-junitlauncher dev-java/ant-jai dev-java/ant-commons-net dev-java/ant-apache-bsf dev-java/ant-jmf dev-java/ant-apache-oro dev-java/ant-javamail dev-java/ant-junit dev-java/ant-jdepend dev-java/ant-antlr dev-java/ant-apache-bcel dev-java/ant-apache-resolver dev-java/ant-jsch dev-java/ant-xz dev-java/gnu-jaf dev-java/failureaccess
[gentoo-dev] [PATCH v2] java-ant-2.eclass: change JAVA_ANT_E_DEPEND to dev-java/ant
Also removes unused eclass variable JAVA_ANT_DISABLE_ANT_CORE_DEP which becomes obsolete by removal of old dev-java/ant-core-1.10.9-r5. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-ant-2.eclass | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 35fe84997563..1eccead3067f 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -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-ant-2.eclass @@ -48,14 +48,12 @@ inherit java-utils-2 multilib #The implementation of dependencies is handled by java-utils-2.eclass #WANT_ANT_TASKS -# @ECLASS_VARIABLE: JAVA_ANT_DISABLE_ANT_CORE_DEP -# @DEFAULT_UNSET +# @VARIABLE: JAVA_ANT_E_DEPEND +# @INTERNAL # @DESCRIPTION: -# Setting this variable non-empty before inheriting java-ant-2 disables adding -# dev-java/ant-core into DEPEND. -if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then - JAVA_ANT_E_DEPEND+=" >=dev-java/ant-core-1.8.2:0" -fi +# Convenience variable adding packages to DEPEND so they need not be added +# in the ebuild. +JAVA_ANT_E_DEPEND+=" >=dev-java/ant-1.10.14-r2:0" # add ant tasks specified in WANT_ANT_TASKS to DEPEND ANT_TASKS_DEPEND="$(java-pkg_ant-tasks-depend)" -- 2.41.0
[gentoo-dev] [PATCH] java-ant-2.eclass: change JAVA_ANT_E_DEPEND to dev-java/ant
Signed-off-by: Volkmar W. Pogatzki --- eclass/java-ant-2.eclass | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 35fe84997563..f29a8d749227 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -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-ant-2.eclass @@ -51,10 +51,16 @@ inherit java-utils-2 multilib # @ECLASS_VARIABLE: JAVA_ANT_DISABLE_ANT_CORE_DEP # @DEFAULT_UNSET # @DESCRIPTION: -# Setting this variable non-empty before inheriting java-ant-2 disables adding -# dev-java/ant-core into DEPEND. +# Setting this variable non-empty before inheriting java-ant-2 disables +# adding dev-java/ant into DEPEND. + +# @VARIABLE: JAVA_ANT_E_DEPEND +# @INTERNAL +# @DESCRIPTION: +# Convenience variable adding packages to DEPEND so they need not be added +# in the ebuild. if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then - JAVA_ANT_E_DEPEND+=" >=dev-java/ant-core-1.8.2:0" + JAVA_ANT_E_DEPEND+=" >=dev-java/ant-1.10.14-r2:0" fi # add ant tasks specified in WANT_ANT_TASKS to DEPEND -- 2.41.0
[gentoo-dev] Last rites: dev-java/icedtea, dev-java/icedtea-bin
# Volkmar W. Pogatzki (2024-02-14) # "A harness to build OpenJDK using [...]" is no longer needed since # Gentoo can build openjdk from source. # Maintainer capacity missing to maintain these packages. # More than 30 open bugs. # Removal on 2024-03-15. dev-java/icedtea dev-java/icedtea-bin
[gentoo-dev] Last rites: dev-java/glassfish-persistence, dev-java/osgi-core-api, dev-java/osgi-enterprise-api, dev-java/osgi-compendium, dev-java/osgi-foundation
# Volkmar W. Pogatzki (2024-01-15) # Unused Java libraries. Removal on 2024-02-15 dev-java/glassfish-persistence dev-java/osgi-core-api dev-java/osgi-enterprise-api dev-java/osgi-compendium dev-java/osgi-foundation
[gentoo-dev] [PATCH 2/3] java-pkg-simple.eclass: respect JAVADOC_SRC_DIRS
This patch helps to avoid useless runs of ejavadoc in multi-jar packages where java-pkg-simple_src_compile is called for each jar file. JAVADOC_SRC_DIRS can be set in the ebuild in global scope and "use doc && ejavadoc" be called at the end of src_compile. And it no longer needs to build a useless "ignoreme.jar". Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 143efa707751..97bad414afb7 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -412,11 +412,15 @@ java-pkg-simple_src_compile() { # javadoc if has doc ${JAVA_PKG_IUSE} && use doc; then - mkdir -p ${apidoc} - ejavadoc -d ${apidoc} \ - -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ - ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ - @${sources} || die "javadoc failed" + if [[ ${JAVADOC_SRC_DIRS} ]]; then + einfo "JAVADOC_SRC_DIRS exists, you need to call ejavadoc separately" + else + mkdir -p ${apidoc} + ejavadoc -d ${apidoc} \ + -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ + ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ + @${sources} || die "javadoc failed" + fi fi # package -- 2.41.0
[gentoo-dev] [PATCH 3/3] java-utils-2.eclass: enhance ejavadoc
This patch enhances the ejavadoc function so that it can be called without arguments if the JAVADOC_SRC_DIRS array is set in the ebuild. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 24 +--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 814b4957d52c..31f7932a16fd 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2192,9 +2192,27 @@ ejavadoc() { einfo "javadoc ${javadoc_args} ${@}" fi - local args=( javadoc ${javadoc_args} "${@}" ) - echo "${args[@]}" >&2 - "${args[@]}" || die "ejavadoc failed" + if [[ "${JAVADOC_SRC_DIRS[@]}" ]]; then + mkdir -p target/api || die "cannot create target/api" + local dependency + for dependency in ${JAVADOC_CLASSPATH}; do + classpath="${classpath}:$(java-pkg_getjars \ + --build-only \ + --with-dependencies \ + ${dependency})" + done + find "${JAVADOC_SRC_DIRS[@]}" -name '*.java' > sources + javadoc \ + "${javadoc_args}" \ + -d target/api \ + -cp "${classpath}" \ + -quiet \ + @sources || die "ejavadoc failed" + else + local args=( javadoc ${javadoc_args} "${@}" ) + echo "${args[@]}" >&2 + "${args[@]}" || die "ejavadoc failed" + fi } # @FUNCTION: java-pkg_filter-compiler -- 2.41.0
[gentoo-dev] [PATCH 1/3] java-utils-2.eclass: new JAVADOC_CLASSPATH, JAVADOC_SRC_DIRS
Several multi-jar packages built with java-pkg-simple.eclass use a workaround to avoid passing arguments to ejavadoc. That workaround runs another java-pkg-simple_src_compile which builds an unneeded jar file usually called "ignoreme.jar". This patch defines the JAVADOC_SRC_DIRS eclass variable needed by the java-pkg-simple.eclass to decide whether to call ejavadoc or not. The other new eclass variable is JAVADOC_CLASSPATH. It can be used for multi-jar packages to pass dependencies's classpath to ejavadoc. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 40 ++ 1 file changed, 40 insertions(+) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 31b8ab8df60a..814b4957d52c 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -218,6 +218,46 @@ JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/com # ebuild foo.ebuild compile # @CODE +# @ECLASS_VARIABLE: JAVADOC_CLASSPATH +# @DEFAULT_UNSET +# @DESCRIPTION: +# Comma or space separated list of java packages that are needed for generating +# javadocs. Can be used to avoid overloading the compile classpath in multi-jar +# packages if there are jar files which have different dependencies. +# +# @CODE +# Example: +# JAVADOC_CLASSPATH=" +# jna-4 +# jsch +# " +# @CODE + +# @ECLASS_VARIABLE: JAVADOC_SRC_DIRS +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array of directories relative to ${S} which contain the sources of +# the application. It needs to sit in global scope; if put in src_compile() +# it would not work. +# It is needed by the java-pkg-simple.eclass to decide whether to call ejavadoc +# or not. If this variable is defined then java-pkg-simple_src_compile will not +# call ejavadoc automatically. ejavadoc has then to be called explicitly from +# the ebuild. It is meant for usage in multi-jar packages in order to avoid an +# extra compilation run only for producing the javadocs. +# +# @CODE +# Example: +# JAVADOC_SRC_DIRS=( +# "${PN}-core" +# "${PN}-jsch" +# "${PN}-pageant" +# "${PN}-sshagent" +# "${PN}-usocket-jna" +# "${PN}-usocket-nc" +# "${PN}-connector-factory" +# ) +# @CODE + # TODO document me JAVA_PKG_QA_VIOLATIONS=0 -- 2.41.0
[gentoo-dev] Last rites: media-video/jubler, dev-java/appenh, dev-java/loadlib
# Volkmar W. Pogatzki (2023-10-04) # Incompatible with newer media-video/ffmpeg, bug #914499. # Deps appenh and loadlib not used by anything else. # Removal on 2023-11-04. media-video/jubler dev-java/appenh dev-java/loadlib
[gentoo-dev] [PATCH] java-pkg-simple.eclass: drop EAPI 6
Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index e50344c32acb..02200f10cb8d 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -6,7 +6,7 @@ # j...@gentoo.org # @AUTHOR: # Java maintainers -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Eclass for packaging Java software with ease. # @DESCRIPTION: # This class is intended to build pure Java packages from Java sources @@ -17,7 +17,6 @@ # directory before calling the src_compile function of this eclass. case ${EAPI} in - 6) inherit eqawarn ;; 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -- 2.41.0
[gentoo-dev] [PATCH 4/4] java-utils-2.eclass: avoid reverse dependency for dev-java/testng
This change depends on the correlating change on the java-pkg-simple.eclass. For testing dev-java/testng before having it installed it is not possible to use java-pkg_getjars. This change adds a condition so that this case uses the freshly compiled testng.jar. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 3fe64e1c317d..133dde59cebd 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1892,7 +1892,11 @@ etestng() { debug-print-function ${FUNCNAME} $* local runner=org.testng.TestNG - local cp=$(java-pkg_getjars --with-dependencies testng) + if [[ ${PN} != testng ]]; then + local cp=$(java-pkg_getjars --with-dependencies testng) + else + local cp=testng.jar + fi local tests if [[ ${1} = -cp || ${1} = -classpath ]]; then -- 2.41.0
[gentoo-dev] [PATCH 3/4] java-pkg-simple.eclass: avoid reverse dependency for dev-java/testng
Presently, when using testng in JAVA_TESTING_FRAMEWORKS, it gets added to test dependencies. Emerging dev-java/testng with USE=test would lead to a reverse dependency on itself. This change allows emerging / testing testng with the ebuild specifying JAVA_TESTING_FRAMEWORKS="testng" without such reverse dependency. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index abac18ca03f8..0ca0914aeee0 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2022 Gentoo Authors +# Copyright 2004-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-pkg-simple.eclass @@ -47,7 +47,8 @@ if has test ${JAVA_PKG_IUSE}; then test_deps+=" amd64? ( dev-util/pkgdiff dev-util/japi-compliance-checker )";; testng) - test_deps+=" dev-java/testng:0";; + [[ ${PN} != testng ]] && \ + test_deps+=" dev-java/testng:0";; esac done [[ ${test_deps} ]] && DEPEND="test? ( ${test_deps} )" -- 2.41.0
[gentoo-dev] [PATCH 2/4] dev-java/testng: add 6.11
- switches slot of dependency assertj-core 2 -> 3 - removes test restriction - moves "test" from IUSE to JAVA_PKG_IUSE - sets the "-verbose 3" option to get the PASSED/FAILED information - uses older version of jcommander 0 -> 1.64 - uses the DOCS array instead of dodoc - uses JAVA_RESOURCE_DIRS instead of java-pkg_addres which allows removing src_compile() - chops long lines - adds MAVEN_ID so that java-ebuilder can find it Signed-off-by: Volkmar W. Pogatzki dev-java/testng: fixup Signed-off-by: Volkmar W. Pogatzki --- dev-java/testng/Manifest | 5 ++ dev-java/testng/metadata.xml | 2 +- dev-java/testng/testng-6.11.ebuild | 100 + 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 dev-java/testng/testng-6.11.ebuild diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest index 310f28a1c68c..aaf68f18ad4d 100644 --- a/dev-java/testng/Manifest +++ b/dev-java/testng/Manifest @@ -1 +1,6 @@ +DIST apache-groovy-binary-2.4.21.zip 37467992 BLAKE2B e0f925bad53f0f8a7012f0bea420ec3e5986118cc23cd677a11f619284754eacc15c3012cf780063fef574053781bba924a86e5fa2ac284d86f349ad18173704 SHA512 e2f73405d7521b99e3ce5622cffcc505bbc039ccb1c35696fc895d648a9325937a136cf97a229f7ac1b90b63ad8603881350c4d41e514ad45233fb333d76d510 +DIST groovy-all-2.4.7.jar 7015434 BLAKE2B 23d22ddd78229c485ed9384169acee154258644249b856661e17d1d0efb5518e32473a26962b5d657a09b41d490813ed76254820ffdf39e83869209617b66c2d SHA512 4c26ff9f7137c0506c95f7ba1d4228ce57e16d87b77dd1d114390224207d71d3958460c7b5a239d5f41596ab87e7f4aa7aaea1dfce19a50badf8f9b818329c54 +DIST jquery-3.5.1.jar 313070 BLAKE2B 76abfbd21d83f72a3cfcb666f3a2fcfcf5975e723a462996bac9701caf6b59cb9998746af713ebb1f6bfe49cce91544216cc65dc6819e95e8a15930744685415 SHA512 9f560415b36875958ff1d3c6d37fa79d6d134c5f5fc7719dd21db36d1f24dec39787834b2a9ffb104ec6b56e725ccc524a8ff9b189ced3d68e24296b2daae720 +DIST spock-core-1.0-groovy-2.4.jar 588030 BLAKE2B 68d8fad8b6ffb45a18778797ea23d4f3b09256bf4e9f207ee666d07572399cd13522e6f1590219a80e23f6906a2e9eaf1f22c6a3c01717e8c1e99b5d37b89210 SHA512 078c0b16688eaa3134043e58ed4273981797ea92f08723b5508c7d7e4f635278dd5ca731fb294da2a1f35674623d969ee423d4344c2c822e1d4cb8d4f3383790 +DIST testng-6.11.tar.gz 677522 BLAKE2B 2e7bf30fcf805cce5a7ec42f22c39e9f4678642fcde9752c51d118e655189805661edeeff1a3db0e960c79e7542fe25ab8fa6995f142da12b3adc8753fd8a361 SHA512 996d7a18399e16626756b7a790182c7b6bf3453280209d0a09d4a509d698fcad1a80e58ec36702de95bd59c90c237463719ad44934c14390620fc9655d871252 DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e diff --git a/dev-java/testng/metadata.xml b/dev-java/testng/metadata.xml index 43f8b5d27805..f79c946be086 100644 --- a/dev-java/testng/metadata.xml +++ b/dev-java/testng/metadata.xml @@ -6,6 +6,6 @@ Java - cbeust/testng + testng-team/testng diff --git a/dev-java/testng/testng-6.11.ebuild b/dev-java/testng/testng-6.11.ebuild new file mode 100644 index ..fd5411152497 --- /dev/null +++ b/dev-java/testng/testng-6.11.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.testng:testng:6.11" +JAVA_TESTING_FRAMEWORKS="testng" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features" +HOMEPAGE="https://testng.org/"; +# Presently we install the binary version of jquery since it is not packaged in ::gentoo. +JQV="3.5.1" +# Currently we bundle the binary versions of spock-core, groovy-all and apache-groovy-binary. +# These are used only for tests, we don't install them. +SCV="1.0-groovy-2.4" +GAV="2.4.7" +AGV="2.4.21" +SRC_URI="https://github.com/testng-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://repo1.maven.org/maven2/org/webjars/jquery/${JQV}/jquery-${JQV}.jar + test? ( + https://repo1.maven.org/maven2/org/spockframework/spock-core/${SCV}/spock-core-${SCV}.jar + https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/${GAV}/groovy-all-${GAV}.jar + https://downloads.apache.org/groovy/${AGV}/distribution/apache-groovy-binary-${AGV}.zip + )" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +SLOT="0" + +CP_DEPEND=" + dev-java/ant-core:0 + dev-java/bsh:0 + dev-java/guice:4 + dev-java/jcommander:1.64 + dev-jav
[gentoo-dev] [PATCH 1/4] java-utils-2.eclass: allow etestng to run testng.xml
The etestng function is presently limited to running test classes and has no option for running testng.xml files. Using testng.xml in an ebuild requires manual coding in src_test(). This change adds a switch to the etestng function which allows running default src_test() with either testng.xml files or test classes. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index c1f42408e462..3fe64e1c317d 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1886,7 +1886,7 @@ ejunit4() { # @CODE # $1 - -cp or -classpath # $2 - the classpath passed to it -# $@ - test classes for testng to run. +# $@ - test classes or testng.xml for testng to run. # @CODE etestng() { debug-print-function ${FUNCNAME} $* @@ -1910,6 +1910,7 @@ etestng() { -cp ${cp} -Djava.io.tmpdir="${T}" -Djava.awt.headless=true + -Dtest.resources.dir="${JAVA_TEST_RESOURCE_DIRS}" ${JAVA_TEST_EXTRA_ARGS[@]} ${runner} ${JAVA_TEST_RUNNER_EXTRA_ARGS[@]} @@ -1922,7 +1923,11 @@ etestng() { ) fi - args+=( -testclass ${tests} ) + if [[ "${test%.xml}" == "${test}" ]]; then + args+=( -testclass ${tests} ) + else + args+=( ${tests%,} ) + fi debug-print "java ${args[@]}" java ${args[@]} || die "Running TestNG failed." -- 2.41.0
[gentoo-dev] [PATCH] java-pkg-opt-2.eclass: drop EAPI 6
Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-opt-2.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass index 3a4b25ec2f0c..0caba1d40e07 100644 --- a/eclass/java-pkg-opt-2.eclass +++ b/eclass/java-pkg-opt-2.eclass @@ -6,7 +6,7 @@ # j...@gentoo.org # @AUTHOR: # Thomas Matthijs -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @PROVIDES: java-utils-2 # @BLURB: Eclass for package with optional Java support # @DESCRIPTION: @@ -14,7 +14,7 @@ # support. case ${EAPI:-0} in - [678]) ;; + [78]) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -50,7 +50,7 @@ java-pkg-opt-2_pkg_setup() { java-pkg-opt-2_src_prepare() { use ${JAVA_PKG_OPT_USE} && java-utils-2_src_prepare case "${EAPI:-0}" in - [678]) use ${JAVA_PKG_OPT_USE} || eapply_user ;; + [78]) use ${JAVA_PKG_OPT_USE} || eapply_user ;; esac } -- 2.41.0
[gentoo-dev] Last rites: net-libs/nativebiginteger
# Volkmar W. Pogatzki (2023-07-05) # Library without consumers. Bug #906882 # Removal on 2023-08-05. net-libs/nativebiginteger
[gentoo-dev] Last rites: dev-java/janino, dev-java/logback-core, dev-java/logback-classic, dev-java/netty
# Volkmar W. Pogatzki (2023-06-06) # Vulnerable CVE-2023-33546, Bug #907927. # Reverse deps (logback-*, netty) are unused Java libraries. # Removal on 2023-07-06. dev-java/janino dev-java/logback-core dev-java/logback-classic dev-java/netty
[gentoo-dev] [PATCH] java-virtuals-2.eclass: mark java-virtuals.eclass dead
Signed-off-by: Volkmar W. Pogatzki --- eclass/java-virtuals-2.eclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eclass/java-virtuals-2.eclass b/eclass/java-virtuals-2.eclass index 842fbe0cc077..2923fe35a0e5 100644 --- a/eclass/java-virtuals-2.eclass +++ b/eclass/java-virtuals-2.eclass @@ -1,6 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# @DEAD # @ECLASS: java-virtuals-2.eclass # @MAINTAINER: # j...@gentoo.org -- 2.39.3
[gentoo-dev] [PATCH v3] java-pkg-simple.eclass: respect SLOT="0" in JAVA_LAUNCHER_FILENAME
Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 929ce68c6c07..46fc036637d8 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -161,7 +161,11 @@ fi # If ${JAVA_MAIN_CLASS} is set, we will create a launcher to # execute the jar, and ${JAVA_LAUNCHER_FILENAME} will be the # name of the script. -: "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}" +if [[ ${SLOT} = 0 ]]; then + : "${JAVA_LAUNCHER_FILENAME:=${PN}}" +else + : "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}" +fi # @ECLASS_VARIABLE: JAVA_TESTING_FRAMEWORKS # @DEFAULT_UNSET -- 2.39.3
[gentoo-dev] [PATCH v2] java-pkg-simple.eclass: respect SLOT="0" in JAVA_LAUNCHER_FILENAME
Avoids the need for setting JAVA_LAUNCHER_FILENAME="${PN}" if SLOT is 0. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 4 1 file changed, 4 insertions(+) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 929ce68c6c07..a57fae02ffd7 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -161,7 +161,11 @@ fi # If ${JAVA_MAIN_CLASS} is set, we will create a launcher to # execute the jar, and ${JAVA_LAUNCHER_FILENAME} will be the # name of the script. +if [[ ${SLOT} = 0 ]]; then +: "${JAVA_LAUNCHER_FILENAME:=${PN}}" +else : "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}" +fi # @ECLASS_VARIABLE: JAVA_TESTING_FRAMEWORKS # @DEFAULT_UNSET -- 2.39.3
Re: [gentoo-dev] [PATCH] java-pkg-simple.eclass: respect SLOT="0" in JAVA_LAUNCHER_FILENAME
> Ulrich Mueller hat am 26.05.2023 10:44 CEST geschrieben: > > > >>>>> On Fri, 26 May 2023, Volkmar W Pogatzki wrote: > > > -: "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}" > > +if [[ ${SLOT} = 0 ]]; then > > + JAVA_LAUNCHER_FILENAME="${PN}" > > +else > > + JAVA_LAUNCHER_FILENAME="${PN}-${SLOT}" > > +fi > > This will no longer allow overriding the variable in the ebuild > (at least not pre-inherit). Is this intentional? > > Ulrich It exactly does what it's supposed to do. No clue about "not pre-inherit". How to sanitize? -- Volkmar W. Pogatzki
[gentoo-dev] [PATCH] java-pkg-simple.eclass: respect SLOT="0" in JAVA_LAUNCHER_FILENAME
Avoids the need for setting JAVA_LAUNCHER_FILENAME="${PN}" if SLOT is 0. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 929ce68c6c07..f919945280b1 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -161,7 +161,11 @@ fi # If ${JAVA_MAIN_CLASS} is set, we will create a launcher to # execute the jar, and ${JAVA_LAUNCHER_FILENAME} will be the # name of the script. -: "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}" +if [[ ${SLOT} = 0 ]]; then + JAVA_LAUNCHER_FILENAME="${PN}" +else + JAVA_LAUNCHER_FILENAME="${PN}-${SLOT}" +fi # @ECLASS_VARIABLE: JAVA_TESTING_FRAMEWORKS # @DEFAULT_UNSET -- 2.39.3
Re: [gentoo-dev] Packages up for grabs: net-p2p/freenet, net-p2p/fms, net-libs/NativeThread, dev-java/jbitcollider-core
> Joonas Niilola hat am 21.05.2023 18:01 CEST geschrieben: > > > Hey, > > the following packages are up for grabs: > acct-group/freenet > acct-user/freenet > dev-java/jbitcollider-core > net-libs/NativeThread > net-p2p/fms > net-p2p/freenet > > They are in pretty good condition. net-p2p/freenet needs a version bump, https://github.com/gentoo/gentoo/pull/30643
[gentoo-dev] Last rites: dev-java/avalon-framework, dev-java/avalon-logkit, java-virtuals/servlet-api, dev-java/resin-servlet-api
# Volkmar W. Pogatzki (2023-04-21) # Unused java libraries. Removal on 2023-05-22 dev-java/avalon-framework dev-java/avalon-logkit java-virtuals/servlet-api dev-java/resin-servlet-api
[gentoo-dev] Last rites: dev-java/jython
# Volkmar W. Pogatzki (2023-04-09) # Numerous vulnerabilities, bug #825486. # Nothing depends on it. Removal on 2023-05-09 dev-java/jython
[gentoo-dev] last-rite {tomcat-{el,jsp},glassfish-xmlrpc}-api
Signed-off-by: Volkmar W. Pogatzki --- # Volkmar W. Pogatzki (2023-03-23) # Unused Java libraries. Removal on 2023-04-22. dev-java/tomcat-jsp-api dev-java/tomcat-el-api dev-java/glassfish-xmlrpc-api +
[gentoo-dev] [PATCH] java-pkg-simple.eclass: MANIFEST.MF show Gentoo in "Created-By: "
Presently, MANIFEST.MF can receive upstream's "Created-By:" if such line is found in a predefined META-INF/MANIFEST.MF in ${JAVA_RESOURCE_DIRS} This change removes such line before the jar command creates the final MANIFEST.MF putting "Created-By: (GEntoo)" Closes: https://bugs.gentoo.org/897786 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index abac18ca03f8..2a817cb759ca 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2022 Gentoo Authors +# Copyright 2004-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-pkg-simple.eclass @@ -417,6 +417,7 @@ java-pkg-simple_src_compile() { # package local jar_args if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then + sed '/Created-By: /d' -i ${classes}/META-INF/MANIFEST.MF jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF" else jar_args="cf ${JAVA_JAR_FILENAME}" -- 2.39.2
[gentoo-dev] [PATCH] profiles: last-rite dev-java/{jboss-modules,sac}
Signed-off-by: Volkmar W. Pogatzki --- profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 3b473dc142d3..100d5a474394 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,11 @@ #--- END OF EXAMPLES --- +# Volkmar W. Pogatzki (2023-02-20) +# Unused Java libraries. Removal on 2023-03-22. +dev-java/jboss-modules +dev-java/sac + # Bernd Waibel (2023-02-19) # Obsolete, last consumer is gone. # Removal on 2023-03-21. Bug #892209 -- 2.39.2
[gentoo-dev] [PATCH] profiles: last-rite unused java libraries
Signed-off-by: Volkmar W. Pogatzki --- profiles/package.mask | 8 1 file changed, 8 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index ca66e4aea325..0e2085a7e5cc 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,14 @@ #--- END OF EXAMPLES --- +# Volkmar W. Pogatzki (2023-02-10) +# Unused Java libraries. Removal on 2023-03-12. +dev-java/jcip-annotations +dev-java/jformatstring +dev-java/jta +dev-java/pdf-renderer +dev-java/picocli + # Florian Schmaus (2023-02-10) # Previous dependencies of ejabberd, now no longer needed. # Removal on 2023-03-10. -- 2.39.1
[gentoo-dev] [PATCH v3] java-utils-2.eclass: ECLASS_VARIABLE JAVA_PKG_NO_CLEAN
The new ECLASS_VARIABLE JAVA_PKG_NO_CLEAN is an array of expressions to match *.class or *.jar files in order to protect them against deletion by java-pkg_clean. This change helps in cases where most bundled *.class or *.jar files can be deleted while only some few cannot be replaced with system libraries. It also helps to visualize bundled stuff in the ebuild. Cleaning does not work by default. It still needs java-pkg_clean within src_prepare(). Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 27 ++- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 4f50ce39c5dc..7641f9f40290 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2022 Gentoo Authors +# Copyright 2004-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-utils-2.eclass @@ -66,6 +66,21 @@ JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"} # JAVA_PKG_FORCE_VM=openjdk-11 emerge foo # @CODE +# @ECLASS_VARIABLE: JAVA_PKG_NO_CLEAN +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array of expressions to match *.class or *.jar files in order to protect +# them against deletion by java-pkg_clean. +# +# @CODE +# JAVA_PKG_NO_CLEAN=( +# "*/standard.jar" +# "*/launch4j.jar" +# "*/apps/jetty/apache-tomcat*" +# "*/lib/jetty*" +# ) +# @CODE + # @ECLASS_VARIABLE: JAVA_PKG_WANT_BUILD_VM # @DEFAULT_UNSET # @DESCRIPTION: @@ -2926,11 +2941,13 @@ is-java-strict() { # @FUNCTION: java-pkg_clean # @DESCRIPTION: # Java package cleaner function. This will remove all *.class and *.jar -# files, removing any bundled dependencies. +# files, except those specified by expressions in JAVA_PKG_NO_CLEAN. java-pkg_clean() { - if [[ -z "${JAVA_PKG_NO_CLEAN}" ]]; then - find "${@}" '(' -name '*.class' -o -name '*.jar' ')' -type f -delete -print || die - fi + NO_DELETE=() + for keep in ${JAVA_PKG_NO_CLEAN[@]}; do + NO_DELETE+=( '!' '-wholename' ${keep} ) + done + find "${@}" '(' -name '*.class' -o -name '*.jar' ${NO_DELETE[@]} ')' -type f -delete -print || die } # @FUNCTION: java-pkg_gen-cp -- 2.39.1
[gentoo-dev] [PATCH v2] profiles: last-rite commons-text, jspeex, osgi-annotation-versioning
Signed-off-by: Volkmar W. Pogatzki --- profiles/package.mask | 7 +++ 1 file changed, 7 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index bfd6d6821b96..abcd3bc34c5b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,13 @@ #--- END OF EXAMPLES --- +# Volkmar W. Pogatzki (2023-02-07) +# Unused Java libraries. Removal on 2023-03-08. +# jspeex had last upstream activities in 2005. +dev-java/jspeex +dev-java/osgi-annotation-versioning +dev-java/commons-text + # Michał Górny (2023-02-05) # dev-python/python-box has broken build system that prevents us from # bumping it. Its only used by dev-python/tavern that is last rited, -- 2.39.1
[gentoo-dev] [PATCH] profiles: last-rite jspeex, osgi-annotation-versioning
Signed-off-by: Volkmar W. Pogatzki --- profiles/package.mask | 6 ++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index bfd6d6821b96..22cd5077f051 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,12 @@ #--- END OF EXAMPLES --- +# Volkmar W. Pogatzki (2023-02-05) +# Unused Java libraries. Removal on 2023-03-07. +# jspeex had last upstream activities in 2005. +dev-java/jspeex +dev-java/osgi-annotation-versioning + # Michał Górny (2023-02-05) # dev-python/python-box has broken build system that prevents us from # bumping it. Its only used by dev-python/tavern that is last rited, -- 2.39.1
[gentoo-dev] [PATCH v2] java-utils-2.eclass: ECLASS_VARIABLE JAVA_PKG_NO_CLEAN
The new ECLASS_VARIABLE JAVA_PKG_NO_CLEAN is defined as an array in which those *.class or *.jar files can be listed which should not be removed by java-pkg_clean. This change helps in cases where only a small parts of bundled stuff cannot be replaced with system libraries. It also helps to visualize not yet unbundled stuff in the ebuild. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 27 ++- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 4f50ce39c5dc..8601c66287a1 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2022 Gentoo Authors +# Copyright 2004-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-utils-2.eclass @@ -66,6 +66,18 @@ JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"} # JAVA_PKG_FORCE_VM=openjdk-11 emerge foo # @CODE +# @ECLASS_VARIABLE: JAVA_PKG_NO_CLEAN +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array of *.class or *.jar files which must not be deleted by java-pkg_clean. +# +# @CODE +# JAVA_PKG_NO_CLEAN=( +# apps/susidns/src/lib/jstl.jar +# apps/susidns/src/lib/standard.jar +# ) +# @CODE + # @ECLASS_VARIABLE: JAVA_PKG_WANT_BUILD_VM # @DEFAULT_UNSET # @DESCRIPTION: @@ -2926,11 +2938,16 @@ is-java-strict() { # @FUNCTION: java-pkg_clean # @DESCRIPTION: # Java package cleaner function. This will remove all *.class and *.jar -# files, removing any bundled dependencies. +# files, removing any bundled dependencies except bundled sources. java-pkg_clean() { - if [[ -z "${JAVA_PKG_NO_CLEAN}" ]]; then - find "${@}" '(' -name '*.class' -o -name '*.jar' ')' -type f -delete -print || die - fi + local FILES_TO_DELETE=$(find "${@}" '(' -name '*.class' -o -name '*.jar' ')') + FILES_TO_DELETE=${FILES_TO_DELETE//\.\/${@}} + for keep in "${JAVA_PKG_NO_CLEAN[@]}"; do + FILES_TO_DELETE=${FILES_TO_DELETE//${keep}} + done + for delete in "${FILES_TO_DELETE[@]}"; do + rm -v ${delete} || die + done } # @FUNCTION: java-pkg_gen-cp -- 2.39.1
[gentoo-dev] [PATCH] java-utils-2.eclass: ECLASS_VARIABLE JAVA_PKG_NO_CLEAN
The new ECLASS_VARIABLE JAVA_PKG_NO_CLEAN is defined as an array in which those *.class or *.jar files can be listed which should not be removed by java-pkg_clean. This change helps in cases where only a small parts of bundled stuff cannot be replaced with system libraries. It also helps to visualize not yet unbundled stuff in the ebuild. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 27 +++ 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 4f50ce39c5dc..5cd9d441f396 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2022 Gentoo Authors +# Copyright 2004-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-utils-2.eclass @@ -66,6 +66,18 @@ JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"} # JAVA_PKG_FORCE_VM=openjdk-11 emerge foo # @CODE +# @ECLASS_VARIABLE: JAVA_PKG_NO_CLEAN +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array of *.class or *.jar files which must not be deleted by java-pkg_clean. +# +# @CODE +# JAVA_PKG_NO_CLEAN=( +# apps/susidns/src/lib/jstl.jar +# apps/susidns/src/lib/standard.jar +# ) +# @CODE + # @ECLASS_VARIABLE: JAVA_PKG_WANT_BUILD_VM # @DEFAULT_UNSET # @DESCRIPTION: @@ -2928,9 +2940,16 @@ is-java-strict() { # Java package cleaner function. This will remove all *.class and *.jar # files, removing any bundled dependencies. java-pkg_clean() { - if [[ -z "${JAVA_PKG_NO_CLEAN}" ]]; then - find "${@}" '(' -name '*.class' -o -name '*.jar' ')' -type f -delete -print || die - fi + pushd ${S} > /dev/null || die + local FILES_TO_DELETE=$(find * '(' -name '*.class' -o -name '*.jar' ')') + for keep in "${JAVA_PKG_NO_CLEAN[@]}"; do + FILES_TO_DELETE=${FILES_TO_DELETE//${keep}} + done + for delete in "${FILES_TO_DELETE[@]}"; do + echo "" + rm -v ${delete} || die + done + popd > /dev/null || die } # @FUNCTION: java-pkg_gen-cp -- 2.39.1
Re: [gentoo-dev] [PATCH] add apache to metadata.dtd
> Michał Górny hat am 25.11.2022 14:16 CET geschrieben: > > > On Fri, 2022-11-25 at 10:04 +0100, Volkmar W. Pogatzki wrote: > > > This doesn't seem consistent. How is it supposed to work? > > You didn't answer this question. > > -- > Best regards, > Michał Górny Sorry. I have to admit I have no idea how remote-id works and what's needed to make a new remote-id work. I was asked on https://bugs.gentoo.org/882351 to post here, so I did. What did you mean with »doesn't seem consistent«, why should an "apache" remote-id not be possible? -- Kind regards Volkmar W. Pogatzki
Re: [gentoo-dev] [PATCH] add apache to metadata.dtd
> Michał Górny hat am 24.11.2022 15:03 CET geschrieben: > > > On Thu, 2022-11-24 at 13:29 +0100, Volkmar W. Pogatzki wrote: > > There are many packages hosted on .apache.org like e.g. > > > > dev-java/log4j-core -> https://logging.apache.org/log4j/2.x/ > > dev-java/pdfbox -> https://pdfbox.apache.org/ > > net-libs/serf -> https://serf.apache.org/ > > > > This doesn't seem consistent. How is it supposed to work? > > Please don't forget to include a patch for the XML Schema and pkgcheck. > > -- > Best regards, > Michał Górny https://882351.bugs.gentoo.org/attachment.cgi?id=835371 https://882351.bugs.gentoo.org/attachment.cgi?id=835437 Wiki says "DTD (needs gentoo-dev ML review, do this before any other step)" -- Best regards Volkmar W. Pogatzki
[gentoo-dev] [PATCH] add apache to metadata.xsd
There are many packages hosted on .apache.org like e.g. dev-java/log4j-core -> https://logging.apache.org/log4j/2.x/ dev-java/pdfbox -> https://pdfbox.apache.org/ net-libs/serf -> https://serf.apache.org/ A new Upstream would allow setting remote-id to the correct value for those packages. Signed-off-by: Volkmar W. Pogatzki --- metadata.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/metadata.xsd b/metadata.xsd index 3812045..7d05234 100644 --- a/metadata.xsd +++ b/metadata.xsd @@ -270,6 +270,7 @@ + -- 2.37.4
[gentoo-dev] [PATCH] add apache to metadata.dtd
There are many packages hosted on .apache.org like e.g. dev-java/log4j-core -> https://logging.apache.org/log4j/2.x/ dev-java/pdfbox -> https://pdfbox.apache.org/ net-libs/serf -> https://serf.apache.org/ A new Upstream would allow setting remote-id to the correct value for those packages. Signed-off-by: Volkmar W. Pogatzki --- metadata.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.dtd b/metadata.dtd index c36242a..6546dc6 100644 --- a/metadata.dtd +++ b/metadata.dtd @@ -56,7 +56,7 @@ - + -- 2.37.4
[gentoo-dev] [PATCH] profiles: last-rite net-p2p/vuze
Signed-off-by: Volkmar W. Pogatzki --- profiles/package.mask | 6 ++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 25711676c87..9c426250346 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,12 @@ #--- END OF EXAMPLES --- +# Volkmar W. Pogatzki (2022-10-31) +# Upstream seems dead, last activities in Nov 2017. +# Doesn't work, bug #857663. Removal on 2022-11-30. +net-p2p/vuze +net-p2p/vuze-coreplugins + # David Seifert (2022-10-31) # EAPI 6, last release over 17 years ago, requires
[gentoo-dev] [PATCH] profiles/package.mask: last-rite dev-java/objenesis-test
Signed-off-by: Volkmar W. Pogatzki --- profiles/package.mask | 4 1 file changed, 4 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 6040ca9ee0e..b4746616bf3 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,10 @@ #--- END OF EXAMPLES --- +# Volkmar W. Pogatzki (2022-10-10) +# Unused Java library. Removal on 2022-11-10. +dev-java/objenesis-test + # Andreas Sturmlechner (2022-10-08) # Obsolete after Plasma 5.25 release, merged into KWin. # Removal on 2022-10-22. -- 2.35.1
[gentoo-dev] [PATCH v2] java-pkg-simple.eclass: allow to compile with sources.lst empty
Compilation of ${sources} fails with error if ${sources} is empty. This is the case when a package (or a module in case of a multi-jar package) has only module-info.java to get compiled. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 28 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index abac18ca03f..dddee3a9610 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -377,13 +377,15 @@ 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 - ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ - ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources} - else - ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ - ${classpath:+--module-path ${classpath}} --module-version ${PV}\ - ${JAVAC_ARGS} @${sources} + if [[ -s "${sources}" ]]; then + if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then + ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ + ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources} + else + ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ + ${classpath:+--module-path ${classpath}} --module-version ${PV}\ + ${JAVAC_ARGS} @${sources} + fi fi # handle module-info.java separately as it needs at least JDK 9 @@ -407,11 +409,13 @@ java-pkg-simple_src_compile() { # javadoc if has doc ${JAVA_PKG_IUSE} && use doc; then - mkdir -p ${apidoc} - ejavadoc -d ${apidoc} \ - -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ - ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ - @${sources} || die "javadoc failed" + if [[ -s "${sources}" ]]; then + mkdir -p ${apidoc} + ejavadoc -d ${apidoc} \ + -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ + ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ + @${sources} || die "javadoc failed" + fi fi # package -- 2.35.1
[gentoo-dev] [PATCH] java-pkg-simple.eclass: allow to compile with sources.lst empty
Compilation of ${sources} fails with error if ${sources} is empty. This is the case when a package (or a module in case of a multi-jar package) has only module-info.java to get compiled. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index abac18ca03f..d3047296035 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -377,13 +377,15 @@ 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 - ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ - ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources} - else - ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ - ${classpath:+--module-path ${classpath}} --module-version ${PV}\ - ${JAVAC_ARGS} @${sources} + if [[ -s "${sources}" ]]; then + if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then + ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ + ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources} + else + ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ + ${classpath:+--module-path ${classpath}} --module-version ${PV}\ + ${JAVAC_ARGS} @${sources} + fi fi # handle module-info.java separately as it needs at least JDK 9 -- 2.35.1
[gentoo-dev] [PATCH v2] java-pkg-simple.eclass: improve MANIFEST.MF manipulation
For adding Main-class and/or Automatic-module-name to MANIFEST.MF it seems better to use "jar" functionality at the end of compilation. This does the necessary checks and issues warnings in case of duplicate entries. Erroneously used existence checks ( -v ) were causing wrong entries in MANIFEST.MF files in case of JAVA_MAIN_CLASS="" which is often used in multi-jar ebuilds. Closes: https://bugs.gentoo.org/874924 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 22 +- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 7a9582393dd..abac18ca03f 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -415,15 +415,6 @@ java-pkg-simple_src_compile() { fi # package - [[ ! -d ${classes}/META-INF ]] && mkdir ${classes}/META-INF - if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then - echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ - >> ${classes}/META-INF/MANIFEST.MF || die "adding module name failed" - fi - if [[ -v JAVA_MAIN_CLASS ]]; then - echo "Main-Class: ${JAVA_MAIN_CLASS}" \ - >> ${classes}/META-INF/MANIFEST.MF || die "adding main class failed" - fi local jar_args if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF" @@ -431,6 +422,19 @@ java-pkg-simple_src_compile() { jar_args="cf ${JAVA_JAR_FILENAME}" fi jar ${jar_args} -C ${classes} . || die "jar failed" + if [[ -n "${JAVA_AUTOMATIC_MODULE_NAME}" ]]; then + echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ + >> "${T}/add-to-MANIFEST.MF" || die "adding module name failed" + fi + if [[ -n "${JAVA_MAIN_CLASS}" ]]; then + echo "Main-Class: ${JAVA_MAIN_CLASS}" \ + >> "${T}/add-to-MANIFEST.MF" || die "adding main class failed" + fi + if [[ -f "${T}/add-to-MANIFEST.MF" ]]; then + jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \ + || die "updating MANIFEST.MF failed" + rm -f "${T}/add-to-MANIFEST.MF" || die "cannot remove" + fi } # @FUNCTION: java-pkg-simple_src_install -- 2.35.1
[gentoo-dev] [PATCH v2] java-pkg-simple.eclass: improve MANIFEST.MF manipulation
For adding Main-class and/or Automatic-module-name to MANIFEST.MF it seems better to use "jar" functionality at the end of compilation. This does the necessary checks and issues warnings in case of duplicate entries. Closes: https://bugs.gentoo.org/874924 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 22 +- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 7a9582393dd..9b50b5dc075 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -415,15 +415,6 @@ java-pkg-simple_src_compile() { fi # package - [[ ! -d ${classes}/META-INF ]] && mkdir ${classes}/META-INF - if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then - echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ - >> ${classes}/META-INF/MANIFEST.MF || die "adding module name failed" - fi - if [[ -v JAVA_MAIN_CLASS ]]; then - echo "Main-Class: ${JAVA_MAIN_CLASS}" \ - >> ${classes}/META-INF/MANIFEST.MF || die "adding main class failed" - fi local jar_args if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF" @@ -431,6 +422,19 @@ java-pkg-simple_src_compile() { jar_args="cf ${JAVA_JAR_FILENAME}" fi jar ${jar_args} -C ${classes} . || die "jar failed" + if [[ -n "${JAVA_AUTOMATIC_MODULE_NAME}" ]]; then + echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ + >> "${T}/add-to-MANIFEST.MF" || die "adding module name failed" + fi + if [[ -n "${JAVA_MAIN_CLASS}" ]]; then + echo "Main-Class: ${JAVA_MAIN_CLASS}" \ + >> "${T}/add-to-MANIFEST.MF" || die "adding main class failed" + fi + if [[ -e ${T}/add-to-MANIFEST.MF ]]; then + jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \ + || die "updating MANIFEST.MF failed" + rm -f "${T}/add-to-MANIFEST.MF" || die "cannot remove" + fi } # @FUNCTION: java-pkg-simple_src_install -- 2.35.1
[gentoo-dev] [PATCH] java-pkg-simple.eclass: improve MANIFEST.MF manipulation
For adding Main-class and/or Automatic-module-name to MANIFEST.MF it seems better to use "jar" functionality at the end of compilation. This does the necessary checks and issues warnings in case of duplicate entries. Closes: https://bugs.gentoo.org/874924 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 21 - 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 7a9582393dd..5f691571e53 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -415,15 +415,6 @@ java-pkg-simple_src_compile() { fi # package - [[ ! -d ${classes}/META-INF ]] && mkdir ${classes}/META-INF - if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then - echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ - >> ${classes}/META-INF/MANIFEST.MF || die "adding module name failed" - fi - if [[ -v JAVA_MAIN_CLASS ]]; then - echo "Main-Class: ${JAVA_MAIN_CLASS}" \ - >> ${classes}/META-INF/MANIFEST.MF || die "adding main class failed" - fi local jar_args if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF" @@ -431,6 +422,18 @@ java-pkg-simple_src_compile() { jar_args="cf ${JAVA_JAR_FILENAME}" fi jar ${jar_args} -C ${classes} . || die "jar failed" + if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then + echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ + >> "${T}/add-to-MANIFEST.MF" || die "adding module name failed" + fi + if [[ -v JAVA_MAIN_CLASS ]]; then + echo "Main-Class: ${JAVA_MAIN_CLASS}" \ + >> "${T}/add-to-MANIFEST.MF" || die "adding main class failed" + fi + if [[ -e ${T}/add-to-MANIFEST.MF ]]; then + jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \ + || die "updating MANIFEST.MF failed" + fi } # @FUNCTION: java-pkg-simple_src_install -- 2.35.1
[gentoo-dev] [PATCH] java-pkg-simple.eclass: improve test selection for multi-jar packages
Testing multi-jar packages was not properly supported. With this change the tests_to_run are selected per module. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 28 +++- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 6e38a07f66e..7a9582393dd 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -545,19 +545,21 @@ java-pkg-simple_src_test() { if [[ -n ${JAVA_TEST_RUN_ONLY} ]]; then tests_to_run="${JAVA_TEST_RUN_ONLY[@]}" else - tests_to_run=$(find "${classes}" -type f\ - \( -name "*Test.class"\ - -o -name "Test*.class"\ - -o -name "*Tests.class"\ - -o -name "*TestCase.class" \)\ - ! -name "*Abstract*"\ - ! -name "*BaseTest*"\ - ! -name "*TestTypes*"\ - ! -name "*TestUtils*"\ - ! -name "*\$*") - tests_to_run=${tests_to_run//"${classes}"\/} - tests_to_run=${tests_to_run//.class} - tests_to_run=${tests_to_run//\//.} + pushd "${JAVA_TEST_SRC_DIR}" > /dev/null || die + tests_to_run=$(find * -type f\ + \( -name "*Test.java"\ + -o -name "Test*.java"\ + -o -name "*Tests.java"\ + -o -name "*TestCase.java" \)\ + ! -name "*Abstract*"\ + ! -name "*BaseTest*"\ + ! -name "*TestTypes*"\ + ! -name "*TestUtils*"\ + ! -name "*\$*") + tests_to_run=${tests_to_run//"${classes}"\/} + tests_to_run=${tests_to_run//.java} + tests_to_run=${tests_to_run//\//.} + popd > /dev/null || die # exclude extra test classes, usually corner cases # that the code above cannot handle -- 2.35.1
[gentoo-dev] [PATCH] java-pkg-simple.eclass: allow JAVA_MAIN_CLASS _and_ MANIFEST.MF
The eclass did not handle JAVA_MAIN_CLASS if there was also a given META-INF/MANIFEST.MF. This change allows adding JAVA_AUTOMATIC_MODULE_NAME and/or JAVA_MAIN_CLASS to the MANIFEST.MF file if it exists or creates one if not. Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 6f7324240e3..6e38a07f66e 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -415,21 +415,22 @@ java-pkg-simple_src_compile() { fi # package + [[ ! -d ${classes}/META-INF ]] && mkdir ${classes}/META-INF + if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then + echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ + >> ${classes}/META-INF/MANIFEST.MF || die "adding module name failed" + fi + if [[ -v JAVA_MAIN_CLASS ]]; then + echo "Main-Class: ${JAVA_MAIN_CLASS}" \ + >> ${classes}/META-INF/MANIFEST.MF || die "adding main class failed" + fi local jar_args if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF" - elif [[ ${JAVA_MAIN_CLASS} ]]; then - jar_args="cfe ${JAVA_JAR_FILENAME} ${JAVA_MAIN_CLASS}" else jar_args="cf ${JAVA_JAR_FILENAME}" fi jar ${jar_args} -C ${classes} . || die "jar failed" - if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then - cat > "${T}/add-to-MANIFEST.MF" <<< "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ - || die "add-to-MANIFEST.MF failed" - jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \ - || die "updating MANIFEST.MF failed" - fi } # @FUNCTION: java-pkg-simple_src_install -- 2.35.1
[gentoo-dev] [PATCH] profiles/package.mask: last rite dev-java/{gin,gwt,validation-api}
Signed-off-by: Volkmar W. Pogatzki --- profiles/package.mask | 7 +++ 1 file changed, 7 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 2a248d2e525..2c9b5e788c6 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,13 @@ #--- END OF EXAMPLES --- +# Volkmar W. Pogatzki (2022-08-25) +# Java libraries without consumers. +# Removal on 2022-09-25, bugs #853100 #716228. +dev-java/gin +dev-java/gwt +dev-java/validation-api + # Jaco Kroon (2022-08-22) # Superceded by bgpq4 (already in tree). Non-co-operative upstream. Removal # in 30 days. Open bugs, already fixed in bgpq4. Please convert your usage to -- 2.35.1
[gentoo-dev] [PATCH] profiles/package.mask: last-rite dev-java/byte-buddy-agent
Signed-off-by: Volkmar W. Pogatzki --- profiles/package.mask | 4 1 file changed, 4 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 0e6d8afee8b..ff956b28187 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,10 @@ #--- END OF EXAMPLES --- +# Volkmar W. Pogatzki (2022-08-22) +# Java library without consumers. Removal on 2022-09-22 +dev-java/byte-buddy-agent + # hololeap (2022-08-21) # Monolithic mask for dev-haskell/* packages which have no reverse dependencies, # are broken, or severely out of date. The aim is to have the Haskell overlay -- 2.35.1
[gentoo-dev] [PATCH] java-pkg-simple.eclass: do not java-pkg_gen-cp if USE=binary
Closes: https://bugs.gentoo.org/861026 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 09062d9ede6..6f7324240e3 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -344,9 +344,6 @@ java-pkg-simple_prepend_resources() { java-pkg-simple_src_compile() { local sources=sources.lst classes=target/classes apidoc=target/api moduleinfo - # auto generate classpath - java-pkg_gen-cp JAVA_GENTOO_CLASSPATH - # do not compile if we decide to install binary jar if has binary ${JAVA_PKG_IUSE} && use binary; then # register the runtime dependencies @@ -357,6 +354,9 @@ java-pkg-simple_src_compile() { cp "${DISTDIR}"/${JAVA_BINJAR_FILENAME} ${JAVA_JAR_FILENAME}\ || die "Could not copy the binary jar file to ${S}" return 0 + else + # auto generate classpath + java-pkg_gen-cp JAVA_GENTOO_CLASSPATH fi # gather sources -- 2.35.1
[gentoo-dev] [PATCH v3] java-pkg-simple.eclass: Automatic-Module-Name
The new variable JAVA_AUTOMATIC_MODULE_NAME can be defined in the ebuild. Its value will be transferred to the MANIFEST.MF of the jar file. Closes: https://bugs.gentoo.org/857468 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 12 1 file changed, 12 insertions(+) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 1e101a828c4..c0a6b4d21df 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -134,6 +134,12 @@ fi # JAVA_MAIN_CLASS="org.gentoo.java.ebuilder.Main" # @CODE +# @ECLASS_VARIABLE: JAVA_AUTOMATIC_MODULE_NAME +# @DEFAULT_UNSET +# @DESCRIPTION: +# The value of the Automatic-Module-Name entry, which is going to be added to +# MANIFEST.MF. + # @ECLASS_VARIABLE: JAVADOC_ARGS # @DEFAULT_UNSET # @DESCRIPTION: @@ -418,6 +424,12 @@ java-pkg-simple_src_compile() { jar_args="cf ${JAVA_JAR_FILENAME}" fi jar ${jar_args} -C ${classes} . || die "jar failed" + if [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then + cat > "${T}/add-to-MANIFEST.MF" <<< "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ + || die "add-to-MANIFEST.MF failed" + jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \ + || die "updating MANIFEST.MF failed" + fi } # @FUNCTION: java-pkg-simple_src_install -- 2.35.1
[gentoo-dev] [PATCH v2] java-pkg-simple.eclass: Automatic-Module-Name
Closes: https://bugs.gentoo.org/857468 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 11 +++ 1 file changed, 11 insertions(+) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 1e101a828c4..9f711c292a7 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -134,6 +134,11 @@ fi # JAVA_MAIN_CLASS="org.gentoo.java.ebuilder.Main" # @CODE +# @ECLASS_VARIABLE: JAVA_AUTOMATIC_MODULE_NAME +# @DEFAULT_UNSET +# @DESCRIPTION: +# The value of Automatic-Module-Name to be added to MANIFEST.MF + # @ECLASS_VARIABLE: JAVADOC_ARGS # @DEFAULT_UNSET # @DESCRIPTION: @@ -418,6 +423,12 @@ java-pkg-simple_src_compile() { jar_args="cf ${JAVA_JAR_FILENAME}" fi jar ${jar_args} -C ${classes} . || die "jar failed" + if [[ ${JAVA_AUTOMATIC_MODULE_NAME} ]]; then + cat > "${T}/add-to-MANIFEST.MF" <<< "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \ + || die "add-to-MANIFEST.MF failed" + jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \ + || die "updating MANIFEST.MF failed" + fi } # @FUNCTION: java-pkg-simple_src_install -- 2.35.1
[gentoo-dev] [PATCH] java-pkg-simple.eclass: Automatic-Module-Name
Closes: https://bugs.gentoo.org/857468 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-pkg-simple.eclass | 11 +++ 1 file changed, 11 insertions(+) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 1e101a828c4..9604b41ea38 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -134,6 +134,11 @@ fi # JAVA_MAIN_CLASS="org.gentoo.java.ebuilder.Main" # @CODE +# @ECLASS_VARIABLE: JAVA_AUTOMATIC_MODULE_MANE +# @DEFAULT_UNSET +# @DESCRIPTION: +# The value of Automatic-Module-Name to be added to MANIFEST.MF + # @ECLASS_VARIABLE: JAVADOC_ARGS # @DEFAULT_UNSET # @DESCRIPTION: @@ -418,6 +423,12 @@ java-pkg-simple_src_compile() { jar_args="cf ${JAVA_JAR_FILENAME}" fi jar ${jar_args} -C ${classes} . || die "jar failed" + if [[ ${JAVA_AUTOMATIC_MODULE_MANE} ]]; then + cat > "${T}/add-to-MANIFEST.MF" <<< "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_MANE}" \ + || die "add-to-MANIFEST.MF failed" + jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \ + || die "updating MANIFEST.MF failed" + fi } # @FUNCTION: java-pkg-simple_src_install -- 2.35.1
[gentoo-dev] [PATCH] profiles/package.mask: last-rite asm submodules
Signed-off-by: Volkmar W. Pogatzki --- profiles/package.mask | 9 + 1 file changed, 9 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 9dd06203385..55ab9066238 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,15 @@ #--- END OF EXAMPLES --- +# Volkmar W. Pogatzki (2022-07-12) +# Unused java libraries, all asm-* included in dev-java/asm, +# log4j-api-java9 never to be used as a package. Removal on 2022-08-12. +dev-java/asm-analysis +dev-java/asm-commons +dev-java/asm-tree +dev-java/asm-util +dev-java/log4j-api-java9 + # Sam James (2022-07-12) # Huge number of open bugs, deprecated upstream (they recommend # using other video editors like Shotcut, Kdenlive, ...). Removal on 2022-08-12. -- 2.35.1
[gentoo-dev] [PATCH v2] eclass/java-utils-2.eclass: testng print verbose output
Bug: https://bugs.gentoo.org/801694 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index e5a2b611d11..6576712e010 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1901,7 +1901,12 @@ etestng() { ${JAVA_TEST_RUNNER_EXTRA_ARGS[@]} ) - [[ ! "${JAVA_TEST_RUNNER_EXTRA_ARGS[@]}" =~ "-usedefaultlisteners" ]] && args+=( -usedefaultlisteners false ) + if [[ ! "${JAVA_TEST_RUNNER_EXTRA_ARGS[@]}" =~ "-usedefaultlisteners" ]]; then + args+=( + -verbose 3 + -usedefaultlisteners true + ) + fi args+=( -testclass ${tests} ) -- 2.35.1
[gentoo-dev] [PATCH] eclass/java-utils-2.eclass: testng print verbose output
Bug: https://bugs.gentoo.org/801694 Signed-off-by: Volkmar W. Pogatzki --- eclass/java-utils-2.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index e5a2b611d11..cfe04d631a0 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1901,7 +1901,9 @@ etestng() { ${JAVA_TEST_RUNNER_EXTRA_ARGS[@]} ) - [[ ! "${JAVA_TEST_RUNNER_EXTRA_ARGS[@]}" =~ "-usedefaultlisteners" ]] && args+=( -usedefaultlisteners false ) + if [[ ! "${JAVA_TEST_RUNNER_EXTRA_ARGS[@]}" =~ "-usedefaultlisteners" ]]; then + args+=( -verbose 3 -usedefaultlisteners true ) + fi args+=( -testclass ${tests} ) -- 2.35.1
[gentoo-dev] Last rites: www-plugins/noscript
# Mounir Lamouri (18 Apr 2010) # The add-on/extension manager should now be used instead of the package # from the tree, bug 315999. Masked for removal in 30 days. www-plugins/noscript
[gentoo-dev] Lastrite: net-voip/wengophone-bin
# Mounir Lamouri (09 Mar 2010) # net-voip/wengophone-bin has been superseeded by net-im/qutecom # and suffers of QA issues, see bug 251575 # Masked for removal in 30 days net-voip/wengophone-bin
Re: [gentoo-dev] Gentoo Mozilla Team meeting decisions
On Mon, Feb 22, 2010 at 02:31:25AM +0530, Nirbheek Chauhan wrote: > -> Ebuilds for Extensions in-tree: The Gentoo Mozilla team will not > ship ebuilds for extensions such as noscript and weave anymore. We > will only have ebuilds for extensions which are linux-specific and > compiled; such as enigmail. Small correction: weave is not a candidate for removal as long as WeaveCrypto lib will be compiled. There is an open bug to have it done in js [1]. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=513798 -- Mounir
Re: [gentoo-dev] Removing kde-base/arts from tree.
On Wed, Nov 11, 2009 at 12:14:41AM +0200, Samuli Suominen wrote: > Here's _somewhat_ complete list of ebuilds that have a depend on > kde-base/arts, excluding those that are masked for other reasons > or ones that I plan on handling myself. > [..] > media-video/vlc-0.9.10:arts There is a bug with ffmpeg for ppc which is blocking vlc-1.0.2 stabilization. Please, consider just dropping arts support from 0.9.10 instead of removing the ebuild. The ffmpeg bug isn't simple enought to be fixed for the end of the week. Thanks. -- Mounir
Re: [gentoo-dev] [RFC] Add operator + for licenses (EAPI-4 ?)
On Thu, Oct 01, 2009 at 04:01:29AM +0200, Sebastian Pipping wrote: > Zac Medico wrote: > >> I propose support for license groups in ebuilds then, I guess. > > > > That seems like a reasonable solution. So, an ebuild can do > > something like LICENSE="@GPL-2+" and that will expand to whatever > > the definition of the GPL-2+ license group happens to be. When a new > > version of GPL license comes out, we simple add it to that group, > > and none of the corresponding ebuilds have to be updated. > > I made a bug from that so it doesn't get lost. > > https://bugs.gentoo.org/show_bug.cgi?id=287192 Actually, it's not lost. I've write a patch for the GLEP-23 and I'm waiting for an answer from the glep team. -- Mounir
Re: [gentoo-dev] [rfc] layman-global.txt, repositories.xml, layman, overlays.gentoo.org
On Mon, Sep 28, 2009 at 08:23:34PM +0200, Sebastian Pipping wrote: > Hello there! > > > This may look like like a lot of text but it actually isn't. > Please read on. Thanks. Thanks for your good work. I agree with your changes it was indeed needed. Actually, during my GSOC, I've noted layman-global.txt should be changed to have a cleanier description information and it's probably the moment to introduce this. At the moment, is used for very short descriptions: Arcon Overlay! or quite longer: A collection of Bazaar-related ebuilds, including release candidates of Bazaar. even ery long: Berkano overlay provides an overlay for Gentoo Linux with ebuilds of bleeding edge software (such as live subversion builds) and other handy tools that are missing from the official portage tree. Areas of interest include multimedia and system administration. layman is a cli so it doesn't really care of the description lenght but it's a pain to use in a GUI like PackageKit repository list. I think we should introduce a field even with a lang parameter like we already have in metadata.xml. So, description field will have to be used for short descriptions (a few words) to complete the name of the overlay like: experimental gnome ebuilds I don't think DTD have abilities to restrict field value lenght but even if we will have to change a few by hands, having a field could help. Sebastian, do you think you can add this to your set of changes ? (only the new field in the DTD at the moment). Thanks, Mounir