Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-core/
Date: Wed, 23 Jan 2019 08:28:44
Message-Id: 1548232091.0dfa7b9c9ca5d0d34e102fcdba48d6b2148227e3.fordfrog@gentoo
1 commit: 0dfa7b9c9ca5d0d34e102fcdba48d6b2148227e3
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 22 15:41:10 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 23 08:28:11 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dfa7b9c
7
8 dev-java/ant-core-1.10.5: bump (bug #571110)
9
10 Package-Manager: Portage-2.3.57, Repoman-2.3.12
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 dev-java/ant-core/Manifest | 2 +
14 dev-java/ant-core/ant-core-1.10.5.ebuild | 115 +++++++++++++++++++++++++++++++
15 2 files changed, 117 insertions(+)
16
17 diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
18 index 407511ed5b5..213bb1a3086 100644
19 --- a/dev-java/ant-core/Manifest
20 +++ b/dev-java/ant-core/Manifest
21 @@ -1,4 +1,6 @@
22 +DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
23 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
24 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
25 +DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
26 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
27 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
28
29 diff --git a/dev-java/ant-core/ant-core-1.10.5.ebuild b/dev-java/ant-core/ant-core-1.10.5.ebuild
30 new file mode 100644
31 index 00000000000..55b6cd4246f
32 --- /dev/null
33 +++ b/dev-java/ant-core/ant-core-1.10.5.ebuild
34 @@ -0,0 +1,115 @@
35 +# Copyright 1999-2019 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=6
39 +
40 +# Don't depend on itself.
41 +JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
42 +
43 +# Rewriting build.xml files for the testcases has no use at the moment.
44 +JAVA_PKG_BSFIX_ALL="no"
45 +JAVA_PKG_IUSE="doc source"
46 +
47 +inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver
48 +
49 +MY_P="apache-ant-${PV}"
50 +
51 +DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
52 +HOMEPAGE="https://ant.apache.org/"
53 +SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
54 + https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2"
55 +
56 +LICENSE="Apache-2.0"
57 +SLOT="0"
58 +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"
59 +
60 +DEPEND=">=virtual/jdk-1.8:*
61 + !dev-java/ant-tasks
62 + !dev-java/ant-optional"
63 +RDEPEND="${DEPEND}"
64 +
65 +S="${WORKDIR}/${MY_P}"
66 +
67 +RESTRICT="test"
68 +
69 +src_prepare() {
70 + epatch "${WORKDIR}/${PV}-build.patch"
71 + epatch "${WORKDIR}/${PV}-launch.patch"
72 +
73 + eprefixify "${S}/src/script/ant"
74 +
75 + # Fixes bug 556008.
76 + java-ant_xml-rewrite -f build.xml \
77 + -c -e javadoc \
78 + -a failonerror \
79 + -v "false"
80 +
81 + # See bug #196080 for more details.
82 + java-ant_bsfix_one build.xml
83 + java-pkg-2_src_prepare
84 +}
85 +
86 +src_compile() {
87 + export ANT_HOME=""
88 +
89 + local bsyscp
90 +
91 + # This ensures that when building ant with bootstrapped ant,
92 + # only the source is used for resolving references, and not
93 + # the classes in bootstrapped ant but jikes in kaffe has issues with this...
94 + if ! java-pkg_current-vm-matches kaffe; then
95 + bsyscp="-Dbuild.sysclasspath=ignore"
96 + fi
97 +
98 + CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \
99 + $(use_doc javadocs) || die "build failed"
100 +}
101 +
102 +src_install() {
103 + dodir /usr/share/ant/lib
104 +
105 + for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
106 + java-pkg_dojar build/lib/${jar}
107 + dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
108 + done
109 +
110 + dobin src/script/ant
111 +
112 + dodir /usr/share/${PN}/bin
113 + for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
114 + dobin "${S}/src/script/${each}"
115 + dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
116 + done
117 + dosym ../${PN}/bin /usr/share/ant/bin
118 +
119 + insinto /usr/share/${PN}
120 + doins -r dist/etc
121 + dosym ../${PN}/etc /usr/share/ant/etc
122 +
123 + echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
124 + doenvd "${T}/20ant"
125 +
126 + dodoc NOTICE README WHATSNEW KEYS
127 +
128 + if use doc; then
129 + dohtml -r manual/*
130 + java-pkg_dojavadoc --symlink manual/api build/javadocs
131 + fi
132 +
133 + use source && java-pkg_dosrc src/main/*
134 +}
135 +
136 +pkg_postinst() {
137 + if [[ -n ${REPLACING_VERSIONS} ]]; then
138 + if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then
139 + elog "The way of packaging ant in Gentoo has changed significantly since"
140 + elog "the 1.7.0 version, For more information, please see:"
141 + elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
142 + fi
143 +
144 + if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then
145 + elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
146 + elog "flags have been moved to dev-java/ant."
147 + fi
148 + fi
149 +}