Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java:master commit in: dev-java/buildmagic-tasks/, dev-java/buildmagic-tasks/files/
Date: Wed, 30 Jun 2021 09:35:58
Message-Id: 1625045726.48970a29d48c13193499ef357fbdf2948545ceb0.flow@gentoo
1 commit: 48970a29d48c13193499ef357fbdf2948545ceb0
2 Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 30 09:34:41 2021 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 30 09:35:26 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=48970a29
7
8 dev-java/buildmagic-tasks: treeclean
9
10 Reason: failed sourcing ebuild: java-pkg-2: EAPI 0 not supported, (java-pkg-2.eclass,
11 line 17: called die)
12
13 Bug: https://bugs.gentoo.org/759889
14 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
15
16 dev-java/buildmagic-tasks/Manifest | 3 -
17 .../buildmagic-tasks-2.0-r1.ebuild | 102 --------------------
18 .../buildmagic-tasks/buildmagic-tasks-2.0.4.ebuild | 103 ---------------------
19 dev-java/buildmagic-tasks/files/build.properties | 12 ---
20 .../buildmagic-tasks-2.0.4-defaults.ent.patch | 10 --
21 .../files/jboss4-buildmagic-tasks-build_xml.patch | 24 -----
22 dev-java/buildmagic-tasks/metadata.xml | 8 --
23 7 files changed, 262 deletions(-)
24
25 diff --git a/dev-java/buildmagic-tasks/Manifest b/dev-java/buildmagic-tasks/Manifest
26 deleted file mode 100644
27 index a46c3e3f..00000000
28 --- a/dev-java/buildmagic-tasks/Manifest
29 +++ /dev/null
30 @@ -1,3 +0,0 @@
31 -DIST buildmagic-2.0.4.tar.bz2 196471 SHA256 c2d8fdd331ef49a266d4e225cc5d123d683b5cda10b5751e5f1ccd469ca289bc
32 -DIST jboss-buildmagic-2.0.tar.gz 8799455 SHA256 c71d6e5f62a693e5ed2362e48014673582277dc308623860fbadc31f6af2560c
33 -DIST jboss-common-4.0.0.DR4.tar.gz 165984 SHA256 ac1a42f3b99055d97413e0bd3a754427696e945e84fa3e1aa2fa7c26019faa5e
34
35 diff --git a/dev-java/buildmagic-tasks/buildmagic-tasks-2.0-r1.ebuild b/dev-java/buildmagic-tasks/buildmagic-tasks-2.0-r1.ebuild
36 deleted file mode 100644
37 index 262fdc50..00000000
38 --- a/dev-java/buildmagic-tasks/buildmagic-tasks-2.0-r1.ebuild
39 +++ /dev/null
40 @@ -1,102 +0,0 @@
41 -# Copyright 1999-2015 Gentoo Foundation
42 -# Distributed under the terms of the GNU General Public License v2
43 -# $Id$
44 -
45 -inherit java-pkg-2 java-ant-2 eutils
46 -
47 -DESCRIPTION="JBoss buildmagic tasks module"
48 -HOMEPAGE="http://www.jboss.org"
49 -BASE_URL="http://gentooexperimental.org/distfiles"
50 -#BASE_URL="mirror://gentoo"
51 -# These source files were obtained from jpackage's srpm for
52 -# jboss4-buildmagic-tasks
53 -SRC_URI="${BASE_URL}/jboss-buildmagic-${PV}.tar.gz ${BASE_URL}/jboss-common-4.0.0.DR4.tar.gz"
54 -
55 -LICENSE="LGPL-2"
56 -SLOT="0"
57 -KEYWORDS="~amd64 ~x86"
58 -IUSE=""
59 -
60 -CDEPEND="dev-java/log4j
61 - >=dev-java/bsf-2.3"
62 -DEPEND=">=virtual/jdk-1.4
63 - ${CDEPEND}"
64 -RDEPEND=">=virtual/jre-1.4
65 - ${CDEPEND}"
66 -
67 -S="${WORKDIR}/buildmagic/tasks"
68 -
69 -COMMON=${WORKDIR}/jboss-common
70 -
71 -src_unpack() {
72 - unpack ${A}
73 -
74 - cd ${S}/..
75 -
76 - # TODO: make this into a patch
77 - # curtesy of jpackage.org
78 - cp tasks/build.xml tasks/build.xml.sav
79 - for f in `find tasks/src -name "*.java"`; do
80 - sed -e 's|com\.ibm\.bsf|org\.apache\.bsf|' $f > temp.java
81 - cp temp.java $f
82 - done
83 - rm temp.java
84 -
85 - # curtesy of jpackage.org
86 - epatch ${FILESDIR}/jboss4-buildmagic-tasks-build_xml.patch
87 -
88 - # in order to avoid a circular dependency with jboss-common, we need
89 - # to include the classes from jboss-common that we actually need
90 - # TODO: this most likely can be cleaned up with some for loops
91 - mkdir -p tasks/src/main/org/jboss/util/file
92 - mkdir -p tasks/src/main/org/jboss/util/platform
93 - mkdir -p tasks/src/main/org/jboss/util/stream
94 - mkdir -p tasks/src/main/org/jboss/logging
95 - cp ../jboss-common/src/main/org/jboss/util/DirectoryBuilder.java tasks/src/main/org/jboss/util
96 - cp ../jboss-common/src/main/org/jboss/util/Strings.java tasks/src/main/org/jboss/util
97 - cp ../jboss-common/src/main/org/jboss/util/NestedError.java tasks/src/main/org/jboss/util
98 - cp ../jboss-common/src/main/org/jboss/util/NestedThrowable.java tasks/src/main/org/jboss/util
99 - cp ../jboss-common/src/main/org/jboss/util/ThrowableHandler.java tasks/src/main/org/jboss/util
100 - cp ../jboss-common/src/main/org/jboss/util/ThrowableListener.java tasks/src/main/org/jboss/util
101 - cp ../jboss-common/src/main/org/jboss/util/NullArgumentException.java tasks/src/main/org/jboss/util
102 - cp ../jboss-common/src/main/org/jboss/util/EmptyStringException.java tasks/src/main/org/jboss/util
103 - cp ../jboss-common/src/main/org/jboss/util/file/Files.java tasks/src/main/org/jboss/util/file
104 - cp ../jboss-common/src/main/org/jboss/util/platform/Java.java tasks/src/main/org/jboss/util/platform
105 - cp ../jboss-common/src/main/org/jboss/util/stream/Streams.java tasks/src/main/org/jboss/util/stream
106 - cp ../jboss-common/src/main/org/jboss/logging/Logger.java tasks/src/main/org/jboss/logging
107 - cp ../jboss-common/src/main/org/jboss/logging/LoggerPlugin.java tasks/src/main/org/jboss/logging
108 - cp ../jboss-common/src/main/org/jboss/logging/NullLoggerPlugin.java tasks/src/main/org/jboss/logging
109 -}
110 -
111 -src_compile() {
112 - local antflags="output"
113 - antflags="-lib $(java-pkg_getjars bsf-2.3,log4j) ${antflags}"
114 - antflags="${antflags} \
115 - -Djavac.optimize=off \
116 - -Djavac.target=1.4 \
117 - -Djavac.debug=off \
118 - -Djavac.depend=no \
119 - -Djavac.verbose=no \
120 - -Djavac.deprecation=on \
121 - -Djavac.include.ant.runtime=yes \
122 - -Djavac.include.java.runtime=no \
123 - -Djavac.fail.onerror=true \
124 - -Djavac.includes=**/*.java \
125 - -Dsource.java=src \
126 - -Dsource.etc=src/etc \
127 - -Dsource.resources=src/resources \
128 - -Dbuild.classes=output/classes \
129 - -Dbuild.gen.classes=output/gen/classes \
130 - -Dbuild.etc=output/etc \
131 - -Dbuild.resources=output/resources \
132 - -Dbuild.lib=output/lib \
133 - -Dinit.disable=true \
134 - -Ddependency-manager.offline=true \
135 - -Dbuild.sysclasspath=only"
136 -
137 - eant ${antflags}
138 -}
139 -
140 -src_install() {
141 - java-pkg_dojar output/lib/buildmagic-tasks.jar
142 -}
143
144 diff --git a/dev-java/buildmagic-tasks/buildmagic-tasks-2.0.4.ebuild b/dev-java/buildmagic-tasks/buildmagic-tasks-2.0.4.ebuild
145 deleted file mode 100644
146 index 62f2ea0a..00000000
147 --- a/dev-java/buildmagic-tasks/buildmagic-tasks-2.0.4.ebuild
148 +++ /dev/null
149 @@ -1,103 +0,0 @@
150 -# Copyright 1999-2015 Gentoo Foundation
151 -# Distributed under the terms of the GNU General Public License v2
152 -# $Id$
153 -
154 -inherit java-pkg-2 java-ant-2 eutils
155 -
156 -DESCRIPTION="JBoss buildmagic tasks module"
157 -HOMEPAGE="http://www.jboss.org"
158 -BASE_URL="http://www.elvanor.net/gentoo"
159 -#BASE_URL="mirror://gentoo"
160 -
161 -# This ebuild is based on files obtained from jpackage repository (jboss4-buildmagic-tasks)
162 -# Note that the version number of buildmagic only reflects the version number of the jpackage rpm file
163 -# To recreate the tarball:
164 -#
165 -# Download the rpm from http://mirrors.dotsrc.org/jpackage/1.7/generic/free/SRPMS/jboss4-buildmagic-tasks-2.0-4jpp.src.rpm
166 -# Convert the rpm to tar, untar jboss-buildmagic-2.0.tar.gz
167 -# In the buildmagic folder remove directories thirdparty and tools/lib (this saves space)
168 -# Compress the folder as buildmagic-${PV}.tar.bz2
169 -# jboss-common-4.0.0.DR4.tar.gz is directly included in the rpm package
170 -#
171 -# Things to improve:
172 -#
173 -# Javadoc generation
174 -# Better handle stuff from jboss-common-4.0.0.DR4
175 -
176 -SRC_URI="${BASE_URL}/buildmagic-${PV}.tar.bz2 ${BASE_URL}/jboss-common-4.0.0.DR4.tar.gz"
177 -
178 -LICENSE="LGPL-2"
179 -SLOT="0"
180 -KEYWORDS="~amd64 ~x86"
181 -IUSE=""
182 -
183 -CDEPEND="dev-java/log4j
184 - >=dev-java/bsf-2.3
185 - dev-java/ant-core
186 - >=dev-java/xerces-2.8"
187 -
188 -DEPEND=">=virtual/jdk-1.4
189 - ${CDEPEND}"
190 -
191 -RDEPEND=">=virtual/jre-1.4
192 - ${CDEPEND}"
193 -
194 -S="${WORKDIR}/buildmagic/tasks"
195 -
196 -src_unpack() {
197 - unpack ${A}
198 -
199 - cd ${S}/..
200 -
201 - # TODO: make this into a patch
202 - # curtesy of jpackage.org
203 - cp tasks/build.xml tasks/build.xml.sav
204 - for f in `find tasks/src -name "*.java"`; do
205 - sed -e 's|com\.ibm\.bsf|org\.apache\.bsf|' $f > temp.java
206 - cp temp.java $f
207 - done
208 - rm temp.java
209 -
210 - # curtesy of jpackage.org
211 - epatch ${FILESDIR}/jboss4-buildmagic-tasks-build_xml.patch
212 -
213 - epatch "${FILESDIR}/buildmagic-tasks-${PV}-defaults.ent.patch"
214 -
215 - # in order to avoid a circular dependency with jboss-common, we need
216 - # to include the classes from jboss-common that we actually need
217 - # TODO: this most likely can be cleaned up with some for loops
218 - mkdir -p tasks/src/main/org/jboss/util/file
219 - mkdir -p tasks/src/main/org/jboss/util/platform
220 - mkdir -p tasks/src/main/org/jboss/util/stream
221 - mkdir -p tasks/src/main/org/jboss/logging
222 - cp ../jboss-common/src/main/org/jboss/util/DirectoryBuilder.java tasks/src/main/org/jboss/util
223 - cp ../jboss-common/src/main/org/jboss/util/Strings.java tasks/src/main/org/jboss/util
224 - cp ../jboss-common/src/main/org/jboss/util/NestedError.java tasks/src/main/org/jboss/util
225 - cp ../jboss-common/src/main/org/jboss/util/NestedThrowable.java tasks/src/main/org/jboss/util
226 - cp ../jboss-common/src/main/org/jboss/util/ThrowableHandler.java tasks/src/main/org/jboss/util
227 - cp ../jboss-common/src/main/org/jboss/util/ThrowableListener.java tasks/src/main/org/jboss/util
228 - cp ../jboss-common/src/main/org/jboss/util/NullArgumentException.java tasks/src/main/org/jboss/util
229 - cp ../jboss-common/src/main/org/jboss/util/EmptyStringException.java tasks/src/main/org/jboss/util
230 - cp ../jboss-common/src/main/org/jboss/util/file/Files.java tasks/src/main/org/jboss/util/file
231 - cp ../jboss-common/src/main/org/jboss/util/platform/Java.java tasks/src/main/org/jboss/util/platform
232 - cp ../jboss-common/src/main/org/jboss/util/stream/Streams.java tasks/src/main/org/jboss/util/stream
233 - cp ../jboss-common/src/main/org/jboss/logging/Logger.java tasks/src/main/org/jboss/logging
234 - cp ../jboss-common/src/main/org/jboss/logging/LoggerPlugin.java tasks/src/main/org/jboss/logging
235 - cp ../jboss-common/src/main/org/jboss/logging/NullLoggerPlugin.java tasks/src/main/org/jboss/logging
236 -
237 - #rm -rf thirdparty
238 - #rm -rf tools/lib
239 -
240 - cp ${FILESDIR}/build.properties tasks/build.properties
241 - java-ant_rewrite-classpath tasks/build.xml
242 -}
243 -
244 -src_compile() {
245 - cd "${S}"
246 - gentoo_jars="$(java-pkg_getjars ant-core,xerces-2,bsf-2.3)"
247 - ANT_TASKS="ant-tasks" eant -propertyfile build.properties -Dgentoo.classpath="${gentoo_jars}"
248 -}
249 -
250 -src_install() {
251 - java-pkg_dojar output/lib/buildmagic-tasks.jar
252 -}
253
254 diff --git a/dev-java/buildmagic-tasks/files/build.properties b/dev-java/buildmagic-tasks/files/build.properties
255 deleted file mode 100644
256 index ac70a591..00000000
257 --- a/dev-java/buildmagic-tasks/files/build.properties
258 +++ /dev/null
259 @@ -1,12 +0,0 @@
260 -init.disable=true
261 -source.java=src
262 -source.etc=src/etc
263 -source.resources=src/resources
264 -build.classes=output/classes
265 -build.gen.classes=output/gen/classes
266 -build.etc=output/etc
267 -build.resources=output/resources
268 -build.lib=output/lib
269 -javac.includes=**/*.java
270 -build.sysclasspath=only
271 -javac.fail.onerror=true
272 \ No newline at end of file
273
274 diff --git a/dev-java/buildmagic-tasks/files/buildmagic-tasks-2.0.4-defaults.ent.patch b/dev-java/buildmagic-tasks/files/buildmagic-tasks-2.0.4-defaults.ent.patch
275 deleted file mode 100644
276 index 0abaeaee..00000000
277 --- a/dev-java/buildmagic-tasks/files/buildmagic-tasks-2.0.4-defaults.ent.patch
278 +++ /dev/null
279 @@ -1,10 +0,0 @@
280 ---- tools/etc/buildfragments/defaults.ent.orig 2007-07-26 14:09:37.000000000 +0200
281 -+++ tools/etc/buildfragments/defaults.ent 2007-07-26 14:06:26.000000000 +0200
282 -@@ -103,7 +103,6 @@
283 -
284 - <!-- The combined thirdparty classpath -->
285 - <path id="thirdparty.classpath">
286 -- <path refid="library.classpath"/>
287 - <path refid="dependentmodule.classpath"/>
288 - </path>
289 -
290
291 diff --git a/dev-java/buildmagic-tasks/files/jboss4-buildmagic-tasks-build_xml.patch b/dev-java/buildmagic-tasks/files/jboss4-buildmagic-tasks-build_xml.patch
292 deleted file mode 100644
293 index 23377818..00000000
294 --- a/dev-java/buildmagic-tasks/files/jboss4-buildmagic-tasks-build_xml.patch
295 +++ /dev/null
296 @@ -1,24 +0,0 @@
297 -*** tasks/build.xml.orig 2004-06-07 09:46:29.000000000 -0400
298 ---- tasks/build.xml 2004-06-07 09:45:44.000000000 -0400
299 -***************
300 -*** 143,161 ****
301 - <include name="**"/>
302 - </fileset>
303 -
304 -- <!-- Include required classes from common -->
305 -- <fileset dir="${jboss.common.root}/classes">
306 -- <include name="org/jboss/net/protocol/**"/>
307 -- <include name="org/jboss/logging/*.class"/>
308 -- <include name="org/jboss/util/DirectoryBuilder*.class"/>
309 -- <include name="org/jboss/util/Strings*.class"/>
310 -- <include name="org/jboss/util/Objects*.class"/>
311 -- <include name="org/jboss/util/*Exception*.class"/>
312 -- <include name="org/jboss/util/*Error*.class"/>
313 -- <include name="org/jboss/util/*Throwable*.class"/>
314 -- <include name="org/jboss/util/platform/Constants.class"/>
315 -- <include name="org/jboss/util/property/**"/>
316 -- </fileset>
317 - </jar>
318 -
319 - </target>
320 ---- 143,148 ----
321
322 diff --git a/dev-java/buildmagic-tasks/metadata.xml b/dev-java/buildmagic-tasks/metadata.xml
323 deleted file mode 100644
324 index 2444066a..00000000
325 --- a/dev-java/buildmagic-tasks/metadata.xml
326 +++ /dev/null
327 @@ -1,8 +0,0 @@
328 -<?xml version="1.0" encoding="UTF-8"?>
329 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
330 -<pkgmetadata>
331 -<maintainer type="project">
332 - <email>java@g.o</email>
333 - <name>Java</name>
334 -</maintainer>
335 -</pkgmetadata>