Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Guillaume Horel <guillaume.horel@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-java/flexdock/, dev-java/flexdock/files/
Date: Thu, 22 Dec 2011 21:31:22
Message-Id: 97665677b7521003dc12bce1418e80ed054b39cd.guillaume_horel@gentoo
1 commit: 97665677b7521003dc12bce1418e80ed054b39cd
2 Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
3 AuthorDate: Thu Dec 22 21:28:03 2011 +0000
4 Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
5 CommitDate: Thu Dec 22 21:28:03 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=97665677
7
8 [dev-java/flexdock] version bump to 1.1
9
10 ---
11 dev-java/flexdock/ChangeLog | 12 ++++-
12 dev-java/flexdock/files/flexdock-0.5.1-build.patch | 44 ---------------
13 .../flexdock/files/flexdock-0.5.1-nativelib.patch | 21 -------
14 .../flexdock/files/flexdock-0.5.1-nodemo.patch | 12 ----
15 dev-java/flexdock/files/flexdock-0.5.2-build.patch | 44 ---------------
16 .../flexdock/files/flexdock-0.5.2-nativelib.patch | 21 -------
17 .../flexdock/files/flexdock-0.5.2-nodemo.patch | 12 ----
18 dev-java/flexdock/files/flexdock-1.1-nodemo.patch | 12 ++++
19 dev-java/flexdock/flexdock-0.5.2.ebuild | 58 --------------------
20 ...lexdock-0.5.1-r1.ebuild => flexdock-1.1.ebuild} | 25 ++++-----
21 10 files changed, 33 insertions(+), 228 deletions(-)
22
23 diff --git a/dev-java/flexdock/ChangeLog b/dev-java/flexdock/ChangeLog
24 index 39f0e98..a97f449 100644
25 --- a/dev-java/flexdock/ChangeLog
26 +++ b/dev-java/flexdock/ChangeLog
27 @@ -1,7 +1,17 @@
28 # ChangeLog for dev-java/flexdock
29 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
30 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
31 # $Header: $
32
33 +*flexdock-1.1 (22 Dec 2011)
34 +
35 + 22 Dec 2011; Guillaume Horel <guillaume.horel@×××××.com>
36 + -flexdock-0.5.1-r1.ebuild, -files/flexdock-0.5.1-build.patch,
37 + -files/flexdock-0.5.1-nativelib.patch, -files/flexdock-0.5.1-nodemo.patch,
38 + -flexdock-0.5.2.ebuild, -files/flexdock-0.5.2-build.patch,
39 + -files/flexdock-0.5.2-nativelib.patch, -files/flexdock-0.5.2-nodemo.patch,
40 + +flexdock-1.1.ebuild, +files/flexdock-1.1-nodemo.patch:
41 + Version bump to 1.1 and delete versions no longer available upstream.
42 +
43 *flexdock-0.5.2 (19 Oct 2010)
44
45 19 Oct 2010; Thomas Kahle <tomka@g.o> +flexdock-0.5.2.ebuild,
46
47 diff --git a/dev-java/flexdock/files/flexdock-0.5.1-build.patch b/dev-java/flexdock/files/flexdock-0.5.1-build.patch
48 deleted file mode 100644
49 index 130df6b..0000000
50 --- a/dev-java/flexdock/files/flexdock-0.5.1-build.patch
51 +++ /dev/null
52 @@ -1,44 +0,0 @@
53 -diff -urN flexdock-0.5.1-orig/build.xml flexdock-0.5.1/build.xml
54 ---- flexdock-0.5.1-orig/build.xml 2010-02-22 21:35:43.000000000 -0500
55 -+++ flexdock-0.5.1/build.xml 2010-02-22 21:39:17.000000000 -0500
56 -@@ -69,6 +69,7 @@
57 -
58 - <path id="rt.classpath">
59 - <pathelement location="${bin.dir}"/>
60 -+ <pathelement location="${lib.dir}/commons-logging.jar"/>
61 - </path>
62 - <path id="rt.classpath.demo">
63 - <pathelement location="${bin.dir.demo}"/>
64 -@@ -118,7 +119,7 @@
65 - <condition property="os.unixWithXlib">
66 - <and>
67 - <os family="unix"/>
68 -- <available file="/usr/X11R6/include/X11/Xlib.h"/>
69 -+ <available file="/usr/include/X11/Xlib.h"/>
70 - </and>
71 - </condition>
72 - </target>
73 -@@ -291,11 +292,12 @@
74 -
75 - <exec executable="gcc" failonerror="true">
76 - <arg value="-lX11"/>
77 -- <arg value="-L/usr/X11R6/lib"/>
78 -- <arg value="-I/usr/X11R6/include"/>
79 -+ <arg value="-L/usr/lib"/>
80 -+ <arg value="-I/usr/include/X11"/>
81 - <arg value="-o"/>
82 - <arg value="${so.dir}/libRubberBand${library.key}.so"/>
83 - <arg value="-shared"/>
84 -+ <arg value="-fPIC"/>
85 - <arg value="${c.dir}/RubberBand.c"/>
86 - <arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs -->
87 - </exec>
88 -@@ -313,7 +315,7 @@
89 - <isset property="generic.jar"/>
90 - </condition>
91 - <property name="jar.suffix" value=""/>
92 -- <property name="jar.excludes" value=""/>
93 -+ <property name="jar.excludes" value="**/*.so"/>
94 -
95 -
96 - <!-- after this method is called, other targets can use these props -->
97
98 diff --git a/dev-java/flexdock/files/flexdock-0.5.1-nativelib.patch b/dev-java/flexdock/files/flexdock-0.5.1-nativelib.patch
99 deleted file mode 100644
100 index ae8df8f..0000000
101 --- a/dev-java/flexdock/files/flexdock-0.5.1-nativelib.patch
102 +++ /dev/null
103 @@ -1,21 +0,0 @@
104 -diff -urN flexdock-0.5.1-orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java flexdock-0.5.1/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java
105 ---- flexdock-0.5.1-orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2010-02-22 21:35:42.000000000 -0500
106 -+++ flexdock-0.5.1/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2010-02-24 23:31:55.000000000 -0500
107 -@@ -17,7 +17,7 @@
108 - *
109 - */
110 - public class XlibRubberBand extends RubberBand {
111 -- private static final String NATIVE_RESOURCE_PATH = "org/flexdock/docking/drag/outline/xlib/";
112 -+ private static final String NATIVE_RESOURCE_PATH = "/usr/lib/flexdock/";
113 - private static final String NATIVE_RESOURCE = "libRubberBand.so";
114 - private static final String NATIVE_RESOURCE_START = "libRubberBand";
115 - private static final String NATIVE_RESOURCE_END = ".so";
116 -@@ -46,7 +46,7 @@
117 - String resource = NATIVE_RESOURCE_PATH + NATIVE_RESOURCE_START + key + NATIVE_RESOURCE_END;
118 -
119 - try {
120 -- ResourceManager.loadLibrary(lib, resource);
121 -+ System.load(resource);
122 - // if the library was successfully loaded, then we don't
123 - // need to do anything else.
124 - return;
125
126 diff --git a/dev-java/flexdock/files/flexdock-0.5.1-nodemo.patch b/dev-java/flexdock/files/flexdock-0.5.1-nodemo.patch
127 deleted file mode 100644
128 index 0324d66..0000000
129 --- a/dev-java/flexdock/files/flexdock-0.5.1-nodemo.patch
130 +++ /dev/null
131 @@ -1,12 +0,0 @@
132 -diff -urN flexdock-orig//build.xml flexdock/build.xml
133 ---- flexdock-orig//build.xml 2010-02-21 23:35:15.000000000 -0500
134 -+++ flexdock/build.xml 2010-02-21 23:35:45.000000000 -0500
135 -@@ -145,8 +145,6 @@
136 - <src path="${java.src.drag}"/>
137 - <src path="${java.src.perspective}"/>
138 - </javac>
139 -- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4"/>
140 -- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4"/>
141 - </target>
142 -
143 -
144
145 diff --git a/dev-java/flexdock/files/flexdock-0.5.2-build.patch b/dev-java/flexdock/files/flexdock-0.5.2-build.patch
146 deleted file mode 100644
147 index 0d55869..0000000
148 --- a/dev-java/flexdock/files/flexdock-0.5.2-build.patch
149 +++ /dev/null
150 @@ -1,44 +0,0 @@
151 -diff -urN flexdock-0.5.2-orig/build.xml flexdock-0.5.2/build.xml
152 ---- flexdock-0.5.2-orig/build.xml 2010-02-22 21:35:43.000000000 -0500
153 -+++ flexdock-0.5.2/build.xml 2010-02-22 21:39:17.000000000 -0500
154 -@@ -69,6 +69,7 @@
155 -
156 - <path id="rt.classpath">
157 - <pathelement location="${bin.dir}"/>
158 -+ <pathelement location="${lib.dir}/commons-logging.jar"/>
159 - </path>
160 - <path id="rt.classpath.demo">
161 - <pathelement location="${bin.dir.demo}"/>
162 -@@ -118,7 +119,7 @@
163 - <condition property="os.unixWithXlib">
164 - <and>
165 - <os family="unix"/>
166 -- <available file="/usr/X11R6/include/X11/Xlib.h"/>
167 -+ <available file="/usr/include/X11/Xlib.h"/>
168 - </and>
169 - </condition>
170 - </target>
171 -@@ -291,11 +292,12 @@
172 -
173 - <exec executable="gcc" failonerror="true">
174 - <arg value="-lX11"/>
175 -- <arg value="-L/usr/X11R6/lib"/>
176 -- <arg value="-I/usr/X11R6/include"/>
177 -+ <arg value="-L/usr/lib"/>
178 -+ <arg value="-I/usr/include/X11"/>
179 - <arg value="-o"/>
180 - <arg value="${so.dir}/libRubberBand${library.key}.so"/>
181 - <arg value="-shared"/>
182 -+ <arg value="-fPIC"/>
183 - <arg value="${c.dir}/RubberBand.c"/>
184 - <arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs -->
185 - </exec>
186 -@@ -313,7 +315,7 @@
187 - <isset property="generic.jar"/>
188 - </condition>
189 - <property name="jar.suffix" value=""/>
190 -- <property name="jar.excludes" value=""/>
191 -+ <property name="jar.excludes" value="**/*.so"/>
192 -
193 -
194 - <!-- after this method is called, other targets can use these props -->
195
196 diff --git a/dev-java/flexdock/files/flexdock-0.5.2-nativelib.patch b/dev-java/flexdock/files/flexdock-0.5.2-nativelib.patch
197 deleted file mode 100644
198 index 256f7e9..0000000
199 --- a/dev-java/flexdock/files/flexdock-0.5.2-nativelib.patch
200 +++ /dev/null
201 @@ -1,21 +0,0 @@
202 -diff -urN flexdock-0.5.2-orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java flexdock-0.5.2/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java
203 ---- flexdock-0.5.2-orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2010-02-22 21:35:42.000000000 -0500
204 -+++ flexdock-0.5.2/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2010-02-24 23:31:55.000000000 -0500
205 -@@ -17,7 +17,7 @@
206 - *
207 - */
208 - public class XlibRubberBand extends RubberBand {
209 -- private static final String NATIVE_RESOURCE_PATH = "org/flexdock/docking/drag/outline/xlib/";
210 -+ private static final String NATIVE_RESOURCE_PATH = "/usr/lib/flexdock/";
211 - private static final String NATIVE_RESOURCE = "libRubberBand.so";
212 - private static final String NATIVE_RESOURCE_START = "libRubberBand";
213 - private static final String NATIVE_RESOURCE_END = ".so";
214 -@@ -46,7 +46,7 @@
215 - String resource = NATIVE_RESOURCE_PATH + NATIVE_RESOURCE_START + key + NATIVE_RESOURCE_END;
216 -
217 - try {
218 -- ResourceManager.loadLibrary(lib, resource);
219 -+ System.load(resource);
220 - // if the library was successfully loaded, then we don't
221 - // need to do anything else.
222 - return;
223
224 diff --git a/dev-java/flexdock/files/flexdock-0.5.2-nodemo.patch b/dev-java/flexdock/files/flexdock-0.5.2-nodemo.patch
225 deleted file mode 100644
226 index 4c2783a..0000000
227 --- a/dev-java/flexdock/files/flexdock-0.5.2-nodemo.patch
228 +++ /dev/null
229 @@ -1,12 +0,0 @@
230 -diff -urN flexdock-0.5.2-orig/build.xml flexdock-0.5.2/build.xml
231 ---- flexdock-0.5.2-orig/build.xml 2010-02-21 23:35:15.000000000 -0500
232 -+++ flexdock-0.5.2/build.xml 2010-02-21 23:35:45.000000000 -0500
233 -@@ -145,8 +145,6 @@
234 - <src path="${java.src.drag}"/>
235 - <src path="${java.src.perspective}"/>
236 - </javac>
237 -- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4" includeAntRuntime="no"/>
238 -- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4" includeAntRuntime="no"/>
239 - </target>
240 -
241 -
242
243 diff --git a/dev-java/flexdock/files/flexdock-1.1-nodemo.patch b/dev-java/flexdock/files/flexdock-1.1-nodemo.patch
244 new file mode 100644
245 index 0000000..415301d
246 --- /dev/null
247 +++ b/dev-java/flexdock/files/flexdock-1.1-nodemo.patch
248 @@ -0,0 +1,12 @@
249 +diff -urN flexdock-orig/build.xml flexdock/build.xml
250 +--- flexdock-orig/build.xml 2011-12-09 11:11:26.000000000 -0500
251 ++++ flexdock/build.xml 2011-12-20 18:47:57.277051174 -0500
252 +@@ -145,8 +145,6 @@
253 + <src path="${java.src.drag}"/>
254 + <src path="${java.src.perspective}"/>
255 + </javac>
256 +- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.5" target="1.5" includeAntRuntime="no"/>
257 +- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.5" target="1.5" includeAntRuntime="no"/>
258 + </target>
259 +
260 +
261
262 diff --git a/dev-java/flexdock/flexdock-0.5.2.ebuild b/dev-java/flexdock/flexdock-0.5.2.ebuild
263 deleted file mode 100644
264 index 35c4e66..0000000
265 --- a/dev-java/flexdock/flexdock-0.5.2.ebuild
266 +++ /dev/null
267 @@ -1,58 +0,0 @@
268 -# Copyright 1999-2010 Gentoo Foundation
269 -# Distributed under the terms of the GNU General Public License v2
270 -# $Header: $
271 -
272 -EAPI="2"
273 -JAVA_PKG_IUSE="doc source"
274 -
275 -inherit java-pkg-2 java-ant-2
276 -
277 -DESCRIPTION="A Java docking framework for use in cross-platform Swing applications"
278 -HOMEPAGE="http://flexdock.dev.java.net/"
279 -SRC_URI="https://flexdock.dev.java.net/files/documents/2037/152436/${P}-src.zip"
280 -
281 -#S=${WORKDIR}
282 -
283 -LICENSE="MIT"
284 -SLOT="0"
285 -KEYWORDS="~x86 ~amd64"
286 -
287 -IUSE=""
288 -
289 -RDEPEND=">=virtual/jre-1.4"
290 -DEPEND=">=virtual/jdk-1.4
291 - app-arch/unzip
292 - dev-java/skinlf
293 - dev-java/commons-logging"
294 -
295 -EANT_BUILD_TARGET="build.with.native jar"
296 -EANT_DOC_TARGET="doc"
297 -
298 -java_prepare() {
299 - epatch "${FILESDIR}"/${P}-nativelib.patch
300 - epatch "${FILESDIR}"/${P}-build.patch
301 - epatch "${FILESDIR}"/${P}-nodemo.patch
302 -
303 - #configure java environment
304 - cp workingcopy.properties-sample workingcopy.properties
305 - sed -i -e 's|sdk.home=C:\\\\jdk1.5.0_03|sdk.home=|' \
306 - -e "s|sdk.home=|sdk.home=$(java-config -O)|" workingcopy.properties|| die
307 -
308 - #some cleanups
309 - find . -name '*.so' -exec rm -v {} \;|| die
310 - find . -name '*.dll' -exec rm -v {} \;|| die
311 -
312 - #remove built-in jars and use the system ones
313 - cd "${WORKDIR}/lib" || die
314 - rm -rvf *.jar jmf|| die
315 - java-pkg_jar-from skinlf
316 - java-pkg_jar-from commons-logging commons-logging.jar
317 - java-pkg_jar-from jgoodies-looks-2.0 looks.jar
318 -}
319 -
320 -src_install() {
321 - java-pkg_newjar "build/${P}.jar" "${PN}.jar"
322 - java-pkg_doso build/bin/org/flexdock/docking/drag/outline/xlib/*.so
323 - use doc && java-pkg_dojavadoc build/docs/api
324 - use source && java-pkg_dosrc src
325 -}
326
327 diff --git a/dev-java/flexdock/flexdock-0.5.1-r1.ebuild b/dev-java/flexdock/flexdock-1.1.ebuild
328 similarity index 57%
329 rename from dev-java/flexdock/flexdock-0.5.1-r1.ebuild
330 rename to dev-java/flexdock/flexdock-1.1.ebuild
331 index 0b57113..9ef3301 100644
332 --- a/dev-java/flexdock/flexdock-0.5.1-r1.ebuild
333 +++ b/dev-java/flexdock/flexdock-1.1.ebuild
334 @@ -1,4 +1,4 @@
335 -# Copyright 1999-2010 Gentoo Foundation
336 +# Copyright 1999-2011 Gentoo Foundation
337 # Distributed under the terms of the GNU General Public License v2
338 # $Header: $
339
340 @@ -9,7 +9,7 @@ inherit java-pkg-2 java-ant-2
341
342 DESCRIPTION="A Java docking framework for use in cross-platform Swing applications"
343 HOMEPAGE="http://flexdock.dev.java.net/"
344 -SRC_URI="https://flexdock.dev.java.net/files/documents/2037/52480/${P}-src.zip"
345 +SRC_URI="http://java.net/projects/flexdock/downloads/download/${P}-src.zip"
346
347 LICENSE="MIT"
348 SLOT="0"
349 @@ -20,37 +20,32 @@ IUSE=""
350 RDEPEND=">=virtual/jre-1.4"
351 DEPEND=">=virtual/jdk-1.4
352 app-arch/unzip
353 - dev-java/skinlf
354 - dev-java/commons-logging"
355 + dev-java/skinlf"
356
357 -EANT_BUILD_TARGET="build.with.native jar"
358 EANT_DOC_TARGET="doc"
359
360 +src_unpack() {
361 + mkdir "${WORKDIR}/${P}"
362 + cd "${S}"
363 + unpack ${A}
364 +}
365 +
366 java_prepare() {
367 - epatch "${FILESDIR}"/${P}-nativelib.patch
368 - epatch "${FILESDIR}"/${P}-build.patch
369 epatch "${FILESDIR}"/${P}-nodemo.patch
370
371 - #configure java environment
372 - cp workingcopy.properties-sample workingcopy.properties
373 - sed -i -e 's|sdk.home=C:\\\\jdk1.5.0_03|sdk.home=|' \
374 - -e "s|sdk.home=|sdk.home=$(java-config -O)|" workingcopy.properties|| die
375 -
376 #some cleanups
377 find . -name '*.so' -exec rm -v {} \;|| die
378 find . -name '*.dll' -exec rm -v {} \;|| die
379
380 #remove built-in jars and use the system ones
381 - cd "${WORKDIR}/lib" || die
382 + cd lib || die
383 rm -rvf *.jar jmf|| die
384 java-pkg_jar-from skinlf
385 - java-pkg_jar-from commons-logging commons-logging.jar
386 java-pkg_jar-from jgoodies-looks-2.0 looks.jar
387 }
388
389 src_install() {
390 java-pkg_newjar "build/${P}.jar" "${PN}.jar"
391 - java-pkg_doso build/bin/org/flexdock/docking/drag/outline/xlib/*.so
392 use doc && java-pkg_dojavadoc build/docs/api
393 use source && java-pkg_dosrc src
394 }
Report Message
Find on MARC Find on Google Groups