Gentoo Archives: gentoo-commits

From: "Miroslav Sulc (fordfrog)" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/log4j: log4j-1.2.16.ebuild ChangeLog
Date: Sat, 29 Jan 2011 10:22:11
Message-Id: 20110129102153.C838020054@flycatcher.gentoo.org
1 fordfrog 11/01/29 10:21:53
2
3 Modified: ChangeLog
4 Added: log4j-1.2.16.ebuild
5 Log:
6 dev-java/log4j: version bump
7
8 (Portage version: 2.1.9.35/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.83 dev-java/log4j/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/log4j/ChangeLog?rev=1.83&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/log4j/ChangeLog?rev=1.83&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/log4j/ChangeLog?r1=1.82&r2=1.83
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v
20 retrieving revision 1.82
21 retrieving revision 1.83
22 diff -u -r1.82 -r1.83
23 --- ChangeLog 20 Mar 2010 14:12:55 -0000 1.82
24 +++ ChangeLog 29 Jan 2011 10:21:53 -0000 1.83
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-java/log4j
27 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.82 2010/03/20 14:12:55 betelgeuse Exp $
29 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.83 2011/01/29 10:21:53 fordfrog Exp $
31 +
32 +*log4j-1.2.16 (29 Jan 2011)
33 +
34 + 29 Jan 2011; Miroslav Šulc <fordfrog@g.o> +log4j-1.2.16.ebuild:
35 + Version bump
36
37 20 Mar 2010; Petteri Räty <betelgeuse@g.o>
38 -log4j-1.2.14-r1.ebuild, -log4j-1.2.15-r1.ebuild:
39
40
41
42 1.1 dev-java/log4j/log4j-1.2.16.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/log4j/log4j-1.2.16.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/log4j/log4j-1.2.16.ebuild?rev=1.1&content-type=text/plain
46
47 Index: log4j-1.2.16.ebuild
48 ===================================================================
49 # Copyright 1999-2011 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.16.ebuild,v 1.1 2011/01/29 10:21:53 fordfrog Exp $
52
53 EAPI=2
54 JAVA_PKG_IUSE="doc javamail jms jmx source"
55
56 inherit java-pkg-2 java-ant-2
57
58 MY_P="apache-${P}"
59 DESCRIPTION="A low-overhead robust logging package for Java"
60 SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
61 HOMEPAGE="http://logging.apache.org/log4j/"
62 LICENSE="Apache-2.0"
63 SLOT="0"
64 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
65 # jikes support disabled: bug #108819
66 IUSE="doc javamail jms jmx source"
67
68 CDEPEND="javamail? ( java-virtuals/javamail java-virtuals/jaf )
69 jmx? ( dev-java/sun-jmx:0 )
70 jms? ( java-virtuals/jms )"
71
72 RDEPEND=">=virtual/jre-1.4
73 ${CDEPEND}"
74
75 DEPEND=">=virtual/jdk-1.4
76 ${CDEPEND}"
77
78 S="${WORKDIR}/${MY_P}"
79
80 java_prepare() {
81 rm -rf dist/
82 java-pkg_filter-compiler jikes
83 rm -v *.jar || die
84 }
85
86 JAVA_ANT_REWRITE_CLASSPATH="true"
87 JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
88 EANT_BUILD_TARGET="log4j.jar"
89 EANT_EXTRA_ARGS="-Djaxp-present=true"
90 EANT_DOC_TARGET=""
91
92 src_compile() {
93 if use javamail; then
94 EANT_GENTOO_CLASSPATH+="javamail,jaf"
95 EANT_EXTRA_ARGS+=" -Djavamail-present=true"
96 fi
97 if use jmx; then
98 use javamail && EANT_GENTOO_CLASSPATH+=","
99 EANT_GENTOO_CLASSPATH+="sun-jmx"
100 EANT_EXTRA_ARGS+=" -Djmx-present=true"
101 fi
102 if use jms; then
103 EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
104 fi
105 java-pkg-2_src_compile
106 }
107
108 src_install() {
109 # the build still builds files with older version in name
110 java-pkg_newjar dist/lib/${PN}-1.2.15.jar ${PN}.jar
111
112 if use doc ; then
113 java-pkg_dohtml -r site/*
114 rm -fr "${D}/usr/share/doc/${PF}/html/apidocs"
115 java-pkg_dojavadoc --symlink apidocs site/apidocs
116 fi
117 use source && java-pkg_dosrc src/main/java/*
118 }