Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/avalon-logkit/
Date: Mon, 28 Aug 2017 22:02:26
Message-Id: 1503957706.85af9e4f2ec1e3500fcf5236aba743b14a92ad6b.chewi@gentoo
1 commit: 85af9e4f2ec1e3500fcf5236aba743b14a92ad6b
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 28 22:00:21 2017 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 28 22:01:46 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85af9e4f
7
8 dev-java/avalon-logkit: Remove old 1.2.2-r2
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.2
11
12 dev-java/avalon-logkit/Manifest | 1 -
13 .../avalon-logkit/avalon-logkit-1.2.2-r2.ebuild | 96 ----------------------
14 2 files changed, 97 deletions(-)
15
16 diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
17 index 9ce57063aef..93733ecf969 100644
18 --- a/dev-java/avalon-logkit/Manifest
19 +++ b/dev-java/avalon-logkit/Manifest
20 @@ -1,2 +1 @@
21 DIST avalon-logkit-2.1-src.tar.gz 60218 SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155 SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a WHIRLPOOL 8fdd0206c2b65c2a8626331ea07b8e5668ef9b2c841ce20ae85459bc8e128c4096c2091f05ad7e92b7c9c769ba0ad485738f7078ce5f205fa38e21d9a1ca1b47
22 -DIST logkit-1.2.2-src.tar.gz 113180 SHA256 2c81edc87571fbd05797da7f65515e089c62cbb735bdbd10f93e29bd3aa3ddb8 SHA512 a2a027e70a2432d07ef44d229edde57b1fe7a89ee9db2cd85c5609b180d704e28273f7ddbe55b7086260bc4be2c0ac56b1e23f405b785068678a50a8159a5333 WHIRLPOOL 2f5eebe87fd6dddce535360c44bb62e0ff90f2eead5a162dea748d7ee712faf2385b16ab0b719cd1537cada0436a9217f093e48de1a50767680d1230eff301f9
23
24 diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r2.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r2.ebuild
25 deleted file mode 100644
26 index 10c58a12255..00000000000
27 --- a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r2.ebuild
28 +++ /dev/null
29 @@ -1,96 +0,0 @@
30 -# Copyright 1999-2017 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=4
34 -
35 -JAVA_PKG_IUSE="doc source test"
36 -
37 -inherit eutils java-pkg-2
38 -
39 -DESCRIPTION="Easy-to-use Java logging toolkit"
40 -HOMEPAGE="http://avalon.apache.org/"
41 -SRC_URI="mirror://apache/avalon/logkit/source/logkit-${PV}-src.tar.gz"
42 -
43 -LICENSE="Apache-1.1"
44 -SLOT="1.2"
45 -
46 -KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
47 -
48 -CDEPEND="
49 - dev-java/log4j:0
50 - dev-java/avalon-framework:4.1
51 - java-virtuals/jms:0
52 - java-virtuals/javamail:0
53 - java-virtuals/servlet-api:2.5"
54 -
55 -RDEPEND="
56 - ${CDEPEND}
57 - >=virtual/jre-1.6"
58 -
59 -DEPEND="
60 - ${CDEPEND}
61 - >=virtual/jdk-1.6
62 - test? ( dev-java/junit:4 )"
63 -
64 -S="${WORKDIR}/logkit-${PV}-dev"
65 -SRC_DIR="${S}/src/java"
66 -JAVADOC_DIR="${S}/javadoc"
67 -
68 -java_prepare() {
69 - epatch "${FILESDIR}/${P}-java7.patch"
70 -}
71 -
72 -src_compile() {
73 - mkdir classes || die "Could not create compile output dir"
74 -
75 - ejavac \
76 - -encoding "ISO-8859-1" \
77 - -classpath $(java-pkg_getjars javamail,jms,log4j,servlet-api-2.5,avalon-framework-4.1) \
78 - -d classes $(find "${SRC_DIR}" -name "*.java") \
79 - || die "Compilation failed"
80 -
81 - jar -cf "${S}/${PN}.jar" -C classes . || die "Could not create jar"
82 -
83 - #Generate javadoc
84 - if use doc ; then
85 - mkdir "${JAVADOC_DIR}" || die "Could not create javadoc dir"
86 - cd "${SRC_DIR}"
87 - javadoc \
88 - -encoding "ISO-8859-1" \
89 - -sourcepath "${SRC_DIR}" \
90 - -classpath $(java-pkg_getjars javamail,jms,log4j,servlet-api-2.5,avalon-framework-4.1) \
91 - -source "${JAVA_VERSION}" \
92 - -d "${JAVADOC_DIR}" \
93 - $(find "org/apache/log" -type d | tr '/' '.') \
94 - || die "Could not create javadoc"
95 - fi
96 -}
97 -
98 -src_test() {
99 - mkdir test-classes || die "Unable to make dir"
100 - local TESTJAR="avalon-logkit-test.jar"
101 -
102 - ejavac \
103 - -encoding "ISO-8859-1" \
104 - -classpath "avalon-logkit.jar:$(java-config -p junit-4)" \
105 - -d test-classes \
106 - $(find src/test -name '*.java')
107 -
108 - jar -cf "${TESTJAR}" -C test-classes .
109 -
110 - java -cp "avalon-logkit.jar:${TESTJAR}:$(java-config -p junit:4)" \
111 - org.junit.runner.JUnitCore org.apache.log.format.test.FormatterTestCase \
112 - org.apache.log.output.test.RevolvingFileStrategyTestCase \
113 - org.apache.log.output.test.OutputTargetTestCase \
114 - org.apache.log.output.test.DBTargetTestCase \
115 - org.apache.log.util.test.UtilTestCase \
116 - org.apache.log.test.LoggerListenerTestCase \
117 - org.apache.log.test.WrappingTargetTestCase \
118 - org.apache.log.test.InheritanceTestCase
119 -}
120 -
121 -src_install() {
122 - java-pkg_dojar "${PN}.jar"
123 - use doc && java-pkg_dojavadoc "${JAVADOC_DIR}"
124 - use source && java-pkg_dosrc "${SRC_DIR}/*"
125 -}