1 |
sera 12/05/30 08:18:07 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ant-core-1.8.4.ebuild |
5 |
Log: |
6 |
-p |
7 |
|
8 |
(Portage version: 2.1.10.62/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.116 dev-java/ant-core/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ant-core/ChangeLog?rev=1.116&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ant-core/ChangeLog?rev=1.116&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ant-core/ChangeLog?r1=1.115&r2=1.116 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v |
20 |
retrieving revision 1.115 |
21 |
retrieving revision 1.116 |
22 |
diff -u -r1.115 -r1.116 |
23 |
--- ChangeLog 25 May 2012 11:20:50 -0000 1.115 |
24 |
+++ ChangeLog 30 May 2012 08:18:06 -0000 1.116 |
25 |
@@ -1,11 +1,16 @@ |
26 |
# ChangeLog for dev-java/ant-core |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.115 2012/05/25 11:20:50 ago Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.116 2012/05/30 08:18:06 sera Exp $ |
30 |
|
31 |
# Ant-core blocks lower/older versions of ant-tasks, |
32 |
# since it will not run when there is a version mismatch betwean the 2 packages |
33 |
# Please unemerge ant-tasks when updating ant-core. |
34 |
|
35 |
+*ant-core-1.8.4 (30 May 2012) |
36 |
+ |
37 |
+ 30 May 2012; Ralph Sennhauser <sera@g.o> +ant-core-1.8.4.ebuild: |
38 |
+ Security bump. CVE-2012-2098 #417909 |
39 |
+ |
40 |
25 May 2012; Agostino Sarubbo <ago@g.o> ant-core-1.8.2.ebuild: |
41 |
Stable for amd64, wrt bug #417403 |
42 |
|
43 |
|
44 |
|
45 |
|
46 |
1.1 dev-java/ant-core/ant-core-1.8.4.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ant-core/ant-core-1.8.4.ebuild?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/ant-core/ant-core-1.8.4.ebuild?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: ant-core-1.8.4.ebuild |
52 |
=================================================================== |
53 |
# Copyright 1999-2012 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.8.4.ebuild,v 1.1 2012/05/30 08:18:06 sera Exp $ |
56 |
|
57 |
EAPI="4" |
58 |
|
59 |
# don't depend on itself |
60 |
JAVA_ANT_DISABLE_ANT_CORE_DEP=true |
61 |
# rewriting build.xml files for the testcases has no reason atm |
62 |
JAVA_PKG_BSFIX_ALL=no |
63 |
JAVA_PKG_IUSE="doc source" |
64 |
inherit eutils java-pkg-2 java-ant-2 prefix versionator |
65 |
|
66 |
MY_P="apache-ant-${PV}" |
67 |
|
68 |
DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files." |
69 |
HOMEPAGE="http://ant.apache.org/" |
70 |
SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2 |
71 |
http://dev.gentoo.org/~sera/distfiles/ant-${PV}-gentoo.tar.bz2" |
72 |
|
73 |
LICENSE="Apache-2.0" |
74 |
SLOT="0" |
75 |
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~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" |
76 |
IUSE="" |
77 |
|
78 |
DEPEND=">=virtual/jdk-1.4 |
79 |
!dev-java/ant-tasks |
80 |
!dev-java/ant-optional" |
81 |
RDEPEND="${DEPEND}" |
82 |
|
83 |
S="${WORKDIR}/${MY_P}" |
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 |
# bug #196080 |
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 |
105 |
# but jikes in kaffe has issues with this... |
106 |
if ! java-pkg_current-vm-matches kaffe; then |
107 |
bsyscp="-Dbuild.sysclasspath=ignore" |
108 |
fi |
109 |
|
110 |
CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars-core internal_dist \ |
111 |
$(use_doc javadocs) || die "build failed" |
112 |
} |
113 |
|
114 |
src_install() { |
115 |
dodir /usr/share/ant/lib |
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" || die "failed to install wrapper" |
122 |
dodir /usr/share/${PN}/bin |
123 |
for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do |
124 |
dobin "${S}/src/script/${each}" |
125 |
dosym /usr/bin/${each} /usr/share/${PN}/bin/${each} |
126 |
done |
127 |
dosym /usr/share/${PN}/bin /usr/share/ant/bin |
128 |
|
129 |
insinto /usr/share/${PN} |
130 |
doins -r dist/etc |
131 |
dosym /usr/share/${PN}/etc /usr/share/ant/etc |
132 |
|
133 |
echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant" |
134 |
doenvd "${T}/20ant" || die "failed to install env.d file" |
135 |
|
136 |
dodoc NOTICE README WHATSNEW KEYS || die |
137 |
|
138 |
if use doc; then |
139 |
dohtml -r docs/* |
140 |
java-pkg_dojavadoc --symlink manual/api build/javadocs |
141 |
fi |
142 |
|
143 |
use source && java-pkg_dosrc src/main/* |
144 |
} |
145 |
|
146 |
pkg_postinst() { |
147 |
if [[ -n ${REPLACING_VERSIONS} ]]; then |
148 |
if ! version_is_at_least 1.7.0 ${REPLACING_VERSIONS}; then |
149 |
elog "The way of packaging ant in Gentoo has changed significantly since" |
150 |
elog "the 1.7.0 version, For more information, please see:" |
151 |
elog "http://www.gentoo.org/proj/en/java/ant-guide.xml" |
152 |
fi |
153 |
|
154 |
if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; then |
155 |
elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE" |
156 |
elog "flags have been moved to dev-java/ant." |
157 |
fi |
158 |
fi |
159 |
} |