* Eclipse dependencies in own packages (not build from source yet)

* Build swt-chart

21 files changed, 555 insertions, 40 deletions

diff --git a/dev-java/eclipse-core-commands/Manifest b/dev-java/eclipse-core-commands/Manifest
new file mode 100644
index 0000000..0426294
--- /dev/null
+++ b/dev-java/eclipse-core-commands/Manifest
@@ -0,0 +1,4 @@
+DIST org.eclipse.core.commands_3.1.0.jar 66098 SHA256 69620587bd85f87d62dcad7ce38f7259a39b9c1eb68ed353a7abb9fa4a7bd1fb SHA512 0b908d5b6809fa5c03dcfb7c1bb2381648b874a5bb87f22f0d82e496dc6147f0fc6f57545e0a7b871be656c5dc449f3e2c187963a84daa9c1b08a19eb2c0e039 WHIRLPOOL 92da8ffe0387eaf73aa35de9ce8c0cd3235c2642974a84f1291c973632c48dbeda81f8a0095693e11b1ec300812149c7b7857fc042bf55773c8c79e135e62219
+DIST org.eclipse.core.commands_3.6.1.v20120521-2329.jar 108729 SHA256 da1b4b239483f29a137f908b90a5747afa9512671f24f0e9d6776d84c22608e7 SHA512 962099e636610fe3a136f33f3c35f973d9298f5082490853b48240edafff1b3d940381091f740497cce75aede7a951e9542c5ba7dc562bcab33afc037eda0082 WHIRLPOOL c8a5b3a21d74287534a5ff404c8b8ee4638cc6c33c185d5461fcf4e888dcf8e1e14846bbf76787493978cb3864913736c2d7eff1fef2dad7d32c3650c700c538
+EBUILD eclipse-core-commands-3.1.0.ebuild 784 SHA256 de5afeb93b402066ea22e1f43e250d5d2c3b3269ddd608845f077ed02b1e400a SHA512 01235be17fe32dbe93338a8729a82146ba36cb8a81d730f2579b4bacea6425cc6bd7b888bf1a9a1d8472d6681d943757eab926b806e1f344c8afc4516017a929 WHIRLPOOL 79b7937adcd32b659186f86c90635f7f2bcbc3a7f949f8f002aadfb315e50bd4042d9a534d310992b8dbdea664945e39e1b2bd04609bbd3a08ab3ee6ffc5ff1e
+EBUILD eclipse-core-commands-3.6.1.ebuild 813 SHA256 5b37b5cca07ca98880fd30ccdd6d4618ac8a8ccc9bee91a781c350b6fc11d018 SHA512 11fc5900a81c5db32f6daca34f3d7df700d06d02afa2fb4479002be4d2cc8411b0e39a1024e20b70662f3b1c202bc1306fdb25beacf041cb4a4ad437b123cc0d WHIRLPOOL 0ad4741198f421bbbdc9e24cf0c056d8620d01530fee6c29cb1aecc4cd3bc2e997191544a952eac515fd932097e755fa717db6b233a85284d46701bc4af89028
diff --git a/dev-java/eclipse-core-commands/eclipse-core-commands-3.1.0.ebuild b/dev-java/eclipse-core-commands/eclipse-core-commands-3.1.0.ebuild
new file mode 100644
index 0000000..187e614
--- /dev/null
+++ b/dev-java/eclipse-core-commands/eclipse-core-commands-3.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.6 2012/05/21 20:05:07 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils java-pkg-2 versionator
+
+S="${WORKDIR}/"
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse-rcp/"
+SRC_URI="http://eclipse.ialto.com/eclipse/updates/${MY_PV}/plugins/org.eclipse.core.commands_${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="${MY_PV}"
+
+CDEPEND=""
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}"
+
+src_unpack() {
+	# Do nothing
+	echo ""
+}
+
+src_install() {
+
+	java-pkg_newjar "${DISTDIR}/${A}" org.eclipse.core.commands.jar
+}
diff --git a/dev-java/eclipse-core-commands/eclipse-core-commands-3.6.1.ebuild b/dev-java/eclipse-core-commands/eclipse-core-commands-3.6.1.ebuild
new file mode 100644
index 0000000..595f6cb
--- /dev/null
+++ b/dev-java/eclipse-core-commands/eclipse-core-commands-3.6.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.6 2012/05/21 20:05:07 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils java-pkg-2 versionator
+
+S="${WORKDIR}/"
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse-rcp/"
+SRC_URI="http://eclipse.ialto.com/eclipse/updates/4.2/R-4.2-201206081400/plugins/org.eclipse.core.commands_${PV}.v20120521-2329.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="${MY_PV}"
+
+CDEPEND=""
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}"
+
+src_unpack() {
+	# Do nothing
+	echo ""
+}
+
+src_install() {
+
+	java-pkg_newjar "${DISTDIR}/${A}" org.eclipse.core.commands.jar
+}
diff --git a/dev-java/eclipse-core-runtime/Manifest b/dev-java/eclipse-core-runtime/Manifest
new file mode 100644
index 0000000..7fb84e2
--- /dev/null
+++ b/dev-java/eclipse-core-runtime/Manifest
@@ -0,0 +1,4 @@
+DIST org.eclipse.core.runtime_3.1.1.jar 454188 SHA256 74d85e66ad98cd44b8d212bf6fec3c8465ad4c2a9649ca54b372eebe18641ac1 SHA512 6469f95e14486cb5f97d1a3e15b8d25016ebc8395fd1caaeea67c05f45ae184972e6f87ba2d2ef7df891c313b9eab7756d3288448cfd7e75869c442a8f1f02f1 WHIRLPOOL 0d6721c7d01101116ffdac7ea76e8bc1046748f478c0ce5c1379056ab8b2ba5781c9661adc1e086847a62b3666a808f75deacb66ed3ed42eea20dd38c4d42ff2
+DIST org.eclipse.core.runtime_3.8.0.v20120521-2346.jar 75324 SHA256 6701154c6b76862b83926c752008e36accb9a22f4798c50cf80342cc678027f8 SHA512 f3487f02d0e3ac5aa53202464eae6618ab3d40fa0f85fc1155fa797e90bcdddf854bf9300e1fa410ab5b734af1d5e6ec95cfb2b4606effe8b31f21a41c555c49 WHIRLPOOL 85fb0ab2208f08853207f8689425b1d179c3ca37f0e3a6ca178ba390c58d545cc1cfe18e880c0df28f9e7bff955804273ce903edd77b160992a349b45387a7fa
+EBUILD eclipse-core-runtime-3.1.1.ebuild 782 SHA256 feb48dac67e6cbbd4dc61ca30bd2e9562c738db168b6ecb3bc454029dff9ea96 SHA512 d9f068f8a527f6a50081c686b5b3f767c26abac173ac6a73ed71eba21eb612df4dc7a4218122c3ce8f4b3d8a42d457dd04e7bf9ad025c3ada8dcedf48437903b WHIRLPOOL c2d6e089a3e3f633ad3af98bd552d5a32d2b4d945ad9d5c4674c492aed0444990ec3ab6cfa6013a96df4b8bc859d1d59f927f6bf1c616b32cf42b66454867143
+EBUILD eclipse-core-runtime-3.8.0.ebuild 811 SHA256 701d325421e4b30b580b98033c8c6929b9d658bf31fbb380d1b4316e570e151a SHA512 d0ea61e64fbd26b87082217db2a80d84f9ebb4614fdd182ddf1bed49b0e5af3507fe5cdfdf4ac7e386966b085618c0f436878d91face886209163844ca9bc38d WHIRLPOOL 1fe6e747545285c66e5268cdb17f570192ddb00da642716f6aa06b98414f7986f7d1ec36728bc7504ab97f7ed76d37648bb562da158fb082a80582024fd40b9b
diff --git a/dev-java/eclipse-core-runtime/eclipse-core-runtime-3.1.1.ebuild b/dev-java/eclipse-core-runtime/eclipse-core-runtime-3.1.1.ebuild
new file mode 100644
index 0000000..038f1b3
--- /dev/null
+++ b/dev-java/eclipse-core-runtime/eclipse-core-runtime-3.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.6 2012/05/21 20:05:07 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils java-pkg-2 versionator
+
+S="${WORKDIR}/"
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse-rcp/"
+SRC_URI="http://eclipse.ialto.com/eclipse/updates/${MY_PV}/plugins/org.eclipse.core.runtime_${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="${MY_PV}"
+
+CDEPEND=""
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}"
+
+src_unpack() {
+	# Do nothing
+	echo ""
+}
+
+src_install() {
+
+	java-pkg_newjar "${DISTDIR}/${A}" org.eclipse.core.runtime.jar
+}
diff --git a/dev-java/eclipse-core-runtime/eclipse-core-runtime-3.8.0.ebuild b/dev-java/eclipse-core-runtime/eclipse-core-runtime-3.8.0.ebuild
new file mode 100644
index 0000000..2f47e20
--- /dev/null
+++ b/dev-java/eclipse-core-runtime/eclipse-core-runtime-3.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.6 2012/05/21 20:05:07 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils java-pkg-2 versionator
+
+S="${WORKDIR}/"
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse-rcp/"
+SRC_URI="http://eclipse.ialto.com/eclipse/updates/4.2/R-4.2-201206081400/plugins/org.eclipse.core.runtime_${PV}.v20120521-2346.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="${MY_PV}"
+
+CDEPEND=""
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}"
+
+src_unpack() {
+	# Do nothing
+	echo ""
+}
+
+src_install() {
+
+	java-pkg_newjar "${DISTDIR}/${A}" org.eclipse.core.runtime.jar
+}
diff --git a/dev-java/eclipse-jface/Manifest b/dev-java/eclipse-jface/Manifest
new file mode 100644
index 0000000..1fa102a
--- /dev/null
+++ b/dev-java/eclipse-jface/Manifest
@@ -0,0 +1,4 @@
+DIST org.eclipse.jface_3.1.1.jar 667680 SHA256 79c0adde8141f672378224e061974432c8a79e808d1f8a86ed141818fe267207 SHA512 069cd28eae5bb734de763f5aca69edafb21cf2179c7154ab978a332ddf61b34170146166c1185627b99e4c3774c46b2fd379a8b2e98c0f02079d0c298bd5ffd5 WHIRLPOOL 62688f1bf2e42c0fb82dde707f6ad098dde2f4c41697b801d36d4957503778f6cb7ef23f610a29dbe9042509041de46349a2eeaa0a40322060a5f97db32e7790
+DIST org.eclipse.jface_3.8.0.v20120521-2329.jar 1090091 SHA256 934b6827aa3695e17d8184fc7931100381757213fcf1f44d882fb559a7cc5e35 SHA512 8e9d934d8ac0b594c44e15aeb88fbd6eb7fd9694badcbf32ebafc31d083627bb6dd73fed0b0ecb648a77c1bb028c2295c5992acbc0c8c428330aedaf3fac1816 WHIRLPOOL 98a68a7df850cd47be167894fd20e62c496277c1eddfc5d35256cc1f8d0f4705f8998807f9ec4e46341a1e26a437d7c9c5e6f1c157cb0e24c156fb3d664f0db6
+EBUILD eclipse-jface-3.1.1.ebuild 768 SHA256 fdada0aeda13fade34ab7ae607952e1d0a358ee2e11e6900381e2edaded95062 SHA512 a6343f30ee62899656936a685a6b81b4f1843fb50f373e534bedae66a6f32c38591d4806d4baf0af561db764db2601b033edece389019d419e71f92ee395d255 WHIRLPOOL 6299b10a5be16da837c79dd4a70c6452844682f5fec8f5d13fd0e0e17148e50f279223e2f734aa81b9bc10a1d8c1f4ca3ea8ced017e74f7f50133b8f69645448
+EBUILD eclipse-jface-3.8.0.ebuild 797 SHA256 1e8657e9e42c23a2695ebf4bd7ad9db24914c03e59a6c010e427ded0d575d98b SHA512 fb212c2a39bee60f2d61e21550cd9e892a2d2e588e2642a11633c98c8f7de64d00c13135acd838ab1332861118f2dbf94411b499cf16550ae4b925675ea2bb28 WHIRLPOOL 09baf40c3ab73028dd49826235d42f7f85e87c53d35178e996f8795ee42eae8b8d581a912becd6095306fef968e35679e1a410d8773ef068b34c4e0d6dff38c3
diff --git a/dev-java/eclipse-jface/eclipse-jface-3.1.1.ebuild b/dev-java/eclipse-jface/eclipse-jface-3.1.1.ebuild
new file mode 100644
index 0000000..864a0d1
--- /dev/null
+++ b/dev-java/eclipse-jface/eclipse-jface-3.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.6 2012/05/21 20:05:07 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils java-pkg-2 versionator
+
+S="${WORKDIR}/"
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse-rcp/"
+SRC_URI="http://eclipse.ialto.com/eclipse/updates/${MY_PV}/plugins/org.eclipse.jface_${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="${MY_PV}"
+
+CDEPEND=""
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}"
+
+src_unpack() {
+	# Do nothing
+	echo ""
+}
+
+src_install() {
+
+	java-pkg_newjar "${DISTDIR}/${A}" org.eclipse.jface.jar
+}
diff --git a/dev-java/eclipse-jface/eclipse-jface-3.8.0.ebuild b/dev-java/eclipse-jface/eclipse-jface-3.8.0.ebuild
new file mode 100644
index 0000000..928d66c
--- /dev/null
+++ b/dev-java/eclipse-jface/eclipse-jface-3.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.6 2012/05/21 20:05:07 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils java-pkg-2 versionator
+
+S="${WORKDIR}/"
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse-rcp/"
+SRC_URI="http://eclipse.ialto.com/eclipse/updates/4.2/R-4.2-201206081400/plugins/org.eclipse.jface_${PV}.v20120521-2329.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="${MY_PV}"
+
+CDEPEND=""
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}"
+
+src_unpack() {
+	# Do nothing
+	echo ""
+}
+
+src_install() {
+
+	java-pkg_newjar "${DISTDIR}/${A}" org.eclipse.jface.jar
+}
diff --git a/dev-java/eclipse-osgi/Manifest b/dev-java/eclipse-osgi/Manifest
new file mode 100644
index 0000000..8c5b418
--- /dev/null
+++ b/dev-java/eclipse-osgi/Manifest
@@ -0,0 +1,4 @@
+DIST org.eclipse.osgi_3.1.1.jar 748300 SHA256 31044d51a4ae788d9ff341abbd5019ac498ac325b75e6cc0179642b413819128 SHA512 731bd97c8d3b8a00b9d99dc87f1ea5f77dc6fd09d175e9cb3d3e07246a57fd5fc1d20bb778203b36d18ec7d63ba027bc2330eafb87b08ba1e83581915ef621fa WHIRLPOOL 020770bcac3cd641d5af719bc4dd0e812a61d5484bd7703ec71761408b09100b4133d1b7307c5ad16378cd908ea5a50bda7cf488b9c45fbf6197f671a9aa28cc
+DIST org.eclipse.osgi_3.8.0.v20120529-1548.jar 1396175 SHA256 97c917e3ad621f9ad686ebb1188c7dd9b188758b93002e835f2d5beb27e10123 SHA512 f9403eb300726407d4a196c1a0908832cab80a61756f68b462231f2f18c7e6429396a9fcc1c35c1aab8352fb8660ef9f3402a6c8b973d049d6f249098ebe9ab5 WHIRLPOOL 58716acaa1e5821c47d343f44409167d6a4cb949542ebf72583a025fea12df2ba92cae917dfbfd0fac865d2d6106e2de92ca997a3944acb7c114a5173d935526
+EBUILD eclipse-osgi-3.1.1.ebuild 766 SHA256 07a1e763239042a2913b0557ae9cf4a1516495325f7e97d64e2907ef7bf30006 SHA512 40e95f6582ce751e0fe426a4a4a84f70585d34b2dafd16cd6b1928bb8e908a0d33ce814fda9f6f589c50dc7daa681f601336e372639694f0e2f3cf85969e9831 WHIRLPOOL 97fb719ba13f1bc420633393855272dc80d375d7dc639ecff21d9d8c3012d9e822b11d39736616262107fdc417d9390030f65a6412a7a28aa118c4434234c07e
+EBUILD eclipse-osgi-3.8.0.ebuild 795 SHA256 e67d23a639e9ac56c86063149bd4202e9bd2df5a284bcd39ac3299f70ae06649 SHA512 20457cf8b34140454651fcef503c27a25c2a0d9cd47712c6107d3c6f47f79fcbdc78757eef9c62f6b0b76d9da53d29fa16d7156edc85044358974dd690ef9e88 WHIRLPOOL f281768e83c8c9e06edfcc0f9973d879d1f5f1584313bb6445a16228e91594458c57e8ce1d12fa36c969baa0b3d99d838dcd1a172e4dbd6a57751ea72c587954
diff --git a/dev-java/eclipse-osgi/eclipse-osgi-3.1.1.ebuild b/dev-java/eclipse-osgi/eclipse-osgi-3.1.1.ebuild
new file mode 100644
index 0000000..37a654a
--- /dev/null
+++ b/dev-java/eclipse-osgi/eclipse-osgi-3.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.6 2012/05/21 20:05:07 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils java-pkg-2 versionator
+
+S="${WORKDIR}/"
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse-rcp/"
+SRC_URI="http://eclipse.ialto.com/eclipse/updates/${MY_PV}/plugins/org.eclipse.osgi_${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="${MY_PV}"
+
+CDEPEND=""
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}"
+
+src_unpack() {
+	# Do nothing
+	echo ""
+}
+
+src_install() {
+
+	java-pkg_newjar "${DISTDIR}/${A}" org.eclipse.osgi.jar
+}
diff --git a/dev-java/eclipse-osgi/eclipse-osgi-3.8.0.ebuild b/dev-java/eclipse-osgi/eclipse-osgi-3.8.0.ebuild
new file mode 100644
index 0000000..75a6c04
--- /dev/null
+++ b/dev-java/eclipse-osgi/eclipse-osgi-3.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.6 2012/05/21 20:05:07 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils java-pkg-2 versionator
+
+S="${WORKDIR}/"
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse-rcp/"
+SRC_URI="http://eclipse.ialto.com/eclipse/updates/4.2/R-4.2-201206081400/plugins/org.eclipse.osgi_${PV}.v20120529-1548.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="${MY_PV}"
+
+CDEPEND=""
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}"
+
+src_unpack() {
+	# Do nothing
+	echo ""
+}
+
+src_install() {
+
+	java-pkg_newjar "${DISTDIR}/${A}" org.eclipse.osgi.jar
+}
diff --git a/dev-java/eclipse-ui-forms/Manifest b/dev-java/eclipse-ui-forms/Manifest
new file mode 100644
index 0000000..b93f563
--- /dev/null
+++ b/dev-java/eclipse-ui-forms/Manifest
@@ -0,0 +1,4 @@
+DIST org.eclipse.ui.forms_3.1.0.jar 206585 SHA256 49f278135b7d70e2af65addd02d6420eec0b1041925c00d06b323e5311786f07 SHA512 675a558c39c6518a73aa73afa6e3258929d35bd568ff979f6de5de67b8ff4bf6eba9d91d038b9de8482064128622d40ff937fdf31d984f4044aa201a37ed30ee WHIRLPOOL 214558a1fa20c84b41441a595f26f4a1e9d7505e8bb389c984d64316b40c5952ab3be3d8f79ec20b7cd3d337255518641657e34b0e6825f0031d8ee4433dcbbb
+DIST org.eclipse.ui.forms_3.5.200.v20120521-2329.jar 302118 SHA256 a3f7d106b651a937e61e8f459e85ccbb6a3325c6901610507856cf3955664eee SHA512 fb5f4b89e297002c2c4de555b6a280df7d65d2a28396d7f8fc7931b36cffef1b3bab9bd85d0d70c5fe40f8c25d79612b28ba3956e0053aa829aeab12e52b16ce WHIRLPOOL 5952039d81492da1fa22c667f03f32a27aedf36632cf8228e3a5dd790632aefadfc5257b3a6536bc293362bf957dfc9c57d0c74bfdbce9861849aa4ae0d42a40
+EBUILD eclipse-ui-forms-3.1.0.ebuild 769 SHA256 90e717e2fb7da619403274dbf68fa3abe2466de5519d6de40c32717741effd12 SHA512 b6e9f2546012f15515105eee3b58bd1400ac7a2d7c5e1a2a70c23e335a8679967e58980ee14f3062631b5dcb9cd1c4df821439e2ba49522947daaba34a87d5c8 WHIRLPOOL e3043d449fec51568c260a01c38acc399e3e717e3605d2f2a12c707722fafff939c4bdaa1b74425feedc2e058673ab46e187b98a4c108c5c136a8f328387105b
+EBUILD eclipse-ui-forms-3.5.200.ebuild 803 SHA256 71f8f089487345792b16a4e7b79445f4e5fbccabd42e8f09138dda60dc48054f SHA512 92b8deb1c8a40164287bdea4b9e2a5fbb568988dd60ec2014740560ab3410525aacfaf9d633240d73625a4f231a04d07e0d8b04097a24eb7c059b512560f1d5b WHIRLPOOL 9cb3096331242718854a1d274f0a8ff76c1ff80c9899c531a9485d174429b9f29a783e1afd3968dc55355b3f48b3595ad9e98c3898625c1ad88c8db79ce1441d
diff --git a/dev-java/eclipse-ui-forms/eclipse-ui-forms-3.1.0.ebuild b/dev-java/eclipse-ui-forms/eclipse-ui-forms-3.1.0.ebuild
new file mode 100644
index 0000000..7a57d65
--- /dev/null
+++ b/dev-java/eclipse-ui-forms/eclipse-ui-forms-3.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.6 2012/05/21 20:05:07 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils java-pkg-2 versionator
+
+S="${WORKDIR}/"
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse-rcp/"
+SRC_URI="http://eclipse.ialto.com/eclipse/updates/3.1/plugins/org.eclipse.ui.forms_${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="${MY_PV}"
+
+CDEPEND=""
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}"
+
+src_unpack() {
+	# Do nothing
+	echo ""
+}
+
+src_install() {
+
+	java-pkg_newjar "${DISTDIR}/${A}" org.eclipse.ui.forms.jar
+}
diff --git a/dev-java/eclipse-ui-forms/eclipse-ui-forms-3.5.200.ebuild b/dev-java/eclipse-ui-forms/eclipse-ui-forms-3.5.200.ebuild
new file mode 100644
index 0000000..aacf627
--- /dev/null
+++ b/dev-java/eclipse-ui-forms/eclipse-ui-forms-3.5.200.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.6 2012/05/21 20:05:07 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils java-pkg-2 versionator
+
+S="${WORKDIR}/"
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse-rcp/"
+SRC_URI="http://eclipse.ialto.com/eclipse/updates/4.2/R-4.2-201206081400/plugins/org.eclipse.ui.forms_${PV}.v20120521-2329.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="${MY_PV}"
+
+CDEPEND=""
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}"
+
+src_unpack() {
+	# Do nothing
+	echo ""
+}
+
+src_install() {
+
+	java-pkg_newjar "${DISTDIR}/${A}" org.eclipse.ui.forms.jar
+}
diff --git a/dev-java/jameica/Manifest b/dev-java/jameica/Manifest
index e6afd3e..80c1dcd 100644
--- a/dev-java/jameica/Manifest
+++ b/dev-java/jameica/Manifest
@@ -1,4 +1,4 @@
 DIST jameica-2.2.0.zip 20393047 SHA256 4bdd4030b9a8d5d5d8f1887db6b2602e094103b86fae7b7f2ea52e6532c2b7a9 SHA512 95e43cbf46f0a00c2db180d62aec2ba256b89baf860bff09c1091884e40f92b56864bbc2157bb5bea84c0ae3eb8d0bcf44a408f2442978c8a68f49088d061a22 WHIRLPOOL 451fdef9d23533927e90786b0f2009a7e3277c87e75d5fa806657e770c517940cd3bac249ef54349b780ddaadbdc82d84e679e1b8e60dbcb9e84ed5567a29b20
 DIST jameica-2.4.0.zip 20395429 SHA256 7c2babf9fc2c43560bb76b6c23442f51a5d307eebe14715785ec23e79ae6a163 SHA512 737181d9a99d7ed7677a7170ca8dd117b811a5d66261bdcb79d64675bf65b3ef8c395ff7b3b7400bcc7cfed5c5a96396d37f7410015337ec9fa748338ae82bc2 WHIRLPOOL f2d6f04a7becc4f8ad1dcc182000e2fe91b9eeca99db65ae56d667e2f5cf2704dcd2e0089886f26827979508af366653bae557e2a07371e24381c66064bad3f5
 EBUILD jameica-2.2.0.ebuild 2569 SHA256 2b4830a1d9ca438a721ec8c642a54d9efce2701fface44e65c6b7ba287edaa54 SHA512 7b614b28915cf8fe4dc3391c7603e4be1b97ea90da6dfae1b4902ecf86faf62506db3e22d2646cf7a41ed947258d2a8fefc5c4921da89669efa6eea8e04e140f WHIRLPOOL d4512aeec091c2e2b99793feb86084c2d201920773bfa096c380e0c86de635003726615dec9a0a0d3b484b8e5a8e0940c4e2b7264813300303447dfae497a7dd
-EBUILD jameica-2.4.0.ebuild 2569 SHA256 2b4830a1d9ca438a721ec8c642a54d9efce2701fface44e65c6b7ba287edaa54 SHA512 7b614b28915cf8fe4dc3391c7603e4be1b97ea90da6dfae1b4902ecf86faf62506db3e22d2646cf7a41ed947258d2a8fefc5c4921da89669efa6eea8e04e140f WHIRLPOOL d4512aeec091c2e2b99793feb86084c2d201920773bfa096c380e0c86de635003726615dec9a0a0d3b484b8e5a8e0940c4e2b7264813300303447dfae497a7dd
+EBUILD jameica-2.4.0.ebuild 2753 SHA256 72d802fde61b085a2d19ab9b9f1ad59b35e056319e3dd2ad767ded6964f5f195 SHA512 caa62a493729cb1a55351bf11d75d9ff3299ed5d15d8ad12b9e1c961383491b8a466af140f8cb47612f6bddc69cef8c290c1afea5480612ae565240c522c0c92 WHIRLPOOL 4ff362923651e54cc4ed977afa023a551a45c21ccd311ca40eb8c101df48fca21a3638ff65018494d761f4c1fff471909563685251a064228895c6bd5139c6b2
diff --git a/dev-java/jameica/jameica-2.4.0.ebuild b/dev-java/jameica/jameica-2.4.0.ebuild
index e62ed68..605f5b0 100644
--- a/dev-java/jameica/jameica-2.4.0.ebuild
+++ b/dev-java/jameica/jameica-2.4.0.ebuild
@@ -20,7 +20,7 @@ COMMON_DEP="~dev-java/willuhn-util-${MY_PV}
 	>=dev-java/nanoxml-2.2.3
 	dev-java/swt:3.7
 	>=dev-java/velocity-1.5
-        >=dev-java/xmlrpc-3.1
+    >=dev-java/xmlrpc-3.1
 	>=dev-java/commons-cli-1.1
 	>=dev-java/commons-collections-3.2.1
 	>=dev-java/commons-lang-2.6
@@ -29,23 +29,27 @@ COMMON_DEP="~dev-java/willuhn-util-${MY_PV}
 	>=dev-java/bcprov-1.44
 	>=dev-java/h2-1.2.145
 	>=dev-java/commons-lang-2.6
-	>=dev-java/swt-paperclips-1.0.4"
+	>=dev-java/swt-paperclips-1.0.4
+	dev-java/eclipse-jface:3.1
+	dev-java/eclipse-core-runtime:3.1
+	dev-java/eclipse-osgi:3.1
+	dev-java/eclipse-ui-forms:3.1"
 
 RDEPEND=">=virtual/jre-1.5
-        ${COMMON_DEP}"
+    ${COMMON_DEP}"
 
 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
-        ${COMMON_DEP}"
+    ${COMMON_DEP}"
 
 S=${WORKDIR}/${PN}
 
 java_prepare() {
-	#rm -r ${S}/lib/*
+	rm -vr ${S}/lib/*
 	cd ${S}/lib
 
-	rm -vr apache_xmlrpc bouncycastle de_willuhn_ds de_willuhn_util h2 jakarta_commons mckoi mysql nanoxml paperclips splash.jar swtcalendar velocity
-	rm -vr swt/linux swt/linux64 swt/macos swt/macos64 swt/win32 swt/win64
+	#rm -vr apache_xmlrpc bouncycastle de_willuhn_ds de_willuhn_util h2 jakarta_commons mckoi mysql nanoxml paperclips splash.jar swtcalendar velocity
+	#rm -vr swt/linux swt/linux64 swt/macos swt/macos64 swt/win32 swt/win64
 
 	mkdir gentoo
 	local xmlrpc
@@ -55,7 +59,7 @@ java_prepare() {
 		xmlrpc="xmlrpc-3"
 	fi
 
-	EANT_GENTOO_CLASSPATH="willuhn-util,willuhn-datasource,nanoxml,swt-3.7,velocity,${xmlrpc},commons-cli-1,commons-collections,commons-lang-2.1,commons-logging,swtcalendar,bcprov,h2,swt-paperclips"
+	EANT_GENTOO_CLASSPATH="willuhn-util,willuhn-datasource,nanoxml,swt-3.7,velocity,${xmlrpc},commons-cli-1,commons-collections,commons-lang-2.1,commons-logging,swtcalendar,bcprov,h2,swt-paperclips,eclipse-jface-3.1,eclipse-osgi-3.1,eclipse-ui-forms-3.1,eclipse-core-runtime-3.1"
 
 	java-pkg_jar-from --with-dependencies --into gentoo "${EANT_GENTOO_CLASSPATH}"
 }
@@ -65,12 +69,12 @@ src_compile() {
 }
 
 src_install() {
-        java-pkg_newjar releases/${PV}-0/jameica/jameica.jar
+    java-pkg_newjar releases/${PV}-0/jameica/jameica.jar
 
-	java-pkg_newjar lib/swt/org.eclipse.core.runtime*.jar org.eclipse.core.runtime.jar
-	java-pkg_newjar lib/swt/org.eclipse.jface*.jar org.eclipse.jface.jar
-	java-pkg_newjar lib/swt/org.eclipse.osgi*.jar org.eclipse.osgi.jar
-	java-pkg_newjar lib/swt/org.eclipse.ui.forms*.jar org.eclipse.ui.forms.jar
+	#java-pkg_newjar lib/swt/org.eclipse.core.runtime*.jar org.eclipse.core.runtime.jar
+	#java-pkg_newjar lib/swt/org.eclipse.jface*.jar org.eclipse.jface.jar
+	#java-pkg_newjar lib/swt/org.eclipse.osgi*.jar org.eclipse.osgi.jar
+	#java-pkg_newjar lib/swt/org.eclipse.ui.forms*.jar org.eclipse.ui.forms.jar
 
 	insinto /usr/share/${PN}
 	doins plugin.xml
@@ -81,6 +85,6 @@ src_install() {
 	newicon	build/${PN}-icon.png ${PN}-icon.png || die "newicon failed"
 	make_desktop_entry jameica "Jameica" ${PN}-icon "Office;Finance"
 
-        use doc && java-pkg_dojavadoc releases/${PV}-0/javadoc
-        use source && java-pkg_dosrc src/de
+    use doc && java-pkg_dojavadoc releases/${PV}-0/javadoc
+    use source && java-pkg_dosrc src/de
 }
diff --git a/dev-java/swt-chart/Manifest b/dev-java/swt-chart/Manifest
index 479166c..0e4d089 100644
--- a/dev-java/swt-chart/Manifest
+++ b/dev-java/swt-chart/Manifest
@@ -1,2 +1,5 @@
+AUX build.xml 2963 SHA256 b26d60757c2c7db848733e6aabfa9f7ab166f3a5f104a25b8ac66a7d8d3119f3 SHA512 c3fda3baeb47b78ec6d7d4bc5b4c90e034ae5bfd4f55d37303f9660859b620a36700b397402442d4515d11b56496fb4aa56b2cb5c24c42dd5a7cb5c11bf1e3d1 WHIRLPOOL 702f9bceb3d79c4710f46c997caeb9d1333e0e30e53d340ceafd0a70542be4bfeb23e35a2a211f0d70005ff5b666b8c54b3538fc66603b7547c33a3ffbc3895e
+DIST org.swtchart_0.7.0.zip 282858 SHA256 86f4988bf3dd59f5a9d3ca960fbaa274884d7276cd1ebfe4704a44ac7c7df5d6 SHA512 ea327bf1779e8c17c9e547cf572af6cb53993092badd3ede1b84185c06987c6db4f5151e2eb5261e2b22a3034df6eded7641b3cf826896f784cee39bc89bac26 WHIRLPOOL 9d1e88510157ad4696e6eb4241f977ea80d52da3047f2ded1fca0c23f298e957da5722f65c5ad5ba7f0d2c8fad146731ebc3806e696e2e6b51c5a36cd4e04ded
 DIST org.swtchart_0.8.0.zip 287272 SHA256 e4334c200ba996aa05abeaf5d6fb91e49ccd8ac93d5273c7a38e365d73edf236 SHA512 8dc13ea114077159c601836a0166224afcbfe79b59930b7a79460873104f35a929d5cd96042b14730d5f36e3497b20629a5d30a87b0e2d0ee5eb240724c22725 WHIRLPOOL 0cd49bbeca52e58a574151a14e89fb2c13f94c063bd19f76f32372675aabb3dd51e9abcfc73a0a414742f794122354d0b4a1fc4d572fc3ae91b685eca2492e68
-EBUILD swt-chart-0.8.0.ebuild 1486 SHA256 72b24abbab2cb707c38f7f86b9e7b87c2cd91126d512e8183669b1d78c8d83a1 SHA512 00611e1a11d71a522c3704a03f016778aa3f3b80f5e193eaba54f973f8f613bb276a0f55b084a0d49270a23bc60ae1a4d0275786907c5d1d5f27a98f68839379 WHIRLPOOL 4ae6eeaa4f5844766c61d632310de357b3d8c3e209e6fb277dbdd51d6f1288f34f7986a46ee970028b6683514e25f76f5e3d743e26eb98db65cbd69e7f343cbf
+EBUILD swt-chart-0.7.0.ebuild 1838 SHA256 9fc1be3e29678dcc6b1c03826d017d859b8c13e29fe292e92a27d003b3965cbe SHA512 155cfd9a0d541ac0d1956e0253f1d84d3a24ab6fad3b9d9b3f9b5e07f8afdbe5d1fecf89f7d2fe92b3378b737d7bb154456b75d13a90e93ad47ed4257041a410 WHIRLPOOL 11cc9595fc375419539825f32f525b8b7c2500656195266691545cee35bbf7b6c44053753de0b6ef5fd3d71f7ae1db60595cb0a3177833087451e6bc4b75b559
+EBUILD swt-chart-0.8.0.ebuild 1838 SHA256 9fc1be3e29678dcc6b1c03826d017d859b8c13e29fe292e92a27d003b3965cbe SHA512 155cfd9a0d541ac0d1956e0253f1d84d3a24ab6fad3b9d9b3f9b5e07f8afdbe5d1fecf89f7d2fe92b3378b737d7bb154456b75d13a90e93ad47ed4257041a410 WHIRLPOOL 11cc9595fc375419539825f32f525b8b7c2500656195266691545cee35bbf7b6c44053753de0b6ef5fd3d71f7ae1db60595cb0a3177833087451e6bc4b75b559
diff --git a/dev-java/swt-chart/files/build.xml b/dev-java/swt-chart/files/build.xml
new file mode 100644
index 0000000..5831d0d
--- /dev/null
+++ b/dev-java/swt-chart/files/build.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project basedir="." default="build" name="org.swtchart">
+    <target name="init">
+        <mkdir dir="org.swtchart/bin"/>
+        <copy file="org.swtchart/META-INF/MANIFEST.MF"
+            tofile="org.swtchart/META-INF/MANIFEST.MF.OUT"/>
+        <replace file="org.swtchart/META-INF/MANIFEST.MF.OUT"
+            token="qualifier" value="dist" />
+        <replace file="org.swtchart/META-INF/MANIFEST.MF.OUT"
+            token=";singleton:=true" value="" />
+
+        <mkdir dir="org.swtchart.ext/bin"/>
+        <copy file="org.swtchart.ext/META-INF/MANIFEST.MF"
+            tofile="org.swtchart.ext/META-INF/MANIFEST.MF.OUT"/>
+        <replace file="org.swtchart.ext/META-INF/MANIFEST.MF.OUT"
+            token="qualifier" value="dist" />
+        <replace file="org.swtchart.ext/META-INF/MANIFEST.MF.OUT"
+            token=";singleton:=true" value="" />
+    </target>
+    <target name="clean">
+        <delete dir="org.swtchart/bin"/>
+        <delete file="org.swtchart/META-INF/MANIFEST.MF.OUT"/>
+        <delete file="org.swtchart.jar"/>
+        
+        <delete dir="org.swtchart.ext/bin"/>
+        <delete file="org.swtchart.ext/META-INF/MANIFEST.MF.OUT"/>
+        <delete file="org.swtchart.ext.jar"/>
+    </target>
+    <target depends="init" name="build">
+        <javac debug="true" destdir="org.swtchart/bin">
+            <src path="org.swtchart/src"/>
+            <classpath>
+                <pathelement location="/usr/share/swt-3.7/lib/swt.jar"/>
+                <pathelement location="org.swtchart/bin"/>
+            </classpath>
+        </javac>
+        <jar destfile="org.swtchart.jar" manifest="org.swtchart/META-INF/MANIFEST.MF.OUT">
+            <manifest>
+                <attribute name="Class-Path" value="/usr/share/swt-3.7/lib/swt.jar"/>
+            </manifest>
+            <fileset dir="org.swtchart/bin"/>
+        </jar>
+        <javac debug="true" destdir="org.swtchart.ext/bin">
+            <src path="org.swtchart.ext/src"/>
+            <classpath>
+                <pathelement location="/usr/share/swt-3.7/lib/swt.jar"/>
+                <pathelement location="org.swtchart/bin"/>
+                <pathelement location="/usr/share/eclipse-jface-3.8/lib/org.eclipse.jface.jar" />
+                <pathelement location="/usr/share/eclipse-core-commands-3.6/lib/org.eclipse.core.commands.jar" />
+            </classpath>
+        </javac>
+        <jar destfile="org.swtchart.ext.jar" manifest="org.swtchart.ext/META-INF/MANIFEST.MF.OUT">
+            <manifest>
+                <attribute name="Class-Path" value="/usr/share/swt-3.7/lib/swt.jar:/usr/share/swt-chart/lib/swt-chart.jar"/>
+            </manifest>
+            <fileset dir="org.swtchart.ext/bin"/>
+        </jar>
+    </target>
+    <target name="doc">
+        <javadoc destdir="api">
+            <fileset dir="org.swtchart/src"/>
+            <fileset dir="org.swtchart.ext/src" />
+        </javadoc>
+    </target>
+</project>
diff --git a/dev-java/swt-chart/swt-chart-0.7.0.ebuild b/dev-java/swt-chart/swt-chart-0.7.0.ebuild
new file mode 100644
index 0000000..04b204f
--- /dev/null
+++ b/dev-java/swt-chart/swt-chart-0.7.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+MY_PN="org.swtchart"
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Lightweight chart component for SWT"
+HOMEPAGE="http://www.swtchart.org/"
+SRC_URI="mirror://sourceforge/${PN}/SWTChart/${MY_PN}_${PV}.zip"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+COMMON_DEP="dev-java/swt:3.7
+			dev-java/eclipse-jface:3.8
+			dev-java/eclipse-core-commands:3.6"
+
+# Remove jameica dep which is only needed for jface
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+    default
+	cd "${WORKDIR}"
+	unzip plugins/org.swtchart_*.jar -d org.swtchart
+	unzip plugins/org.swtchart.ext_*.jar -d org.swtchart.ext
+}
+
+java_prepare() {
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+	eant clean
+}
+
+src_compile() {
+
+#        local classpath="$(java-pkg_getjars swt-3.7)"
+	EANT_GENTOO_CLASSPATH="swt-3.7,eclipse-jface-3.8,eclipse-core-commands-3.6" eant build 
+
+#	mkdir -p bin/swtchart bin/swtchart-ext
+
+#        find swtchart/src -name '*.java' > sources.list
+#        ejavac -cp "${classpath}" -d bin/swtchart @sources.list
+#        jar cf org.swtchart_${PV}.jar -C bin/swtchart .
+
+#	find swtchart-ext/src -name '*.java' > sources.list
+#        ejavac -cp "${classpath}:org.swtchart_${PV}.jar" -d bin/swtchart-ext @sources.list
+#        jar cf org.swtchart.ext_${PV}.jar -C bin/swtchart-ext .
+
+        # TODO: javadoc
+}
+
+
+src_install() {
+        java-pkg_newjar org.swtchart.jar org.swtchart.jar
+		java-pkg_newjar org.swtchart.ext.jar org.swtchart.ext.jar
+
+#        use doc && dodoc doc/*
+#        use doc && java-pkg_dojavadoc javadoc
+
+ #       use source && java-pkg_dosrc src/de
+}
diff --git a/dev-java/swt-chart/swt-chart-0.8.0.ebuild b/dev-java/swt-chart/swt-chart-0.8.0.ebuild
index e1162fb..04b204f 100644
--- a/dev-java/swt-chart/swt-chart-0.8.0.ebuild
+++ b/dev-java/swt-chart/swt-chart-0.8.0.ebuild
@@ -6,21 +6,24 @@ EAPI="2"
 
 JAVA_PKG_IUSE="doc source"
 
-MY_PN="net.sf.paperclips"
+MY_PN="org.swtchart"
 
-inherit java-pkg-2 eutils
+inherit java-pkg-2 eutils java-ant-2
 
-DESCRIPTION="Simplified Java Printing Support for SWT"
-HOMEPAGE="http://code.google.com/p/swt-paperclips"
-SRC_URI="mirror://sourceforge/${PN}/SWTChart/org.swtchart_${PV}.zip"
+DESCRIPTION="Lightweight chart component for SWT"
+HOMEPAGE="http://www.swtchart.org/"
+SRC_URI="mirror://sourceforge/${PN}/SWTChart/${MY_PN}_${PV}.zip"
 
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-COMMON_DEP="dev-java/swt:3.7"
+COMMON_DEP="dev-java/swt:3.7
+			dev-java/eclipse-jface:3.8
+			dev-java/eclipse-core-commands:3.6"
 
+# Remove jameica dep which is only needed for jface
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-1.5"
 
@@ -30,36 +33,42 @@ RDEPEND="${COMMON_DEP}
 S="${WORKDIR}"
 
 src_unpack() {
-        default
-	cd "${S}"
-	unzip plugins/org.swtchart_*.jar -d swtchart
-	unzip plugins/org.swtchart.ext_*.jar -d swtchart-ext
+    default
+	cd "${WORKDIR}"
+	unzip plugins/org.swtchart_*.jar -d org.swtchart
+	unzip plugins/org.swtchart.ext_*.jar -d org.swtchart.ext
+}
+
+java_prepare() {
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+	eant clean
 }
 
 src_compile() {
 
-        local classpath="$(java-pkg_getjars swt-3.7)"
+#        local classpath="$(java-pkg_getjars swt-3.7)"
+	EANT_GENTOO_CLASSPATH="swt-3.7,eclipse-jface-3.8,eclipse-core-commands-3.6" eant build 
 
-	mkdir -p bin/swtchart bin/swtchart-ext
+#	mkdir -p bin/swtchart bin/swtchart-ext
 
-        find swtchart/src -name '*.java' > sources.list
-        ejavac -cp "${classpath}" -d bin/swtchart @sources.list
-        jar cf org.swtchart_${PV}.jar -C bin/swtchart .
+#        find swtchart/src -name '*.java' > sources.list
+#        ejavac -cp "${classpath}" -d bin/swtchart @sources.list
+#        jar cf org.swtchart_${PV}.jar -C bin/swtchart .
 
-	find swtchart-ext/src -name '*.java' > sources.list
-        ejavac -cp "${classpath}:org.swtchart_${PV}.jar" -d bin/swtchart-ext @sources.list
-        jar cf org.swtchart.ext_${PV}.jar -C bin/swtchart-ext .
+#	find swtchart-ext/src -name '*.java' > sources.list
+#        ejavac -cp "${classpath}:org.swtchart_${PV}.jar" -d bin/swtchart-ext @sources.list
+#        jar cf org.swtchart.ext_${PV}.jar -C bin/swtchart-ext .
 
         # TODO: javadoc
 }
 
 
 src_install() {
-        java-pkg_newjar org.swtchart_${PV}.jar
-	java-pkg_newjar org.swtchart.ext_${PV}.jar
+        java-pkg_newjar org.swtchart.jar org.swtchart.jar
+		java-pkg_newjar org.swtchart.ext.jar org.swtchart.ext.jar
 
-        use doc && dodoc doc/*
-        use doc && java-pkg_dojavadoc javadoc
+#        use doc && dodoc doc/*
+#        use doc && java-pkg_dojavadoc javadoc
 
-        use source && java-pkg_dosrc src/de
+ #       use source && java-pkg_dosrc src/de
 }