1 |
commit: 14263b5b782e1870721fbb06ef76c6f7c25301e5 |
2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 30 09:34:46 2021 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 30 09:35:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=14263b5b |
7 |
|
8 |
dev-java/jaminid: treeclean |
9 |
|
10 |
Reason: failed sourcing ebuild: eutils: EAPI 0 not supported, (eutils.eclass, line |
11 |
32: called die) |
12 |
|
13 |
Bug: https://bugs.gentoo.org/759889 |
14 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
15 |
|
16 |
dev-java/jaminid/Manifest | 1 - |
17 |
dev-java/jaminid/files/build.xml | 19 ---- |
18 |
dev-java/jaminid/files/jaminid-0.99-utf8.patch | 133 ------------------------- |
19 |
dev-java/jaminid/jaminid-0.99-r3.ebuild | 42 -------- |
20 |
dev-java/jaminid/metadata.xml | 8 -- |
21 |
5 files changed, 203 deletions(-) |
22 |
|
23 |
diff --git a/dev-java/jaminid/Manifest b/dev-java/jaminid/Manifest |
24 |
deleted file mode 100644 |
25 |
index 51a01f7f..00000000 |
26 |
--- a/dev-java/jaminid/Manifest |
27 |
+++ /dev/null |
28 |
@@ -1 +0,0 @@ |
29 |
-DIST Jaminid-0.99.tgz 127831 SHA256 f9a5924b8c8a11bf2a8bf68f66faa1f0f425a40a8d9e068aadf9006cac7c7795 |
30 |
|
31 |
diff --git a/dev-java/jaminid/files/build.xml b/dev-java/jaminid/files/build.xml |
32 |
deleted file mode 100644 |
33 |
index 76370194..00000000 |
34 |
--- a/dev-java/jaminid/files/build.xml |
35 |
+++ /dev/null |
36 |
@@ -1,19 +0,0 @@ |
37 |
-<project name="jaminid" default="jar"> |
38 |
- <target name="init"> |
39 |
- <delete dir="doc"/> |
40 |
- </target> |
41 |
- <target name="compile" depends="init"> |
42 |
- <mkdir dir="build"/> |
43 |
- <javac srcdir="." destdir="build" classpath="${gentoo.classpath}"/> |
44 |
- </target> |
45 |
- |
46 |
- <target name="jar" depends="compile"> |
47 |
- <jar destfile="jaminid.jar" basedir="build"/> |
48 |
- </target> |
49 |
- |
50 |
- <target name="javadoc"> |
51 |
- <mkdir dir="docs"/> |
52 |
- <javadoc sourcepath="src" destdir="docs" classpath="${gentoo.classpath}"/> |
53 |
- </target> |
54 |
- |
55 |
-</project> |
56 |
|
57 |
diff --git a/dev-java/jaminid/files/jaminid-0.99-utf8.patch b/dev-java/jaminid/files/jaminid-0.99-utf8.patch |
58 |
deleted file mode 100644 |
59 |
index 26a61f7d..00000000 |
60 |
--- a/dev-java/jaminid/files/jaminid-0.99-utf8.patch |
61 |
+++ /dev/null |
62 |
@@ -1,133 +0,0 @@ |
63 |
-Index: src/com/prolixtech/jaminid/Connection.java |
64 |
-=================================================================== |
65 |
---- src/com/prolixtech/jaminid/Connection.java (revision 13) |
66 |
-+++ src/com/prolixtech/jaminid/Connection.java (working copy) |
67 |
-@@ -3,10 +3,13 @@ |
68 |
- import java.io.IOException; |
69 |
- import java.io.InputStream; |
70 |
- import java.io.OutputStream; |
71 |
-+import java.io.UnsupportedEncodingException; |
72 |
- import java.net.InetAddress; |
73 |
- import java.net.Socket; |
74 |
- import java.text.SimpleDateFormat; |
75 |
-+import java.util.ArrayList; |
76 |
- import java.util.Date; |
77 |
-+import java.util.List; |
78 |
- import java.util.Locale; |
79 |
- import java.util.Timer; |
80 |
- import java.util.TimerTask; |
81 |
-@@ -82,7 +85,7 @@ |
82 |
- |
83 |
- CONNECTED: |
84 |
- while(true){ |
85 |
-- StringBuffer requestInputBuffer = new StringBuffer(); |
86 |
-+ List<Byte> requestInputBuffer = new ArrayList<Byte>(); |
87 |
- |
88 |
- int byteIn = -1; |
89 |
- int CRLFState = 0; |
90 |
-@@ -106,7 +109,7 @@ |
91 |
- byteIn = socketInput.read(); |
92 |
- if (byteIn > 0) { |
93 |
- |
94 |
-- requestInputBuffer.append((char) byteIn); |
95 |
-+ requestInputBuffer.add((byte)byteIn); |
96 |
- if (doubleCRLFpassed) |
97 |
- bodyCharsParsed++; |
98 |
- |
99 |
-@@ -142,10 +145,10 @@ |
100 |
- if ("\n".charAt(0) == (thischar)) { |
101 |
- CRLFState++; |
102 |
- doubleCRLFpassed = true; |
103 |
-- serviceRequest.addRequestLines(requestInputBuffer |
104 |
-- .toString()); |
105 |
-- |
106 |
-- requestInputBuffer = new StringBuffer(); |
107 |
-+ String inputString = bytesToString(requestInputBuffer); |
108 |
-+ serviceRequest.addRequestLines(inputString); |
109 |
-+ |
110 |
-+ requestInputBuffer = new ArrayList<Byte>(); |
111 |
- |
112 |
- expectedBodySize = serviceRequest.switchToBody(); |
113 |
- } else { |
114 |
-@@ -163,8 +166,9 @@ |
115 |
- && bodyCharsParsed < expectedBodySize || doubleCRLFpassed |
116 |
- && byteIn != -1 && socketInput.available() > 0); |
117 |
- |
118 |
-- printlog("Request: " + requestInputBuffer.toString()); |
119 |
-- serviceRequest.addRequestLines(requestInputBuffer.toString()); |
120 |
-+ String inputString = bytesToString(requestInputBuffer); |
121 |
-+ printlog("Request: " + inputString); |
122 |
-+ serviceRequest.addRequestLines(inputString); |
123 |
- |
124 |
- serviceRequest.switchToCompleted(); |
125 |
- |
126 |
-@@ -242,6 +246,22 @@ |
127 |
- } |
128 |
- |
129 |
- /** |
130 |
-+ * Added dnaber 2007-06-09, to make UTF-8 input work. |
131 |
-+ */ |
132 |
-+ private String bytesToString(List<Byte> requestInputBuffer) { |
133 |
-+ Byte[] b = (Byte[])requestInputBuffer.toArray(new Byte[]{}); |
134 |
-+ byte[] bytes = new byte[b.length]; |
135 |
-+ for (int i = 0; i < b.length; i++) { |
136 |
-+ bytes[i] = b[i]; |
137 |
-+ } |
138 |
-+ try { |
139 |
-+ return new String(bytes, "utf-8"); |
140 |
-+ } catch (UnsupportedEncodingException e) { |
141 |
-+ throw new RuntimeException(e.toString(), e); |
142 |
-+ } |
143 |
-+ } |
144 |
-+ |
145 |
-+ /** |
146 |
- * a shortcut method |
147 |
- * |
148 |
- * @param message |
149 |
-@@ -261,7 +281,7 @@ |
150 |
- protected void sendString(Object string) throws IOException { |
151 |
- if (string == null) |
152 |
- return; |
153 |
-- socketOutput.write((string.toString()).getBytes()); |
154 |
-+ socketOutput.write((string.toString()).getBytes("UTF-8")); |
155 |
- } |
156 |
- |
157 |
- protected void sendString(byte[] bytes) { |
158 |
-Index: src/com/prolixtech/jaminid/Protocol.java |
159 |
-=================================================================== |
160 |
---- src/com/prolixtech/jaminid/Protocol.java (revision 13) |
161 |
-+++ src/com/prolixtech/jaminid/Protocol.java (working copy) |
162 |
-@@ -280,7 +280,7 @@ |
163 |
- MIME.setProperty(".txt", "text/plain"); |
164 |
- |
165 |
- |
166 |
-- |
167 |
-+ /* dnaber, 2006-09-16 |
168 |
- try { |
169 |
- OutputStream nmim = new FileOutputStream(Protocol.MIMEFILE); |
170 |
- MIME.storeToXML(nmim, "\nJAMINID MIMETYPES\n\nThese are the default MIME types for the jaminid daemon. If you had a modified but invalid MIME file here, it may have been reverted to this."); |
171 |
-@@ -287,7 +287,8 @@ |
172 |
- } catch (IOException e) { |
173 |
- // TODO Auto-generated catch block |
174 |
- e.printStackTrace(); |
175 |
-- } |
176 |
-+ |
177 |
-+ }*/ |
178 |
- |
179 |
- } |
180 |
- |
181 |
-Index: src/com/prolixtech/jaminid/Request.java |
182 |
-=================================================================== |
183 |
---- src/com/prolixtech/jaminid/Request.java (revision 13) |
184 |
-+++ src/com/prolixtech/jaminid/Request.java (working copy) |
185 |
-@@ -321,8 +321,8 @@ |
186 |
- try { |
187 |
- String hex = s.substring(lastIndex + 1, lastIndex + 3); |
188 |
- char hin = (char) hex2int(hex); |
189 |
-- System.out.println(lastIndex + " Hex is " + hex + " or " |
190 |
-- + hin); |
191 |
-+ //System.out.println(lastIndex + " Hex is " + hex + " or " |
192 |
-+ // + hin); |
193 |
- String sBefore = s.substring(0, lastIndex); |
194 |
- String sAfter = s.substring(lastIndex + 3); |
195 |
- |
196 |
|
197 |
diff --git a/dev-java/jaminid/jaminid-0.99-r3.ebuild b/dev-java/jaminid/jaminid-0.99-r3.ebuild |
198 |
deleted file mode 100644 |
199 |
index 96fc1cef..00000000 |
200 |
--- a/dev-java/jaminid/jaminid-0.99-r3.ebuild |
201 |
+++ /dev/null |
202 |
@@ -1,42 +0,0 @@ |
203 |
-# Copyright 1999-2015 Gentoo Foundation |
204 |
-# Distributed under the terms of the GNU General Public License v2 |
205 |
-# $Id$ |
206 |
- |
207 |
-JAVA_PKG_IUSE="doc source examples" |
208 |
- |
209 |
-inherit eutils java-pkg-2 java-ant-2 |
210 |
- |
211 |
-MY_PN="Jaminid" |
212 |
-MY_P="${MY_PN}-${PV}" |
213 |
- |
214 |
-DESCRIPTION="Jaminid is a very small daemon meant to embed in Java applications as an add-on HTTP interface." |
215 |
-HOMEPAGE="http://jaminid.sourceforge.net/" |
216 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz" |
217 |
-LICENSE="LGPL-2" #Assuming v2 |
218 |
-SLOT="0" |
219 |
-KEYWORDS="~amd64 ~x86" |
220 |
-IUSE="" |
221 |
- |
222 |
-RDEPEND=">=virtual/jre-1.5" |
223 |
-DEPEND=">=virtual/jdk-1.5" |
224 |
- |
225 |
-S="${WORKDIR}/${MY_PN}" |
226 |
- |
227 |
-src_unpack() { |
228 |
- unpack ${A} |
229 |
- cd "${S}" || die |
230 |
- mv src/com/prolixtech/jaminid_examples . -v |
231 |
- epatch "${FILESDIR}"/${P}-utf8.patch |
232 |
- sed -i -e 's/config\/MIME.XML/\/usr\/share\/jaminid\/config\/MIME.XML/g' src/com/prolixtech/jaminid/Protocol.java |
233 |
- cp -v "${FILESDIR}"/build.xml . || die |
234 |
-} |
235 |
- |
236 |
-src_install() { |
237 |
- java-pkg_dojar ${PN}.jar |
238 |
- insinto /usr/share/jaminid |
239 |
- doins -r config || die "doins failed." |
240 |
- use doc && java-pkg_dojavadoc docs |
241 |
- use source && java-pkg_dosrc src/com |
242 |
- use examples && java-pkg_doexamples jaminid_examples |
243 |
- dodoc README.TXT || die |
244 |
-} |
245 |
|
246 |
diff --git a/dev-java/jaminid/metadata.xml b/dev-java/jaminid/metadata.xml |
247 |
deleted file mode 100644 |
248 |
index 952a4b9b..00000000 |
249 |
--- a/dev-java/jaminid/metadata.xml |
250 |
+++ /dev/null |
251 |
@@ -1,8 +0,0 @@ |
252 |
-<?xml version="1.0" encoding="UTF-8"?> |
253 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
254 |
-<pkgmetadata> |
255 |
- <maintainer type="project"> |
256 |
- <email>java@g.o</email> |
257 |
- <name>Java</name> |
258 |
- </maintainer> |
259 |
-</pkgmetadata> |