diff options
| -rw-r--r-- | dev-java/flexdock/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-java/flexdock/files/flexdock-0.5.1-build.patch | 44 | ||||
| -rw-r--r-- | dev-java/flexdock/files/flexdock-0.5.1-nativelib.patch | 21 | ||||
| -rw-r--r-- | dev-java/flexdock/files/flexdock-0.5.1-nodemo.patch | 12 | ||||
| -rw-r--r-- | dev-java/flexdock/files/flexdock-0.5.2-build.patch | 44 | ||||
| -rw-r--r-- | dev-java/flexdock/files/flexdock-0.5.2-nativelib.patch | 21 | ||||
| -rw-r--r-- | dev-java/flexdock/files/flexdock-0.5.2-nodemo.patch | 12 | ||||
| -rw-r--r-- | dev-java/flexdock/files/flexdock-1.1-nodemo.patch | 12 | ||||
| -rw-r--r-- | dev-java/flexdock/flexdock-0.5.2.ebuild | 58 | ||||
| -rw-r--r-- | dev-java/flexdock/flexdock-1.1.ebuild (renamed from dev-java/flexdock/flexdock-0.5.1-r1.ebuild) | 25 |
10 files changed, 33 insertions, 228 deletions
diff --git a/dev-java/flexdock/ChangeLog b/dev-java/flexdock/ChangeLog index 39f0e98ec..a97f449d8 100644 --- a/dev-java/flexdock/ChangeLog +++ b/dev-java/flexdock/ChangeLog @@ -1,7 +1,17 @@ # ChangeLog for dev-java/flexdock -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*flexdock-1.1 (22 Dec 2011) + + 22 Dec 2011; Guillaume Horel <guillaume.horel@gmail.com> + -flexdock-0.5.1-r1.ebuild, -files/flexdock-0.5.1-build.patch, + -files/flexdock-0.5.1-nativelib.patch, -files/flexdock-0.5.1-nodemo.patch, + -flexdock-0.5.2.ebuild, -files/flexdock-0.5.2-build.patch, + -files/flexdock-0.5.2-nativelib.patch, -files/flexdock-0.5.2-nodemo.patch, + +flexdock-1.1.ebuild, +files/flexdock-1.1-nodemo.patch: + Version bump to 1.1 and delete versions no longer available upstream. + *flexdock-0.5.2 (19 Oct 2010) 19 Oct 2010; Thomas Kahle <tomka@gentoo.org> +flexdock-0.5.2.ebuild, diff --git a/dev-java/flexdock/files/flexdock-0.5.1-build.patch b/dev-java/flexdock/files/flexdock-0.5.1-build.patch deleted file mode 100644 index 130df6b8d..000000000 --- a/dev-java/flexdock/files/flexdock-0.5.1-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -urN flexdock-0.5.1-orig/build.xml flexdock-0.5.1/build.xml ---- flexdock-0.5.1-orig/build.xml 2010-02-22 21:35:43.000000000 -0500 -+++ flexdock-0.5.1/build.xml 2010-02-22 21:39:17.000000000 -0500 -@@ -69,6 +69,7 @@ -
- <path id="rt.classpath">
- <pathelement location="${bin.dir}"/>
-+ <pathelement location="${lib.dir}/commons-logging.jar"/>
- </path>
- <path id="rt.classpath.demo">
- <pathelement location="${bin.dir.demo}"/>
-@@ -118,7 +119,7 @@ - <condition property="os.unixWithXlib">
- <and>
- <os family="unix"/>
-- <available file="/usr/X11R6/include/X11/Xlib.h"/>
-+ <available file="/usr/include/X11/Xlib.h"/>
- </and>
- </condition>
- </target>
-@@ -291,11 +292,12 @@ -
- <exec executable="gcc" failonerror="true">
- <arg value="-lX11"/>
-- <arg value="-L/usr/X11R6/lib"/>
-- <arg value="-I/usr/X11R6/include"/>
-+ <arg value="-L/usr/lib"/>
-+ <arg value="-I/usr/include/X11"/>
- <arg value="-o"/>
- <arg value="${so.dir}/libRubberBand${library.key}.so"/>
- <arg value="-shared"/>
-+ <arg value="-fPIC"/>
- <arg value="${c.dir}/RubberBand.c"/>
- <arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs -->
- </exec>
-@@ -313,7 +315,7 @@ - <isset property="generic.jar"/>
- </condition>
- <property name="jar.suffix" value=""/>
-- <property name="jar.excludes" value=""/>
-+ <property name="jar.excludes" value="**/*.so"/>
-
-
- <!-- after this method is called, other targets can use these props -->
diff --git a/dev-java/flexdock/files/flexdock-0.5.1-nativelib.patch b/dev-java/flexdock/files/flexdock-0.5.1-nativelib.patch deleted file mode 100644 index ae8df8f23..000000000 --- a/dev-java/flexdock/files/flexdock-0.5.1-nativelib.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 ---- flexdock-0.5.1-orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2010-02-22 21:35:42.000000000 -0500 -+++ flexdock-0.5.1/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2010-02-24 23:31:55.000000000 -0500 -@@ -17,7 +17,7 @@ - *
- */
- public class XlibRubberBand extends RubberBand {
-- private static final String NATIVE_RESOURCE_PATH = "org/flexdock/docking/drag/outline/xlib/";
-+ private static final String NATIVE_RESOURCE_PATH = "/usr/lib/flexdock/";
- private static final String NATIVE_RESOURCE = "libRubberBand.so";
- private static final String NATIVE_RESOURCE_START = "libRubberBand";
- private static final String NATIVE_RESOURCE_END = ".so";
-@@ -46,7 +46,7 @@ - String resource = NATIVE_RESOURCE_PATH + NATIVE_RESOURCE_START + key + NATIVE_RESOURCE_END;
-
- try {
-- ResourceManager.loadLibrary(lib, resource);
-+ System.load(resource);
- // if the library was successfully loaded, then we don't
- // need to do anything else.
- return;
diff --git a/dev-java/flexdock/files/flexdock-0.5.1-nodemo.patch b/dev-java/flexdock/files/flexdock-0.5.1-nodemo.patch deleted file mode 100644 index 0324d66bd..000000000 --- a/dev-java/flexdock/files/flexdock-0.5.1-nodemo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN flexdock-orig//build.xml flexdock/build.xml ---- flexdock-orig//build.xml 2010-02-21 23:35:15.000000000 -0500 -+++ flexdock/build.xml 2010-02-21 23:35:45.000000000 -0500 -@@ -145,8 +145,6 @@ - <src path="${java.src.drag}"/>
- <src path="${java.src.perspective}"/>
- </javac>
-- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4"/>
-- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4"/>
- </target>
-
-
diff --git a/dev-java/flexdock/files/flexdock-0.5.2-build.patch b/dev-java/flexdock/files/flexdock-0.5.2-build.patch deleted file mode 100644 index 0d5586970..000000000 --- a/dev-java/flexdock/files/flexdock-0.5.2-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -urN flexdock-0.5.2-orig/build.xml flexdock-0.5.2/build.xml ---- flexdock-0.5.2-orig/build.xml 2010-02-22 21:35:43.000000000 -0500 -+++ flexdock-0.5.2/build.xml 2010-02-22 21:39:17.000000000 -0500 -@@ -69,6 +69,7 @@ - - <path id="rt.classpath"> - <pathelement location="${bin.dir}"/> -+ <pathelement location="${lib.dir}/commons-logging.jar"/> - </path> - <path id="rt.classpath.demo"> - <pathelement location="${bin.dir.demo}"/> -@@ -118,7 +119,7 @@ - <condition property="os.unixWithXlib"> - <and> - <os family="unix"/> -- <available file="/usr/X11R6/include/X11/Xlib.h"/> -+ <available file="/usr/include/X11/Xlib.h"/> - </and> - </condition> - </target> -@@ -291,11 +292,12 @@ - - <exec executable="gcc" failonerror="true"> - <arg value="-lX11"/> -- <arg value="-L/usr/X11R6/lib"/> -- <arg value="-I/usr/X11R6/include"/> -+ <arg value="-L/usr/lib"/> -+ <arg value="-I/usr/include/X11"/> - <arg value="-o"/> - <arg value="${so.dir}/libRubberBand${library.key}.so"/> - <arg value="-shared"/> -+ <arg value="-fPIC"/> - <arg value="${c.dir}/RubberBand.c"/> - <arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs --> - </exec> -@@ -313,7 +315,7 @@ - <isset property="generic.jar"/> - </condition> - <property name="jar.suffix" value=""/> -- <property name="jar.excludes" value=""/> -+ <property name="jar.excludes" value="**/*.so"/> - - - <!-- after this method is called, other targets can use these props --> diff --git a/dev-java/flexdock/files/flexdock-0.5.2-nativelib.patch b/dev-java/flexdock/files/flexdock-0.5.2-nativelib.patch deleted file mode 100644 index 256f7e9bd..000000000 --- a/dev-java/flexdock/files/flexdock-0.5.2-nativelib.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 ---- flexdock-0.5.2-orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2010-02-22 21:35:42.000000000 -0500 -+++ flexdock-0.5.2/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2010-02-24 23:31:55.000000000 -0500 -@@ -17,7 +17,7 @@ - * - */ - public class XlibRubberBand extends RubberBand { -- private static final String NATIVE_RESOURCE_PATH = "org/flexdock/docking/drag/outline/xlib/"; -+ private static final String NATIVE_RESOURCE_PATH = "/usr/lib/flexdock/"; - private static final String NATIVE_RESOURCE = "libRubberBand.so"; - private static final String NATIVE_RESOURCE_START = "libRubberBand"; - private static final String NATIVE_RESOURCE_END = ".so"; -@@ -46,7 +46,7 @@ - String resource = NATIVE_RESOURCE_PATH + NATIVE_RESOURCE_START + key + NATIVE_RESOURCE_END; - - try { -- ResourceManager.loadLibrary(lib, resource); -+ System.load(resource); - // if the library was successfully loaded, then we don't - // need to do anything else. - return; diff --git a/dev-java/flexdock/files/flexdock-0.5.2-nodemo.patch b/dev-java/flexdock/files/flexdock-0.5.2-nodemo.patch deleted file mode 100644 index 4c2783a51..000000000 --- a/dev-java/flexdock/files/flexdock-0.5.2-nodemo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN flexdock-0.5.2-orig/build.xml flexdock-0.5.2/build.xml ---- flexdock-0.5.2-orig/build.xml 2010-02-21 23:35:15.000000000 -0500 -+++ flexdock-0.5.2/build.xml 2010-02-21 23:35:45.000000000 -0500 -@@ -145,8 +145,6 @@ - <src path="${java.src.drag}"/> - <src path="${java.src.perspective}"/> - </javac> -- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4" includeAntRuntime="no"/> -- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4" includeAntRuntime="no"/> - </target> - - diff --git a/dev-java/flexdock/files/flexdock-1.1-nodemo.patch b/dev-java/flexdock/files/flexdock-1.1-nodemo.patch new file mode 100644 index 000000000..415301d20 --- /dev/null +++ b/dev-java/flexdock/files/flexdock-1.1-nodemo.patch @@ -0,0 +1,12 @@ +diff -urN flexdock-orig/build.xml flexdock/build.xml +--- flexdock-orig/build.xml 2011-12-09 11:11:26.000000000 -0500 ++++ flexdock/build.xml 2011-12-20 18:47:57.277051174 -0500 +@@ -145,8 +145,6 @@ + <src path="${java.src.drag}"/> + <src path="${java.src.perspective}"/> + </javac> +- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.5" target="1.5" includeAntRuntime="no"/> +- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.5" target="1.5" includeAntRuntime="no"/> + </target> + + diff --git a/dev-java/flexdock/flexdock-0.5.2.ebuild b/dev-java/flexdock/flexdock-0.5.2.ebuild deleted file mode 100644 index 35c4e665b..000000000 --- a/dev-java/flexdock/flexdock-0.5.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A Java docking framework for use in cross-platform Swing applications" -HOMEPAGE="http://flexdock.dev.java.net/" -SRC_URI="https://flexdock.dev.java.net/files/documents/2037/152436/${P}-src.zip" - -#S=${WORKDIR} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~x86 ~amd64" - -IUSE="" - -RDEPEND=">=virtual/jre-1.4" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - dev-java/skinlf - dev-java/commons-logging" - -EANT_BUILD_TARGET="build.with.native jar" -EANT_DOC_TARGET="doc" - -java_prepare() { - epatch "${FILESDIR}"/${P}-nativelib.patch - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-nodemo.patch - - #configure java environment - cp workingcopy.properties-sample workingcopy.properties - sed -i -e 's|sdk.home=C:\\\\jdk1.5.0_03|sdk.home=|' \ - -e "s|sdk.home=|sdk.home=$(java-config -O)|" workingcopy.properties|| die - - #some cleanups - find . -name '*.so' -exec rm -v {} \;|| die - find . -name '*.dll' -exec rm -v {} \;|| die - - #remove built-in jars and use the system ones - cd "${WORKDIR}/lib" || die - rm -rvf *.jar jmf|| die - java-pkg_jar-from skinlf - java-pkg_jar-from commons-logging commons-logging.jar - java-pkg_jar-from jgoodies-looks-2.0 looks.jar -} - -src_install() { - java-pkg_newjar "build/${P}.jar" "${PN}.jar" - java-pkg_doso build/bin/org/flexdock/docking/drag/outline/xlib/*.so - use doc && java-pkg_dojavadoc build/docs/api - use source && java-pkg_dosrc src -} diff --git a/dev-java/flexdock/flexdock-0.5.1-r1.ebuild b/dev-java/flexdock/flexdock-1.1.ebuild index 0b5711308..9ef3301a0 100644 --- a/dev-java/flexdock/flexdock-0.5.1-r1.ebuild +++ b/dev-java/flexdock/flexdock-1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -9,7 +9,7 @@ inherit java-pkg-2 java-ant-2 DESCRIPTION="A Java docking framework for use in cross-platform Swing applications" HOMEPAGE="http://flexdock.dev.java.net/" -SRC_URI="https://flexdock.dev.java.net/files/documents/2037/52480/${P}-src.zip" +SRC_URI="http://java.net/projects/flexdock/downloads/download/${P}-src.zip" LICENSE="MIT" SLOT="0" @@ -20,37 +20,32 @@ IUSE="" RDEPEND=">=virtual/jre-1.4" DEPEND=">=virtual/jdk-1.4 app-arch/unzip - dev-java/skinlf - dev-java/commons-logging" + dev-java/skinlf" -EANT_BUILD_TARGET="build.with.native jar" EANT_DOC_TARGET="doc" +src_unpack() { + mkdir "${WORKDIR}/${P}" + cd "${S}" + unpack ${A} +} + java_prepare() { - epatch "${FILESDIR}"/${P}-nativelib.patch - epatch "${FILESDIR}"/${P}-build.patch epatch "${FILESDIR}"/${P}-nodemo.patch - #configure java environment - cp workingcopy.properties-sample workingcopy.properties - sed -i -e 's|sdk.home=C:\\\\jdk1.5.0_03|sdk.home=|' \ - -e "s|sdk.home=|sdk.home=$(java-config -O)|" workingcopy.properties|| die - #some cleanups find . -name '*.so' -exec rm -v {} \;|| die find . -name '*.dll' -exec rm -v {} \;|| die #remove built-in jars and use the system ones - cd "${WORKDIR}/lib" || die + cd lib || die rm -rvf *.jar jmf|| die java-pkg_jar-from skinlf - java-pkg_jar-from commons-logging commons-logging.jar java-pkg_jar-from jgoodies-looks-2.0 looks.jar } src_install() { java-pkg_newjar "build/${P}.jar" "${PN}.jar" - java-pkg_doso build/bin/org/flexdock/docking/drag/outline/xlib/*.so use doc && java-pkg_dojavadoc build/docs/api use source && java-pkg_dosrc src } |