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/mx4j/, dev-java/mx4j/files/
Date: Mon, 26 Oct 2015 23:31:08
Message-Id: 1445902239.8a9cf23bd19bc1c92a8aa2d3e1444ad94e0f94bc.chewi@gentoo
1 commit: 8a9cf23bd19bc1c92a8aa2d3e1444ad94e0f94bc
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 23:14:20 2015 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 23:30:39 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a9cf23b
7
8 dev-java/mx4j: Remove obsolete package
9
10 dev-java/mx4j/Manifest | 2 -
11 dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch | 37 --------
12 dev-java/mx4j/metadata.xml | 17 ----
13 dev-java/mx4j/mx4j-3.0.2-r1.ebuild | 105 -----------------------
14 4 files changed, 161 deletions(-)
15
16 diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
17 deleted file mode 100644
18 index b19c903..0000000
19 --- a/dev-java/mx4j/Manifest
20 +++ /dev/null
21 @@ -1,2 +0,0 @@
22 -DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05
23 -DIST mx4j-3.0.2.tar.gz 4555894 SHA256 282bd68e517aba3d0f5bbf76f90c3c09e446c529e7796467ab7de65398bb1115 SHA512 a4b8b62530ce41a0e3170a0c31dbaf5251096b98e50f73eeebd725f29e5b7e920d8c7f03d486d72c7643e9ce069a86a048c080f019fd0053dce5e6774809a26f WHIRLPOOL 775f2b51664e3d05687b1e3fbb7b538e45e2918b8a079d2048a75a1f5aca1c323a2d0c1e8847ca94649973fc7e6f9bb324d44f76acb551fe1270138ae126ebbb
24
25 diff --git a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch b/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch
26 deleted file mode 100644
27 index 25de4b5..0000000
28 --- a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch
29 +++ /dev/null
30 @@ -1,37 +0,0 @@
31 -diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java
32 ---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2010-04-03 13:09:19.815790652 +0100
33 -+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2010-04-03 13:09:29.096398617 +0100
34 -@@ -12,13 +12,13 @@
35 - import java.io.IOException;
36 - import java.io.ObjectInputStream;
37 -
38 -+import com.caucho.hessian.io.AbstractDeserializer;
39 - import com.caucho.hessian.io.AbstractHessianInput;
40 --import com.caucho.hessian.io.Deserializer;
41 -
42 - /**
43 - * @version $
44 - */
45 --class JMXDeserializer extends Deserializer
46 -+class JMXDeserializer extends AbstractDeserializer
47 - {
48 - private Class type;
49 -
50 -diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java
51 ---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2010-04-03 13:09:19.815790652 +0100
52 -+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2010-04-03 13:11:41.543862447 +0100
53 -@@ -13,12 +13,12 @@
54 - import java.io.ObjectOutputStream;
55 -
56 - import com.caucho.hessian.io.AbstractHessianOutput;
57 --import com.caucho.hessian.io.Serializer;
58 -+import com.caucho.hessian.io.AbstractSerializer;
59 -
60 - /**
61 - * @version $Revision: 1.3 $
62 - */
63 --class JMXSerializer extends Serializer
64 -+class JMXSerializer extends AbstractSerializer
65 - {
66 - public void writeObject(Object obj, AbstractHessianOutput out) throws IOException
67 - {
68
69 diff --git a/dev-java/mx4j/metadata.xml b/dev-java/mx4j/metadata.xml
70 deleted file mode 100644
71 index ef5247c..0000000
72 --- a/dev-java/mx4j/metadata.xml
73 +++ /dev/null
74 @@ -1,17 +0,0 @@
75 -<?xml version="1.0" encoding="UTF-8"?>
76 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
77 -<pkgmetadata>
78 - <herd>java</herd>
79 - <longdescription>
80 -MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.
81 -
82 -JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems.
83 -
84 -Beginning with 3.0.1-r2 mx4j was split into three packages dev-java/mxj4-core,
85 -dev-java/mxj4-tools and dev-java/mx4j. This was done in order to reduce
86 -dependencies in packages that only require the core.
87 -</longdescription>
88 - <upstream>
89 - <remote-id type="sourceforge">mx4j</remote-id>
90 - </upstream>
91 -</pkgmetadata>
92
93 diff --git a/dev-java/mx4j/mx4j-3.0.2-r1.ebuild b/dev-java/mx4j/mx4j-3.0.2-r1.ebuild
94 deleted file mode 100644
95 index 776bb7c..0000000
96 --- a/dev-java/mx4j/mx4j-3.0.2-r1.ebuild
97 +++ /dev/null
98 @@ -1,105 +0,0 @@
99 -# Copyright 1999-2015 Gentoo Foundation
100 -# Distributed under the terms of the GNU General Public License v2
101 -# $Id$
102 -
103 -EAPI=5
104 -
105 -JAVA_PKG_IUSE="examples source doc"
106 -
107 -inherit java-pkg-2 java-ant-2
108 -
109 -DESCRIPTION="Metapackage for mx4j"
110 -HOMEPAGE="http://mx4j.sourceforge.net/"
111 -
112 -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz
113 - doc? ( mirror://sourceforge/${PN}/${P}.tar.gz )"
114 -
115 -LICENSE="GPL-2"
116 -SLOT="3.0"
117 -
118 -KEYWORDS="amd64 x86"
119 -
120 -IUSE=""
121 -
122 -CDEPEND="examples? (
123 - dev-java/bcel:0
124 - dev-java/log4j:0
125 - dev-java/commons-logging:0
126 - www-servers/axis:1
127 - java-virtuals/servlet-api:3.0
128 - dev-java/hessian:4.0
129 - dev-java/jython:2.7
130 - dev-java/gnu-jaf:1
131 - java-virtuals/javamail:0
132 - )
133 - dev-java/mx4j-core:3.0
134 - dev-java/mx4j-tools:3.0
135 - !<dev-java/mx4j-tools-3.0.1-r1
136 - "
137 -
138 -RDEPEND="
139 - ${CDEPEND}
140 - examples? ( >=virtual/jre-1.6 )"
141 -
142 -# We always depend on a jdk to get the package.env created
143 -DEPEND=">=virtual/jdk-1.6
144 - ${CDEPEND}"
145 -
146 -src_prepare() {
147 - epatch "${FILESDIR}/${P}-new-hessian.patch"
148 -
149 - if use doc; then
150 - mkdir binary && cd binary
151 - unpack "${P}.tar.gz"
152 - fi
153 -
154 - if use examples; then
155 - cd "${S}/lib"
156 - java-pkg_jar-from bcel bcel.jar
157 - java-pkg_jar-from log4j
158 - java-pkg_jar-from commons-logging commons-logging.jar
159 - java-pkg_jar-from axis-1
160 - java-pkg_jar-from hessian-4.0
161 - java-pkg_jar-from jython-2.7 jython.jar
162 - java-pkg_jar-from gnu-jaf-1 activation.jar
163 - java-pkg_jar-from --virtual javamail mail.jar
164 - java-pkg_jar-from --virtual servlet-api-3.0 servlet-api.jar
165 - fi
166 -}
167 -
168 -src_compile() {
169 - cd build
170 - if use examples; then
171 - eant compile.examples
172 - fi
173 -}
174 -
175 -src_install() {
176 - dodoc README.txt RELEASE-NOTES-* || die
177 -
178 - if use examples; then
179 - java-pkg_dojar dist/examples/mx4j-examples.jar
180 - dodir /usr/share/doc/${PF}/examples
181 - cp -r src/examples/mx4j/examples/* "${D}usr/share/doc/${PF}/examples"
182 - fi
183 -
184 - use source && java-pkg_dosrc src/examples/mx4j
185 -
186 - if use doc; then
187 - local docdir="${WORKDIR}/${P}/binary/${P}/docs"
188 - java-pkg_dojavadoc "${docdir}/api"
189 - dohtml -r "${docdir}/images"
190 - dohtml "${docdir}"/{*.html,*.css}
191 - fi
192 -
193 - # Recording jars to get the same behaviour as before
194 - local jars="$(java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0)"
195 - for jar in ${jars//:/ }; do
196 - java-pkg_regjar "${jar}"
197 - done
198 -}
199 -
200 -pkg_postinst() {
201 - elog "Although this package can be used directly with java-config,"
202 - elog "ebuild developers should use mx4j-core and mx4j-tools directly."
203 -}