diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-24 20:54:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-24 20:54:05 +0100 |
| commit | fc879856a16ea66528a11a00cf6ee19891f3d186 (patch) | |
| tree | 01ac0b4134970567587e7176ffc531a404898186 /dev-java/jaxb-runtime | |
| parent | f73bef95b39f4fbc8f0278c26ad1534e5eec322f (diff) | |
gentoo auto-resync : 24:07:2022 - 20:54:05
Diffstat (limited to 'dev-java/jaxb-runtime')
| -rw-r--r-- | dev-java/jaxb-runtime/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild (renamed from dev-java/jaxb-runtime/jaxb-runtime-4.0.0.ebuild) | 27 |
2 files changed, 7 insertions, 22 deletions
diff --git a/dev-java/jaxb-runtime/Manifest b/dev-java/jaxb-runtime/Manifest index 5a41a7f809c1..add8ed089b35 100644 --- a/dev-java/jaxb-runtime/Manifest +++ b/dev-java/jaxb-runtime/Manifest @@ -1,3 +1,3 @@ DIST jaxb-ri-4.0.0.tar.gz 1739184 BLAKE2B a85a12fdca0b6eff8664894d65e2f82d30491e20050fde2ca828fa3c2c79ce2e158fca5ce6d0ae2cb2a00859abc0c9e9d49321c0943b862fd603a9e732f29dc4 SHA512 766a58d5107a88c19a99014b737b7b14a510b928dd26991adfe902073614923690c1e5a231834ec4a200a10adf9505b27179b8d84cf09dbb09292341c328e743 -EBUILD jaxb-runtime-4.0.0.ebuild 3314 BLAKE2B fd7c5aa639ff12d7b2f19702e3d92113369ac74f3027caad750e71739611a64ee067cf811916b4bc1502655c98748945aa43e6fa028af356a239aa3070a82a31 SHA512 c8506d511c249761aa5cbdf079b19354e2ce5639726e49bfc5b825db37faae0b000d029fc5639159c4de765f119d6cc5834bdeb97dc9d29536786b0875f37cc9 +EBUILD jaxb-runtime-4.0.0-r1.ebuild 2989 BLAKE2B c11dcc38dfb8a2f584b34a10ffac8d8bb23c1499e3faa442d76f37aa997d6bd0bf87d05bc627dcb5a892bb1659bef93cc84b8b3d2e2ef4520cb380f8d0d9548f SHA512 601617a2d6801029c9fb36e64a8bb665eff04cd1dffb8fd7f812be07c13ac228e853ce0282ea3c3886c806a266bf683e800909672cd608051b65ce39add35a50 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6 diff --git a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0.ebuild b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild index 0f4c1c55c97d..586a6dc6e5e1 100644 --- a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0.ebuild +++ b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild @@ -20,34 +20,23 @@ LICENSE="EPL-1.0" SLOT="4" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -# Common dependencies -# POM: runtime/impl/pom.xml -# com.sun.xml.fastinfoset:FastInfoset:2.1.0 -> !!!groupId-not-found!!! -# org.glassfish.jaxb:jaxb-core:4.0.0 -> !!!groupId-not-found!!! -# org.jvnet.staxex:stax-ex:2.1.0 -> !!!groupId-not-found!!! - -CP_DEPEND=" - dev-java/fastinfoset:0 - dev-java/jaxb-stax-ex:0 -" - DEPEND=" - dev-java/istack-commons-runtime:0 + >=dev-java/fastinfoset-2.1.0-r1:0 dev-java/jaxb-api:4 + >=dev-java/jaxb-stax-ex-2.1.0-r1:0 + dev-java/istack-commons-runtime:0 >=virtual/jdk-11:* - ${CP_DEPEND} " # reason: '<>' with anonymous inner classes is not supported in -source 8 # (use -source 9 or higher to enable '<>' with anonymous inner classes) -RDEPEND=" - >=virtual/jre-11:* - ${CP_DEPEND}" +RDEPEND=">=virtual/jre-11:*" DOCS=( ../{CONTRIBUTING,NOTICE,README}.md ) S="${WORKDIR}/jaxb-ri-${PV}-RI/jaxb-ri" +JAVA_CLASSPATH_EXTRA="fastinfoset,jaxb-stax-ex" JAVA_TEST_GENTOO_CLASSPATH="junit-4" src_compile() { @@ -62,7 +51,7 @@ src_compile() { JAVA_SRC_DIR="core/src/main/java" JAVA_RESOURCE_DIRS="core/src/main/resources" JAVA_JAR_FILENAME="core.jar" - JAVA_CLASSPATH_EXTRA="istack-commons-runtime,jaxb-api-4" + JAVA_CLASSPATH_EXTRA+=" istack-commons-runtime,jaxb-api-4" java-pkg-simple_src_compile JAVA_GENTOO_CLASSPATH_EXTRA+=":core.jar" rm -r target || die @@ -89,10 +78,6 @@ src_compile() { } src_test() { -# einfo "Testing txw-runtime" -# JAVA_TEST_SRC_DIR="txw/runtime/src/test/java" -# java-pkg-simple_src_test - einfo "Testing core" JAVA_TEST_SRC_DIR="core/src/test/java" JAVA_TEST_RESOURCE_DIRS="core/src/test/resources" |