Gentoo Archives: gentoo-commits

From: "Tom Wijsman (tomwij)" <tomwij@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/ant-core: ant-core-1.9.2.ebuild ChangeLog
Date: Wed, 28 Aug 2013 22:13:15
Message-Id: 20130828221309.444D22004C@flycatcher.gentoo.org
1 tomwij 13/08/28 22:13:09
2
3 Modified: ChangeLog
4 Added: ant-core-1.9.2.ebuild
5 Log:
6 Version bump to 1.9.2. Fixes security bug #476958.
7
8 (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
9
10 Revision Changes Path
11 1.127 dev-java/ant-core/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ant-core/ChangeLog?rev=1.127&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ant-core/ChangeLog?rev=1.127&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ant-core/ChangeLog?r1=1.126&r2=1.127
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v
20 retrieving revision 1.126
21 retrieving revision 1.127
22 diff -u -r1.126 -r1.127
23 --- ChangeLog 5 Jul 2013 11:02:05 -0000 1.126
24 +++ ChangeLog 28 Aug 2013 22:13:09 -0000 1.127
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-java/ant-core
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.126 2013/07/05 11:02:05 tomwij Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.127 2013/08/28 22:13:09 tomwij Exp $
30 +
31 +*ant-core-1.9.2 (28 Aug 2013)
32 +
33 + 28 Aug 2013; Tom Wijsman <TomWij@g.o> +ant-core-1.9.2.ebuild:
34 + Version bump to 1.9.2. Fixes security bug #476958.
35
36 *ant-core-1.9.1 (05 Jul 2013)
37
38
39
40
41 1.1 dev-java/ant-core/ant-core-1.9.2.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ant-core/ant-core-1.9.2.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ant-core/ant-core-1.9.2.ebuild?rev=1.1&content-type=text/plain
45
46 Index: ant-core-1.9.2.ebuild
47 ===================================================================
48 # Copyright 1999-2013 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.9.2.ebuild,v 1.1 2013/08/28 22:13:09 tomwij Exp $
51
52 EAPI="5"
53
54 # Don't depend on itself.
55 JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
56
57 # Rewriting build.xml files for the testcases has no use at the moment.
58 JAVA_PKG_BSFIX_ALL="no"
59 JAVA_PKG_IUSE="doc source"
60
61 inherit eutils java-pkg-2 java-ant-2 prefix versionator
62
63 MY_P="apache-ant-${PV}"
64
65 DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
66 HOMEPAGE="http://ant.apache.org/"
67 SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
68 http://dev.gentoo.org/~tomwij/files/dist/ant-${PV}-gentoo.tar.bz2"
69
70 LICENSE="Apache-2.0"
71 SLOT="0"
72 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd \
73 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos \
74 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
75
76 DEPEND=">=virtual/jdk-1.5
77 !dev-java/ant-tasks
78 !dev-java/ant-optional"
79 RDEPEND="${DEPEND}"
80
81 S="${WORKDIR}/${MY_P}"
82
83 RESTRICT="test"
84
85 src_prepare() {
86 EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/"
87 eprefixify "${WORKDIR}/ant"
88
89 # use our split-ant build.xml.
90 mv -f "${WORKDIR}/build.xml" . || die
91
92 # See bug #196080 for more details.
93 java-ant_bsfix_one build.xml
94 java-pkg-2_src_prepare
95 }
96
97 src_compile() {
98 export ANT_HOME=""
99
100 local bsyscp
101
102 # This ensures that when building ant with bootstrapped ant,
103 # only the source is used for resolving references, and not
104 # the classes in bootstrapped ant but jikes in kaffe has issues with this...
105 if ! java-pkg_current-vm-matches kaffe; then
106 bsyscp="-Dbuild.sysclasspath=ignore"
107 fi
108
109 CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars internal_dist \
110 $(use_doc javadocs) || die "build failed"
111 }
112
113 src_install() {
114 dodir /usr/share/ant/lib
115
116 for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
117 java-pkg_dojar build/lib/${jar}
118 dosym /usr/share/${PN}/lib/${jar} /usr/share/ant/lib/${jar}
119 done
120
121 dobin "${WORKDIR}/ant"
122
123 dodir /usr/share/${PN}/bin
124 for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
125 dobin "${S}/src/script/${each}"
126 dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
127 done
128 dosym /usr/share/${PN}/bin /usr/share/ant/bin
129
130 insinto /usr/share/${PN}
131 doins -r dist/etc
132 dosym /usr/share/${PN}/etc /usr/share/ant/etc
133
134 echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
135 doenvd "${T}/20ant"
136
137 dodoc NOTICE README WHATSNEW KEYS
138
139 if use doc; then
140 dohtml -r manual/*
141 java-pkg_dojavadoc --symlink manual/api build/javadocs
142 fi
143
144 use source && java-pkg_dosrc src/main/*
145 }
146
147 pkg_postinst() {
148 if [[ -n ${REPLACING_VERSIONS} ]]; then
149 if ! version_is_at_least 1.7.0 ${REPLACING_VERSIONS}; then
150 elog "The way of packaging ant in Gentoo has changed significantly since"
151 elog "the 1.7.0 version, For more information, please see:"
152 elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
153 fi
154
155 if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; then
156 elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
157 elog "flags have been moved to dev-java/ant."
158 fi
159 fi
160 }