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