diff options
| author |   Zhang Zongyu <zzy2529420793@gmail.com> | 2020-08-26 00:30:10 +0800 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2020-08-30 18:02:35 +0200 |
| commit | a4d773b4c2f433438b00010bbf0981c81e123d1b (patch) | |
| tree | f6790211a06ccf8175642c8ae14be4f8da53511f | |
| parent | java-pkg-simple.eclass and java-utils-2.eclass: features and enhancements (diff) | |
| download | gentoo-a4d773b4c2f433438b00010bbf0981c81e123d1b.tar.gz gentoo-a4d773b4c2f433438b00010bbf0981c81e123d1b.tar.bz2 gentoo-a4d773b4c2f433438b00010bbf0981c81e123d1b.zip | |
patching ebuild files to support new java-pkg-simple
Signed-off-by: Zhang Zongyu <zzy2529420793@gmail.com>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
| -rw-r--r-- | dev-java/juel/juel-2.1.0-r2.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/xml-commons/xml-commons-1.4.01.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/xsdlib/xsdlib-20090415.ebuild | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/dev-java/juel/juel-2.1.0-r2.ebuild b/dev-java/juel/juel-2.1.0-r2.ebuild index 052a8b4e96e9..6b7b4c894a20 100644 --- a/dev-java/juel/juel-2.1.0-r2.ebuild +++ b/dev-java/juel/juel-2.1.0-r2.ebuild @@ -26,7 +26,7 @@ DEPEND=" S="${WORKDIR}/${P}" -JAVA_SRC_DIR="src/api src/impl" +JAVA_SRC_DIR=( "src/api" "src/impl" ) java_prepare() { java-pkg_clean diff --git a/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild b/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild index 6193eb4112ae..bd8cd931c7e7 100644 --- a/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild +++ b/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild @@ -29,7 +29,7 @@ DEPEND=" S="${WORKDIR}/${PN}.java-${PN}-complete-${PV}" JAVA_GENTOO_CLASSPATH="swt-3.8" -JAVA_SRC_DIR="core extras swt" +JAVA_SRC_DIR=( "core" "extras" "swt" ) java_prepare() { rm -rf core/src/test extras/src/test swt/src/test || die diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild index d417f67fd56f..a9667ffec756 100644 --- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild +++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild @@ -37,7 +37,7 @@ DEPEND=" app-arch/unzip" S="${WORKDIR}/${MY_P}/src" -JAVA_SRC_DIR="beaninfo java" +JAVA_SRC_DIR=( "beaninfo" "java" ) src_prepare() { default @@ -61,7 +61,7 @@ src_compile() { java-pkg-simple_src_compile local DIR - for DIR in ${JAVA_SRC_DIR}; do + for DIR in "${JAVA_SRC_DIR[@]}"; do java-pkg_addres ${PN}.jar ${DIR} done } diff --git a/dev-java/xml-commons/xml-commons-1.4.01.ebuild b/dev-java/xml-commons/xml-commons-1.4.01.ebuild index 25d9caa3b6a6..028c71cf67d2 100644 --- a/dev-java/xml-commons/xml-commons-1.4.01.ebuild +++ b/dev-java/xml-commons/xml-commons-1.4.01.ebuild @@ -26,4 +26,4 @@ DEPEND=" >=virtual/jdk-1.6 source? ( app-arch/zip )" -JAVA_SRC_DIR="org javax" +JAVA_SRC_DIR=( "org" "javax" ) diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild index c317785fc9fb..0cb2aba0120a 100644 --- a/dev-java/xsdlib/xsdlib-20090415.ebuild +++ b/dev-java/xsdlib/xsdlib-20090415.ebuild @@ -31,13 +31,13 @@ java_prepare() { find -name '*.jar' -exec rm -v {} + || die } -JAVA_SRC_DIR="src src-apache" +JAVA_SRC_DIR=( "src" "src-apache" ) JAVA_GENTOO_CLASSPATH="relaxng-datatype,xerces-2" src_compile() { java-pkg-simple_src_compile - local dir; for dir in ${JAVA_SRC_DIR}; do + local dir; for dir in "${JAVA_SRC_DIR[@]}"; do pushd ${dir} > /dev/null || die jar -uf "${S}"/${PN}.jar $(find -name '*.properties') || die popd > /dev/null |