summaryrefslogtreecommitdiff
path: root/dev-java/ant-core
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/ant-core')
-rw-r--r--dev-java/ant-core/Manifest5
-rw-r--r--dev-java/ant-core/ant-core-1.10.14.ebuild2
-rw-r--r--dev-java/ant-core/ant-core-1.10.9-r5.ebuild159
3 files changed, 2 insertions, 164 deletions
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index a3d1ec57ea1d..fad9932f4c8f 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,5 +1,2 @@
-DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-core-1.10.14.ebuild 500 BLAKE2B 1006ce23dca9634f1ee8a2e4ec6c4d3a6fef843e29df32e53355d6eb81c8948e3aa9866bb049059ab436e1d2c89ddd1267589e90427441a4192c73efbde2a941 SHA512 26ce92cc04b5bf61376ad0bc3444dacfcfe2d5c512d617cf71853ca9362cb44a6cfcc720d0209524aa4fb743ba90a1a671dd5ffca4fa5652506c8cd6434d2630
-EBUILD ant-core-1.10.9-r5.ebuild 4049 BLAKE2B 4bba71206ec27d44129187e60bb36023a7692e43e48a442a0e8ddfc2cf82bba6520ede091484429bf7cf80ad5fb16d4290bd12b6facad18749a387250fd8fa62 SHA512 e6d97d8b3b3147c40840a803e02bfdaf5a7119e4341fbad58a532ef9a14552b54dff10e523925d366329e3c15d723778d04b83313e24bf25423ba53921a5f537
+EBUILD ant-core-1.10.14.ebuild 559 BLAKE2B 0ec8a184f49c69f91cebd1531608584a8c856cfc4dd9373d5a70f1000a75aa41db9fe8fe2b93b62d2103f6f186b520eb35cfc6c6b5e969428af5edef9971b4c0 SHA512 6c144ce0033c618d11410cbef0d649d2ce46a7026e8645413aa484e66a0cfdb0efff216bf39e261a4d33627b31fee65305b5ead74842b169b1bb39c9029811dc
MISC metadata.xml 434 BLAKE2B f6e80b35f9e2744a724af5869f1c1ca894e2a5b1732ea39ab3025dff60928612df0a582f958df34402d365f32c14b452be62a07328df6e6b13f4de534936f8a0 SHA512 db54bd8fcf1763471b4fba7bc846f27b1049d85bf242fedf4428be1c1c91eab34c7686f26b7c730e795739e95bedea7174f3579871ecc94f5cae634dfaef68a7
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild b/dev-java/ant-core/ant-core-1.10.14.ebuild
index b26b93661c3c..c69d378ddc71 100644
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
DEPEND="
~dev-java/ant-${PV}:0
diff --git a/dev-java/ant-core/ant-core-1.10.9-r5.ebuild b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
deleted file mode 100644
index 40333bc9a9d1..000000000000
--- a/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Don't depend on itself.
-JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
-
-# Rewriting build.xml files for the testcases has no use at the moment.
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.ant:ant:1.10.9"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
- https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${CDEPEND}
- doc? (
- dev-java/bcel:0
- dev-java/bsf:2.3
- dev-java/commons-logging:0
- dev-java/commons-net:0
- dev-java/jakarta-activation-api:1
- dev-java/jakarta-regexp:1.4
- dev-java/jakarta-oro:2.0
- dev-java/jdepend:0
- dev-java/jsch:0
- dev-java/log4j-12-api:2
- dev-java/javax-mail:0
- dev-java/sun-jai-bin:0
- dev-java/xalan:0
- dev-java/xml-commons-resolver:0
- dev-java/xz-java:0
- )"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-PATCHES=(
- "${WORKDIR}/${PV}-build.patch"
- "${WORKDIR}/${PV}-launch.patch"
-)
-
-src_prepare() {
- default
-
- eprefixify "${S}/src/script/ant"
-
- # Fixes bug 556008.
- java-ant_xml-rewrite -f build.xml \
- -c -e javadoc \
- -a failonerror \
- -v "false"
-
- # See bug #196080 for more details.
- java-ant_bsfix_one build.xml
- java-pkg-2_src_prepare
-
- # Remove JDK9+ stuff
- einfo "Removing JDK9+ classes (Jmod and Link)"
- rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
-}
-
-src_compile() {
- export ANT_HOME=""
- # Avoid error message that package ant-core was not found
- export ANT_TASKS="none"
-
- local bsyscp
-
- # This ensures that when building ant with bootstrapped ant,
- # only the source is used for resolving references, and not
- # the classes in bootstrapped ant but jikes in kaffe has issues with this...
- if ! java-pkg_current-vm-matches kaffe; then
- bsyscp="-Dbuild.sysclasspath=ignore"
- fi
-
- CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal ||
- die "build failed"
-
- if use doc; then
- # All Java packages imported by the source files need to present in
- # the classpath, otherwise it would be https://bugs.gentoo.org/780531
- local doc_deps=(
- bcel
- bsf-2.3
- commons-logging
- commons-net
- jakarta-activation-api-1
- jakarta-oro-2.0
- jakarta-regexp-1.4
- jdepend
- jsch
- log4j-12-api-2
- javax-mail
- sun-jai-bin
- xalan
- xml-commons-resolver
- xz-java
- )
- for dep in "${doc_deps[@]}"; do
- java-pkg_jar-from --build-only --into lib/optional/ "${dep}"
- done
- # This file imports netrexx.lang.Rexx, which is not available
- # from ::gentoo. Fortunately, there is not a dev-java/ant-*
- # package for it, so even if we could generate documentation
- # for it, it would be irrelevant
- rm src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java ||
- die "Failed to remove Java source file blocking Javadoc generation"
- ./build.sh ${bsyscp} javadocs || die "Javadoc build failed"
- fi
-}
-
-src_install() {
- dodir /usr/share/ant/lib
-
- for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
- java-pkg_dojar build/lib/${jar}
- dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
- done
-
- dobin src/script/ant
-
- dodir /usr/share/${PN}/bin
- for each in antRun antRun.pl runant.pl runant.py ; do
- dobin "${S}/src/script/${each}"
- dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
- done
- dosym ../${PN}/bin /usr/share/ant/bin
-
- insinto /usr/share/${PN}
- doins -r dist/etc
- dosym ../${PN}/etc /usr/share/ant/etc
-
- echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
- doenvd "${T}/20ant"
-
- dodoc NOTICE README WHATSNEW KEYS
-
- if use doc; then
- dodoc -r manual/*
- java-pkg_dojavadoc --symlink manual/api build/javadocs
- fi
-
- use source && java-pkg_dosrc src/main/*
-}