Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci into guillaume

Conflicts:
	sci-mathematics/scilab/Manifest

2 files changed, 49 insertions, 1 deletions

diff --git a/dev-java/jgraphx/ChangeLog b/dev-java/jgraphx/ChangeLog
index db63fbc87..6cc153d72 100644
--- a/dev-java/jgraphx/ChangeLog
+++ b/dev-java/jgraphx/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-java/jgraphx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*jgraphx-1.4.1.0 (30 Jun 2011)
+
+  30 Jun 2011; Guillaume Horel <guillaume.horel@gmail.com>
+  +jgraphx-1.4.1.0.ebuild:
+  Version 1.4.1.0 is specifically required by scilab
+
 *jgraphx-1.4.1.2 (06 Oct 2010)
 
   06 Oct 2010; Thomas Kahle <tom111@gmx.de> +jgraphx-1.4.1.2.ebuild:
diff --git a/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild b/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild
new file mode 100644
index 000000000..5813fb713
--- /dev/null
+++ b/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+JAVA_PKG_IUSE="doc source"
+EAPI=2
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_PV=$(replace_all_version_separators '_')
+
+DESCRIPTION="Open-source graph component for Java"
+SRC_URI="http://www.jgraph.com/downloads/jgraphx/archive/${PN}-${MY_PV}.zip\
+		-> ${P}.zip"
+HOMEPAGE="http://www.jgraph.com"
+IUSE="doc examples source"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	# don't do javadoc always
+	sed -i \
+		-e 's/depends="doc"/depends="compile"/' \
+		build.xml || die "sed failed"
+	rm -rf doc/api lib/jgraphx.jar || die
+}
+
+EANT_BUILD_TARGET="build"
+EANT_DOC_TARGET="doc"
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc src/org
+	use examples && java-pkg_doexamples examples
+}