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, 20 Mar 2019 17:28:12
Message-Id: 1553102863.4e697300bfda1a8f43cd0f16c49c829285e03fea.fordfrog@gentoo
1 commit: 4e697300bfda1a8f43cd0f16c49c829285e03fea
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 20 17:15:28 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 20 17:27:43 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e697300
7
8 dev-java/ant-core-1.9.2: removed obsolete
9
10 Package-Manager: Portage-2.3.62, 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.2.ebuild | 116 --------------------------------
15 2 files changed, 118 deletions(-)
16
17 diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
18 index b5117327cb0..20081eaa123 100644
19 --- a/dev-java/ant-core/Manifest
20 +++ b/dev-java/ant-core/Manifest
21 @@ -1,6 +1,4 @@
22 DIST ant-1.10.5-r1-gentoo.tar.bz2 6400 BLAKE2B 349a45ee678217ee31ae2f6e982ceec2d31138dcb58e614f496125d7d9bc01a0fa3630be069fbf0d131f4006cb7912597c31392bc82ab7f9b0a1189bbe9a763e SHA512 adf544c151f46df8a7fb7f7d33450f9a2390f568dd4c7b1c0e8850b1a155ea0ddc1f834d869d657806570d59af2d194cb443ddfc653627967246f3b38e264b12
23 DIST ant-1.9.13-r1-gentoo.tar.bz2 7208 BLAKE2B 6f041a69f5f8e38e95b26030cf4d730ed22b071ad1d6e87ab1fb2707e2b40c7e23e1c8f7759d6904ad2b25793a7d9b2ead1c2649b6b029296cd9d05bec4ea296 SHA512 5b105ea00fbc7d6f63c0016b288f5e46a81b89cc46015e2ffcb2a4d41f915331ac8f8183752fea547396f204748132f6ce7aa7b3e6f6181c4983b4eb7ee84d54
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.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
30 deleted file mode 100644
31 index 1f5fc1092c4..00000000000
32 --- a/dev-java/ant-core/ant-core-1.9.2.ebuild
33 +++ /dev/null
34 @@ -1,116 +0,0 @@
35 -# Copyright 1999-2018 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI="5"
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 versionator
48 -
49 -MY_P="apache-ant-${PV}"
50 -
51 -DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
52 -HOMEPAGE="http://ant.apache.org/"
53 -SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
54 - https://dev.gentoo.org/~tomwij/files/dist/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.5 dev-java/gcj-jdk )
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_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/"
71 - eprefixify "${WORKDIR}/ant"
72 -
73 - # use our split-ant build.xml.
74 - mv -f "${WORKDIR}/build.xml" . || die
75 -
76 - # Fixes bug 556008.
77 - java-ant_xml-rewrite -f build.xml \
78 - -c -e javadoc \
79 - -a failonerror \
80 - -v "false"
81 -
82 - # See bug #196080 for more details.
83 - java-ant_bsfix_one build.xml
84 - java-pkg-2_src_prepare
85 -}
86 -
87 -src_compile() {
88 - export ANT_HOME=""
89 -
90 - local bsyscp
91 -
92 - # This ensures that when building ant with bootstrapped ant,
93 - # only the source is used for resolving references, and not
94 - # the classes in bootstrapped ant but jikes in kaffe has issues with this...
95 - if ! java-pkg_current-vm-matches kaffe; then
96 - bsyscp="-Dbuild.sysclasspath=ignore"
97 - fi
98 -
99 - CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars internal_dist \
100 - $(use_doc javadocs) || die "build failed"
101 -}
102 -
103 -src_install() {
104 - dodir /usr/share/ant/lib
105 -
106 - for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
107 - java-pkg_dojar build/lib/${jar}
108 - dosym /usr/share/${PN}/lib/${jar} /usr/share/ant/lib/${jar}
109 - done
110 -
111 - dobin "${WORKDIR}/ant"
112 -
113 - dodir /usr/share/${PN}/bin
114 - for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
115 - dobin "${S}/src/script/${each}"
116 - dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
117 - done
118 - dosym /usr/share/${PN}/bin /usr/share/ant/bin
119 -
120 - insinto /usr/share/${PN}
121 - doins -r dist/etc
122 - dosym /usr/share/${PN}/etc /usr/share/ant/etc
123 -
124 - echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
125 - doenvd "${T}/20ant"
126 -
127 - dodoc NOTICE README WHATSNEW KEYS
128 -
129 - if use doc; then
130 - dohtml -r manual/*
131 - java-pkg_dojavadoc --symlink manual/api build/javadocs
132 - fi
133 -
134 - use source && java-pkg_dosrc src/main/*
135 -}
136 -
137 -pkg_postinst() {
138 - if [[ -n ${REPLACING_VERSIONS} ]]; then
139 - if ! version_is_at_least 1.7.0 ${REPLACING_VERSIONS}; then
140 - elog "The way of packaging ant in Gentoo has changed significantly since"
141 - elog "the 1.7.0 version, For more information, please see:"
142 - elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
143 - fi
144 -
145 - if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; then
146 - elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
147 - elog "flags have been moved to dev-java/ant."
148 - fi
149 - fi
150 -}