1 |
betelgeuse 08/06/16 18:59:17 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ant-core-1.7.0-r2.ebuild |
5 |
Log: |
6 |
Revision bump with patch for upstream bug with the jar task. Fixes bug #227465. |
7 |
(Portage version: 2.1.5.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.81 dev-java/ant-core/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-core/ChangeLog?rev=1.81&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-core/ChangeLog?rev=1.81&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-core/ChangeLog?r1=1.80&r2=1.81 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v |
19 |
retrieving revision 1.80 |
20 |
retrieving revision 1.81 |
21 |
diff -u -r1.80 -r1.81 |
22 |
--- ChangeLog 12 Apr 2008 10:28:19 -0000 1.80 |
23 |
+++ ChangeLog 16 Jun 2008 18:59:17 -0000 1.81 |
24 |
@@ -1,11 +1,17 @@ |
25 |
# ChangeLog for dev-java/ant-core |
26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.80 2008/04/12 10:28:19 nixnut Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.81 2008/06/16 18:59:17 betelgeuse Exp $ |
29 |
|
30 |
# Ant-core blocks lower/older versions of ant-tasks, |
31 |
# since it will not run when there is a version mismatch betwean the 2 packages |
32 |
# Please unemerge ant-tasks when updating ant-core. |
33 |
|
34 |
+*ant-core-1.7.0-r2 (16 Jun 2008) |
35 |
+ |
36 |
+ 16 Jun 2008; Petteri Räty <betelgeuse@g.o> |
37 |
+ +files/ant-core-1.7.0-services.patch, +ant-core-1.7.0-r2.ebuild: |
38 |
+ Revision bump with patch for upstream bug with the jar task. Fixes bug #227465. |
39 |
+ |
40 |
12 Apr 2008; nixnut <nixnut@g.o> ant-core-1.7.0-r1.ebuild: |
41 |
Stable on ppc wrt bug 216258 |
42 |
|
43 |
|
44 |
|
45 |
|
46 |
1.1 dev-java/ant-core/ant-core-1.7.0-r2.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-core/ant-core-1.7.0-r2.ebuild?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-core/ant-core-1.7.0-r2.ebuild?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: ant-core-1.7.0-r2.ebuild |
52 |
=================================================================== |
53 |
# Copyright 1999-2008 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.7.0-r2.ebuild,v 1.1 2008/06/16 18:59:17 betelgeuse Exp $ |
56 |
|
57 |
# don't depend on itself |
58 |
JAVA_ANT_DISABLE_ANT_CORE_DEP=true |
59 |
# rewriting build.xml files for the testcases has no reason atm |
60 |
JAVA_PKG_BSFIX_ALL=no |
61 |
inherit java-pkg-2 java-ant-2 |
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 |
mirror://gentoo/ant-${PV}-gentoo.tar.bz2" |
69 |
|
70 |
LICENSE="Apache-2.0" |
71 |
SLOT="0" |
72 |
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
73 |
IUSE="doc source" |
74 |
|
75 |
# 1.7.0 instead of $PV in blocks is intentional, >1.7.0 upgrades should |
76 |
# be block free (but these fixed blocks should stay there for users upgrading |
77 |
# from <1.7.0 of course) |
78 |
RDEPEND=">=virtual/jdk-1.4 |
79 |
!<dev-java/ant-tasks-1.7.0 |
80 |
!<dev-java/ant-1.7.0 |
81 |
!dev-java/ant-optional" |
82 |
DEPEND="${RDEPEND} |
83 |
source? ( app-arch/zip )" |
84 |
|
85 |
S="${WORKDIR}/${MY_P}" |
86 |
|
87 |
src_unpack() { |
88 |
unpack ${A} |
89 |
cd "${S}" |
90 |
epatch "${FILESDIR}/ant-core-1.7.0-services.patch" |
91 |
|
92 |
# remove bundled xerces |
93 |
rm -v lib/*.jar |
94 |
|
95 |
# use our split-ant build.xml |
96 |
mv -f "${WORKDIR}/build.xml" . |
97 |
} |
98 |
|
99 |
src_compile() { |
100 |
export ANT_HOME="" |
101 |
|
102 |
local bsyscp |
103 |
|
104 |
# this ensures that when building ant with bootstrapped ant, |
105 |
# only the source is used for resolving references, and not |
106 |
# the classes in bootstrapped ant |
107 |
# but jikes in kaffe has issues with this... |
108 |
if ! java-pkg_current-vm-matches kaffe; then |
109 |
bsyscp="-Dbuild.sysclasspath=ignore" |
110 |
fi |
111 |
|
112 |
./build.sh ${bsyscp} jars-core $(use_doc javadocs) \ |
113 |
|| die "build failed" |
114 |
} |
115 |
|
116 |
src_install() { |
117 |
newbin "${FILESDIR}/${PV}-ant" ant || die "failed to install wrapper" |
118 |
|
119 |
dodir /usr/share/${PN}/bin |
120 |
for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do |
121 |
dobin "${S}/src/script/${each}" |
122 |
dosym /usr/bin/${each} /usr/share/${PN}/bin/${each} |
123 |
done |
124 |
|
125 |
echo "ANT_HOME=\"/usr/share/${PN}\"" > "${T}/20ant" |
126 |
doenvd "${T}/20ant" || die "failed to install env.d file" |
127 |
|
128 |
java-pkg_dojar build/lib/ant.jar |
129 |
java-pkg_dojar build/lib/ant-bootstrap.jar |
130 |
java-pkg_dojar build/lib/ant-launcher.jar |
131 |
|
132 |
use source && java-pkg_dosrc src/main/* |
133 |
|
134 |
dodoc README WHATSNEW KEYS |
135 |
|
136 |
if use doc; then |
137 |
dohtml welcome.html |
138 |
dohtml -r docs/* |
139 |
java-pkg_dojavadoc --symlink manual/api build/javadocs |
140 |
fi |
141 |
} |
142 |
|
143 |
pkg_postinst() { |
144 |
elog "The way of packaging ant in Gentoo has changed significantly since" |
145 |
elog "the 1.7.0 version, For more information, please see:" |
146 |
elog "http://www.gentoo.org/proj/en/java/ant-guide.xml" |
147 |
} |
148 |
|
149 |
|
150 |
|
151 |
-- |
152 |
gentoo-commits@l.g.o mailing list |