From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Sep 2020 14:09:07 +0100 Subject: gentoo resync : 02.09.2020 --- dev-java/Manifest.gz | Bin 87270 -> 87249 bytes dev-java/bsh/Manifest | 4 +- dev-java/bsh/bsh-2.0_beta6-r1.ebuild | 67 +++++++ dev-java/bsh/bsh-2.0_beta6.ebuild | 67 ------- dev-java/jboss-modules/Manifest | 2 +- .../jboss-modules/jboss-modules-1.3.3-r1.ebuild | 6 +- dev-java/joda-convert/Manifest | 2 +- dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild | 43 ++++ dev-java/joda-convert/joda-convert-1.3.1.ebuild | 42 ---- dev-java/joda-time/Manifest | 2 +- dev-java/joda-time/joda-time-2.7-r1.ebuild | 61 ++++++ dev-java/joda-time/joda-time-2.7.ebuild | 59 ------ dev-java/juel/Manifest | 2 +- dev-java/juel/juel-2.1.0-r2.ebuild | 2 +- dev-java/objenesis/Manifest | 2 +- dev-java/objenesis/objenesis-1.3-r1.ebuild | 29 +++ dev-java/objenesis/objenesis-1.3.ebuild | 29 --- dev-java/openjfx/Manifest | 4 +- dev-java/openjfx/openjfx-11.0.8_p2.ebuild | 222 --------------------- dev-java/openjfx/openjfx-11.0.9_p0.ebuild | 4 +- dev-java/piccolo2d/Manifest | 2 +- dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild | 2 +- dev-java/plexus-classworlds/Manifest | 2 +- .../plexus-classworlds-2.2.3.ebuild | 16 +- dev-java/swingx-ws/Manifest | 2 +- .../swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild | 4 +- dev-java/validation-api/Manifest | 2 +- .../validation-api/validation-api-1.1.0-r1.ebuild | 22 ++ .../validation-api/validation-api-1.1.0.ebuild | 22 -- dev-java/xml-commons/Manifest | 2 +- dev-java/xml-commons/xml-commons-1.4.01.ebuild | 2 +- dev-java/xsdlib/Manifest | 2 +- dev-java/xsdlib/xsdlib-20090415.ebuild | 4 +- 33 files changed, 256 insertions(+), 477 deletions(-) create mode 100644 dev-java/bsh/bsh-2.0_beta6-r1.ebuild delete mode 100644 dev-java/bsh/bsh-2.0_beta6.ebuild create mode 100644 dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild delete mode 100644 dev-java/joda-convert/joda-convert-1.3.1.ebuild create mode 100644 dev-java/joda-time/joda-time-2.7-r1.ebuild delete mode 100644 dev-java/joda-time/joda-time-2.7.ebuild create mode 100644 dev-java/objenesis/objenesis-1.3-r1.ebuild delete mode 100644 dev-java/objenesis/objenesis-1.3.ebuild delete mode 100644 dev-java/openjfx/openjfx-11.0.8_p2.ebuild create mode 100644 dev-java/validation-api/validation-api-1.1.0-r1.ebuild delete mode 100644 dev-java/validation-api/validation-api-1.1.0.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 082616f16198..707102e85cad 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest index 7761b988a4a0..3ea8f9efce11 100644 --- a/dev-java/bsh/Manifest +++ b/dev-java/bsh/Manifest @@ -1,3 +1,3 @@ -DIST bsh-2.0b6.zip 1994608 BLAKE2B c06b783fed6a1b433d5c6efcf3f2343493c96895863118326f41076d56465b88b9139810c8ae38895b9c2c2da226788ef8ba7657b1ceadcac8ee8e7ed79d9c07 SHA512 ce461cc74bc48580c636c2f2e55e4e734a2b2075547cc5663722866e5c978a680051131c13240afb586a777ab93165119d1f96f9623bd9747f8e7d8293dd3bcf -EBUILD bsh-2.0_beta6.ebuild 1313 BLAKE2B 67d40df99363970f214d50593c4d300f6e29a03c3208bebe8636ecfd4dd5394943ab8c07e5777210d4e31fa4894c8856c4fee92262f99b50bf810b6fd431c6b2 SHA512 5294ec898198726a1b5c1261bdb6d19bb23da96101882f82757a72b585c0453b26325244f2aebdc691ebb13cc09397f7b5eaa0f2f6b47d36a902ab52c2b8961a +DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c +EBUILD bsh-2.0_beta6-r1.ebuild 1314 BLAKE2B 18c385182eb1ca8b721b97a3038503302fe3a0b4b62139d7e605ad448fd3688bf88520631dec6d5079a4a7851e8bca6278acf8c58797be6024db7160809760ad SHA512 97efbdceef57cdd8e7154fcdb2109bffc5ae0c9acb0db298d57b1e6bc44a67d8f2a87ab03ceb3e4cf3d3f2a0bb757d946acce83b909f9d9be2a97bcb00f6dbea MISC metadata.xml 330 BLAKE2B 4295b9afc957d9b69add3267ff62910a7cb8bed9b918dec04d0f56612f452b669639462479e9627c2fd451977c4f74b2ddbf031b395e34e11a0af34a70405d8b SHA512 5c495c72dfc5d55c63b0af0740b0b82306e047817965a8c095dc6ae89324af842d5f8ccaa218107ff715544051e9c984fd1997ca11786a9c0fd070d72441b7be diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild new file mode 100644 index 000000000000..d98757feaf2a --- /dev/null +++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 + +MY_PN="beanshell" +MY_BETA="b6" +MY_PV="${PV%%_*}" +MY_P="${PN}-${MY_PV}${MY_BETA}" + +DESCRIPTION="A small embeddable Java source interpreter" +HOMEPAGE="https://github.com/beanshell/beanshell" +SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.tar.gz -> ${MY_P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="" + +CDEPEND=" + dev-java/bsf:2.3 + java-virtuals/servlet-api:3.0 +" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.8" + +DEPEND=" + ${CDEPEND} + test? ( dev-java/ant-junit:0 ) + source? ( app-arch/zip ) + virtual/jdk:1.8" + +S="${WORKDIR}/${MY_PN}-${MY_PV}${MY_BETA}" + +JAVA_ANT_REWRITE_CLASSPATH="yes" +EANT_BUILD_TARGET="jarall" +EANT_DOC_TARGET="javadoc" +EANT_GENTOO_CLASSPATH=" + bsf-2.3 + servlet-api-3.0 +" + +java_prepare() { + java-pkg_clean +} + +EANT_TEST_TARGET="test" + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_newjar "dist/${MY_P}.jar" "${PN}.jar" + + java-pkg_dolauncher "${PN}-console" --main bsh.Console + java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter + + use doc && java-pkg_dojavadoc javadoc + use source && java-pkg_dosrc src/bsh +} diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild deleted file mode 100644 index 2026697f5ffc..000000000000 --- a/dev-java/bsh/bsh-2.0_beta6.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -MY_PN="beanshell" -MY_BETA="b6" -MY_PV="${PV%%_*}" -MY_P="${PN}-${MY_PV}${MY_BETA}" - -DESCRIPTION="A small embeddable Java source interpreter" -HOMEPAGE="https://github.com/beanshell/beanshell" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.zip -> ${MY_P}.zip" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="" - -CDEPEND=" - dev-java/bsf:2.3 - java-virtuals/servlet-api:3.0 -" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -DEPEND=" - ${CDEPEND} - test? ( dev-java/ant-junit:0 ) - source? ( app-arch/zip ) - >=virtual/jdk-1.6" - -S="${WORKDIR}/${MY_PN}-${MY_PV}${MY_BETA}" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_BUILD_TARGET="jarall" -EANT_DOC_TARGET="javadoc" -EANT_GENTOO_CLASSPATH=" - bsf-2.3 - servlet-api-3.0 -" - -java_prepare() { - java-pkg_clean -} - -EANT_TEST_TARGET="test" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar "dist/${MY_P}.jar" "${PN}.jar" - - java-pkg_dolauncher "${PN}-console" --main bsh.Console - java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter - - use doc && java-pkg_dojavadoc javadoc - use source && java-pkg_dosrc src/bsh -} diff --git a/dev-java/jboss-modules/Manifest b/dev-java/jboss-modules/Manifest index 9e03eb1215a3..d928640eb448 100644 --- a/dev-java/jboss-modules/Manifest +++ b/dev-java/jboss-modules/Manifest @@ -1,3 +1,3 @@ DIST jboss-modules-1.3.3.tar.gz 189906 BLAKE2B f291391a9292731ab9fa00d9ce94817138ea502dbeac282cac0bbb08e070ef64f72dbd5e1cec570afa6452245197fda004173d04b838d806b40a2f808e539321 SHA512 d8e19c59105358070cc7e48a0be29ee68751155d5ac88723dbf32659e73ab4bd9afddf119fec66af8c9420a7e406e77f2eb4a164fbd9c1867b91414de71ddbb7 -EBUILD jboss-modules-1.3.3-r1.ebuild 661 BLAKE2B 4297401986ba31cd80025106fda89a02befd7d352b59536457859b5b1cfb531fea0ac814c68e53dae28441e88b7c9fc5738100217a7044f3e05d082d5b4961b1 SHA512 481b4836356e6f09d8186b6863c75b71389fcb51defdf17fdfa07c9878fac652b13769d0baef8177dc6be1f8d5211949f100b535cd045403f610ce348482b10b +EBUILD jboss-modules-1.3.3-r1.ebuild 659 BLAKE2B 06b6798356a9b814919c2c9108b5d2c3447e5f015e777487c1cc670bbce5cc35e973712354b50e056bf0380c7d15d78be5d73bb719b6279c3f2bf1ac30734135 SHA512 4a3ab42a73d564175a26b9228a106a5bd913c2b6de793bfd0b34aa4da32093b5e89364dd88cdb54378b1e9e82487587badbc1ae44a734281fee7e3bf3617a3d9 MISC metadata.xml 328 BLAKE2B 70528967605fb41f0541ebc752a11e64f759840e46d6489d8da3c532b3fc253e3e2ff7807bc625a7e2c6150c7e2688059e240df8dc58a161764af0404d9c1400 SHA512 56f41e4a3acd01abe24d0ad6211e1b5f1822462ed8a3724a26fffa4e9631f310888c0b8b213d71cbe1804ac524a637e5e02cb5d4f99d2414debc560cfba5a86a diff --git a/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild b/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild index 141ee970261f..177c33e4ec83 100644 --- a/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild +++ b/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 JAVA_PKG_IUSE="source" # doc (needs APIviz) @@ -15,8 +15,8 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 x86" -RDEPEND=">=virtual/jre-1.7" -DEPEND=">=virtual/jdk-1.7" +RDEPEND=">=virtual/jre-1.8" +DEPEND="virtual/jdk:1.8" S="${WORKDIR}/${P}.Final/" diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest index e82122019a84..6671bde6b09d 100644 --- a/dev-java/joda-convert/Manifest +++ b/dev-java/joda-convert/Manifest @@ -1,4 +1,4 @@ AUX joda-convert-1.3.1-build.xml 10459 BLAKE2B 79f7930f5d71e046a5e0ad8e4b7bbddb10ce2be67e6d4120685e640d51d201289e02a45bf37a5c295add8cc90404c74c06709b996a946f88b4b2c7a0467c7cb2 SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce DIST joda-convert-1.3.1-dist.tar.gz 131288 BLAKE2B 0b7b6cebb7e13e89d838ec10c4edd54b52bf3449b3003cd41ea2628719b8ea52bc00a8681a96fad0de79b4acd56fc4a8d4a31d558841fa268d9ffbeb97ca1ed0 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451 -EBUILD joda-convert-1.3.1.ebuild 927 BLAKE2B 5d013236441dd750f515439280200c45984a5e8d9ecf1bbdcfedc326b4e40b06a97f1650c65bb2817f7ff477803af6903319c7502ded60b4ce3a7ff0c77258c9 SHA512 92630d102052b71a644894835c5def32b4bb6155b5109e3dc1c253d606f5c2780b7a2d4e6adb8b6379d9dda94675f4600e53b67276593b99529ad73ccec483c1 +EBUILD joda-convert-1.3.1-r1.ebuild 931 BLAKE2B 2f74298f6d5641fe6f251075943a70a918e4e46b36a4430c01832bb52d81dda5282764c39c1834ff6fd77815049f8c1ba17c0cb8645cda4c90c4adff30c7e8b4 SHA512 7a7c44975ff1a890e1fe79860b08fe5e77a0aaca31947d7b72807744598ae169b3900f0652d21d0f3f25b02cf21905e82d795e1166556ce47e28f470dab8bb63 MISC metadata.xml 318 BLAKE2B 2222c7e9955b61b5a3369476bfdaa1087b8381846f325d3218768a672b594d64cadc6998d13012653c89df816133be237f97c9f1b2949712c4f120cd107c0a15 SHA512 13ce055f2cf64b4b5f7f6b780c98cfae6bcae0792d5bee30633cb465ab49045fc77da1337042d672bcb1c74cb3a1dc0e26b1d6c5e38f17d3a79152b423a97030 diff --git a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild new file mode 100644 index 000000000000..80b986790cd2 --- /dev/null +++ b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Java library for conversion between Object and String" +HOMEPAGE="https://www.joda.org/joda-convert/" +SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ppc64 x86" + +DEPEND="virtual/jdk:1.8 + test? ( + dev-java/junit:4 + dev-java/ant-junit:0 + )" +RDEPEND=">=virtual/jre-1.8" + +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_TEST_GENTOO_CLASSPATH="junit-4" +EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" + +src_prepare() { + default + cp "${FILESDIR}"/${P}-build.xml build.xml || die +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_dojar target/${PN}.jar + dodoc NOTICE.txt RELEASE-NOTES.txt + + use doc && java-pkg_dojavadoc target/site/apidocs + use source && java-pkg_dosrc src/main/java/* +} diff --git a/dev-java/joda-convert/joda-convert-1.3.1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1.ebuild deleted file mode 100644 index ed172701ffa4..000000000000 --- a/dev-java/joda-convert/joda-convert-1.3.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java library for conversion between Object and String" -HOMEPAGE="https://www.joda.org/joda-convert/" -SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.6 - test? ( - dev-java/junit:4 - dev-java/ant-junit:0 - )" -RDEPEND=">=virtual/jre-1.6" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_TEST_GENTOO_CLASSPATH="junit-4" -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" - -java_prepare() { - cp "${FILESDIR}"/${P}-build.xml build.xml || die -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar target/${PN}.jar - dodoc NOTICE.txt RELEASE-NOTES.txt - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest index db875c255740..d365093b4760 100644 --- a/dev-java/joda-time/Manifest +++ b/dev-java/joda-time/Manifest @@ -1,4 +1,4 @@ AUX joda-time-2.7-build.xml 11231 BLAKE2B 9b7350270773c59f3497be28581408f9984f1151b812f3ddc4bbf8fbfe50505e36cb5fdbfc330f7f07416275adc92a8176b25d7c4cb4cecbdc9d239f711bc9e7 SHA512 c614cc2425b0cefdc5f9def196cd5014d6d65552038dd22f876bbb64ee25131ead57aa94ef967491e292cf1ddefef933d9827dd588056d58c9a311640a5af63f DIST joda-time-2.7-dist.tar.gz 4007765 BLAKE2B ed34c988dae1f1fb3359e06cccc148f680a04244987464770024635e72d5693036ec4d1648245f44db2fd57c47d9842a964d39e04e9ba510ecda7ec25c853ee7 SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209 -EBUILD joda-time-2.7.ebuild 1911 BLAKE2B 94a16745aee39443eb88b7c6aba6df6cfa8c5c0be82222684bbe41297bb50a95b521814eddde54e213178fd7f8573872283cc5832b931fc71f1b54d803d66c4b SHA512 5257e0719d996f065c87019827b740cac645f24992e0eee4841021534bf0719ffdcd9ad97a2c39a9d3ac83b8384f2beb70030164b660e2a0f8516f6da7abe9f0 +EBUILD joda-time-2.7-r1.ebuild 1918 BLAKE2B 397a64f536c6b1667f19af5b85f456cc375b38d166db658c395983c83c3485fb79bf07ad0e418c6fb3190e4704c98680ee914c45b563df436c9d93de6e151dcd SHA512 70755306d7c11c7a842188a5b42e12bf36f91ace4222fb925388c719cf8552caa4d363a33cb804c6146f7d1851db5868e4998a28c2084766b3ec37fe36cb5f3d MISC metadata.xml 384 BLAKE2B 298d00eca8bdd34de1a3c30a423051cd62923963b1d239640690cf12c3ddbbe661bfaa689f1b225a968747bcc7d3b28aa53ccd90fa406322aeaa3e1f3703f4a6 SHA512 441aa3d5876d8ff91b9f9d368e817bf6869266c27f7f8686e9eb47812f899f37c5fa2e65337e979dd3247932b61d84e4b4f0d7325ea2659d54221ab428c9c089 diff --git a/dev-java/joda-time/joda-time-2.7-r1.ebuild b/dev-java/joda-time/joda-time-2.7-r1.ebuild new file mode 100644 index 000000000000..bbf0efca3a84 --- /dev/null +++ b/dev-java/joda-time/joda-time-2.7-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +JAVA_PKG_IUSE="doc examples source test" +JAVA_ANT_REWRITE_CLASSPATH="true" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="A quality open-source replacement for the Java Date and Time classes" +HOMEPAGE="https://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/" +SRC_URI="https://github.com/JodaOrg/${PN}/releases/download/v${PV}/${P}-dist.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" + +RESTRICT="test" + +DEPEND=">=virtual/jdk-1.8 + dev-java/joda-convert:0 + test? ( + dev-java/junit:0 + dev-java/ant-junit:0 + )" +RDEPEND=">=virtual/jre-1.8" + +src_prepare() { + default + + rm -v *.jar || die "Failed to remove bundled jars." + cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file." + + mkdir -p "${S}"/target/classes || die "Failed to create target classes directory." + cp -Rv "${S}"/src/tz-data/* "${S}"/target/classes/ || die "Failed to copy timezone data." + + mkdir -p "${S}"/target/classes/org/joda/time/format || die "Failed to create target classes subdirectory." + cp -Rv "${S}"/src/main/java/org/joda/time/format/*properties "${S}"/target/classes/org/joda/time/format/ || die "Failed to copy message bundles." +} + +src_compile() { + EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar)" + + java-pkg-2_src_compile +} + +src_test() { + EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar):$(java-pkg_getjar --build-only junit junit.jar)" + + java-pkg-2_src_test +} + +src_install() { + java-pkg_newjar target/${P}.jar + + dodoc NOTICE.txt RELEASE-NOTES.txt + + use doc && java-pkg_dojavadoc target/site/apidocs + use examples && java-pkg_doexamples src/example + use source && java-pkg_dosrc src/main/java/* +} diff --git a/dev-java/joda-time/joda-time-2.7.ebuild b/dev-java/joda-time/joda-time-2.7.ebuild deleted file mode 100644 index 2f19a557d78d..000000000000 --- a/dev-java/joda-time/joda-time-2.7.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -JAVA_PKG_IUSE="doc examples source test" -JAVA_ANT_REWRITE_CLASSPATH="true" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A quality open-source replacement for the Java Date and Time classes" -HOMEPAGE="https://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/" -SRC_URI="https://github.com/JodaOrg/${PN}/releases/download/v${PV}/${P}-dist.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" - -RESTRICT="test" - -DEPEND=">=virtual/jdk-1.5 - dev-java/joda-convert:0 - test? ( - dev-java/junit:0 - dev-java/ant-junit:0 - )" -RDEPEND=">=virtual/jre-1.5" - -java_prepare() { - rm -v *.jar || die "Failed to remove bundled jars." - cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file." - - mkdir -p "${S}"/target/classes || die "Failed to create target classes directory." - cp -Rv "${S}"/src/tz-data/* "${S}"/target/classes/ || die "Failed to copy timezone data." - - mkdir -p "${S}"/target/classes/org/joda/time/format || die "Failed to create target classes subdirectory." - cp -Rv "${S}"/src/main/java/org/joda/time/format/*properties "${S}"/target/classes/org/joda/time/format/ || die "Failed to copy message bundles." -} - -src_compile() { - EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar)" - - java-pkg-2_src_compile -} - -src_test() { - EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar):$(java-pkg_getjar --build-only junit junit.jar)" - - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar target/${P}.jar - - dodoc NOTICE.txt RELEASE-NOTES.txt - - use doc && java-pkg_dojavadoc target/site/apidocs - use examples && java-pkg_doexamples src/example - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/juel/Manifest b/dev-java/juel/Manifest index b2fda15aceec..19ce93fdc6e8 100644 --- a/dev-java/juel/Manifest +++ b/dev-java/juel/Manifest @@ -1,3 +1,3 @@ DIST juel-2.1.0.zip 477363 BLAKE2B 3d1af823adcf27a5f9918983abf3de47f218089fdabc63975d8f3031c81bb02dcfe5c2fa822be02087f50537ba4e29b606c86abb324cc2bddbf07a6e80c56453 SHA512 eec79c301491b8bae5c394591feab0abed302da55e8cded798874286af32f15ce575bdb365ec9f90add89e320d23d3e40fbb5d465d34c66da60df26e1f7cb6f3 -EBUILD juel-2.1.0-r2.ebuild 712 BLAKE2B b539609615a37a134dbe21fb9516d19325c9182ad221b3ebaa50c1c525b173588dfe0b67dc96fe39c673718d0c0727b8a7409c91274a1b4366bb9264ec88c9f3 SHA512 6d5195b871d7a962f8c2a1172d278062074851af2d6a149e88067acf2dcdce44afcd04fac8f1e459f85cf34be8a3627fa3be9a6b2301dc44ebe9164df4aeec6d +EBUILD juel-2.1.0-r2.ebuild 718 BLAKE2B 7d965f8c2f4aa8fd40001f0030a6732b4bf59c67e3781eacdc6abb36827782d4dfd2ca4926b588b95b2ad1efb8c7e10dee8ec0e5a967f40406cce06b166500e8 SHA512 ddac09edade7c2b4a544d4c1145f28d9ea954a9abbabc1b4346f4483e2515949bf9bebfd186a24ee85f4db5baff7f0789c0167f779c51ce4a65cea09563d384b MISC metadata.xml 310 BLAKE2B ac14e313c0c30fb7e4792f55acae0f7755d6ba5b23ec404ef7a24b48aeec998efde59a9524cd816c0dcf494130f42faa7d8500ab46dad809163fc0a9133f22a0 SHA512 9ea87185947ee4bebce3ada55cb9ddeb79392467a115d7d809b6d0942f3455742c5172e5a41540098db0b5ea7f36642e89958ded9ad4a8870d8b5f01bfa0c294 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/objenesis/Manifest b/dev-java/objenesis/Manifest index d74dea9457ca..47a7bde4e230 100644 --- a/dev-java/objenesis/Manifest +++ b/dev-java/objenesis/Manifest @@ -1,3 +1,3 @@ DIST objenesis-1.3-bin.zip 287452 BLAKE2B d3f6cce9ad46d8578e24077df8a19fcdf2f9456ef732f73fe234ae688c9ceca7277e5376657efcdaba1a7b5a80ddf106aff52f291a6b2f698a010a288e961e33 SHA512 48f838e00cfe0d12c6c73fb3d1d8482ccd8de71742a86c3afbba832c6b73e1f7b1604f8c209386e00f7751cd568e9ef4d61b543db66c927f3d61f9e6ee0a4193 -EBUILD objenesis-1.3.ebuild 640 BLAKE2B 6f067beab07e849b7fc6f703cd34dfce294f7f4a3ae873156254c21f06a4669f809ff85fcfc6394ff4621aeed5fe6d157d08bacb28c49bdebe027189261e4185 SHA512 3cc3e667bf3f1bf371239b0dbe6248dc5e513473aac39f2ca545ead0c0b78ad9f1ebc45bc8af2b8303668d1366a2f3625a48a5c3cd1a85e00e9c4ad467e41a6b +EBUILD objenesis-1.3-r1.ebuild 649 BLAKE2B 12ba0512f6eaa5327d423b69d7ef4c98dd0a3fa6d3aae8b6cf786495714dc9ae41bf43bf283010f7bdd5edfff5f22737e1da13021ab9392220f2d052003fd2bf SHA512 8ff4f36ef08630a495091a48752d570a777545222fdd3c0ad939677ba41a4136598d9509f84044b9db5ddd691406341133baab6d2124349b75cccfd52a188f27 MISC metadata.xml 315 BLAKE2B 2190fc553786144aad4a8887b7d040a8597cb48aacb4f9ad04261bab6b7752d2d43779edd3f4bfb8fc700c7decbb0e82f80216dd8f1722f6bae6f2522aeb8a50 SHA512 21adb506d9c4eb3d989497eccc9ae6d052753e880afa8b7800dc86d54128173b288c1788579f1d8e1be4acf7b03a1fee2e15ade6551241062e8a908ae9a6c7ed diff --git a/dev-java/objenesis/objenesis-1.3-r1.ebuild b/dev-java/objenesis/objenesis-1.3-r1.ebuild new file mode 100644 index 000000000000..83197bba73a8 --- /dev/null +++ b/dev-java/objenesis/objenesis-1.3-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="source doc" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A small Java library with one purpose: To instantiate a new object of a class" +HOMEPAGE="https://objenesis.googlecode.com/" +SRC_URI="https://${PN}.googlecode.com/files/${P}-bin.zip" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm64 ppc64 x86" +IUSE="" + +BDEPEND="app-arch/unzip" +RDEPEND=">=virtual/jre-1.8" +DEPEND=">=virtual/jdk-1.8" + +S="${WORKDIR}/${P}" +JAVA_SRC_DIR="src" + +src_unpack() { + unpack ${A} + unzip "${S}"/${P}-sources.jar -d "${S}"/src || die +} diff --git a/dev-java/objenesis/objenesis-1.3.ebuild b/dev-java/objenesis/objenesis-1.3.ebuild deleted file mode 100644 index 1b50c28dec33..000000000000 --- a/dev-java/objenesis/objenesis-1.3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="source doc" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A small Java library with one purpose: To instantiate a new object of a class" -HOMEPAGE="https://objenesis.googlecode.com/" -SRC_URI="https://${PN}.googlecode.com/files/${P}-bin.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 x86" -IUSE="" - -RDEPEND=">=virtual/jre-1.5" -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip" - -S="${WORKDIR}/${P}" -JAVA_SRC_DIR="src" - -src_unpack() { - unpack ${A} - unzip "${S}"/${P}-sources.jar -d "${S}"/src || die -} diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index 3dd98b603f18..eaf662fea9fb 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -13,8 +13,6 @@ DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60 DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b967243289d9bded5e9768cb441a35fabbe63641d00b72a8c14aace0bad402df49c21b853f620bf81bc1e829dcecdb SHA512 34df5eccf0577ed037ef347adc9c2552c49d57e35dbff629fdbb860926765be48f8b06fd693bdacfc2edcd9c6ad711c13fe98e5317cb1d1f2157dcab938e34ea DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500 -DIST openjfx-11.0.8_p2.tar.bz2 64151301 BLAKE2B 045dcfa35c52fe6f293713420147dd1a69b1851c8e1a1d09f0be1e0237d510e8d7b67d8c0ad36bcf23e1504a540c905a95c706faf0919da4de5005f3046e6cce SHA512 d693e1f4215e9ba42b3241f50581dbc3e7a3e6bf8ccda6f3c43c6a976389d321e6ca3d393138b62f6defd240b9d1aaef7ab26083520ed404d0d439ac9478341d DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236 -EBUILD openjfx-11.0.8_p2.ebuild 6464 BLAKE2B a9f744e7110f9ba603be95bece2ed38c7ade228aebf0ce08717e53c05fd416ac565b35b3186fadc7e953b6d354c41e4cf039784c0937c4946aa60d8e51a5ee4e SHA512 896d9ce23679f4649bdec58e40682393e508bdafb265728cb318d52443351342dc0be79a8c20d5164d40032c80b4ee2779b2def73be2a22f097e77bae4c3506b -EBUILD openjfx-11.0.9_p0.ebuild 6502 BLAKE2B b64405041784dc2a1eaeca4ff789259378bd11428182aaa719d1def547194445b1c2e22efa20ba63546df7730b677319bd63e344a803e37c0cf7a22953682934 SHA512 b6b0f5a5b2829bd061f2f127be0489ced00fe0caf5e6ef40a7110ef3e1d2394e5ffcff95d6851ce84188375c5d152e327d40159e0c54670fbb7b8ab9eb59b852 +EBUILD openjfx-11.0.9_p0.ebuild 6502 BLAKE2B a21489ee9fc2342d3c2cd5808cc2c3ba1567b96f8391b2356028a18ebf4e5c77e54d537dbaba74ebcdddc4a6d8ac6e4c6ace4f75749b7e6f8d0e5159afbc3835 SHA512 474743ff11d921b7654508e3ee9a2644cf7d1b1baeb5dc5b7348b6bd6bc84877354313bb62f64b84ccd27a68eb55690838170e1aadc510eeb6d0ebeb6d18bb0a MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d diff --git a/dev-java/openjfx/openjfx-11.0.8_p2.ebuild b/dev-java/openjfx/openjfx-11.0.8_p2.ebuild deleted file mode 100644 index 5f211eba215c..000000000000 --- a/dev-java/openjfx/openjfx-11.0.8_p2.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/_p/+}" -SLOT="${MY_PV%%[.+]*}" -EGRADLE_VER="4.8" - -inherit flag-o-matic java-pkg-2 multiprocessing - -DESCRIPTION="Java OpenJFX client application platform" -HOMEPAGE="https://openjfx.io" - -SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2 - https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar - https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar - https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar - https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar -" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="-* ~amd64" - -IUSE="cpu_flags_x86_sse2 debug doc source +media" - -RDEPEND=" - dev-java/swt:4.10[cairo,opengl] - dev-libs/atk - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/freetype:2 - media-libs/fontconfig:1.0 - media-video/ffmpeg:0= - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/gtk+:3 - x11-libs/cairo[glib] - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/pango - virtual/jpeg - virtual/opengl - || ( - dev-java/openjdk-bin:${SLOT}[doc?] - dev-java/openjdk:${SLOT}[doc?] - ) -" - -DEPEND="${RDEPEND} - app-arch/unzip - app-arch/zip - >=dev-java/ant-core-1.10.7-r1:0 - dev-java/antlr:0 - dev-java/antlr:3.5 - dev-java/hamcrest-core:0 - dev-java/stringtemplate:0 - virtual/ttf-fonts - virtual/pkgconfig -" - -REQUIRED_USE="cpu_flags_x86_sse2" - -PATCHES=( - "${FILESDIR}"/11/disable-buildSrc-tests.patch - "${FILESDIR}"/11/glibc-compatibility.patch - "${FILESDIR}"/11/respect-user-cflags.patch - "${FILESDIR}"/11/use-system-swt-jar.patch - "${FILESDIR}"/11/wno-error.patch -) - -S="${WORKDIR}/rt-${MY_PV}" - -egradle() { - local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" - local gradle="${GRADLE_HOME}/bin/gradle" - local gradle_args=( - --info - --stacktrace - --no-build-cache - --no-daemon - --offline - --gradle-user-home "${T}/gradle_user_home" - --project-cache-dir "${T}/gradle_project_cache" - ) - - export GRADLE_HOME - - # FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist - unset ANT_HOME - - einfo "gradle "${gradle_args[@]}" ${@}" - # TERM needed, otherwise gradle may fail on terms it does not know about - TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed" -} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - - if has_version --host-root dev-java/openjdk:${SLOT}; then - export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} - export JDK_HOME="${JAVA_HOME}" - export ANT_RESPECT_JAVA_HOME=ture - - else - if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - export JDK_HOME - export JAVA_HOME="${JDK_HOME}" - export ANT_RESPECT_JAVA_HOME=ture - fi - fi -} - -src_unpack() { - unpack "${P}.tar.bz2" - unpack "gradle-${EGRADLE_VER}-bin.zip" - - mkdir "${T}/jars" || die - - local line jar - for line in ${SRC_URI}; do - if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then - jar=$(basename "${BASH_REMATCH[-1]}") - cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die - fi - done -} - -src_prepare() { - default - - local d="${T}/jars" - - java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr - java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5 - java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate - java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core - - sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die -} - -src_configure() { - append-flags -Wno-error -fcommon - - #FIXME: still calls gcc, pkg-config etc by name without chost prefix - #FIXME: should we enable webkit? doubt so - - # build is very sensetive to doc presense, take extra steps - if use doc; then - local jdk_doc - if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then - jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api" - elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then - jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api" - fi - [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" - fi - - cat <<- _EOF_ > "${S}"/gradle.properties - COMPILE_TARGETS = linux - COMPILE_WEBKIT = false - COMPILE_MEDIA = $(usex media true false) - JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api - JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "") - BUILD_LIBAV_STUBS = false - GRADLE_VERSION_CHECK = false - LINT = none - CONF = $(usex debug DebugNative Release) - NUM_COMPILE_THREADS = $(makeopts_jobs) - JFX_DEPS_URL = ${T}/jars - COMPANY_NAME = "Gentoo" - _EOF_ -} - -src_compile() { - egradle zips $(usex doc "" "--exclude-task javadoc") -} - -src_install() { - if ! use source ; then - rm -v build/sdk/lib/src.zip || die - fi - - insinto "/usr/$(get_libdir)/${PN}-${SLOT}" - doins -r build/sdk/. - doins build/javafx-exports.zip - - if use doc; then - docinto html - dodoc -r build/javadoc/. - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild index be554f4fb9cf..d9fd79845b49 100644 --- a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild +++ b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild @@ -126,7 +126,7 @@ pkg_setup() { if has_version --host-root dev-java/openjdk:${SLOT}; then export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} export JDK_HOME="${JAVA_HOME}" - export ANT_RESPECT_JAVA_HOME=ture + export ANT_RESPECT_JAVA_HOME=true else if [[ ${MERGE_TYPE} != "binary" ]]; then @@ -136,7 +136,7 @@ pkg_setup() { JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} export JDK_HOME export JAVA_HOME="${JDK_HOME}" - export ANT_RESPECT_JAVA_HOME=ture + export ANT_RESPECT_JAVA_HOME=true fi fi } diff --git a/dev-java/piccolo2d/Manifest b/dev-java/piccolo2d/Manifest index 56b8cd3ee90b..f36ae7d9aab6 100644 --- a/dev-java/piccolo2d/Manifest +++ b/dev-java/piccolo2d/Manifest @@ -1,3 +1,3 @@ DIST piccolo2d-3.0.zip 786064 BLAKE2B f550bc7d39811998616000833543e048c879eeaf5006ba3d1cd19c7ac3c3c588fdf1c9b66986e5232dea49c1081082716e16542918319c18207cc2177d38ff10 SHA512 c57d0e86ea36e662027559c63c8e300629361849d4526d9271ea1ed3c8d55296ab1fab846c7a475c5d831fc6330052fa897ba8d3f89a196bca752a7ae802aa2a -EBUILD piccolo2d-3.0-r1.ebuild 1112 BLAKE2B 4cd4c70be3584920e82e61ce1fca091311cb906a334a6cb6ed90863a214ed30fe8057928fc95882fa156d0811d63836d793beffcbf3a5509b7cc5c4f37a39703 SHA512 2f64269113b317883de2a7ebc5659a479610d53e57ff8384c025dd6062414cda7f977fa533df4adc0d27ee754d0ceb456c4093856304c0a07995ad4d26291e43 +EBUILD piccolo2d-3.0-r1.ebuild 1120 BLAKE2B 0bada107c136f31b96d5045132a717ba15deb80129a22a8dd800e2644fc2055cb41a91594fc9aa897cddaeb72192af19613aced26826c687cb43250dd2f22f35 SHA512 dddbb48aa868a36363479e8f28fbbda3bb5fb8d2ac1642da705c7255c4cfb48afb770a9742fdb6688b4120a4d1f7147a567d581eadae3235ecf34a28a5c5f05b MISC metadata.xml 379 BLAKE2B 91a8e052e0698a62a8596c658229b78e0750cc80e34ce81d3be41c833e106f2e2f0d7c5eb7d148b2674f4e218602b054e2435c52d9c0ce27ef546ad0ff43d9bc SHA512 dd13d25a0d532e7246cdc32b6e058dc9fa3979d4d28e459ecde801b103ca8e40cf9f154208c9ee364379f2f6c6059011269a75d658d68b207e7d013c7d0bdf02 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/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest index a8cb7a967e34..64a8af439ee3 100644 --- a/dev-java/plexus-classworlds/Manifest +++ b/dev-java/plexus-classworlds/Manifest @@ -1,4 +1,4 @@ AUX 2.2.3-build.xml 5712 BLAKE2B 334710114da891baa655f4cf6811967af323fb957a97259f13326d3ce16b30d3b13c7cc9a05b26a275eb95d6e220a4b409d66332469699a1e2d063a50905f652 SHA512 575a086222b4cb9728b36c7a8d9eb64e73438023a0a83b94549962d88aea9591fb847c7d866a830e991bff296d66bf9ebd79c5a93922f040c9d5ce432fbc78cc DIST plexus-classworlds-2.2.3.tar.bz2 41744 BLAKE2B 41ddc64c066bdfb5f2398773790b9fec213070d3dad5e57f7b0643f4347386d5304c435cd60e5b1fad32f2d7fae7b48a2afd0189d115018ed5ee38901c80867a SHA512 d5f3d3dac4df569b91ddea9265b14a2459b0ecd4ac3e4547cbac341f50d18238071a7a560d9771a9f8724c59225ea7fa8645ed72c5a00a684519a46a024c3c61 -EBUILD plexus-classworlds-2.2.3.ebuild 923 BLAKE2B 27b4cbcd6e57cecc169036966c5428f34dd05ca37765110e6172f8e41b743cba474141496539e24d78cab94652e36b83e2a40ef3e2a9e04514b674761018b277 SHA512 d2e80f0e3f7d9e69a505a7c4b8e73fc244a29aa4d51b7716fa734ad2f4a82842f1c32a5b69dfb82c6aeac8457cdd8c80d4ea8e8ed26b0f35c4ca759c26dc87ff +EBUILD plexus-classworlds-2.2.3.ebuild 859 BLAKE2B 2292e34f07ca5fcc7b722bb631822d26dfd5adade739cc709955b7197353778efc1e52e30e2d0cd3aeb527f9c7383bd57017b8ad3c1b95228c332f43e81c2b57 SHA512 a604d9a2e78f41b4c17d97db8ba07554785bc0831f61048c53338318e3a2d7acf17db3188adbad83bda9275ea41597ee54a13886211e20cefa80d3b6fc355e11 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild index a75ec187a22e..49465eea7b4e 100644 --- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild +++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 JAVA_PKG_IUSE="doc source test" +WANT_ANT_TASKS="ant-junit4" inherit java-pkg-2 java-ant-2 @@ -17,16 +18,15 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND=">=virtual/jdk-1.6 - test? ( dev-java/junit:4 )" -RDEPEND=">=virtual/jre-1.6" +DEPEND=">=virtual/jdk-1.8" +RDEPEND=">=virtual/jre-1.8" JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_TEST_GENTOO_CLASSPATH="junit-4" -EANT_TEST_ANT_TASKS="ant-junit" -java_prepare() { +src_prepare() { cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die + + default } src_install() { diff --git a/dev-java/swingx-ws/Manifest b/dev-java/swingx-ws/Manifest index f757caf04eeb..770feee4535d 100644 --- a/dev-java/swingx-ws/Manifest +++ b/dev-java/swingx-ws/Manifest @@ -1,5 +1,5 @@ DIST swingx-ws-1.0-sources.jar 281598 BLAKE2B bf978c90d302183818a9da0bc2151b03bc4284d83bac9064a9dfc4db1a1bc95f28e835c45e6aa57a6b47a407926d01273c8ec0ea3bfa22052608c0106ca52a53 SHA512 722f8642e3a7c7825dd44cf01eca624b1d8a6bbfa829dbd7be326b53bf9d5467f48293489bbac6466ba9e74d991caaa6c9d56f0b7a08d205133926413517ca28 DIST swingx-ws-2011_05_15-src.zip 7010679 BLAKE2B 529507f3a7f48d38eb755001b2d442d040adf884a31a49c00f57fc638855e96b195a50813196fdb7318860b0a547eb8220fdd2d05ed613c2cd7d83cb8b7dd7fd SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da EBUILD swingx-ws-1.0-r1.ebuild 1392 BLAKE2B b9b473f8dd3bb53e8a707c03f2356cd5716556078e45dd21c290ecaee4308149cdd88609ff314845aa2384334352bc1ddc671a70dbbbd2647c7a411ba9cce96c SHA512 7fba5f418d1f17920d2e5813a33692c615c028455457637e8e7ba8e9a479ceebe39500dd98ab3184291836552f0cbd3ebaf9498694b2b91519a49b905507eb16 -EBUILD swingx-ws-1.0_p20110515-r1.ebuild 1740 BLAKE2B 5463bd477386719d2aa4e089ec1ad99ef98280c773a56910949ad991af39f4c8c8015606714d200225e74431ea26022d69839f3f97980345319eeb1461f168fd SHA512 d3d3dc25a9c6e60f8d781aed453d160237b886ee5042aaa54c1fa04c74dbde3a1a2745b4fe62db8df88a795c739e2bbfac5cd4a65c32e5e627e862ac18603719 +EBUILD swingx-ws-1.0_p20110515-r1.ebuild 1751 BLAKE2B 1374241deb08b8787dc0fa83f0ad4b80ed21e876ee56df4cb01eaeb175768231d173d499b4aae7dc99636c141ea26f60b7be63a142310ebd9d9f0479b75bce60 SHA512 a689391d049fa4d1ed11ce5c791f7e2f3690001547f2686de03140a94912ae810de7729d7f56d73f3c5ab12be96813f65e10d2fa194f30167f6131c19efb6455 MISC metadata.xml 459 BLAKE2B 33dce90cfd998c8a2c5ae695840604ff6092fe43765f6825af684689d30f69b6cd806b3b3ddf591c587bd397426dc8186449597bcdb9e14052ab029de9cb7ecb SHA512 ba6627622238e8d5ebfac52de63029eee448edd37a4819cc08677abd2f04601be6f29943785ff5abb16e602e919d04ec15427de0b371962cf03e1d35da6315d9 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/validation-api/Manifest b/dev-java/validation-api/Manifest index 24979afdb7cc..2c7aa3854cc8 100644 --- a/dev-java/validation-api/Manifest +++ b/dev-java/validation-api/Manifest @@ -1,5 +1,5 @@ DIST validation-api-1.0.0.GA-sources.jar 65220 BLAKE2B cee01d9979671bc2d64a22f21d608d50ddf6eca730a7c0d1fee3c4c05fab0af200153a48491b8d54a5a29b84a220f841c85264446117e25e89bd306bdd764843 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0 DIST validation-api-1.1.0.jar 94671 BLAKE2B c28f6b2ca52094f33e82d2e7c71e52ef57c503c5d50f34646ee28a9f61ea7e4da7f494f41b5f8a34ce6108ca1b75fa2d0f08eb9aab15cf033e825afc2eefdf19 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8 EBUILD validation-api-1.0.0.ebuild 583 BLAKE2B 04bce00b1bf1ce957a655b9cc6cf3db960ed79356dea5962f60fcfaca832ff4af16a2ad841e0d625739a208b0833a9d83a0fe38a45041bc495d214c44f36e20b SHA512 87b346c5454661c46a9966d0b91d165397e25c344eee2b955267cf951663786e1f92845b7c91497d21d16fe896865dba54f4ccda5a59048e5895cf3b38569654 -EBUILD validation-api-1.1.0.ebuild 557 BLAKE2B 85ffd53d4c49e2822e32425717daff1d3bd7c8b734eadf082ecd9cc1faaece990ac557cc8b2610cfb69ac2c6500a0c14248a8d6a8cbe8e48bb1e07a5c4687820 SHA512 0145dad1a8a358d64a9f9e65c5dfca7da5a95bfb066027ef94b07cbfee1f4f59be7cfa3b1b0ac6163674ee84f2cc190a7e7903fac746d2b834e1043dcef0e85d +EBUILD validation-api-1.1.0-r1.ebuild 563 BLAKE2B f530bb1707a6b29d347a68cb9160493e9d5afea2bb60c19dcf3c5e25fab42e539bec572472981c11741663063d16114fc0bc9faa81ee5234a423491b726ab338 SHA512 323466c2e62862decf9d77285433b066fb0599585e5db2818d54345b8f7cbe2c4bf53aa82764abe6c52b7af924375b24b5c0b0733b73b4424676f3b0cbd63786 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 diff --git a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild b/dev-java/validation-api/validation-api-1.1.0-r1.ebuild new file mode 100644 index 000000000000..25f7a00c3bf0 --- /dev/null +++ b/dev-java/validation-api/validation-api-1.1.0-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Bean Validation (JSR-303) API" +HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA" +SRC_URI="https://repo1.maven.org/maven2/javax/validation/${PN}/${PV}.Final/${P}.Final-sources.jar -> ${P}.jar" + +LICENSE="Apache-2.0" +SLOT="1.0" +KEYWORDS="amd64 x86" + +IUSE="" + +BDEPEND="app-arch/unzip" +RDEPEND=">=virtual/jre-1.8" +DEPEND=">=virtual/jdk-1.8" diff --git a/dev-java/validation-api/validation-api-1.1.0.ebuild b/dev-java/validation-api/validation-api-1.1.0.ebuild deleted file mode 100644 index 19740c19abb0..000000000000 --- a/dev-java/validation-api/validation-api-1.1.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Bean Validation (JSR-303) API" -HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA" -SRC_URI="https://repo1.maven.org/maven2/javax/validation/${PN}/${PV}.Final/${P}.Final-sources.jar -> ${P}.jar" - -LICENSE="Apache-2.0" -SLOT="1.0" -KEYWORDS="amd64 x86" - -IUSE="" - -RDEPEND=">=virtual/jre-1.5" -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip" diff --git a/dev-java/xml-commons/Manifest b/dev-java/xml-commons/Manifest index d5124a46d9f7..88aef395c0d6 100644 --- a/dev-java/xml-commons/Manifest +++ b/dev-java/xml-commons/Manifest @@ -1,3 +1,3 @@ DIST xml-commons-1.4.01.tar.gz 358779 BLAKE2B 8e1f42b25279eb2ed8bc33be5ac421b91e256cc1ef170b91f38800417502cb546598fb4c3d4619ab7b3637a9b7173d2d5fefd39af12f75c7b10cfb219396cda7 SHA512 9e8f77f7dc65a492548fa2313b49855ad0880fe663acdac865a1b235ea3bc0ba347c4fad3ca16f0c92a60df42a0a802a74525b56ea58dc575cd2d94013561868 -EBUILD xml-commons-1.4.01.ebuild 591 BLAKE2B 97329e12494a6d46f4565e09d721cc48fafcc2337ab82218097eff6c4896eb708dd688c374313e822281d84193671311a47ba763a4d3fcd7850b6158d2fcfab8 SHA512 dacbcd0cfa5c10d4f178af51188281add62475e3bb02acd213f00bb346747eb83ef4392430b3846c9f1c51e261f37dce168b479252a37a43f3e14152955386fd +EBUILD xml-commons-1.4.01.ebuild 597 BLAKE2B 583c7b84fce516ad589ad701663ddf1ed76d719f609b2cce80612b487465aff9447b3f55c6891e39cc63b31681e63815dc3d9aea8a2e8a03692b3a1cfb0db95f SHA512 e494de5cab3ff74167b987e3d80fede7cd83175b9ceafda1199c3313537d46cc34517a51e03970c96a63571b4df78bd58666429838b4e95739fa18758eeb628e MISC metadata.xml 653 BLAKE2B 75fdc42387f3ed46c83044e3d8feb3be13e6924b24bdb388752b9406fc6bb510fffec696ba27b8003a31f268200f5dcecec3e6e1ac8d5f9deb6ce422d607b170 SHA512 969511cbcf2b402bf8da5c10b79a0fd0f4918cbf67d4ecca7a699834cccd2e96994f3b9b9aa5d8a32ada62a418056a3811d64ddc8ce15660487b68c79cb0fc79 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/Manifest b/dev-java/xsdlib/Manifest index dbd9709cf3c4..d7dfdc73fa8a 100644 --- a/dev-java/xsdlib/Manifest +++ b/dev-java/xsdlib/Manifest @@ -1,3 +1,3 @@ DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2 -EBUILD xsdlib-20090415.ebuild 1129 BLAKE2B 35b0645927a87c0e0694ddb6f34b55bd13b57b5b47659c303ad9913815df75d2baffd32697fb8ae8645b534b67891dd96ef85d8b786dfb0582263bb848111fa0 SHA512 444afb0d39f0d1e4dedfbb923b6a94254f692681e90962bca5c6a06f3d269427d34174eb1c6d8862befb23815c0a4eb6386ca34763bc438dc1b042ab2b48b7af +EBUILD xsdlib-20090415.ebuild 1140 BLAKE2B 2930216d726b2555e39622a2973f1cd8e8ac0ea1d2a40bf5865989e1c4882ffadfa4bf7de00a84bb20251f8f25e6e9889c5fe8b5967ca334b84fa0a54bb79d0e SHA512 9097e2318b21b184c067a7ea2898b7229d802f75fb368cb4ff0393de35ea4fb473c8da09ea2fc7500df83f149576636407069e7b8c5c801b5ada87e2e61a38af MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 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 -- cgit v1.2.3