commit: 7d31d19020444a6ec3e8e556ea396f540fda8741 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Jan 4 15:53:01 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Jan 5 10:29:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d31d190
dev-java/bsf: move dependencies to runtime classpath Also adds *.properties files which were missing Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/34640 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/bsf/{bsf-2.4.0-r4.ebuild => bsf-2.4.0-r5.ebuild} | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dev-java/bsf/bsf-2.4.0-r4.ebuild b/dev-java/bsf/bsf-2.4.0-r5.ebuild similarity index 83% rename from dev-java/bsf/bsf-2.4.0-r4.ebuild rename to dev-java/bsf/bsf-2.4.0-r5.ebuild index 392c3e6152ec..129e8013ff23 100644 --- a/dev-java/bsf/bsf-2.4.0-r4.ebuild +++ b/dev-java/bsf/bsf-2.4.0-r5.ebuild @@ -35,16 +35,17 @@ RDEPEND="${CDEPEND} DOCS=( CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt ) -JAVA_CLASSPATH_EXTRA=" +JAVA_GENTOO_CLASSPATH=" commons-logging xalan " JAVA_MAIN_CLASS="org.apache.bsf.Main" +JAVA_RESOURCE_DIRS="res" JAVA_SRC_DIR="src" src_prepare() { java-pkg-2_src_prepare - rm -r src/org/apache/bsf/engines/{netrexx,jython} || die + rm -r src/org/apache/bsf/engines/{java,javaclass,jython,netrexx} || die if use javascript; then JAVA_GENTOO_CLASSPATH+=" rhino-1.6" else @@ -55,6 +56,12 @@ src_prepare() { else rm -r src/org/apache/bsf/engines/jacl || die fi + # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS + mkdir res || die "create res" + pushd src > /dev/null || die "pushd" + find -type f -name '*.properties' \ + | xargs cp --parent -t ../res || die "copy resources" + popd > /dev/null } src_install() {
