dev-java/flexdock version bump

5 files changed, 72 insertions, 0 deletions

diff --git a/dev-java/flexdock/ChangeLog b/dev-java/flexdock/ChangeLog
index 49794812f..2ed21fcb7 100644
--- a/dev-java/flexdock/ChangeLog
+++ b/dev-java/flexdock/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*flexdock-1.2.0 (28 Jul 2012)
+
+  28 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  +flexdock-1.2.0.ebuild, +files/flexdock-1.2.0-nodemo.patch:
+  version bump.
+  remove jgoodies-looks dependencies since we don't build demos
+
   23 May 2012; Sébastien Fabbro <bicatali@gentoo.org> flexdock-1.1.1.ebuild:
   add missing jgoodies-looks dependency
 
diff --git a/dev-java/flexdock/Manifest b/dev-java/flexdock/Manifest
index 40a273fcd..4d08759fc 100644
--- a/dev-java/flexdock/Manifest
+++ b/dev-java/flexdock/Manifest
@@ -1 +1,2 @@
 DIST flexdock-1.1.1-src.zip 6163036 SHA256 e0bed4b633dd09da20651d495eb87b985150938564dd124083483c98bda09cf3 SHA512 104398a573b2aade0ed6b848920f8a3903964feabd755c653d8e62ea986251d9c31a07e88308c9cffe7e696c99109a3dfca249f0ca0357e88a896fc5769170f4 WHIRLPOOL 3265875a173911f5635d76824c1c98bc5f0fef3761abc7f5efc3ddc3582f354562391982f6c6f0f286ac2677bafc94237ce09e63ae877da79cad7dfcd50855b9
+DIST flexdock-1.2.0-src.zip 6159196 SHA256 7506b49c902d7d48ef0c06a145327fa9e1166a522e0990e74b37a8936f62ebf5 SHA512 cafdc84037af81c5f2fccb3642cd6db7a2b16b10156c7536c566624ecba9dd42e50cd08dfc0ed49c83e88b07cede6d8c2afb6ed707451c39906dffcf274327d7 WHIRLPOOL 8d06b0840db904f75905927d3990613e18f71cb183a27d4ff2d9c01318cf6a5136b5e4e8cfaed775d9a595c83cabb5aeeaa9d2244b43ab345d7d116fdce98ae8
diff --git a/dev-java/flexdock/files/flexdock-1.2.0-nodemo.patch b/dev-java/flexdock/files/flexdock-1.2.0-nodemo.patch
new file mode 100644
index 000000000..415301d20
--- /dev/null
+++ b/dev-java/flexdock/files/flexdock-1.2.0-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-1.2.0.ebuild b/dev-java/flexdock/flexdock-1.2.0.ebuild
new file mode 100644
index 000000000..f24cc2510
--- /dev/null
+++ b/dev-java/flexdock/flexdock-1.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 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="http://forge.scilab.org/index.php/p/flexdock/downloads/get/${P}-src.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	dev-java/skinlf"
+
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="doc"
+
+src_unpack() {
+	mkdir "${WORKDIR}/${P}"
+	cd "${S}"
+	unpack ${A}
+}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-nodemo.patch
+
+	#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 lib || die
+	rm -rvf *.jar jmf|| die
+	java-pkg_jar-from skinlf
+}
+
+src_install() {
+	java-pkg_newjar "build/${P}.jar" "${PN}.jar"
+	use doc && java-pkg_dojavadoc build/docs/api
+	use source && java-pkg_dosrc src
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 4e5d129e5..b2d90b18d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,7 @@
 # Guillaume Horel <guillaume.horel@gmail.com> (11 July 2012)
 # masked for upcoming scilab-5.4.0
 =dev-java/jrosetta-1.0.4
+=dev-java/flexdock-1.2.0
 
 # Nicolas Bock <nicolasbock@gmail.com> (05 July 2012)
 # live ebuild