diff options
Diffstat (limited to 'dev-java/qdox')
| -rw-r--r-- | dev-java/qdox/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/qdox/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-java/qdox/qdox-1.12.1-r5.ebuild (renamed from dev-java/qdox/qdox-1.12.1-r4.ebuild) | 32 |
3 files changed, 26 insertions, 13 deletions
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest index 6e457da8d361..1c5f2c045e45 100644 --- a/dev-java/qdox/Manifest +++ b/dev-java/qdox/Manifest @@ -1,6 +1,6 @@ AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5 DIST qdox-2.0.1.tar.gz 528305 BLAKE2B ff2f4b59d650b93a466eae6cc69239b059f7786ea609c18c56414e7e849d711d5316664a376b2c2c6e0021a21e7577cc21c9f5cfd215c4af612100a4c81da758 SHA512 db9d9ed8e8cf38c74e35be493aebcca54ba9d2c43a92c066d1964777293ad3af8e3212fcb8c20e9453b93e9bbe868c988dab69f936e7df41450183ce385137fa -EBUILD qdox-1.12.1-r4.ebuild 2170 BLAKE2B a7d0ec67a704a7ce4a9eabf1848e122424cda2c7b30af7c1aa0fe852e3832eada2b8f0aaeb84da25ccbcaa514c086496a54aa6b84b98a787978e030c0e9f3c8c SHA512 83d92d6ae65d76fc70311801932ee84de01c1f417bba52c3503e651c00ab1ab99b03f036930ec157e72923e59c9f7a17cb0f25d1cfc02eb411e4d5a9137b62db +EBUILD qdox-1.12.1-r5.ebuild 2422 BLAKE2B 25c1c4fee466506df67515b7f8b8cc5b19c650ea33e17d71703fd84b91eb25a7a2893b6a7a80e74499208b4dd0442b51e22cab803875317542de51a0fd256fe2 SHA512 92407c44ae8e33935525262aacc2ca6f7a12b22638f26489112b902608a09401120e6732cc8d96f9e1c8eb3ab5d0a4b432cb40221ae67b75b62b3c7bcc10b5e2 EBUILD qdox-2.0.1.ebuild 2820 BLAKE2B e22d6ed9daaaf8f32cdf25d2355676adcb780261d2ab65928e580e2b26c5557d3a8a111f876c444888735faa9accc95e6ab42eee5dce3964ba1e5913a8c02baf SHA512 894ff8420252af370ac335e85c80ad56daeff216286b9534a5664399e951af5f2713606ae1e2f8641a6cd72c7edb2b2bda705a2ae88e3ef21013ca6499adc892 -MISC metadata.xml 494 BLAKE2B 9d4eebdef42221ae522f9642dd022db253e2672a5f7d990bc1c1116c49ad5004dd5c9ffd2944927610bbd15652cca26899d89b3422e3876b9f7fedb98306d8bd SHA512 944cada2a9b4e35e48516eb9faf506a8045dd29d42dd3958df9cfe54c73d6e7b715c8074aa2707f6ca7a5e3efc7138650d56bd1f9629cb1843cdc2c78365a999 +MISC metadata.xml 559 BLAKE2B d6d6774a40f5ff9d1a1bec881cb25d168c97d26705dfa0379cb40dfdd628ebda573e004080252bdbb7e2826daace708ff291ff1726760bdbf29c24102db3debd SHA512 ed0d7a8d8f90b3890edd368715980141a54b02e84f49b34132c165985df822be898e3b564d56e30938a6812639309a1f2947f5346f10678957dd9bf3858dd3f5 diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml index f00a4317cac4..fe50d6ed9393 100644 --- a/dev-java/qdox/metadata.xml +++ b/dev-java/qdox/metadata.xml @@ -12,4 +12,7 @@ <upstream> <remote-id type="github">paul-hammant/qdox</remote-id> </upstream> + <use> + <flag name="ant-task">Build the ant-task</flag> + </use> </pkgmetadata> diff --git a/dev-java/qdox/qdox-1.12.1-r4.ebuild b/dev-java/qdox/qdox-1.12.1-r5.ebuild index cf1dc1eeb7d5..a4419f6cf68e 100644 --- a/dev-java/qdox/qdox-1.12.1-r4.ebuild +++ b/dev-java/qdox/qdox-1.12.1-r5.ebuild @@ -11,31 +11,35 @@ inherit java-pkg-2 DESCRIPTION="Parser for extracting class/interface/method definitions" HOMEPAGE="https://github.com/codehaus/qdox" SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${PN}-${PV}" LICENSE="Apache-2.0" SLOT="1.12" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos" +IUSE="ant-task" +REQUIRED_USE="test? ( ant-task )" -S="${WORKDIR}/${PN}-${PN}-${PV}" - -CDEPEND=">=dev-java/ant-1.10.14-r3:0" - -DEPEND=">=virtual/jdk-1.8:* +DEPEND=" + >=virtual/jdk-1.8:* dev-java/byaccj:0 - >=dev-java/jflex-1.6.1:0 + dev-java/jflex:0 dev-java/jmock:1.0 + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) test? ( dev-java/junit:0 ) - ${CDEPEND}" +" -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" +RDEPEND=" + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) +" PATCHES=( "${FILESDIR}/jflex-1.6.1.patch" ) src_prepare() { - default + default #780585 + java-pkg-2_src_prepare if ! use test ; then rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java @@ -52,12 +56,18 @@ src_compile() { # create jar mkdir -p build/classes || die - local cp="$(java-pkg_getjars --build-only ant,jmock-1.0)" + local cp="$(java-pkg_getjars --build-only jmock-1.0)" if use test ; then cp="${cp}:$(java-pkg_getjars --build-only junit)" fi + if use ant-task ; then + cp="${cp}:$(java-pkg_getjars --build-only ant)" + else + rm src/java/com/thoughtworks/qdox/ant/AbstractQdoxTask.java || die + fi + ejavac -sourcepath . -d build/classes -classpath "${cp}" \ $(find . -name "*.java") || die "Cannot compile sources" |