Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@××××××××××××××.uk>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java:master commit in: dev-java/log4j-api/
Date: Fri, 06 Mar 2015 23:38:05
Message-Id: 1425684852.c8f323c7b01f0ce95570f38cc00e11e1a87b2b51.chewi@gentoo
1 commit: c8f323c7b01f0ce95570f38cc00e11e1a87b2b51
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 6 23:34:12 2015 +0000
4 Commit: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk>
5 CommitDate: Fri Mar 6 23:34:12 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=c8f323c7
7
8 The new Log4j is far more modular than version 1. This API component
9 is required by the core component. I have tried to get the tests
10 passing but I keep getting class cast exceptions and I can't figure
11 out why. Even swapping in the upstream jars doesn't work. Perhaps
12 Maven does some trickery that I'm not aware of.
13
14 Package-Manager: portage-2.2.18
15 Manifest-Sign-Key: 9C6D7DE4
16
17 dev-java/log4j-api/ChangeLog | 13 ++++++++
18 dev-java/log4j-api/Manifest | 26 +++++++++++++++
19 dev-java/log4j-api/log4j-api-2.2.ebuild | 57 +++++++++++++++++++++++++++++++++
20 dev-java/log4j-api/metadata.xml | 6 ++++
21 4 files changed, 102 insertions(+)
22
23 diff --git a/dev-java/log4j-api/ChangeLog b/dev-java/log4j-api/ChangeLog
24 new file mode 100644
25 index 0000000..5095289
26 --- /dev/null
27 +++ b/dev-java/log4j-api/ChangeLog
28 @@ -0,0 +1,13 @@
29 +# ChangeLog for dev-java/log4j-api
30 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
31 +# $Header: $
32 +
33 +*log4j-api-2.2 (06 Mar 2015)
34 +
35 + 06 Mar 2015; James Le Cuirot <chewi@g.o> +log4j-api-2.2.ebuild,
36 + +metadata.xml:
37 + The new Log4j is far more modular than version 1. This API component is
38 + required by the core component. I have tried to get the tests passing but I
39 + keep getting class cast exceptions and I can't figure out why. Even swapping
40 + in the upstream jars doesn't work. Perhaps Maven does some trickery that I'm
41 + not aware of.
42
43 diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
44 new file mode 100644
45 index 0000000..e71f870
46 --- /dev/null
47 +++ b/dev-java/log4j-api/Manifest
48 @@ -0,0 +1,26 @@
49 +-----BEGIN PGP SIGNED MESSAGE-----
50 +Hash: SHA256
51 +
52 +DIST apache-log4j-2.2-src.tar.gz 2175754 SHA256 57a1a1ba9d03ba9798ee2d197a37710d3cea7fc2ddd7d3912d7b9aa7a6d65c8f SHA512 686d5146fbcf4a501ce6aa8695ae727216687a2486e62401cf0f4064093292bc11819e0d6fa1ce772052485f613f0a1ef35274d3c893af728623e38f89953e1e WHIRLPOOL 7149a13a230f573f6395a95b7d299c3a4b4746e2c93bcf3f71c07128db8aea20bef2865276b46eaf8e6d39030dbf759d7820ab3caf54bf760ae87a42655363a7
53 +EBUILD log4j-api-2.2.ebuild 1373 SHA256 9cc9db18c8b7268a0a7917cf2441abc2c3250dcdc94d3d2d49b2842470b5fe47 SHA512 a22b9535d889a58bc058873e5d3f362e950bae801e3cfa41ac7e606b559fdaeeeff3aa36c2078d594d18687d471673b64f547d94a2c099f0b5ead274f98f5c9e WHIRLPOOL 00084af600012e6b69c762e20499664e4508c7b8f50ef4a382c3b7b42ff7cbb5af184633a930ab13f538177c1083eb7065a384f63593b916621fafe0c6f04205
54 +MISC ChangeLog 565 SHA256 195fbc960dbc96b6225f9d15d621109ebbd9271d92354bed6bc48bc78141904e SHA512 930a3b442962b22bd9099ce827c8060784b09ac6ee38cd0862cde33a8c04506d448ed7cadd4a0226c6b23d141318aee6587bdf81d2577b54856305f60448cc34 WHIRLPOOL 06ce6f603c329c570c64e33fbfcfdd597e51e1b91c484dc2cc242908c72eeb9ea063ce8b01f3d121d2085662c8d8cb811c0a8543449fbe6ec9d8c3db86dfd1d2
55 +MISC metadata.xml 426 SHA256 77ad7987c300d04501c10dd3713b13bd6ff7b03576b367672d04355cece35694 SHA512 f49fc4bcd0b42edee23de3ee57d4fe795330c59fbeef39851e1dba96936d684d804d3cf8ced5652e087c0c9cec63f0db7b5de072e6596c93319c8140aef99a5c WHIRLPOOL a84700f3df391980e0331d6a09ff0b994e067f2d2e26c68a46a410704fbad59059bf6bab88cf89ba823aebc4d23dde8fdd7bcfe18120f83523e468246309a938
56 +-----BEGIN PGP SIGNATURE-----
57 +Version: GnuPG v2.0
58 +
59 +iQJ8BAEBCABmBQJU+jl0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
60 +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
61 +MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kiRYP/3SvjYtcKlfghfeNTvK8TLCz
62 +fyiaLVt46q1BPKHVCjLXMMIEbo15YlzSVKxQ5h/hz9z2kwuDIjaiPcPfBXNMd9K6
63 +0BPF7rXO/FHFqxZNPVHBpmdEZTkChYVnMO1n/WYWaDZ0JWYJd/hP3NtDOwdqIKXS
64 +Y+XzA7U7oPRMq2qByGfhv5X4hlLEdYisciQHSvACHtddrN5K+kYmf9Ref4UlC12i
65 +uhfPbp9NMe+nNsm3/2w/ebdanDB+6Q0FPdmzBUvSlKjqcOmHc0v9aU/hE90G7Byb
66 +amaeiKcwnv46SaFwipRw5tktVIOFlAyYhWUCIquSVH7SGOfBI2L3QFJ6Lj8zU+QJ
67 +z4ewhbpLn4aneCTS0jHQ784zEEJWGw5aJebJHoicUhqVR78McmdscKLeYOjw06lP
68 +HMiGqZ/3Bbwk32p3fDSatmBniI2Es/q+bJnebQgPGlvmrrc+ViAiheoss56YA6zo
69 +MRY/XpCnnnReWPtxvVLMr110i5A1yqIKKB+dyirEgegNDRrmPbJu6oNoJYUlVt/6
70 +pt3V3AahQBEM25SKAv2F4euJvy45dEJGKKVYxJxcSSBYVfyDQGD8htIiVjhBeyUT
71 +Jzcbun8QNNL35olTkyMQcb/84AiOZm7Qr9D48jk5n8kiL8uLHDdWAMQY9rYr3Qdi
72 +xr2m6oUtiA1kJvkhQlrX
73 +=jQQ5
74 +-----END PGP SIGNATURE-----
75
76 diff --git a/dev-java/log4j-api/log4j-api-2.2.ebuild b/dev-java/log4j-api/log4j-api-2.2.ebuild
77 new file mode 100644
78 index 0000000..4a3244b
79 --- /dev/null
80 +++ b/dev-java/log4j-api/log4j-api-2.2.ebuild
81 @@ -0,0 +1,57 @@
82 +# Copyright 1999-2015 Gentoo Foundation
83 +# Distributed under the terms of the GNU General Public License v2
84 +# $Header: $
85 +
86 +EAPI=5
87 +
88 +JAVA_PKG_IUSE="doc source"
89 +
90 +inherit java-pkg-2 java-pkg-simple
91 +
92 +MY_P="apache-log4j-${PV}-src"
93 +DESCRIPTION="API for Java's Apache Log4j"
94 +HOMEPAGE="http://logging.apache.org/log4j/"
95 +SRC_URI="mirror://apache/logging/log4j/${PV}/${MY_P}.tar.gz"
96 +LICENSE="Apache-2.0"
97 +SLOT="2"
98 +KEYWORDS="~amd64"
99 +IUSE="test"
100 +
101 +# Chewi keeps getting class cast exceptions but can't figure out
102 +# why. Even swapping in the upstream jars doesn't work.
103 +RESTRICT="test"
104 +
105 +CDEPEND="dev-java/osgi-core-api:0"
106 +
107 +RDEPEND=">=virtual/jre-1.6
108 + ${CDEPEND}"
109 +
110 +DEPEND=">=virtual/jdk-1.6
111 + ${CDEPEND}
112 + test? (
113 + dev-java/commons-lang:3.3
114 + dev-java/hamcrest-core:1.3
115 + dev-java/log4j-core:2
116 + dev-java/junit:4
117 + )"
118 +
119 +S="${WORKDIR}/${MY_P}/${PN}/src"
120 +JAVA_SRC_DIR="main/java"
121 +JAVA_GENTOO_CLASSPATH="osgi-core-api"
122 +
123 +java_prepare() {
124 + # Cowardly avoiding some test dependencies.
125 + rm -r test/java/org/apache/logging/log4j/osgi || die
126 +}
127 +
128 +src_test() {
129 + cd test/java || die
130 +
131 + local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars commons-lang-3.3,hamcrest-core-1.3,log4j-core-2,junit-4,${JAVA_GENTOO_CLASSPATH})"
132 + local TESTS=$(find * -name "*Test.java")
133 + TESTS="${TESTS//.java}"
134 + TESTS="${TESTS//\//.}"
135 +
136 + ejavac -cp "${CP}" -d . $(find * -name "*.java")
137 + ejunit4 -classpath "${CP}" ${TESTS}
138 +}
139
140 diff --git a/dev-java/log4j-api/metadata.xml b/dev-java/log4j-api/metadata.xml
141 new file mode 100644
142 index 0000000..42ca59b
143 --- /dev/null
144 +++ b/dev-java/log4j-api/metadata.xml
145 @@ -0,0 +1,6 @@
146 +<?xml version="1.0" encoding="UTF-8"?>
147 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
148 +<pkgmetadata>
149 + <herd>java</herd>
150 + <longdescription>Apache Log4j 2 is an upgrade to Log4j that provides significant improvements over its predecessor, Log4j 1.x, and provides many of the improvements available in Logback while fixing some inherent problems in Logback's architecture.</longdescription>
151 +</pkgmetadata>