* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2017-01-26 21:50 James Le Cuirot
0 siblings, 0 replies; 55+ messages in thread
From: James Le Cuirot @ 2017-01-26 21:50 UTC (permalink / raw
To: gentoo-commits
commit: affb02c6e663ae572a5318219396e5512998016d
Author: Roy Bamford <neddyseagoon <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 11:54:47 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 21:50:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=affb02c6
dev-java/ant-core: added ~arm64 keyword. Tested on cortex-a53 Dependency of icedtea on arm64
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3668
dev-java/ant-core/ant-core-1.9.2.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index 91372a9..d30cec7 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,7 +22,8 @@ SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+~x86-solaris"
DEPEND="|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk )
!dev-java/ant-tasks
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2017-01-27 9:34 Patrick Lauer
0 siblings, 0 replies; 55+ messages in thread
From: Patrick Lauer @ 2017-01-27 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 441340048789ec305b009c5050a4bb6ba7139c8d
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 09:28:18 2017 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 09:28:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44134004
dev-java/ant-core: Whitespace
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-java/ant-core/ant-core-1.9.2.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index d30cec7..6117290 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -22,8 +22,9 @@ SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
-~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd \
+ ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos \
+ ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk )
!dev-java/ant-tasks
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2017-01-30 19:03 Fabian Groffen
0 siblings, 0 replies; 55+ messages in thread
From: Fabian Groffen @ 2017-01-30 19:03 UTC (permalink / raw
To: gentoo-commits
commit: d18347a53703f1eb8dd4fa4997253ca37f484cb5
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 18:47:38 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 19:03:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18347a5
dev-java/ant-core: dropped ~x64-freebsd ~x86-freebsd
Package-Manager: portage-2.3.3
dev-java/ant-core/ant-core-1.9.2.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index 6117290..98a86f2 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -22,9 +22,7 @@ SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd \
- ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos \
- ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk )
!dev-java/ant-tasks
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2018-02-12 22:18 James Le Cuirot
0 siblings, 0 replies; 55+ messages in thread
From: James Le Cuirot @ 2018-02-12 22:18 UTC (permalink / raw
To: gentoo-commits
commit: f3f094b4d695b4ce485c45090203325618c6970c
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 22:17:41 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 22:18:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f094b4
dev-java/ant-core: Update SRC_URI
1.9.2 has been moved to the archive location.
Closes: https://bugs.gentoo.org/647320
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-java/ant-core/ant-core-1.9.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index 571c5663615..e2696d37d4b 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -16,7 +16,7 @@ MY_P="apache-ant-${PV}"
DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
+SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
https://dev.gentoo.org/~tomwij/files/dist/ant-${PV}-gentoo.tar.bz2"
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-01-21 10:29 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2019-01-21 10:29 UTC (permalink / raw
To: gentoo-commits
commit: 1f139a29528fd97ed8a875c02e339fea9b9304c2
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 09:24:49 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 10:29:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f139a29
dev-java/ant-core-1.9.13: bump (bug #571110)
Package-Manager: Portage-2.3.57, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/Manifest | 2 +
dev-java/ant-core/ant-core-1.9.13.ebuild | 115 +++++++++++++++++++++++++++++++
2 files changed, 117 insertions(+)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index bb1cab123eb..407511ed5b5 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,2 +1,4 @@
+DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
diff --git a/dev-java/ant-core/ant-core-1.9.13.ebuild b/dev-java/ant-core/ant-core-1.9.13.ebuild
new file mode 100644
index 00000000000..55b6cd4246f
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.9.13.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# 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"
+
+inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver
+
+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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*
+ !dev-java/ant-tasks
+ !dev-java/ant-optional"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+src_prepare() {
+ epatch "${WORKDIR}/${PV}-build.patch"
+ epatch "${WORKDIR}/${PV}-launch.patch"
+
+ 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
+}
+
+src_compile() {
+ export ANT_HOME=""
+
+ 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 \
+ $(use_doc javadocs) || die "build failed"
+}
+
+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 complete-ant-cmd.pl ; 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
+ dohtml -r manual/*
+ java-pkg_dojavadoc --symlink manual/api build/javadocs
+ fi
+
+ use source && java-pkg_dosrc src/main/*
+}
+
+pkg_postinst() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then
+ elog "The way of packaging ant in Gentoo has changed significantly since"
+ elog "the 1.7.0 version, For more information, please see:"
+ elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
+ fi
+
+ if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then
+ elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
+ elog "flags have been moved to dev-java/ant."
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-01-23 8:28 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2019-01-23 8:28 UTC (permalink / raw
To: gentoo-commits
commit: 0dfa7b9c9ca5d0d34e102fcdba48d6b2148227e3
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 22 15:41:10 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 08:28:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dfa7b9c
dev-java/ant-core-1.10.5: bump (bug #571110)
Package-Manager: Portage-2.3.57, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/Manifest | 2 +
dev-java/ant-core/ant-core-1.10.5.ebuild | 115 +++++++++++++++++++++++++++++++
2 files changed, 117 insertions(+)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 407511ed5b5..213bb1a3086 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,6 @@
+DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
+DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
diff --git a/dev-java/ant-core/ant-core-1.10.5.ebuild b/dev-java/ant-core/ant-core-1.10.5.ebuild
new file mode 100644
index 00000000000..55b6cd4246f
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.5.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# 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"
+
+inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver
+
+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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*
+ !dev-java/ant-tasks
+ !dev-java/ant-optional"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+src_prepare() {
+ epatch "${WORKDIR}/${PV}-build.patch"
+ epatch "${WORKDIR}/${PV}-launch.patch"
+
+ 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
+}
+
+src_compile() {
+ export ANT_HOME=""
+
+ 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 \
+ $(use_doc javadocs) || die "build failed"
+}
+
+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 complete-ant-cmd.pl ; 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
+ dohtml -r manual/*
+ java-pkg_dojavadoc --symlink manual/api build/javadocs
+ fi
+
+ use source && java-pkg_dosrc src/main/*
+}
+
+pkg_postinst() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then
+ elog "The way of packaging ant in Gentoo has changed significantly since"
+ elog "the 1.7.0 version, For more information, please see:"
+ elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
+ fi
+
+ if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then
+ elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
+ elog "flags have been moved to dev-java/ant."
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-01-24 22:06 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2019-01-24 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 9989ce97dabcf6ef399581493ea145409012ccdf
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 24 22:04:38 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jan 24 22:06:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9989ce97
dev-java/ant-core-1.{9.13,10.5}-r1: fixes
1) fixed bug #675992
2) fixed 'package not found' error on systems wnere ant-core
is not installed yet
Closes: https://bugs.gentoo.org/675992
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/Manifest | 4 ++--
.../ant-core/{ant-core-1.10.5.ebuild => ant-core-1.10.5-r1.ebuild} | 4 +++-
.../ant-core/{ant-core-1.9.13.ebuild => ant-core-1.9.13-r1.ebuild} | 4 +++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 213bb1a3086..b5117327cb0 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,5 +1,5 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
+DIST ant-1.10.5-r1-gentoo.tar.bz2 6400 BLAKE2B 349a45ee678217ee31ae2f6e982ceec2d31138dcb58e614f496125d7d9bc01a0fa3630be069fbf0d131f4006cb7912597c31392bc82ab7f9b0a1189bbe9a763e SHA512 adf544c151f46df8a7fb7f7d33450f9a2390f568dd4c7b1c0e8850b1a155ea0ddc1f834d869d657806570d59af2d194cb443ddfc653627967246f3b38e264b12
+DIST ant-1.9.13-r1-gentoo.tar.bz2 7208 BLAKE2B 6f041a69f5f8e38e95b26030cf4d730ed22b071ad1d6e87ab1fb2707e2b40c7e23e1c8f7759d6904ad2b25793a7d9b2ead1c2649b6b029296cd9d05bec4ea296 SHA512 5b105ea00fbc7d6f63c0016b288f5e46a81b89cc46015e2ffcb2a4d41f915331ac8f8183752fea547396f204748132f6ce7aa7b3e6f6181c4983b4eb7ee84d54
DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
diff --git a/dev-java/ant-core/ant-core-1.10.5.ebuild b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
similarity index 95%
rename from dev-java/ant-core/ant-core-1.10.5.ebuild
rename to dev-java/ant-core/ant-core-1.10.5-r1.ebuild
index 55b6cd4246f..7ddd5d55ba2 100644
--- a/dev-java/ant-core/ant-core-1.10.5.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
@@ -17,7 +17,7 @@ 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"
+ https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
@@ -51,6 +51,8 @@ src_prepare() {
src_compile() {
export ANT_HOME=""
+ # Avoid error message that package ant-core was not found
+ export ANT_TASKS="none"
local bsyscp
diff --git a/dev-java/ant-core/ant-core-1.9.13.ebuild b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
similarity index 95%
rename from dev-java/ant-core/ant-core-1.9.13.ebuild
rename to dev-java/ant-core/ant-core-1.9.13-r1.ebuild
index 55b6cd4246f..7ddd5d55ba2 100644
--- a/dev-java/ant-core/ant-core-1.9.13.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
@@ -17,7 +17,7 @@ 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"
+ https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
@@ -51,6 +51,8 @@ src_prepare() {
src_compile() {
export ANT_HOME=""
+ # Avoid error message that package ant-core was not found
+ export ANT_TASKS="none"
local bsyscp
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-03-01 1:14 Thomas Deutschmann
0 siblings, 0 replies; 55+ messages in thread
From: Thomas Deutschmann @ 2019-03-01 1:14 UTC (permalink / raw
To: gentoo-commits
commit: 3cb16702bbce9963dfe9cf669eb82eeacb46a4fe
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 1 00:58:59 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 1 01:13:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb16702
dev-java/ant-core: x86 stable (bug #678858)
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.5-r1.ebuild | 2 +-
dev-java/ant-core/ant-core-1.9.13-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
index 7ddd5d55ba2..1d60b29e99b 100644
--- a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.8:*
!dev-java/ant-tasks
diff --git a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
index 7ddd5d55ba2..1d60b29e99b 100644
--- a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.8:*
!dev-java/ant-tasks
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-03-01 12:46 Mikle Kolyada
0 siblings, 0 replies; 55+ messages in thread
From: Mikle Kolyada @ 2019-03-01 12:46 UTC (permalink / raw
To: gentoo-commits
commit: 625a0df7c4af5260382518cf6568a8e29fddd0df
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 1 12:38:39 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Mar 1 12:38:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625a0df7
dev-java/ant-core: amd64 stable wrt bug #678858
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
dev-java/ant-core/ant-core-1.10.5-r1.ebuild | 2 +-
dev-java/ant-core/ant-core-1.9.13-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
index 1d60b29e99b..5f5cb9ca722 100644
--- a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.8:*
!dev-java/ant-tasks
diff --git a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
index 1d60b29e99b..5f5cb9ca722 100644
--- a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.8:*
!dev-java/ant-tasks
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-03-15 8:21 Mikle Kolyada
0 siblings, 0 replies; 55+ messages in thread
From: Mikle Kolyada @ 2019-03-15 8:21 UTC (permalink / raw
To: gentoo-commits
commit: a074c7a5d560f121bee5e397638ac524404c1ca5
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 08:19:27 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 08:20:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a074c7a5
dev-java/ant-core: ppc64 stable wrt bug #678858
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"
dev-java/ant-core/ant-core-1.10.5-r1.ebuild | 2 +-
dev-java/ant-core/ant-core-1.9.13-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
index 5f5cb9ca722..a5340c00be7 100644
--- a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.8:*
!dev-java/ant-tasks
diff --git a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
index 5f5cb9ca722..a5340c00be7 100644
--- a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.8:*
!dev-java/ant-tasks
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-03-20 17:27 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2019-03-20 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 4e697300bfda1a8f43cd0f16c49c829285e03fea
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 17:15:28 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 17:27:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e697300
dev-java/ant-core-1.9.2: removed obsolete
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/Manifest | 2 -
dev-java/ant-core/ant-core-1.9.2.ebuild | 116 --------------------------------
2 files changed, 118 deletions(-)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index b5117327cb0..20081eaa123 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,6 +1,4 @@
DIST ant-1.10.5-r1-gentoo.tar.bz2 6400 BLAKE2B 349a45ee678217ee31ae2f6e982ceec2d31138dcb58e614f496125d7d9bc01a0fa3630be069fbf0d131f4006cb7912597c31392bc82ab7f9b0a1189bbe9a763e SHA512 adf544c151f46df8a7fb7f7d33450f9a2390f568dd4c7b1c0e8850b1a155ea0ddc1f834d869d657806570d59af2d194cb443ddfc653627967246f3b38e264b12
DIST ant-1.9.13-r1-gentoo.tar.bz2 7208 BLAKE2B 6f041a69f5f8e38e95b26030cf4d730ed22b071ad1d6e87ab1fb2707e2b40c7e23e1c8f7759d6904ad2b25793a7d9b2ead1c2649b6b029296cd9d05bec4ea296 SHA512 5b105ea00fbc7d6f63c0016b288f5e46a81b89cc46015e2ffcb2a4d41f915331ac8f8183752fea547396f204748132f6ce7aa7b3e6f6181c4983b4eb7ee84d54
-DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
deleted file mode 100644
index 1f5fc1092c4..00000000000
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# 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"
-
-inherit eutils java-pkg-2 java-ant-2 prefix versionator
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
- https://dev.gentoo.org/~tomwij/files/dist/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk )
- !dev-java/ant-tasks
- !dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/"
- eprefixify "${WORKDIR}/ant"
-
- # use our split-ant build.xml.
- mv -f "${WORKDIR}/build.xml" . || die
-
- # 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
-}
-
-src_compile() {
- export ANT_HOME=""
-
- 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 internal_dist \
- $(use_doc javadocs) || die "build failed"
-}
-
-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 /usr/share/${PN}/lib/${jar} /usr/share/ant/lib/${jar}
- done
-
- dobin "${WORKDIR}/ant"
-
- dodir /usr/share/${PN}/bin
- for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
- dobin "${S}/src/script/${each}"
- dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
- done
- dosym /usr/share/${PN}/bin /usr/share/ant/bin
-
- insinto /usr/share/${PN}
- doins -r dist/etc
- dosym /usr/share/${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
- dohtml -r manual/*
- java-pkg_dojavadoc --symlink manual/api build/javadocs
- fi
-
- use source && java-pkg_dosrc src/main/*
-}
-
-pkg_postinst() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ! version_is_at_least 1.7.0 ${REPLACING_VERSIONS}; then
- elog "The way of packaging ant in Gentoo has changed significantly since"
- elog "the 1.7.0 version, For more information, please see:"
- elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
- fi
-
- if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; then
- elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
- elog "flags have been moved to dev-java/ant."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-04-30 8:40 Michał Górny
0 siblings, 0 replies; 55+ messages in thread
From: Michał Górny @ 2019-04-30 8:40 UTC (permalink / raw
To: gentoo-commits
commit: 1e5a585127d65ab1e607938609fe7de81df16309
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 06:35:26 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 08:40:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5a5851
dev-java/ant-core: Stop installing complete-ant-cmd.pl
The completion script is apparently buggy and conflicts with built-in
bash-completion support. Remove it.
Closes: https://bugs.gentoo.org/623254
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../ant-core/{ant-core-1.10.5-r1.ebuild => ant-core-1.10.5-r2.ebuild} | 2 +-
.../ant-core/{ant-core-1.9.13-r1.ebuild => ant-core-1.9.13-r2.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild b/dev-java/ant-core/ant-core-1.10.5-r2.ebuild
similarity index 97%
rename from dev-java/ant-core/ant-core-1.10.5-r1.ebuild
rename to dev-java/ant-core/ant-core-1.10.5-r2.ebuild
index a5340c00be7..d5c615d4701 100644
--- a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.5-r2.ebuild
@@ -78,7 +78,7 @@ src_install() {
dobin src/script/ant
dodir /usr/share/${PN}/bin
- for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
+ 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
diff --git a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild b/dev-java/ant-core/ant-core-1.9.13-r2.ebuild
similarity index 97%
rename from dev-java/ant-core/ant-core-1.9.13-r1.ebuild
rename to dev-java/ant-core/ant-core-1.9.13-r2.ebuild
index a5340c00be7..d5c615d4701 100644
--- a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.13-r2.ebuild
@@ -78,7 +78,7 @@ src_install() {
dobin src/script/ant
dodir /usr/share/${PN}/bin
- for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
+ 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
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-10-17 14:02 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2019-10-17 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 45e525301bdf27cb1ab9e007b07fb9f8faf75306
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 13:02:59 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 14:02:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e52530
dev-java/ant-core-1.10.7: bump
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/Manifest | 2 +
dev-java/ant-core/ant-core-1.10.7.ebuild | 123 +++++++++++++++++++++++++++++++
2 files changed, 125 insertions(+)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 20081eaa123..c3eadc79a6f 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,6 @@
DIST ant-1.10.5-r1-gentoo.tar.bz2 6400 BLAKE2B 349a45ee678217ee31ae2f6e982ceec2d31138dcb58e614f496125d7d9bc01a0fa3630be069fbf0d131f4006cb7912597c31392bc82ab7f9b0a1189bbe9a763e SHA512 adf544c151f46df8a7fb7f7d33450f9a2390f568dd4c7b1c0e8850b1a155ea0ddc1f834d869d657806570d59af2d194cb443ddfc653627967246f3b38e264b12
+DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
DIST ant-1.9.13-r1-gentoo.tar.bz2 7208 BLAKE2B 6f041a69f5f8e38e95b26030cf4d730ed22b071ad1d6e87ab1fb2707e2b40c7e23e1c8f7759d6904ad2b25793a7d9b2ead1c2649b6b029296cd9d05bec4ea296 SHA512 5b105ea00fbc7d6f63c0016b288f5e46a81b89cc46015e2ffcb2a4d41f915331ac8f8183752fea547396f204748132f6ce7aa7b3e6f6181c4983b4eb7ee84d54
DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
+DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
diff --git a/dev-java/ant-core/ant-core-1.10.7.ebuild b/dev-java/ant-core/ant-core-1.10.7.ebuild
new file mode 100644
index 00000000000..004db50c84b
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.7.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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"
+
+inherit eutils 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND=">=virtual/jdk-1.8:*
+ !dev-java/ant-tasks
+ !dev-java/ant-optional"
+DEPEND="${CDEPEND}"
+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 \
+ $(use_doc javadocs) || die "build failed"
+}
+
+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/*
+}
+
+pkg_postinst() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then
+ elog "The way of packaging ant in Gentoo has changed significantly since"
+ elog "the 1.7.0 version, For more information, please see:"
+ elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
+ fi
+
+ if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then
+ elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
+ elog "flags have been moved to dev-java/ant."
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-11-01 10:31 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2019-11-01 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 0810f758d1714ee89fe9102cc649bcca91a61c52
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 10:31:19 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Nov 1 10:31:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0810f758
dev-java/ant-core: removed obsolete code
Closes: https://bugs.gentoo.org/699066
Closes: https://bugs.gentoo.org/589460
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.5-r2.ebuild | 15 ---------------
dev-java/ant-core/ant-core-1.10.7.ebuild | 15 ---------------
dev-java/ant-core/ant-core-1.9.13-r2.ebuild | 15 ---------------
3 files changed, 45 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.5-r2.ebuild b/dev-java/ant-core/ant-core-1.10.5-r2.ebuild
index c5cc705083b..823285c258d 100644
--- a/dev-java/ant-core/ant-core-1.10.5-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.5-r2.ebuild
@@ -100,18 +100,3 @@ src_install() {
use source && java-pkg_dosrc src/main/*
}
-
-pkg_postinst() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then
- elog "The way of packaging ant in Gentoo has changed significantly since"
- elog "the 1.7.0 version, For more information, please see:"
- elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
- fi
-
- if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then
- elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
- elog "flags have been moved to dev-java/ant."
- fi
- fi
-}
diff --git a/dev-java/ant-core/ant-core-1.10.7.ebuild b/dev-java/ant-core/ant-core-1.10.7.ebuild
index 004db50c84b..e9e1e3cd6aa 100644
--- a/dev-java/ant-core/ant-core-1.10.7.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.7.ebuild
@@ -106,18 +106,3 @@ src_install() {
use source && java-pkg_dosrc src/main/*
}
-
-pkg_postinst() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then
- elog "The way of packaging ant in Gentoo has changed significantly since"
- elog "the 1.7.0 version, For more information, please see:"
- elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
- fi
-
- if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then
- elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
- elog "flags have been moved to dev-java/ant."
- fi
- fi
-}
diff --git a/dev-java/ant-core/ant-core-1.9.13-r2.ebuild b/dev-java/ant-core/ant-core-1.9.13-r2.ebuild
index d5c615d4701..6452cfa885e 100644
--- a/dev-java/ant-core/ant-core-1.9.13-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.13-r2.ebuild
@@ -100,18 +100,3 @@ src_install() {
use source && java-pkg_dosrc src/main/*
}
-
-pkg_postinst() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then
- elog "The way of packaging ant in Gentoo has changed significantly since"
- elog "the 1.7.0 version, For more information, please see:"
- elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
- fi
-
- if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then
- elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
- elog "flags have been moved to dev-java/ant."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-11-22 10:24 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2019-11-22 10:24 UTC (permalink / raw
To: gentoo-commits
commit: b547bd86b3943917319eda25655e977f0c1ce3ef
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 10:22:04 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 10:22:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b547bd86
dev-java/ant-core: amd64 stable wrt bug #700460
Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.7.ebuild b/dev-java/ant-core/ant-core-1.10.7.ebuild
index e9e1e3cd6aa..1a9d12da567 100644
--- a/dev-java/ant-core/ant-core-1.10.7.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*
!dev-java/ant-tasks
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-11-23 5:42 Aaron Bauman
0 siblings, 0 replies; 55+ messages in thread
From: Aaron Bauman @ 2019-11-23 5:42 UTC (permalink / raw
To: gentoo-commits
commit: b1579c33b4edf35e3ea321cf39c7a5e008edf78d
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 05:40:22 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 05:42:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1579c33
dev-java/ant-core: arm64 stable (bug #700460)
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.79, Repoman-2.3.18
dev-java/ant-core/ant-core-1.10.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.7.ebuild b/dev-java/ant-core/ant-core-1.10.7.ebuild
index 1a9d12da567..3eda84cc64a 100644
--- a/dev-java/ant-core/ant-core-1.10.7.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*
!dev-java/ant-tasks
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-11-23 12:43 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2019-11-23 12:43 UTC (permalink / raw
To: gentoo-commits
commit: 95099a16a9de58a0111d4d99f460f98380b246e0
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 12:42:25 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 12:43:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95099a16
dev-java/ant-core: x86 stable wrt bug #700460
Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.7.ebuild b/dev-java/ant-core/ant-core-1.10.7.ebuild
index 3eda84cc64a..7a238e1e6f3 100644
--- a/dev-java/ant-core/ant-core-1.10.7.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*
!dev-java/ant-tasks
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-11-23 16:49 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2019-11-23 16:49 UTC (permalink / raw
To: gentoo-commits
commit: b41b487f43d555c087161f6038df12f64da2ce8a
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 16:48:04 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 16:48:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41b487f
dev-java/ant-core: ppc64 stable wrt bug #700460
Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.7.ebuild b/dev-java/ant-core/ant-core-1.10.7.ebuild
index 7a238e1e6f3..8ee57868f33 100644
--- a/dev-java/ant-core/ant-core-1.10.7.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*
!dev-java/ant-tasks
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-11-25 13:22 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2019-11-25 13:22 UTC (permalink / raw
To: gentoo-commits
commit: ce1fe6046b22ac05e8decd7ad607e35df52ee22d
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 13:18:53 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 13:22:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce1fe604
dev-java/ant-core-1.{9.13,10.5}: removed obsolete
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/Manifest | 4 --
dev-java/ant-core/ant-core-1.10.5-r2.ebuild | 102 ----------------------------
dev-java/ant-core/ant-core-1.9.13-r2.ebuild | 102 ----------------------------
3 files changed, 208 deletions(-)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index c3eadc79a6f..f5b5cdc72b9 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,6 +1,2 @@
-DIST ant-1.10.5-r1-gentoo.tar.bz2 6400 BLAKE2B 349a45ee678217ee31ae2f6e982ceec2d31138dcb58e614f496125d7d9bc01a0fa3630be069fbf0d131f4006cb7912597c31392bc82ab7f9b0a1189bbe9a763e SHA512 adf544c151f46df8a7fb7f7d33450f9a2390f568dd4c7b1c0e8850b1a155ea0ddc1f834d869d657806570d59af2d194cb443ddfc653627967246f3b38e264b12
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-r1-gentoo.tar.bz2 7208 BLAKE2B 6f041a69f5f8e38e95b26030cf4d730ed22b071ad1d6e87ab1fb2707e2b40c7e23e1c8f7759d6904ad2b25793a7d9b2ead1c2649b6b029296cd9d05bec4ea296 SHA512 5b105ea00fbc7d6f63c0016b288f5e46a81b89cc46015e2ffcb2a4d41f915331ac8f8183752fea547396f204748132f6ce7aa7b3e6f6181c4983b4eb7ee84d54
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
diff --git a/dev-java/ant-core/ant-core-1.10.5-r2.ebuild b/dev-java/ant-core/ant-core-1.10.5-r2.ebuild
deleted file mode 100644
index 823285c258d..00000000000
--- a/dev-java/ant-core/ant-core-1.10.5-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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"
-
-inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver
-
-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}-r1-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*
- !dev-java/ant-tasks
- !dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-src_prepare() {
- epatch "${WORKDIR}/${PV}-build.patch"
- epatch "${WORKDIR}/${PV}-launch.patch"
-
- 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
-}
-
-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 \
- $(use_doc javadocs) || die "build failed"
-}
-
-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
- dohtml -r manual/*
- java-pkg_dojavadoc --symlink manual/api build/javadocs
- fi
-
- use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/ant-core/ant-core-1.9.13-r2.ebuild b/dev-java/ant-core/ant-core-1.9.13-r2.ebuild
deleted file mode 100644
index 6452cfa885e..00000000000
--- a/dev-java/ant-core/ant-core-1.9.13-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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"
-
-inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver
-
-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}-r1-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*
- !dev-java/ant-tasks
- !dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-src_prepare() {
- epatch "${WORKDIR}/${PV}-build.patch"
- epatch "${WORKDIR}/${PV}-launch.patch"
-
- 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
-}
-
-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 \
- $(use_doc javadocs) || die "build failed"
-}
-
-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
- dohtml -r manual/*
- java-pkg_dojavadoc --symlink manual/api build/javadocs
- fi
-
- use source && java-pkg_dosrc src/main/*
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2019-11-25 13:22 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2019-11-25 13:22 UTC (permalink / raw
To: gentoo-commits
commit: 05190a98831ef53d13d2b37871e36421e0548cff
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 13:20:39 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 13:22:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05190a98
dev-java/ant-core-1.10.7: removed nonexistent blockers
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.7.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.7.ebuild b/dev-java/ant-core/ant-core-1.10.7.ebuild
index 8ee57868f33..4c9e8245d24 100644
--- a/dev-java/ant-core/ant-core-1.10.7.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.7.ebuild
@@ -23,9 +23,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND=">=virtual/jdk-1.8:*
- !dev-java/ant-tasks
- !dev-java/ant-optional"
+CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2020-07-05 11:20 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2020-07-05 11:20 UTC (permalink / raw
To: gentoo-commits
commit: e5420b9e81fdeb7a1f956f953bdaf08e286bfc8a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 5 11:07:50 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jul 5 11:20:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5420b9e
dev-java/ant-core: bump to 1.10.8
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/Manifest | 2 +
dev-java/ant-core/ant-core-1.10.8.ebuild | 109 +++++++++++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index f5b5cdc72b9..400ef9f3de5 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-core/ant-core-1.10.8.ebuild b/dev-java/ant-core/ant-core-1.10.8.ebuild
new file mode 100644
index 00000000000..b7a55bbe663
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.8.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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"
+
+inherit eutils 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${CDEPEND}"
+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 \
+ $(use_doc javadocs) || die "build failed"
+}
+
+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/*
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2020-07-19 13:38 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2020-07-19 13:38 UTC (permalink / raw
To: gentoo-commits
commit: 0df92926f61cfba6b6f09289b8d4ea9f35937cb8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 13:26:47 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 13:37:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df92926
dev-java/ant-core: x86 stable (bug #723086)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.8.ebuild b/dev-java/ant-core/ant-core-1.10.8.ebuild
index 0d628f9781f..2bb56800a92 100644
--- a/dev-java/ant-core/ant-core-1.10.8.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2020-07-19 15:18 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2020-07-19 15:18 UTC (permalink / raw
To: gentoo-commits
commit: 99873158e6d6a6106cbce903cd6e8f77b72eef0c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 14:58:25 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 15:18:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99873158
dev-java/ant-core: arm64 stable (bug #723086)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.8.ebuild b/dev-java/ant-core/ant-core-1.10.8.ebuild
index 2bb56800a92..43094cbce31 100644
--- a/dev-java/ant-core/ant-core-1.10.8.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2020-07-19 21:35 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2020-07-19 21:35 UTC (permalink / raw
To: gentoo-commits
commit: 099faf88a60dd36ed56c7a63f91049c3061edc6b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 21:34:57 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 21:34:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=099faf88
dev-java/ant-core: ppc64 stable (bug #723086)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.8.ebuild b/dev-java/ant-core/ant-core-1.10.8.ebuild
index 43094cbce31..12b283e416e 100644
--- a/dev-java/ant-core/ant-core-1.10.8.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2020-10-01 18:16 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2020-10-01 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 1076fc86d3502d0f5d26fa95111aba9624de7615
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 1 18:04:07 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 1 18:15:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1076fc86
dev-java/ant-core: bump to 1.10.9
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/Manifest | 2 +
dev-java/ant-core/ant-core-1.10.9.ebuild | 109 +++++++++++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index fbf293080e3..55cdb859de9 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
new file mode 100644
index 00000000000..b7a55bbe663
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.9.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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"
+
+inherit eutils 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${CDEPEND}"
+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 \
+ $(use_doc javadocs) || die "build failed"
+}
+
+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/*
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2020-10-14 18:29 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2020-10-14 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 9574b6881ab3b9c20cfa0dfe521032fe27cafad0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 18:28:28 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 18:28:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9574b688
dev-java/ant-core: Stabilize 1.10.9 arm64, #745768
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
index b7a55bbe663..551581c2be2 100644
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2020-10-14 19:08 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2020-10-14 19:08 UTC (permalink / raw
To: gentoo-commits
commit: 35d570b4a2e137950510fe8595c4246089974238
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 19:06:51 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 19:06:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35d570b4
dev-java/ant-core: amd64 stable wrt bug #745768
Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
index 551581c2be2..84c2d210f43 100644
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2020-10-14 19:19 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2020-10-14 19:19 UTC (permalink / raw
To: gentoo-commits
commit: cd00067a9dad2a017214f3118f144c3d044b1ef8
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 19:18:48 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 19:18:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd00067a
dev-java/ant-core: ppc64 stable wrt bug #745768
Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
index 84c2d210f43..5f2b28e0f4d 100644
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2020-10-14 19:22 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2020-10-14 19:22 UTC (permalink / raw
To: gentoo-commits
commit: f21711187dc3cbf88d6347056a928416e6c79658
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 19:21:27 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 19:22:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2171118
dev-java/ant-core: x86 stable wrt bug #745768
Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
index 5f2b28e0f4d..12b283e416e 100644
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2020-10-15 7:42 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2020-10-15 7:42 UTC (permalink / raw
To: gentoo-commits
commit: bc79b708b0eaf4d62fcbbb0c6dea8f751d413827
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 07:32:28 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 07:32:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc79b708
dev-java/ant-core: removed vulnerable
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/Manifest | 2 -
dev-java/ant-core/ant-core-1.10.8.ebuild | 109 -------------------------------
2 files changed, 111 deletions(-)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 55cdb859de9..dccd735d44e 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,2 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-core/ant-core-1.10.8.ebuild b/dev-java/ant-core/ant-core-1.10.8.ebuild
deleted file mode 100644
index 12b283e416e..00000000000
--- a/dev-java/ant-core/ant-core-1.10.8.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# 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"
-
-inherit eutils 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${CDEPEND}"
-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 \
- $(use_doc javadocs) || die "build failed"
-}
-
-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/*
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2020-12-27 14:07 Fabian Groffen
0 siblings, 0 replies; 55+ messages in thread
From: Fabian Groffen @ 2020-12-27 14:07 UTC (permalink / raw
To: gentoo-commits
commit: 8aff189e16fa4fe44097a5401faeabefa3583d2e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 14:06:10 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 14:06:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aff189e
dev-java/ant-core: drop ppc-aix m68k-mint
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
index 12b283e416e..7dd9454c91a 100644
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-01-18 9:51 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2022-01-18 9:51 UTC (permalink / raw
To: gentoo-commits
commit: b9c527e63e7b06632120f95d09959af90c040ed2
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Tue Jan 18 00:28:22 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 09:51:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c527e6
dev-java/ant-core: Fix Javadoc generation on JDK 11+; EAPI 8
Closes: https://bugs.gentoo.org/780531
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23849
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r1.ebuild | 161 ++++++++++++++++++++++++++++
1 file changed, 161 insertions(+)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r1.ebuild b/dev-java/ant-core/ant-core-1.10.9-r1.ebuild
new file mode 100644
index 000000000000..9c38f6a612b8
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.9-r1.ebuild
@@ -0,0 +1,161 @@
+# 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"
+
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Some dependencies for building Javadoc are unavailable on these architectures
+REQUIRED_USE="doc? ( !arm !arm64 )"
+
+CDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${CDEPEND}
+ doc? ( !arm? ( !arm64? (
+ 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:0
+ dev-java/oracle-javamail: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
+ oracle-javamail
+ 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/*
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-01-30 9:00 Florian Schmaus
0 siblings, 0 replies; 55+ messages in thread
From: Florian Schmaus @ 2022-01-30 9:00 UTC (permalink / raw
To: gentoo-commits
commit: da450f5082b193d616ae67e5dcfdeeabb16f6119
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jan 29 17:18:20 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 08:59:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da450f50
dev-java/ant-core: Switch to javax-mail
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r2.ebuild | 161 ++++++++++++++++++++++++++++
1 file changed, 161 insertions(+)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild b/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
new file mode 100644
index 000000000000..d43683dda998
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
@@ -0,0 +1,161 @@
+# 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"
+
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Some dependencies for building Javadoc are unavailable on these architectures
+REQUIRED_USE="doc? ( !arm !arm64 )"
+
+CDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${CDEPEND}
+ doc? ( !arm? ( !arm64? (
+ 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:0
+ 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
+ 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/*
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-01-30 9:00 Florian Schmaus
0 siblings, 0 replies; 55+ messages in thread
From: Florian Schmaus @ 2022-01-30 9:00 UTC (permalink / raw
To: gentoo-commits
commit: 0cf90df33d15d53cc0e926e2b1418e9234de8aff
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jan 29 17:20:08 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 08:59:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf90df3
dev-java/ant-core: Remove obsolete
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23996
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r1.ebuild | 161 ----------------------------
1 file changed, 161 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r1.ebuild b/dev-java/ant-core/ant-core-1.10.9-r1.ebuild
deleted file mode 100644
index 9c38f6a612b8..000000000000
--- a/dev-java/ant-core/ant-core-1.10.9-r1.ebuild
+++ /dev/null
@@ -1,161 +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"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Some dependencies for building Javadoc are unavailable on these architectures
-REQUIRED_USE="doc? ( !arm !arm64 )"
-
-CDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${CDEPEND}
- doc? ( !arm? ( !arm64? (
- 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:0
- dev-java/oracle-javamail: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
- oracle-javamail
- 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/*
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-02-03 6:56 Florian Schmaus
0 siblings, 0 replies; 55+ messages in thread
From: Florian Schmaus @ 2022-02-03 6:56 UTC (permalink / raw
To: gentoo-commits
commit: 4aba550072ebec9355bda94608ff0aa33a73d0dc
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Thu Jan 27 00:40:30 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Feb 3 06:55:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aba5500
dev-java/ant-core: Enable USE="doc" on all architectures for 1.10.9-r2
Closes: https://bugs.gentoo.org/831424
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24007
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r2.ebuild | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild b/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
index d43683dda998..8ff88e179ea9 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
@@ -23,12 +23,9 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Some dependencies for building Javadoc are unavailable on these architectures
-REQUIRED_USE="doc? ( !arm !arm64 )"
-
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
- doc? ( !arm? ( !arm64? (
+ doc? (
dev-java/bcel:0
dev-java/bsf:2.3
dev-java/commons-logging:0
@@ -44,7 +41,7 @@ DEPEND="${CDEPEND}
dev-java/xalan:0
dev-java/xml-commons-resolver:0
dev-java/xz-java:0
- ) ) )"
+ )"
RDEPEND="${CDEPEND}"
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-02-19 9:25 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2022-02-19 9:25 UTC (permalink / raw
To: gentoo-commits
commit: 74e792668ba568d285725e9446c1b4d39a76d2d2
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 09:19:55 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 09:25:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e79266
dev-java/ant-core: 1.10.9-r2
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r2.ebuild | 158 ----------------------------
1 file changed, 158 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild b/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
deleted file mode 100644
index 8ff88e179ea9..000000000000
--- a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
+++ /dev/null
@@ -1,158 +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"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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:0
- 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
- 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/*
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-02-19 9:25 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2022-02-19 9:25 UTC (permalink / raw
To: gentoo-commits
commit: e61498c775c4925d46c06c5f2384d48d24c7d3ac
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Thu Feb 17 18:22:28 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 09:25:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61498c7
dev-java/ant-core: Switch to log4j-12-api:2
Closes: https://bugs.gentoo.org/831715
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24261/commits/26f95069c6aefc34dfa5e8cadcc944f6635d38f7
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 158 ++++++++++++++++++++++++++++
1 file changed, 158 insertions(+)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
new file mode 100644
index 000000000000..5e02bb8b0df4
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -0,0 +1,158 @@
+# 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"
+
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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/*
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-03-22 8:37 Arthur Zamarin
0 siblings, 0 replies; 55+ messages in thread
From: Arthur Zamarin @ 2022-03-22 8:37 UTC (permalink / raw
To: gentoo-commits
commit: 1746c2caf877e7b678a5028ecff4bfcfb8899ff1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 08:37:38 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 08:37:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1746c2ca
dev-java/ant-core: Stabilize 1.10.9-r3 arm64, #835500
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index 5e02bb8b0df4..a165bea4858b 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-03-22 9:27 Jakov Smolić
0 siblings, 0 replies; 55+ messages in thread
From: Jakov Smolić @ 2022-03-22 9:27 UTC (permalink / raw
To: gentoo-commits
commit: ca90e6b39b2740e43d0a7583c96e5288f5909cfd
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 09:26:17 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 09:26:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca90e6b3
dev-java/ant-core: Stabilize 1.10.9-r3 amd64, #835500
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index a165bea4858b..194912140473 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-03-22 9:27 Jakov Smolić
0 siblings, 0 replies; 55+ messages in thread
From: Jakov Smolić @ 2022-03-22 9:27 UTC (permalink / raw
To: gentoo-commits
commit: d013a51e9c108968182cc446351d0e1edccc4aee
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 09:26:51 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 09:26:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d013a51e
dev-java/ant-core: Stabilize 1.10.9-r3 x86, #835500
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index 194912140473..f3900c689f26 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-03-22 11:26 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2022-03-22 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 36c9c568992f4f981a82de9b1868bef5b56682c0
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 11:25:30 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 11:25:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36c9c568
dev-java/ant-core: ppc64 stable wrt bug #835500
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index f3900c689f26..6ceeeb9e569f 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-03-22 17:47 Arthur Zamarin
0 siblings, 0 replies; 55+ messages in thread
From: Arthur Zamarin @ 2022-03-22 17:47 UTC (permalink / raw
To: gentoo-commits
commit: 8d405f429ce717a0a0683ba2f43bfd2315b1f1c8
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Mar 22 11:34:36 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 17:47:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d405f42
dev-java/ant-core: Drop 1.10.9
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24707
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9.ebuild | 109 -------------------------------
1 file changed, 109 deletions(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
deleted file mode 100644
index 86eeb87ed9ba..000000000000
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# 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"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${CDEPEND}"
-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 \
- $(use_doc javadocs) || die "build failed"
-}
-
-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/*
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-05-12 18:23 Florian Schmaus
0 siblings, 0 replies; 55+ messages in thread
From: Florian Schmaus @ 2022-05-12 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 91b99620c8467babedf053d46ab92a42352cb4e8
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed May 11 08:05:33 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu May 12 18:23:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b99620
dev-java/ant-core: MAVEN_ID
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25439
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.9-r3.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index 6ceeeb9e569f..f7540588ca05 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -9,6 +9,7 @@ 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
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-05-20 8:45 Florian Schmaus
0 siblings, 0 replies; 55+ messages in thread
From: Florian Schmaus @ 2022-05-20 8:45 UTC (permalink / raw
To: gentoo-commits
commit: c9826d526b71e87c2ec94a7ea7dce4952cd8a79f
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 08:20:06 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri May 20 08:45:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9826d52
dev-java/ant-core: raise minimum Java version to 9
While Ant runs on Java 8, it is hit by API changes of ByteBuffer.flip():
The flip() method returns Buffer in Java 8 and ByteBuffer in Java 9. If
Ant is now emerged and build using Java 8, and then run with Java 9 (or
higher), a NoSuchMethodError is potentially thrown invoking ant:
BUILD FAILED
/var/tmp/portage/net-vpn/i2p-1.6.1/work/i2p-1.6.1/build.xml:1634: java.lang.NoSuchMethodError: java.nio.CharBuffer.flip()Ljava/nio/CharBuffer;
at org.apache.tools.ant.util.ReaderInputStream.<init>(ReaderInputStream.java:81)
at org.apache.tools.ant.util.ReaderInputStream.<init>(ReaderInputStream.java:66)
at org.apache.tools.ant.util.ReaderInputStream.<init>(ReaderInputStream.java:118)
at org.apache.tools.ant.util.ReaderInputStream.<init>(ReaderInputStream.java:93)
at org.apache.tools.ant.taskdefs.Concat$ConcatResource.getInputStream(Concat.java:421)
at org.apache.tools.ant.util.ResourceUtils.copyUsingStreams(ResourceUtils.java:766)
at org.apache.tools.ant.util.ResourceUtils.copyResource(ResourceUtils.java:437)
at org.apache.tools.ant.taskdefs.Concat.execute(Concat.java:802)
at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
at org.apache.tools.ant.Task.perform(Task.java:350)
at org.apache.tools.ant.Target.execute(Target.java:449)
at org.apache.tools.ant.Target.performTasks(Target.java:470)
at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41)
at org.apache.tools.ant.Project.executeTargets(Project.java:1264)
at org.apache.tools.ant.Main.runBuild(Main.java:827)
at org.apache.tools.ant.Main.startAnt(Main.java:223)
at org.apache.tools.ant.launch.Launcher.run(Launcher.java:284)
Raising the minimum required Java version to 9 fixes this.
Closes: https://bugs.gentoo.org/839093
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../ant-core/{ant-core-1.10.9-r3.ebuild => ant-core-1.10.9-r4.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild b/dev-java/ant-core/ant-core-1.10.9-r4.ebuild
similarity index 99%
rename from dev-java/ant-core/ant-core-1.10.9-r3.ebuild
rename to dev-java/ant-core/ant-core-1.10.9-r4.ebuild
index f7540588ca05..9efad621827e 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r4.ebuild
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND=">=virtual/jdk-1.8:*"
+CDEPEND=">=virtual/jdk-1.9:*"
DEPEND="${CDEPEND}
doc? (
dev-java/bcel:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2022-05-21 18:19 Florian Schmaus
0 siblings, 0 replies; 55+ messages in thread
From: Florian Schmaus @ 2022-05-21 18:19 UTC (permalink / raw
To: gentoo-commits
commit: b24498c7e502a18bac9b4f42e94bf479bb96a34c
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 18:17:55 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat May 21 18:17:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b24498c7
dev-java/ant-core: lower min Java to 8 again
Turns out that raising ant-core's min Java requirement to 9, while
fixing bug #831290, renders ant unable to build pure Java 8 packages (of
which we have a few, most prominently jna), see bug #846782.
We go back to Java 8 again, until we find a better solution.
Bug: https://bugs.gentoo.org/846782
Bug: https://bugs.gentoo.org/831290
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../ant-core/{ant-core-1.10.9-r4.ebuild => ant-core-1.10.9-r5.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-core/ant-core-1.10.9-r4.ebuild b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
similarity index 99%
rename from dev-java/ant-core/ant-core-1.10.9-r4.ebuild
rename to dev-java/ant-core/ant-core-1.10.9-r5.ebuild
index 9efad621827e..f7540588ca05 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r4.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r5.ebuild
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND=">=virtual/jdk-1.9:*"
+CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}
doc? (
dev-java/bcel:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2023-12-11 19:21 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2023-12-11 19:21 UTC (permalink / raw
To: gentoo-commits
commit: f08ffdc068486820c01506309d941b9c3d172964
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Dec 11 09:05:11 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 19:21:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f08ffdc0
dev-java/ant-core: add github upstream metadata
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/metadata.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dev-java/ant-core/metadata.xml b/dev-java/ant-core/metadata.xml
index 4221e170cbc0..d0bcffb03628 100644
--- a/dev-java/ant-core/metadata.xml
+++ b/dev-java/ant-core/metadata.xml
@@ -5,4 +5,9 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bz.apache.org/bugzilla/enter_bug.cgi?product=Ant</bugs-to>
+ <doc>https://ant.apache.org/manual/</doc>
+ <remote-id type="github">apache/ant</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2024-01-23 9:42 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2024-01-23 9:42 UTC (permalink / raw
To: gentoo-commits
commit: d3e32af191491a385fea63c285d0eade85d329c1
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Dec 26 10:47:11 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 09:42:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e32af1
dev-java/ant-core: compatibility symlink, add 1.10.14
Some packages still depend on dev-java/ant-core just for getting ant.jar
into their classpath. Starting from version 1.10.14 ant-core is no longer
used as a regular package. Instead, ant.jar is provided by dev-java/ant.
This version of dev-java/ant-core provides only the package.env file to
register the compatibility symlink /usr/share/ant-core/lib/ant.jar which
is provided by dev-java/ant.
Delete this package at the end of transition period after adjusting
JAVA_ANT_E_DEPEND in java-ant-2.eclass when all reverse dependencies
have switched to dev-java/ant.
Bug: https://bugs.gentoo.org/802165
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild b/dev-java/ant-core/ant-core-1.10.14.ebuild
new file mode 100644
index 000000000000..be672e0f7aa2
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="Compatibility link to ant-core for >=dev-java/ant-1.10.14"
+HOMEPAGE="https://ant.apache.org/"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DEPEND="
+ ~dev-java/ant-${PV}:0
+ >=virtual/jdk-1.8:*
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_compile() { :; }
+
+src_install() {
+ java-pkg_regjar /usr/share/ant-core/lib/ant.jar
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2024-01-26 2:09 Ionen Wolkens
0 siblings, 0 replies; 55+ messages in thread
From: Ionen Wolkens @ 2024-01-26 2:09 UTC (permalink / raw
To: gentoo-commits
commit: 22e564d8fa9f4cf34dd9916e365ff8a2a541892d
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Thu Jan 25 16:36:07 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 01:26:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e564d8
dev-java/ant-core: Keyword 1.10.14 ppc64, #922765
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 be672e0f7aa2..6084381556eb 100644
--- a/dev-java/ant-core/ant-core-1.10.14.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
DEPEND="
~dev-java/ant-${PV}:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2024-01-26 2:09 Ionen Wolkens
0 siblings, 0 replies; 55+ messages in thread
From: Ionen Wolkens @ 2024-01-26 2:09 UTC (permalink / raw
To: gentoo-commits
commit: ba021a3e8b9cf2c4825891561ad8a03688df4177
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Thu Jan 25 16:57:21 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 01:26:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba021a3e
dev-java/ant-core: Keyword 1.10.14 x86, #922765
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 6084381556eb..4894ae3382bf 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
DEPEND="
~dev-java/ant-${PV}:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2024-02-25 19:19 Jakov Smolić
0 siblings, 0 replies; 55+ messages in thread
From: Jakov Smolić @ 2024-02-25 19:19 UTC (permalink / raw
To: gentoo-commits
commit: a2a093601f8e2c93b6aab79f196eb7135fd901cd
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 19:19:37 2024 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 19:19:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2a09360
dev-java/ant-core: Stabilize 1.10.14 amd64, #922766
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 4894ae3382bf..06844430df56 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"
DEPEND="
~dev-java/ant-${PV}:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2024-02-25 23:06 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2024-02-25 23:06 UTC (permalink / raw
To: gentoo-commits
commit: fe7e9f0bd18d6cdb26ac0696dec67d7f11cb338c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 23:06:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 23:06:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe7e9f0b
dev-java/ant-core: Stabilize 1.10.14 ppc64, #922766
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 06844430df56..db4cfbb97de3 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"
DEPEND="
~dev-java/ant-${PV}:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2024-03-03 6:11 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2024-03-03 6:11 UTC (permalink / raw
To: gentoo-commits
commit: 7535b6b30406bc7768fc72aa692b5e2d316b1912
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 06:11:16 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 06:11:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7535b6b3
dev-java/ant-core: Stabilize 1.10.14 arm64, #922766
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 db4cfbb97de3..9d093f51c4dd 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"
DEPEND="
~dev-java/ant-${PV}:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2024-03-10 8:53 Arthur Zamarin
0 siblings, 0 replies; 55+ messages in thread
From: Arthur Zamarin @ 2024-03-10 8:53 UTC (permalink / raw
To: gentoo-commits
commit: f428deaf50f0ca67af95432514f23cc032d4f514
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 08:53:11 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 08:53:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f428deaf
dev-java/ant-core: Stabilize 1.10.14 x86, #922766
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 9d093f51c4dd..b26b93661c3c 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"
DEPEND="
~dev-java/ant-${PV}:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2024-03-10 21:10 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2024-03-10 21:10 UTC (permalink / raw
To: gentoo-commits
commit: e3c35c1f7761be2131f1b2fa835bb6bebc9e3282
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Mar 10 09:15:37 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 21:10:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c35c1f
dev-java/ant-core: re-add unstable keywords
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/ant-core-1.10.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
@ 2024-03-10 21:10 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2024-03-10 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 741d4790f8f688a04715b447481adc57c1d888b1
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Feb 26 13:59:33 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 21:10:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741d4790
dev-java/ant-core: drop 1.10.9-r5
Bug: https://bugs.gentoo.org/802165
Closes: https://bugs.gentoo.org/202276
Closes: https://bugs.gentoo.org/850430
Closes: https://bugs.gentoo.org/829815
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-core/Manifest | 2 -
dev-java/ant-core/ant-core-1.10.9-r5.ebuild | 159 ----------------------------
2 files changed, 161 deletions(-)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
deleted file mode 100644
index dccd735d44ed..000000000000
--- a/dev-java/ant-core/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-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
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/*
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
end of thread, other threads:[~2024-03-10 21:10 UTC | newest]
Thread overview: 55+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-26 21:50 [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2017-01-27 9:34 Patrick Lauer
2017-01-30 19:03 Fabian Groffen
2018-02-12 22:18 James Le Cuirot
2019-01-21 10:29 Miroslav Šulc
2019-01-23 8:28 Miroslav Šulc
2019-01-24 22:06 Miroslav Šulc
2019-03-01 1:14 Thomas Deutschmann
2019-03-01 12:46 Mikle Kolyada
2019-03-15 8:21 Mikle Kolyada
2019-03-20 17:27 Miroslav Šulc
2019-04-30 8:40 Michał Górny
2019-10-17 14:02 Miroslav Šulc
2019-11-01 10:31 Miroslav Šulc
2019-11-22 10:24 Agostino Sarubbo
2019-11-23 5:42 Aaron Bauman
2019-11-23 12:43 Agostino Sarubbo
2019-11-23 16:49 Agostino Sarubbo
2019-11-25 13:22 Miroslav Šulc
2019-11-25 13:22 Miroslav Šulc
2020-07-05 11:20 Miroslav Šulc
2020-07-19 13:38 Sam James
2020-07-19 15:18 Sam James
2020-07-19 21:35 Sam James
2020-10-01 18:16 Miroslav Šulc
2020-10-14 18:29 Sam James
2020-10-14 19:08 Agostino Sarubbo
2020-10-14 19:19 Agostino Sarubbo
2020-10-14 19:22 Agostino Sarubbo
2020-10-15 7:42 Miroslav Šulc
2020-12-27 14:07 Fabian Groffen
2022-01-18 9:51 Miroslav Šulc
2022-01-30 9:00 Florian Schmaus
2022-01-30 9:00 Florian Schmaus
2022-02-03 6:56 Florian Schmaus
2022-02-19 9:25 Miroslav Šulc
2022-02-19 9:25 Miroslav Šulc
2022-03-22 8:37 Arthur Zamarin
2022-03-22 9:27 Jakov Smolić
2022-03-22 9:27 Jakov Smolić
2022-03-22 11:26 Agostino Sarubbo
2022-03-22 17:47 Arthur Zamarin
2022-05-12 18:23 Florian Schmaus
2022-05-20 8:45 Florian Schmaus
2022-05-21 18:19 Florian Schmaus
2023-12-11 19:21 Miroslav Šulc
2024-01-23 9:42 Miroslav Šulc
2024-01-26 2:09 Ionen Wolkens
2024-01-26 2:09 Ionen Wolkens
2024-02-25 19:19 Jakov Smolić
2024-02-25 23:06 Sam James
2024-03-03 6:11 Sam James
2024-03-10 8:53 Arthur Zamarin
2024-03-10 21:10 Miroslav Šulc
2024-03-10 21:10 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox