1 |
betelgeuse 07/10/30 01:18:20 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ant-tasks-1.6.5-r4.ebuild |
5 |
Log: |
6 |
Add missing dependency on xml-commons-external and switch to from source sun-jaf. |
7 |
(Portage version: 2.1.3.16) |
8 |
|
9 |
Revision Changes Path |
10 |
1.67 dev-java/ant-tasks/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-tasks/ChangeLog?rev=1.67&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-tasks/ChangeLog?rev=1.67&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-tasks/ChangeLog?r1=1.66&r2=1.67 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v |
19 |
retrieving revision 1.66 |
20 |
retrieving revision 1.67 |
21 |
diff -u -r1.66 -r1.67 |
22 |
--- ChangeLog 12 May 2007 18:21:23 -0000 1.66 |
23 |
+++ ChangeLog 30 Oct 2007 01:18:19 -0000 1.67 |
24 |
@@ -1,6 +1,13 @@ |
25 |
# ChangeLog for dev-java/ant-tasks |
26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.66 2007/05/12 18:21:23 wltjr Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.67 2007/10/30 01:18:19 betelgeuse Exp $ |
29 |
+ |
30 |
+*ant-tasks-1.6.5-r4 (30 Oct 2007) |
31 |
+ |
32 |
+ 30 Oct 2007; Petteri Räty <betelgeuse@g.o> |
33 |
+ +ant-tasks-1.6.5-r4.ebuild: |
34 |
+ Add missing dependency on xml-commons-external and switch to from source |
35 |
+ sun-jaf. |
36 |
|
37 |
12 May 2007; William L. Thomson Jr. <wltjr@g.o> |
38 |
ant-tasks-1.7.0-r2.ebuild: |
39 |
@@ -159,6 +166,8 @@ |
40 |
ant-tasks-1.6.5-r2.ebuild: |
41 |
Replace arch with uname -m for Gentoo/FreeBSD compatibility. See bug #141422. |
42 |
|
43 |
+*ant-tasks-1.6.5-r2 (26 Jun 2006) |
44 |
+ |
45 |
26 Jun 2006; Joshua Nichols <nichoj@g.o> |
46 |
+ant-tasks-1.6.5-r2.ebuild: |
47 |
Revision bump to add support for new Java system. |
48 |
|
49 |
|
50 |
|
51 |
1.1 dev-java/ant-tasks/ant-tasks-1.6.5-r4.ebuild |
52 |
|
53 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r4.ebuild?rev=1.1&view=markup |
54 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r4.ebuild?rev=1.1&content-type=text/plain |
55 |
|
56 |
Index: ant-tasks-1.6.5-r4.ebuild |
57 |
=================================================================== |
58 |
# Copyright 1999-2007 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r4.ebuild,v 1.1 2007/10/30 01:18:19 betelgeuse Exp $ |
61 |
|
62 |
inherit java-pkg-2 eutils |
63 |
|
64 |
MY_PV=${PV/_/} |
65 |
MY_P=${PN}-${MY_PV} |
66 |
|
67 |
DESCRIPTION="Apache ANT Optional Tasks Jar Files" |
68 |
HOMEPAGE="http://ant.apache.org/" |
69 |
SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2" |
70 |
|
71 |
LICENSE="Apache-2.0" |
72 |
SLOT="0" |
73 |
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
74 |
IUSE="javamail noantlr nobcel nobeanutils nobsh nobsf nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces" |
75 |
|
76 |
CDEPEND="=dev-java/ant-core-${PV}* |
77 |
>=dev-java/junit-3.8 |
78 |
!nolog4j? ( >=dev-java/log4j-1.2.8 ) |
79 |
!noxerces? ( >=dev-java/xerces-2.7.1 =dev-java/xml-commons-external-1.3* ) |
80 |
!noxalan? ( >=dev-java/xalan-2.5.2 ) |
81 |
!nobsh? ( >=dev-java/bsh-1.2-r7 ) |
82 |
!nobsf? ( >=dev-java/bsf-2.3.0-r2 ) |
83 |
!noantlr? ( >=dev-java/antlr-2.7.2 ) |
84 |
!nobeanutils? ( =dev-java/commons-beanutils-1.6* ) |
85 |
!nocommonslogging? ( >=dev-java/commons-logging-1.0.3 ) |
86 |
!nocommonsnet? ( >=dev-java/commons-net-1.1.0 ) |
87 |
!nobcel? ( >=dev-java/bcel-5.1 ) |
88 |
!nooro? ( >=dev-java/jakarta-oro-2.0.8-r1 ) |
89 |
!norhino? ( =dev-java/rhino-1.5* ) |
90 |
!nojdepend? ( >=dev-java/jdepend-2.6 ) |
91 |
!nojsch? ( >=dev-java/jsch-0.1.12 ) |
92 |
!noregexp? ( =dev-java/jakarta-regexp-1.3* ) |
93 |
!nojython? ( >=dev-java/jython-2.1-r5 ) |
94 |
javamail? ( dev-java/sun-javamail dev-java/sun-jaf )" |
95 |
RDEPEND=">=virtual/jre-1.4 |
96 |
${CDEPEND}" |
97 |
DEPEND=">=virtual/jdk-1.4 |
98 |
>=dev-java/java-config-1.2 |
99 |
!dev-java/ant-optional |
100 |
${CDEPEND}" |
101 |
|
102 |
S="${WORKDIR}/apache-ant-${MY_PV}" |
103 |
|
104 |
src_unpack() { |
105 |
unpack ${A} |
106 |
cd "${S}" |
107 |
rm -v lib/*.jar |
108 |
} |
109 |
|
110 |
src_compile() { |
111 |
addwrite "/proc/self/maps" |
112 |
if [[ $(uname -m) == "ppc" ]] ; then |
113 |
# We're compiling _ON_ PPC |
114 |
export THREADS_FLAG="green" |
115 |
fi |
116 |
|
117 |
local p="ant-core,junit" libs |
118 |
use noantlr || p="${p},antlr" |
119 |
use nobcel || p="${p},bcel" |
120 |
use nobeanutils || p="${p},commons-beanutils-1.6" |
121 |
use nobsh || p="${p},bsh" |
122 |
use nobsf || p="${p},bsf-2.3" |
123 |
use nocommonslogging || p="${p},commons-logging" |
124 |
use nocommonsnet || p="${p},commons-net" |
125 |
use nojdepend || p="${p},jdepend" |
126 |
use nojsch || p="${p},jsch" |
127 |
use nojython || p="${p},jython" |
128 |
use nolog4j || p="${p},log4j" |
129 |
use nooro || p="${p},jakarta-oro-2.0" |
130 |
use noregexp || p="${p},jakarta-regexp-1.3" |
131 |
use norhino || p="${p},rhino-1.5" |
132 |
use noxalan || p="${p},xalan" |
133 |
use noxerces || p="${p},xml-commons-external-1.3,xerces-2" |
134 |
|
135 |
use javamail && p="${p},sun-javamail,sun-jaf" |
136 |
|
137 |
CLASSPATH="${JAVA_HOME}/lib/tools.jar:.:$(java-pkg_getjars ant-core,${p})" \ |
138 |
java org.apache.tools.ant.launch.Launcher -Dant.install=${ANT_HOME} \ |
139 |
|| die "Build failed." |
140 |
} |
141 |
|
142 |
src_install() { |
143 |
dodir /usr/share/ant-core/lib |
144 |
for jar in build/lib/ant-*.jar; do |
145 |
[[ "$(basename ${jar})" == "ant-launcher.jar" ]] && continue |
146 |
java-pkg_dojar ${jar} |
147 |
dosym /usr/share/${PN}/lib/$(basename ${jar}) /usr/share/ant-core/lib/ |
148 |
done |
149 |
} |
150 |
|
151 |
pkg_postinst() { |
152 |
local noset=false |
153 |
for x in ${IUSE} ; do |
154 |
if [ "${x:0:2}" == "no" ] ; then |
155 |
use ${x} && noset=true |
156 |
fi |
157 |
done |
158 |
if [ ${noset} == "true" ]; then |
159 |
ewarn "You have disabled some of the ant tasks. Be advised that this may" |
160 |
ewarn "break building some of the Java packages!!" |
161 |
ewarn "" |
162 |
ewarn "We can only offer very limited support in cases where dev-java/ant-tasks" |
163 |
ewarn "has been build with essential features disabled." |
164 |
fi |
165 |
} |
166 |
|
167 |
|
168 |
|
169 |
-- |
170 |
gentoo-commits@g.o mailing list |