New eclipse version

svn path=/trunk/overlay/; revision=135

19 files changed, 1023 insertions, 0 deletions

diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
new file mode 100644
index 0000000..e10dba8
--- /dev/null
+++ b/dev-java/asm/Manifest
@@ -0,0 +1,2 @@
+DIST asm-3.3.1.tar.gz 854626 RMD160 69d746d81c22779d78c9dc136c0d7b2142c58800 SHA1 230c4a99ca8436a584b9a322b4fe7a585f5b084e SHA256 69a523d41c82d7979c9b47271e31187e23c064e1d2a93b52950463bcb80197f5
+EBUILD asm-3.3.1.ebuild 979 RMD160 7317b37f8ab3ae7e32d35aa3a284b39958b511a3 SHA1 28a1f5db32e4824c51a91bd6e5616a8f9635b048 SHA256 c1c5652b40207c567b48e0e2a65266642ac7b6c37d710e6b4505ca57787e4b3a
diff --git a/dev-java/asm/asm-3.3.1.ebuild b/dev-java/asm/asm-3.3.1.ebuild
new file mode 100644
index 0000000..bad1e5d
--- /dev/null
+++ b/dev-java/asm/asm-3.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-3.2.ebuild,v 1.5 2010/04/24 17:57:07 grobian Exp $
+
+WANT_ANT_TASKS="ant-owanttask"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="http://asm.objectweb.org"
+SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="3"
+IUSE=""
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~sparc-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+# Needs deps we don't have yet
+RESTRICT="test"
+
+EANT_DOC_TARGET="jdoc"
+
+# Fails if this property is not set
+EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar"
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/lucene-analyzers/Manifest b/dev-java/lucene-analyzers/Manifest
new file mode 100644
index 0000000..d067baa
--- /dev/null
+++ b/dev-java/lucene-analyzers/Manifest
@@ -0,0 +1,3 @@
+AUX manifest 489 RMD160 ec7b6fc9caf12a66c26a3350e1dd2440c98162ec SHA1 12058907b13c63499c9b7c24105c953f6d85e75f SHA256 365599ae4dd1eaf54b5fb267ee5402f2cfbd78fbd0c7aaca7a5f6db2af37cf84
+DIST lucene-2.9.4-src.tar.gz 12494586 RMD160 da4229b7541cab1776a491c4bec86bbd15871c73 SHA1 bac4fdea0fcd18788d798f5cdd24fd975cca6b3f SHA256 2a8bd7c6f0632bc406bcec0091d286b3efd4743c2d45fd88b0d0d564281780cd
+EBUILD lucene-analyzers-2.9.4.ebuild 920 RMD160 315476d25da33f7eb9fba21c82c6b4dd762f014a SHA1 7e805969a9958dc1b4e2f35e45310fc9050e21cc SHA256 39c2066e57f7a303f2c40e28a4cc7b1cd8a3701869dcf8639fd3c36060191b2f
diff --git a/dev-java/lucene-analyzers/files/manifest b/dev-java/lucene-analyzers/files/manifest
new file mode 100644
index 0000000..ab9a2f6
--- /dev/null
+++ b/dev-java/lucene-analyzers/files/manifest
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %vendorName
+Bundle-Localization: plugin
+Export-Package: org.apache.lucene.analysis.br,org.apache.lucene.analysis.cjk,org.apache.lucene.analysis.cn,
+ org.apache.lucene.analysis.cz,org.apache.lucene.analysis.de,org.apache.lucene.analysis.el,org.apache.lucene.analysis.fr,
+ org.apache.lucene.analysis.nl,org.apache.lucene.analysis.ru
+Bundle-SymbolicName: org.apache.lucene.analysis
+Bundle-Version: 2.9.4
diff --git a/dev-java/lucene-analyzers/lucene-analyzers-2.9.4.ebuild b/dev-java/lucene-analyzers/lucene-analyzers-2.9.4.ebuild
new file mode 100644
index 0000000..34aa9ec
--- /dev/null
+++ b/dev-java/lucene-analyzers/lucene-analyzers-2.9.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild,v 1.5 2010/02/13 16:41:40 grobian Exp $
+
+JAVA_PKG_IUSE="source"
+inherit java-pkg-2 java-ant-2 java-osgi
+
+MY_PN="${PN/lucene-}"
+MY_P="${P/-${MY_PN}}"
+
+DESCRIPTION="Lucene Analyzers additions"
+HOMEPAGE="http://lucene.apache.org/java"
+SRC_URI="mirror://apache/lucene/java/${MY_P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.9"
+KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd ~x86-linux ~amd64-linux ~ppc-macos"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_P}/contrib/${MY_PN}/common"
+
+src_install() {
+	java-osgi_newjar-fromfile "${WORKDIR}/${MY_P}/build/contrib/${MY_PN}/common/${P}-dev.jar" \
+			"${FILESDIR}/manifest" "Apache Lucene Analysis"
+
+	use source && java-pkg_dosrc "${S}/src/java/org"
+}
diff --git a/dev-java/sat4j-core/Manifest b/dev-java/sat4j-core/Manifest
index a9c998d..bb8a7a0 100644
--- a/dev-java/sat4j-core/Manifest
+++ b/dev-java/sat4j-core/Manifest
@@ -1,4 +1,7 @@
 DIST build-2.4.xml 9458 RMD160 a42173b5390cbf8027d180eb8d857cbae124e29b SHA1 70ce855116615e1e13283e00dd2e20eeae2d5447 SHA256 f0d05ae4fa0485b0dacc3627120b6d7053e24356127a12733a95f85f30bca2d8
+DIST sat4j-core-2.3.0-build.xml 9458 RMD160 a42173b5390cbf8027d180eb8d857cbae124e29b SHA1 70ce855116615e1e13283e00dd2e20eeae2d5447 SHA256 f0d05ae4fa0485b0dacc3627120b6d7053e24356127a12733a95f85f30bca2d8
 DIST sat4j-core-v20080622.zip 351856 RMD160 1dd050afc4f871e5c183f5df5ccf035928e7b34f SHA1 411c3a89bb07782b3b75f32292d4609a41827326 SHA256 3248597350666f919fa488c113a124530acb55af44bcdd35e93098c7b9b72221
+DIST sat4j-core-v20110329.zip 416094 RMD160 280887e130635872ea3646ef8deafadd2672c2c6 SHA1 04708fe82b2f0f4dbaedc423f2513d7a9b3cf3a0 SHA256 70d1e3671aca052e250a07fe9a63c748ca3b8fae9682e2ef8f1cb075e6d65571
 EBUILD sat4j-core-2.0.1.ebuild 1340 RMD160 3683d87d9db7dfb42b4575eb230a14d434519d57 SHA1 3cdbf2544c974bc427d9cd22829a099f35b424c3 SHA256 26c17a12e26229b8824de7e6f1bd2c4123062bb175910132d6e90fc012b59030
+EBUILD sat4j-core-2.3.0.ebuild 1509 RMD160 ab0303476989439b6bb5f8177456c410ae474bf9 SHA1 16f94e90ae1553a6a4da8b851dca75cf7efa6282 SHA256 c5283d1c251287bf5b7684504a05be6989482bd200e8e641e25cb1d077ba078f
 MISC ChangeLog 351 RMD160 f23c17ef5cb077b147558211f1dec889939779f8 SHA1 058a7d7e17e84d898866c0764a8acedc03f8663b SHA256 6ae0aeaae2196387135a27c10efed81e1af2962c1e83d971f248f5bef069614f
diff --git a/dev-java/sat4j-core/sat4j-core-2.3.0.ebuild b/dev-java/sat4j-core/sat4j-core-2.3.0.ebuild
new file mode 100644
index 0000000..5c0e32c
--- /dev/null
+++ b/dev-java/sat4j-core/sat4j-core-2.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-core/sat4j-core-2.1.1.ebuild,v 1.3 2010/05/29 16:33:53 phajdan.jr Exp $
+
+EAPI="2"
+
+MY_PN="org.${PN//-/.}"
+MY_PV="20110329"
+BUILD_PV="2.4"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight constraint programming with a SAT solver"
+HOMEPAGE="http://www.sat4j.org/"
+SRC_URI="http://download.forge.objectweb.org/sat4j/${PN}-v${MY_PV}.zip
+	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${PN}-v${MY_PV}.zip
+}
+
+java_prepare() {
+	mkdir -p core/{lib,src} || die
+
+	# Don't complain about missing javadoc stylesheet.
+	touch core/lib/stylesheet.css
+
+	# Grab build.xml. Don't fetch from CVS. Version file is gone.
+	sed -e 's/depends="prepare,getsource"/depends="prepare"/g' \
+		-e '/<replace/d' \
+		"${DISTDIR}/${P}-build.xml" > build.xml || die
+
+	# Unpack manifest.
+	cd core || die
+	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
+
+	# Unpack sources.
+	cd src || die
+	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
+}
+
+EANT_BUILD_TARGET="core"
+EANT_DOC_TARGET="javadoc -Dmodule=core -Dlib=core/lib"
+
+src_install() {
+	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
+	use doc && java-pkg_dojavadoc api/core
+	use source && java-pkg_dosrc core/src/org
+}
diff --git a/dev-java/sat4j-pseudo/Manifest b/dev-java/sat4j-pseudo/Manifest
index 3f90ff3..cb700a3 100644
--- a/dev-java/sat4j-pseudo/Manifest
+++ b/dev-java/sat4j-pseudo/Manifest
@@ -1,4 +1,7 @@
 DIST build-2.4.xml 9458 RMD160 a42173b5390cbf8027d180eb8d857cbae124e29b SHA1 70ce855116615e1e13283e00dd2e20eeae2d5447 SHA256 f0d05ae4fa0485b0dacc3627120b6d7053e24356127a12733a95f85f30bca2d8
 DIST sat4j-pb-v20080622.zip 178075 RMD160 7f6bab474e4c6c8337938cc4dd84aff6beea149a SHA1 5c12525cbaca1fe3dd99c0dd2fa46dfad9ea9a4a SHA256 852fffdd6568ff98045b54507ee7829d8c5e63f23dffd2ebe9034fd277099bad
+DIST sat4j-pb-v20110329.zip 566331 RMD160 c1726192435b3ce79981f48ee6457e8921db3ebf SHA1 4d208ad87e4eecabbd3f67655402c75d6dad3738 SHA256 b9f1108464ac22ca1968a3d12726c29a6aa0bc15465fbf6c1b84c6909842094a
+DIST sat4j-pseudo-2.3.0-build.xml 9458 RMD160 a42173b5390cbf8027d180eb8d857cbae124e29b SHA1 70ce855116615e1e13283e00dd2e20eeae2d5447 SHA256 f0d05ae4fa0485b0dacc3627120b6d7053e24356127a12733a95f85f30bca2d8
 EBUILD sat4j-pseudo-2.0.1.ebuild 1606 RMD160 474c4882a27a494664b764bf98d371f3d83a22fb SHA1 0d85a96de5d00213add39c71c1daa773a7a3220e SHA256 db827ca3951c70a160e949178ec2f8c1b8b0272ac3c92f657d26de26998c7501
+EBUILD sat4j-pseudo-2.3.0.ebuild 1719 RMD160 bfbfd4abd18f0ac2803a5fbbe099e04b2eaed145 SHA1 26a10b711f51e1b18f40a04880e16bb96aa1b054 SHA256 b083bc2e34ea73edc3a452b43964173536e8c90e6ff2b9c3fd128afaeb289360
 MISC ChangeLog 361 RMD160 1c2230ca7e3211f67456164c8b30617651a336c5 SHA1 3a629660f0d75fa4d673ad099de669bef890fd1c SHA256 cbd1994d85ae5f6476864c097ce18714535847385b634e1e64fa0c34bc2e5a77
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.0.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.0.ebuild
new file mode 100644
index 0000000..b70a273
--- /dev/null
+++ b/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sat4j-pseudo/sat4j-pseudo-2.1.1.ebuild,v 1.3 2010/06/25 22:24:23 angelos Exp $
+
+EAPI="2"
+
+MY_PN="org.sat4j.pb"
+MY_PV="20110329"
+BUILD_PV="2.4"
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Pseudo Boolean solvers"
+HOMEPAGE="http://www.sat4j.org/"
+SRC_URI="http://download.forge.objectweb.org/sat4j/sat4j-pb-v${MY_PV}.zip
+	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/sat4j-core:2"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack sat4j-pb-v${MY_PV}.zip
+}
+
+java_prepare() {
+	mkdir -p {core,pb}/{lib,src} || die
+
+	# Don't complain about missing javadoc stylesheet.
+	touch core/lib/stylesheet.css
+
+	# Grab build.xml. Don't fetch from CVS. Don't build core.
+	sed -e 's/depends="core"//g' \
+		-e 's/depends="prepare,getsource"/depends="prepare"/g' \
+		"${DISTDIR}/${P}-build.xml" > build.xml || die
+
+	# This is the version identifier used for custom builds.
+	echo 'CUSTOM' > core/src/sat4j.version || die
+
+	# Unpack manifest.
+	cd pb || die
+	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
+
+	# Unpack sources.
+	cd src || die
+	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="pseudo"
+EANT_GENTOO_CLASSPATH="sat4j-core-2"
+EANT_DOC_TARGET="javadoc -Dmodule=pb -Dlib=pb/lib"
+
+src_install() {
+	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
+	use doc && java-pkg_dojavadoc api/pb
+	use source && java-pkg_dosrc pb/src/org
+}
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index c57cc99..0466c07 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -3,6 +3,7 @@ AUX build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 SHA1 3d5befea1
 AUX swt-3.3-callback-pointer-dereferencing.patch 882 RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea SHA1 d703af14ca2c405304583fead0f06946c1f26a12 SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab
 AUX swt-3.3-manifest 752 RMD160 024e2ace2caa4871b3ec07f7adf853fdbaad91c5 SHA1 73a334d10776a77d32b76e63d7bed59b77c0efbb SHA256 f0c98cefd1ddebe0a5a0c15558edba16b00a3ecc910a3fb0a52babb56fd72dae
 AUX swt-3.4-manifest 753 RMD160 c56ff2fcaf42d35af618a60273c9f6580adc0d79 SHA1 052261ea0c4f6758959fcd4e2718feabbed4273e SHA256 6401f555a867cba47463a36d3c150f7cf5962ac85be53e14c43a88eadf74c94e
+AUX swt-3.7-manifest 752 RMD160 c9f8138a09c77e4217a14684f7f34e0107d923bc SHA1 9c3664629300f7c75050edd40ec1afc53d5fac30 SHA256 dc01ac16950a3db9f49ccc34c85ac38d3a248d0da11b96bcad80ca8534491a14
 AUX webkitbydefault.patch 888 RMD160 13aee6334fa1f8248ca53f8f05823386c8bc7ea6 SHA1 c771cfbb62c2aa64d73151af46417b55eed96ff6 SHA256 6137b374bf9f8d629aea94c2614a6529d05d8756ebcdf706062598ea18f52e1e
 DIST swt-3.4.1-gtk-linux-ppc.zip 4631702 RMD160 84d106fef906afbe537919f5d965eed309c5f960 SHA1 f3308bfb5dee4d4029e7c4eac4dcade568388b14 SHA256 97f2ee7873986d9e92d1f21bf02010023b562cb6f4d963fffa5bd7f0800dd84d
 DIST swt-3.4.1-gtk-linux-x86.zip 4563980 RMD160 bba99111e10eb372a319aa91f99fe6cf4b0d6f23 SHA1 d1fd22dce69153d6a0a34ecebba41a24e8bffbaa SHA256 12cc6ce1a17de34fc97943dd43f5593a4b28e09f85b9405487099496347cdae3
@@ -14,8 +15,11 @@ DIST swt-3.6.2-gtk-linux-ppc.zip 5416141 RMD160 9154837630ca3e4cc9fb0ce338eed2ac
 DIST swt-3.6.2-gtk-linux-ppc64.zip 5570574 RMD160 1e2fb74ebf7a30a38ee4e2157875f76cac2bb0e7 SHA1 012bd7b8fea4696a84fabcd015874e321de35b3a SHA256 5a3c83d68ab4db1ca610098fa4722f08b95241ce45e7171af323beb706e50775
 DIST swt-3.6.2-gtk-linux-x86.zip 5236728 RMD160 ee0d8a5ccfde54fa694cf507596679c56e14d34c SHA1 8f0979203d60e746c068674a8190123daab2e3d8 SHA256 1f380d8cd5545af90d7814db4824322f56c9cd4bb476febbadc8d54707779543
 DIST swt-3.6.2-gtk-linux-x86_64.zip 5531856 RMD160 9f0babeed72d1994c1d5df5299b7632028c9f6af SHA1 dbeeb832192974f82c013d965628621b750f1d69 SHA256 9459fbee1cab66fae9dabe085d911b6bfee52e41e1a236ac65bf0491fdbdb205
+DIST swt-3.7-gtk-linux-x86.zip 5371493 RMD160 3bc3843179854d63f4fa8facba33a50ec24d19ad SHA1 e69d26d78f939663918aa8a2af3bf6fe899c06ba SHA256 98c438e65c6372ef14b3faca07b5e4020a331d047e2fa660f820dfa54641f172
+DIST swt-3.7-gtk-linux-x86_64.zip 5667945 RMD160 9ca08f85ca2a73cc26960f863b807a97814e5f42 SHA1 903c913271d7fa6a740b028aeea7fc2357bf3b30 SHA256 0640ff2a1906aa2cbead27aa4d004f4baa5f77e1f9e1df923b6984633d72e3f3
 EBUILD swt-3.4.1.ebuild 5963 RMD160 60cf61a9e7996b0d4a8b2748118adb9b1fb756c2 SHA1 e727232311da81ba86b5a2ef9dda688f9f0ef04c SHA256 02656504f6472835f39de6d37b344234ae3225048519fdf9c3822aec41e9cdc4
 EBUILD swt-3.4.2.ebuild 5962 RMD160 485042f03d0ce87dc72f338a6f381f44624cf62a SHA1 7ac829930d47cd795210577b0a2fedd598579f87 SHA256 4721ecd9396d9a13c62ff64f01f17556c8028d9e18fded4ceb8531cae7eedb2b
 EBUILD swt-3.6.2.ebuild 6887 RMD160 6fdbe2be16164dddc85637850c13b854f430bfdc SHA1 ad65f5f85cd358d98af584b3d4c2b7a527c2147e SHA256 5da6753ca4d164a764a10655c0bcbeb6c15f946ddb90fadafa61c2ac93d02895
+EBUILD swt-3.7.ebuild 5880 RMD160 554d9f919b1926604fede924078b6e84555c8dd0 SHA1 ceb4fd03410bc5590ebfa5e83a0d8e0eb6260728 SHA256 5967987cbbf4646e7bc9ccc5848d266ab11b367f4f01f3182b8273a5311edef8
 MISC ChangeLog 16455 RMD160 209444c270dd9e4ab99ef7b9c056f1702fdb9cf2 SHA1 ec1447424442b16b52519dcd918879f7e7f60981 SHA256 3fa7133b6d56a104a93bfe65dd069163d9e67838d985a4ed4e41fd955ab950d3
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
diff --git a/dev-java/swt/files/swt-3.7-manifest b/dev-java/swt/files/swt-3.7-manifest
new file mode 100644
index 0000000..d22f212
--- /dev/null
+++ b/dev-java/swt/files/swt-3.7-manifest
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
+Bundle-Version: 3.7
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
+Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
+ org.eclipse.swt.internal.cairo; x-internal:=true,
+ org.eclipse.swt.internal.cde; x-internal:=true,
+ org.eclipse.swt.internal.gnome; x-internal:=true,
+ org.eclipse.swt.internal.gtk; x-internal:=true,
+ org.eclipse.swt.internal.mozilla; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
+
diff --git a/dev-java/swt/swt-3.7.ebuild b/dev-java/swt/swt-3.7.ebuild
new file mode 100644
index 0000000..3a641ae
--- /dev/null
+++ b/dev-java/swt/swt-3.7.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+EAPI=2
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201106131736"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)
+		ppc64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)"
+
+SLOT="3.7"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE="cairo gnome opengl xulrunner"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8
+		>=dev-libs/atk-1.10.2
+		cairo? ( >=x11-libs/cairo-1.4.14 )
+		gnome?	(
+				=gnome-base/libgnome-2*
+				=gnome-base/gnome-vfs-2*
+				=gnome-base/libgnomeui-2*
+				)
+		xulrunner? ( <net-libs/xulrunner-2:1.9 )
+		opengl?	(
+			virtual/opengl
+			virtual/glu
+		)
+		x11-libs/libXtst"
+
+# Use a blocker to avoid file collisions when upgrading to the slotted version
+# We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT
+# so this is the only way to prevent collisions
+# libXtst/xextproto is done like this due to the XTest.h move - bug #292244
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		|| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )
+		x11-proto/inputproto
+		dev-util/pkgconfig
+		${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+java_prepare() {
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	# Fix Makefiles to respect flags and work with --as-needed
+	epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'x86' ]] ; then
+		AWT_ARCH="i386"
+	elif [[ $(tc-arch) == 'ppc' ]] ; then
+		AWT_ARCH="ppc"
+	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
+
+	local platform="linux"
+
+	use elibc_FreeBSD && platform="freebsd"
+
+	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt || die "Failed to build AWT support"
+
+	einfo "Building SWT library"
+	${make} make_swt || die "Failed to build SWT support"
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk || die "Failed to build ATK support"
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome || die "Failed to build GNOME VFS support"
+	fi
+
+	if use xulrunner ; then
+		einfo "Building the Mozilla component against xulrunner-1.9"
+
+		export MOZILLA_INCLUDES="$(pkg-config --cflags libxul libxul-embedding)"
+		# the -R is a workaround for bug #234934
+		export MOZILLA_LIBS="-Wl,-R$(pkg-config libxul --variable=sdkdir) $(pkg-config --libs libxul libxul-embedding)"
+
+		${make} make_mozilla || die "Failed to build Mozilla support"
+
+		# upstream ships libswt-xulrunner*.so even though the build.sh does not
+		# build it anymore... missing this file leads to another instance
+		# of bug #234934 so we build it too
+		einfo "Building the xulrunner component against xulrunner-1.9"
+
+		export XULRUNNER_INCLUDES="${MOZILLA_INCLUDES}"
+		export XULRUNNER_LIBS="${MOZILLA_LIBS}"
+
+		${make} make_xulrunner || die "Failed to build xulrunner support"
+
+		${make} make_xpcominit || die "Failed to build xpcominit support"
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo || die "Unable to build CAIRO support"
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx || die "Unable to build OpenGL component"
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt"
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/"
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+	use x86-fbsd && swtArch=x86
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF"
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	if use xulrunner; then
+		local gecko_dir="$(pkg-config libxul --variable=sdkdir)"
+		java-pkg_register-environment-variable MOZILLA_FIVE_HOME "${gecko_dir}"
+	fi
+
+	dohtml about.html || die
+}
+
+pkg_postinst() {
+	if use xulrunner; then
+		local gecko_dir="$(pkg-config libxul --variable=sdkdir)"
+		elog "You built swt with xulrunner support. For your custom applications please set"
+		elog "MOZILLA_FIVE_HOME environment variable to ${gecko_dir}"
+	fi
+}
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index e9dcb6a..16cd503 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -3,11 +3,19 @@ AUX 3.6/eclipserc-3.6 858 RMD160 f911438aa661be9ca8fc352dd372c9485d163ddb SHA1 a
 AUX 3.6/gtk_makefile.patch 1541 RMD160 39738d224c8d6aa9683b6898c773cd0f72f9bd70 SHA1 32b0cbaea2cba87191d3eb8cfa260f3419eea50a SHA256 5b33a3bb23856cdd46381a4de50100392858e9e37cbf814d2426589fa0bbdf58
 AUX 3.6/hamcrest-junit-lib.patch 1123 RMD160 16a33e88295718a43931d54d1dd5f57ddfcfd4f7 SHA1 69697c2b3b430f47391896590f5ac10554b9190e SHA256 147c55f9cb222745f64d0711211f5f900352712c2df6e449c424fe5b7fba3fec
 AUX 3.6/iterators.patch 2058 RMD160 a91238c61510f16bc48bc9559e9c6e341def6dd0 SHA1 f0fcc75ec4827a1f2dbc65af65940beb7274864b SHA256 cc2a1da26b8f63d9c4b75ededf10d7aa67a0d53dea390154eef882dc75e37f2b
+AUX 3.7/eclipse-3.7 1387 RMD160 32c47706d839fce9a2e08c91e108b8924a9975f2 SHA1 02d4ab620eb01ea152c0f6df6600ce77a46f16e8 SHA256 b2974e94d54db5094052fe1c56810993d4275bdf6afa0a653f81cc49486cfed6
+AUX 3.7/eclipserc-3.7 858 RMD160 f911438aa661be9ca8fc352dd372c9485d163ddb SHA1 abb1c369326be455d16bc42cf0a1b035aa145dc0 SHA256 0aea733c968ca064ad5ca95d5895778ecf7387826198b512e98d0cbb7dd353f1
+AUX 3.7/gtk_makefile.patch 1541 RMD160 39738d224c8d6aa9683b6898c773cd0f72f9bd70 SHA1 32b0cbaea2cba87191d3eb8cfa260f3419eea50a SHA256 5b33a3bb23856cdd46381a4de50100392858e9e37cbf814d2426589fa0bbdf58
+AUX 3.7/hamcrest-junit-lib.patch 1236 RMD160 f61fb1b274293c311366c463b9e8bd4fdca14c4f SHA1 8986d82583845dbf45469015ffde890f61eb16e2 SHA256 fbf4cf2b341e87b0e14be8e9794bee89b31e12af1fdf6e078d465d4d29bf09eb
+AUX 3.7/iterators.patch 2058 RMD160 a91238c61510f16bc48bc9559e9c6e341def6dd0 SHA1 f0fcc75ec4827a1f2dbc65af65940beb7274864b SHA256 cc2a1da26b8f63d9c4b75ededf10d7aa67a0d53dea390154eef882dc75e37f2b
 DIST eclipse-3.6.1-src.tar.bz2 62823517 RMD160 82d7d50d8f2be20116f55e6be086ae9dbac9bc0e SHA1 c95a21897da29b080e86b94c0298cc8b792af929 SHA256 6144cbcf3715a144d9be433c2a89f3f3bdce6ee3c33396e3e783d3b683cdc94f
 DIST eclipse-3.6.2-src.tar.bz2 62525869 RMD160 5c32204c99249db39a839c72753564fa63e3f3a0 SHA1 113b22702a26a88ff8736d6a232f6a41fe4eb00d SHA256 b72951cc75eba57c7d849210de38f69858ac4699eb3a69d4261a80d125f70d45
+DIST eclipse-3.7.0-src.tar.bz2 67181722 RMD160 2863a0130c5b75c08cf0c1f1977be894ad8edf5e SHA1 361247f39eacdeffb2159e59f508a5ac889912c9 SHA256 a068bab6f06b7939e557be7432b59bcde6925d86edffaa6dc2c1a6eca0fadbb2
 DIST eclipse-build-0.6.0.tar.bz2 293428 RMD160 3ca7b8e8e4016cab251ef758ed533856aa31ced3 SHA1 2f0580bb2496bd299ad77ada48cb7d9e3ab5a4fd SHA256 a2dc16b9178d0416e01c52306c68b4a82c34a7cc163d86326dbcfbab16a68ef3
 DIST eclipse-build-0.6.1.tar.bz2 295425 RMD160 f0306941e0c2618dc3f0a0b2b5a2e30e935839bc SHA1 cc81b424934b4fff96d6cbc2967dd4bec4c30e86 SHA256 66b6344fe55523b1e2243bd37f9ad14aeff0fd7f0f44669a89cada9146e5b46e
+DIST eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5.tar.xz 276668 RMD160 346bcdd9e8d44ae865ae80380c54b7fd05a7dd04 SHA1 cb806a93b3f237aec2913d6f8b9068aeb1f9320b SHA256 1703ae2b9062e8692a2ab8aa589c91dc42fe90f6e3ba09ea2f69caf91d9b4865
 EBUILD eclipse-sdk-3.6.1.ebuild 12488 RMD160 d2757dcdeee41fc84b47698be3368b2601feec8a SHA1 a30445590973ee8f6e05a419f9b5877c10a6d7e0 SHA256 b17bc05a2cd878bdb06becbe45313b50b12482e2e023dfd94396877967a3735b
 EBUILD eclipse-sdk-3.6.2.ebuild 12821 RMD160 0e63693d9d276a0a963d14bc6de2fa0ad099c51a SHA1 5f797a462331d6fe0ac5911d06508457081f4561 SHA256 3b55917d2e8370a78ac7fc3fd112e14de85ad8fd79a617872dc80696f9ba8260
+EBUILD eclipse-sdk-3.7.0.ebuild 13863 RMD160 784e35aed2af5d6c8ab39ba43f1290d9ab20956f SHA1 df7fd9814c72f289193864f4f6f4e93af4a788a5 SHA256 85414ea422171354aee9ecd3dae209c9ed322770b062d11698d77deef7d7a0e5
 MISC NOTES 95 RMD160 8a25c8c280750c4369e7659cd990e70a55a8221e SHA1 19f635c381122e9f4ef91d3bff5654abc914eb7f SHA256 7a46f31a4ef7c84668092d04c333241ca6dc68c27113de95644fb3247c286e10
 MISC metadata.xml 800 RMD160 f97cc4ac78898369a7706331bb14bc838519cf21 SHA1 21cd52a15acb6510aa3b955f78fb28a73cf58234 SHA256 76e243573c28c3d705f54745cfbcedd85dae3233b6ed00e2f81a61ac9caeeeaa
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.7.0.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.7.0.ebuild
new file mode 100644
index 0000000..5e84bbf
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.7.0.ebuild
@@ -0,0 +1,394 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+EAPI="2"
+WANT_ANT_TASKS="ant-nodeps"
+
+# eclipse-build is too complicated for automatic fixing
+# if there are any fixes we should create patches
+# and push them upstream
+JAVA_PKG_BSFIX="off"
+
+inherit java-pkg-2 java-ant-2 check-reqs
+
+BUILD_VER="3.7.0"
+BUILD_ID="I20110613-1736"
+BUILD_LABEL="${BUILD_VER}-${BUILD_ID}"
+ECLIPSE_BUILD_VER="5791c48513b4207ab1eec1e00bed4b2186f9aad5"
+S="${WORKDIR}/eclipse-build-${ECLIPSE_BUILD_VER}"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse/"
+BASE_URI="http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/"
+SRC_URI="${BASE_URI}eclipse-${BUILD_VER}-src.tar.bz2 ${BASE_URI}eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
+
+LICENSE="EPL-1.0"
+SLOT="3.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gnome source"
+
+# ant dependencies should really be >=1.8.2
+CDEPEND=">=dev-java/swt-${PV%.0}_rc4:${SLOT}
+	>=dev-java/ant-1.8.1
+	>=dev-java/asm-3.3.1:3
+	>=dev-java/commons-codec-1.3
+	>=dev-java/commons-el-1.0
+	>=dev-java/commons-httpclient-3.1:3
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/hamcrest-core-1.1
+	>=dev-java/icu4j-4.4.2:4.4
+	>=dev-java/jsch-0.1.41
+	>=dev-java/junit-3.8.2:0
+	>=dev-java/junit-4.8.2:4
+	>=dev-java/lucene-2.9.1:2.9
+	>=dev-java/lucene-analyzers-2.9.1:2.9
+	>=dev-java/sat4j-core-2.3.0:2
+	>=dev-java/sat4j-pseudo-2.3.0:2
+	dev-java/tomcat-servlet-api:2.5
+	>=www-servers/jetty-6.1.23:6
+	>=www-servers/tomcat-5.5.17:5.5
+	x86? ( gnome? ( gnome-base/gconf ) )"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+# ant dependencies should really be >=1.8.2
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	app-arch/xz-utils
+	app-arch/zip
+	>=dev-java/ant-antlr-1.8.1
+	>=dev-java/ant-apache-bcel-1.8.1
+	>=dev-java/ant-apache-bsf-1.8.1
+	>=dev-java/ant-apache-log4j-1.8.1
+	>=dev-java/ant-apache-oro-1.8.1
+	>=dev-java/ant-apache-regexp-1.8.1
+	>=dev-java/ant-apache-resolver-1.8.1
+	>=dev-java/ant-apache-xalan2-1.8.1
+	>=dev-java/ant-commons-logging-1.8.1
+	>=dev-java/ant-commons-net-1.8.1
+	>=dev-java/ant-core-1.8.1
+	>=dev-java/ant-javamail-1.8.1
+	>=dev-java/ant-jdepend-1.8.1
+	>=dev-java/ant-jmf-1.8.1
+	>=dev-java/ant-jsch-1.8.1
+	>=dev-java/ant-junit-1.8.1
+	>=dev-java/ant-junit4-1.8.1
+	>=dev-java/ant-swing-1.8.1
+	>=dev-java/ant-testutil-1.8.1
+	>=virtual/jdk-1.6"
+#	>=dev-java/ant-launcher-1.8.1
+
+OSGI_DEPENDENCIES=(
+	'com.ibm.icu - icu4j-4.4'
+	'com.jcraft.jsch - jsch'
+	'javax.servlet tomcat6-servlet-2.5-api tomcat-servlet-api-2.5 servlet-api'
+	'javax.servlet.jsp tomcat6-jsp-2.1-api tomcat-servlet-api-2.5 jsp-api'
+	'org.apache.commons.codec commons-codec commons-codec'
+	'org.apache.commons.el apache-commons-el-1.0 commons-el'
+	'org.apache.commons.httpclient jakarta-commons-httpclient-3.1 commons-httpclient-3'
+	'org.apache.commons.logging apache-commons-logging commons-logging'
+	'org.apache.jasper - tomcat-5.5 jasper-compiler jasper-runtime'
+	'org.apache.lucene.core lucene lucene-2.9'
+	'org.apache.lucene.analysis lucene-analyzers lucene-analyzers-2.9'
+	'org.hamcrest.core - hamcrest-core'
+	'org.mortbay.jetty.server jetty-6.1.26 jetty-6 jetty'
+	'org.mortbay.jetty.util jetty-util-6.1.26 jetty-6 jetty-util'
+	'org.objectweb.asm - asm-3'
+	'org.sat4j.core org.sat4j.core sat4j-core-2'
+	'org.sat4j.pb org.sat4j.pb sat4j-pseudo-2'
+)
+NONOSGI_DEPENDENCIES=(
+	'org.apache.ant ant-antlr'
+	'org.apache.ant ant-apache-bcel'
+	'org.apache.ant ant-apache-bsf'
+	'org.apache.ant ant-apache-log4j'
+	'org.apache.ant ant-apache-oro'
+	'org.apache.ant ant-apache-regexp'
+	'org.apache.ant ant-apache-resolver'
+	'org.apache.ant ant-apache-xalan2'
+	'org.apache.ant ant-commons-logging'
+	'org.apache.ant ant-commons-net'
+	'org.apache.ant ant-core ant ant-launcher'
+	'org.apache.ant ant-javamail'
+	'org.apache.ant ant-jdepend'
+	'org.apache.ant ant-jmf'
+	'org.apache.ant ant-jsch'
+	'org.apache.ant ant-junit'
+	'org.apache.ant ant-junit4'
+#	'org.apache.ant ant-launcher'
+	'org.apache.ant ant-swing'
+	'org.apache.ant ant-testutil'
+	'org.junit_3.8.2.v3 junit'
+	'org.junit4 junit-4 junit'
+	'org.junit_4.8.2.v4 junit-4 junit'
+)
+
+ALL_OS='aix hpux linux macosx qnx solaris win32'
+ALL_WS='carbon cocoa gtk motif photon win32 wpf'
+ALL_ARCH='alpha arm ia64 mips mipsel PA_RISC ppc ppc64 s390 s390x sparc sparc64 x86 x86_64'
+
+buildDir="${S}/build/eclipse-${BUILD_LABEL}-src"
+
+pkg_setup() {
+	ws='gtk'
+	if use x86 ; then os='linux' ; arch='x86'
+	elif use amd64 ; then os='linux' ; arch='x86_64'
+	fi
+
+	java-pkg-2_pkg_setup
+
+	if use doc ; then
+		ewarn "Having the 'doc' USE flag enabled greatly increases the build time."
+		ewarn "You might want to disable it for ${PN} if you don't need it."
+	fi
+}
+
+src_unpack() {
+	CHECKREQS_MEMORY="1536"
+	if use doc ; then
+		CHECKREQS_DISK_BUILD="3072"
+	else
+		CHECKREQS_DISK_BUILD="1536"
+	fi
+	check_reqs
+
+	#unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
+	tar -xpJf "${DISTDIR}/eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
+	ln -s "${DISTDIR}/eclipse-${BUILD_VER}-src.tar.bz2" "${S}/eclipse-${BUILD_LABEL}-src.tar.bz2" || die
+
+	cd "${S}"
+	# building with ecj fails for some reason (polluted classpath probably)
+	java-pkg_force-compiler javac
+	#sed -e 's/^\(label\|testsBuildLabel\)=.*$/\1='"${BUILD_LABEL}"'/' \
+	#		-e 's/^buildId=.*$/buildId='"${BUILD_ID}"'/' \
+	#		-i build.properties -i pdebuild.properties || die
+	eant unpack
+}
+
+src_prepare() {
+	# apply patches before we start cleaning junk out
+	eant applyPatches
+
+	# fix up hardcoded runtime class paths
+	sed -e 's|/usr/lib/jvm/java/jre/lib/rt\.jar:.*$|'"$(java-config --runtime)"'|' \
+			-i {,pde}build.properties || die
+
+	# we'll handle our own dependency symlinking, so disable eclipse-build helper
+	sed -e 's/,symlinkDeps,/,/' -i build.xml || die
+	sed_xml_element 'target' -e '/name="provision.sdk"/ s|<symlinkInstalled.*\(<echo \)|\1|' \
+			-i build.xml || die
+
+	# this unpacking step appears to be unnecessary (and it doesn't work)
+	sed_xml_element 'target' -e 's/\(depends="[^"]\+\),[^",]*nestedJars/\1/' \
+			-i "${buildDir}"/plugins/*/build.xml || die
+
+	# disable building of libgnomeproxy on x86 if USE=-gnome
+	if ! use gnome ; then
+		sed_xml_element 'condition' -e '/property="build\.libgnomeproxy"/d' -i build.xml || die
+	fi
+
+	# skip compilation of SWT native libraries (we use the system-installed copies)
+	sed_xml_element 'ant' -e '/swt/d' -i build.xml || die
+
+	ebegin 'Removing plugins of irrelevant platforms'
+	local remove_os=" ${ALL_OS} " ; remove_os=${remove_os/ ${os} / }
+	remove_os=${remove_os# } ; remove_os=${remove_os% } ; remove_os=${remove_os// /'\|'}
+	local remove_ws=" ${ALL_WS} " ; remove_ws=${remove_ws/ ${ws} / }
+	remove_ws=${remove_ws# } ; remove_ws=${remove_ws% } ; remove_ws=${remove_ws// /'\|'}
+	local remove_arch=" ${ALL_ARCH} " ; remove_arch=${remove_arch/ ${arch} / }
+	remove_arch=${remove_arch# } ; remove_arch=${remove_arch% } ; remove_arch=${remove_arch// /'\|'}
+	sed_xml_element 'includes\|plugin' \
+			-e '/id="org\.eclipse\.\(core\.net\.linux\.x86\|update\.core\.linux\)"/b' \
+			-e '/os="'"${remove_os}"'"/d' -e '/ws="'"${remove_ws}"'"/d' -e '/arch="'"${remove_arch}"'"/d' \
+			-i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \
+		|| die 'remove irrelevant platforms failed'
+	eend
+
+	if ! use doc ; then
+		ebegin 'Removing documentation plugins'
+		rm -rf "${buildDir}"/plugins/*.doc{,.*}
+		eclipse_delete-plugins '.*\.doc\(\..*\|\)'
+		eend
+	fi
+
+	if ! use source ; then
+		ebegin 'Removing source plugins'
+		rm -rf "${buildDir}"/plugins/*.source{,_*}
+		eclipse_delete-plugins '.*\.source'
+		eend
+	fi
+
+	ebegin 'Linking dependencies'
+	local dep ; for dep in "${OSGI_DEPENDENCIES[@]}" ; do
+		eclipse_create-osgi-dep ${dep}
+	done
+	local dep ; for dep in "${NONOSGI_DEPENDENCIES[@]}" ; do
+		eclipse_create-nonosgi-dep ${dep}
+	done
+	eend
+
+	cd "${buildDir}" || die
+	epatch "${FILESDIR}/${SLOT}/hamcrest-junit-lib.patch"
+	epatch "${FILESDIR}/${SLOT}/gtk_makefile.patch"
+	epatch "${FILESDIR}/${SLOT}/iterators.patch"
+}
+
+src_compile() {
+	ANT_OPTS='-Xmx512M' eant -DbuildArch="${arch}"
+
+	# remove stray symlink
+	rm "${buildDir}"/installation/plugins/junit4.jar
+}
+
+src_install() {
+	local destDir="/usr/$(get_libdir)/eclipse-${SLOT}"
+
+	insinto "${destDir}"
+	shopt -s dotglob
+	doins -r "${buildDir}"/installation/* || die
+	shopt -u dotglob
+	chmod +x "${D}${destDir}"/eclipse
+	rm -f "${D}${destDir}"/libcairo-swt.so  # use the system-installed SWT libraries
+
+	# redo symlinks
+	ebegin 'Relinking dependencies'
+	local dep ; for dep in "${OSGI_DEPENDENCIES[@]}" ; do
+		eclipse_relink-osgi-dep ${dep}
+	done
+	local dep ; for dep in "${NONOSGI_DEPENDENCIES[@]}" ; do
+		eclipse_relink-nonosgi-dep ${dep}
+	done
+	eend
+
+	# Install Gentoo wrapper and config
+	dobin "${FILESDIR}/${SLOT}/eclipse-${SLOT}" || die
+	insinto /etc
+	doins "${FILESDIR}/${SLOT}/eclipserc-${SLOT}" || die
+
+	# Create desktop entry
+	make_desktop_entry "eclipse-${SLOT}" "Eclipse ${PV}" "${destDir}/icon.xpm" || die
+}
+
+eclipse_create-osgi-dep() {
+	local bundle=${1} replace=${2} package=${3} ; shift 3
+	bundle=$(basename "${S}/dependencyManifests/${bundle}"_*.jar .jar) || die
+	[[ ${replace} == '-' ]] && replace=${bundle}
+	einfo "  ${bundle} => ${package}" "${@}"
+	mkdir -p "${buildDir}/plugins/${bundle}" || die
+	pushd "${buildDir}/plugins/${bundle}" > /dev/null || die
+	if (( ${#} )) ; then
+		local jar ; for jar in "${@}" ; do
+			java-pkg_jar-from "${package}" "${jar}.jar"
+		done
+	else
+		java-pkg_jar-from "${package}"
+	fi
+	mkdir META-INF || die
+	cp "${S}/dependencyManifests/${bundle}.jar/META-INF/MANIFEST.MF" META-INF/ || die
+	manifest_replace META-INF/MANIFEST.MF 'Bundle-ClassPath' "$(echo *.jar | tr ' ' ',')"
+	manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest'
+	# replace classpath refs to this bundle with refs to system-installed jars
+	sed_xml_element 'pathelement' -e '/path="\([^"]\+\/\)\?'"${replace//./\.}"'\.jar"/c '"$(
+			for jar in *.jar ; do
+				echo -n '<pathelement path="'"$(readlink "${jar}")"'"/>'
+			done)" -i "${buildDir}"/plugins/*/build.xml || die
+	popd > /dev/null || die
+	# include unpacked bundle in copy to bootstrap plugins dir
+	sed_xml_element 'fileset' -e '/id="orbitDeps"/ s|</fileset>|<include name="'"${bundle}/"'"/>\0|' \
+			-i "${S}/pdebuild.xml" || die
+}
+
+eclipse_create-nonosgi-dep() {
+	local bundle=${1} package=${2} ; shift 2
+	local pdir=${buildDir}/plugins
+	local jar ; for jar in "${@:-${package}}" ; do
+		local dir=$(dirname "$(grep -ho "${bundle//./\.}"'\(_[^/=]*\)\?/\([^/=]*/\)*'"${jar}"'\.jar' \
+				"${S}"/{,jdt}nonosgidependencies.properties)") || die
+		einfo "  ${dir}/${jar}.jar => ${package}"
+		mkdir -p "${pdir}/${dir}" || die
+		java-pkg_jar-from --build-only "${package}" "${jar}.jar" "${pdir}/${dir}/${jar}.jar"
+		dir=${dir%%/*}
+		local manifest=${pdir}/${dir}/META-INF/MANIFEST.MF
+		[[ -f ${manifest} ]] && manifest_delete "${manifest}" 'Name\|SHA1-Digest'
+		rm -f "${pdir}/${dir}"/META-INF/ECLIPSEF.{RSA,SF}
+	done
+}
+
+eclipse_relink-osgi-dep() {
+	local bundle=${1} replace=${2} package=${3} ; shift 3
+	einfo "  ${bundle} => ${package}" "${@}"
+	pushd "${D}${destDir}/plugins/${bundle}"_* > /dev/null || die
+	if (( ${#} )) ; then
+		local jar ; for jar in "${@}" ; do
+			java-pkg_jar-from --build-only "${package}" "${jar}.jar"
+		done
+	else
+		java-pkg_jar-from --build-only "${package}"
+	fi
+	popd > /dev/null || die
+}
+
+eclipse_relink-nonosgi-dep() {
+	local bundle=${1} package=${2} ; shift 2
+	local pdir=${D}${destDir}/plugins
+	local jar ; for jar in "${@:-${package}}" ; do
+		local dir=$(dirname "$(grep -ho "${bundle//./\.}"'\(_[^/=]*\)\?/\([^/=]*/\)*'"${jar}"'\.jar' \
+				"${S}"/{,jdt}nonosgidependencies.properties)") || die
+		einfo "  ${dir}/${jar}.jar => ${package}"
+		mkdir -p "${pdir}/${dir}" || die
+		java-pkg_jar-from --build-only "${package}" "${jar}.jar" "${pdir}/${dir}/${jar}.jar"
+	done
+}
+
+# Removes feature.xml references to plugins matching ${1}.
+eclipse_delete-plugins() {
+	sed_xml_element 'includes\|plugin' -e '/id="'"${1}"'"/d' \
+			-i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \
+		|| die 'eclipse_delete-plugins failed'
+}
+
+# Prints the first value from manifest file ${1} whose key matches regex ${2},
+# unfolding as necessary.
+manifest_get() {
+	sed -n -e '/^\('"${2}"'\): /{h;:A;$bB;n;/^ /!bB;H;bA};d;:B;g;s/^[^:]*: //;s/\n //g;p;q' "${1}" \
+		|| die 'manifest_get failed'
+}
+
+# Deletes values from manifest file ${1} whose keys match regex ${2}, taking
+# into account folding.
+manifest_delete() {
+	sed -n -e ':A;/^\('"${2}"'\): /{:B;n;/^ /!{bA};bB};p' -i "${1}" \
+		|| die 'manifest_delete failed'
+}
+
+# Replaces the value for key ${2} in the first section of manifest file ${1}
+# with ${3}, or adds the key-value pair to that section if the key was absent.
+manifest_replace() {
+	LC_ALL='C' awk -v key="${2}" -v val="${3}" '
+function fold(s,  o, l, r) {
+	o = 2 ; l = length(s) - 1 ; r = substr(s, 1, 1)
+	while (l > 69) { r = r substr(s, o, 69) "\n " ; o += 69 ; l -= 69 }
+	return r substr(s, o)
+}
+BEGIN { FS = ": " }
+f { print ; next }
+i { if ($0 !~ "^ ") { f = 1 ; print } ; next }
+$1 == key { print fold(key FS val) ; i = 1 ; next }
+/^\r?$/ { print fold(key FS val) ; print ; f = 1 ; next }
+{ print }
+END { if (!f) { print fold(key FS val) } }
+' "${1}" > "${1}-" && mv "${1}"{-,} || die 'manifest_replace failed'
+}
+
+# Executes sed over each XML element with a name matching ${1}, rather than
+# over each line. The entire element (and its children) may be removed with the
+# 'd' command, or they may be edited using all the usual sed foo. Basically,
+# the script argument will be executed only for elements matching ${1}, and the
+# sed pattern space will consist of the entire element, including any nested
+# elements. Note that this is not perfect and requires no more than one XML
+# element per line to be reliable.
+sed_xml_element() {
+	local elem=${1} ; shift
+	sed -e '/<\('"${elem}"'\)\([> \t]\|$\)/{:_1;/>/!{N;b_1};/\/>/b_3' \
+			-e ':_2;/<\/\('"${elem}"'\)>/!{N;b_2};b_3};b;:_3' "${@}"
+}
diff --git a/dev-util/eclipse-sdk/files/3.7/eclipse-3.7 b/dev-util/eclipse-sdk/files/3.7/eclipse-3.7
new file mode 100644
index 0000000..aed6745
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.7/eclipse-3.7
@@ -0,0 +1,46 @@
+#! /bin/sh
+#
+# Tiny startup wrapper for Eclipse
+#
+# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
+# Copyright (c) 2007-2008, Jean-Noël Rivasseau <elvanor@gentoo.org>
+# Copyright (c) 2004-2008, Gentoo Foundation
+#
+# Licensed under the GNU General Public License, version 2
+#
+
+SLOT="3.7"
+
+[ -f "/etc/eclipserc-${SLOT}" ] && . "/etc/eclipserc-${SLOT}"
+[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc"
+
+ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-${SLOT}"}
+ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse"
+
+if [ ! -x "${ECLIPSE_BIN}" ] ; then
+	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
+	exit 1
+fi
+
+if [ $(id -u) -eq 0 ] ; then
+	echo "Do not run eclipse as root user! Exiting ..." > /dev/stderr
+	exit 1
+fi
+
+case "$(java-config -f)" in
+	*gcj*)
+		export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb"
+		;;
+esac
+
+eval $(gjl --package "swt-${SLOT}" --get-args)
+
+[ -n "${ECLIPSE_XMS}" ] && VM_ARGS="${VM_ARGS} -Xms${ECLIPSE_XMS}"
+[ -n "${ECLIPSE_XMX}" ] && VM_ARGS="${VM_ARGS} -Xmx${ECLIPSE_XMX}"
+[ -n "${ECLIPSE_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:PermSize=${ECLIPSE_PERMSIZE}"
+[ -n "${ECLIPSE_MAX_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${ECLIPSE_MAX_PERMSIZE}"
+
+# Fix for JRE 1.5.
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib
+
+exec "${ECLIPSE_BIN}" -vm $(java-config --java) "$@" "${ECLIPSE_USER_ARGS}" -vmargs ${VM_ARGS} 
diff --git a/dev-util/eclipse-sdk/files/3.7/eclipserc-3.7 b/dev-util/eclipse-sdk/files/3.7/eclipserc-3.7
new file mode 100644
index 0000000..703b649
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.7/eclipserc-3.7
@@ -0,0 +1,20 @@
+# This file specifies some initial Eclipse settings, like memory allowed
+# These settings only affect Eclipse startup and overall configuration
+# Main Eclipse configuration should be done within Eclipse (with the GUI)
+
+# Following variables controls the minimal and maximum amounts of memory
+# allocated to Eclipse (respectively).
+# Increase those numbers if you get OutOfMemory errors.
+
+ECLIPSE_XMS=128m
+ECLIPSE_XMX=256m
+
+# Following variables controls the minimal and maximum amounts of memory
+# allocated to the permanent generation space.
+# This space contains data related to all classes.
+# Thus, if you use a lot of Eclipse plugins, it is recommended to uncomment
+# these variables and even increase it, if you have enough RAM.
+# Else you will get crashes related to OutOfMemory in PermGen exceptions. 
+
+#ECLIPSE_PERMSIZE=64m
+#ECLIPSE_MAX_PERMSIZE=128m
\ No newline at end of file
diff --git a/dev-util/eclipse-sdk/files/3.7/gtk_makefile.patch b/dev-util/eclipse-sdk/files/3.7/gtk_makefile.patch
new file mode 100644
index 0000000..dd71e95
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.7/gtk_makefile.patch
@@ -0,0 +1,36 @@
+--- features/org.eclipse.equinox.executable/library/gtk/make_linux.mak~	2010-02-08 21:14:12.000000000 +0000
++++ features/org.eclipse.equinox.executable/library/gtk/make_linux.mak	2010-08-09 21:47:30.543247031 +0000
+@@ -27,7 +27,8 @@
+   PROGRAM_OUTPUT=eclipse
+ endif
+ 
+-PROGRAM_LIBRARY=$(PROGRAM_OUTPUT)_$(LIB_VERSION).so
++PROGRAM_SONAME=$(PROGRAM_OUTPUT)_$(LIB_VERSION)
++PROGRAM_LIBRARY=$(PROGRAM_SONAME).so
+ 
+ ifeq ($(DEFAULT_JAVA),)
+   DEFAULT_JAVA=DEFAULT_JAVA_JNI
+@@ -44,8 +45,8 @@
+ #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl -lX11
+ LIBS = -lpthread -ldl
+ GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
+-LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic 
+-CFLAGS = ${M_ARCH} -g -s -Wall\
++LFLAGS = ${M_ARCH} -shared -Wl,-soname=$(PROGRAM_SONAME) -fpic -Wl,--export-dynamic 
++CFLAGS += ${M_ARCH} -Wall\
+ 	-fpic \
+ 	-DLINUX \
+ 	-DMOZILLA_FIX \
+@@ -95,10 +96,10 @@
+ 	$(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o
+ 
+ $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
+-	$(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
++	$(CC) ${M_ARCH} $(LDFLAGS) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+ 	
+ $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
+-	$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
+ 
+ install: all
+ 	cp $(EXEC) $(OUTPUT_DIR)
diff --git a/dev-util/eclipse-sdk/files/3.7/hamcrest-junit-lib.patch b/dev-util/eclipse-sdk/files/3.7/hamcrest-junit-lib.patch
new file mode 100644
index 0000000..edad52c
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.7/hamcrest-junit-lib.patch
@@ -0,0 +1,11 @@
+--- plugins/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java~	2011-03-09 16:38:30.000000000 +0000
++++ plugins/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java	2011-06-15 18:07:35.272733911 +0000
+@@ -161,7 +161,7 @@
+ 			"org.junit", new VersionRange("[4.7.0,5.0.0)"), "junit.jar", "junit.jar", "org.junit.source", "source-bundle/", JUnitPreferencesConstants.JUNIT4_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+ 	
+ 	private static final JUnitPluginDescription HAMCREST_CORE_PLUGIN= new JUnitPluginDescription(
+-			"org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), null, "org.hamcrest.core_1.*.jar", "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
++			"org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), "hamcrest-core.jar", "org.hamcrest.core_1.*.jar", "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ 
+ 	/**
+ 	 * @return the JUnit3 classpath container
diff --git a/dev-util/eclipse-sdk/files/3.7/iterators.patch b/dev-util/eclipse-sdk/files/3.7/iterators.patch
new file mode 100644
index 0000000..eca230e
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.7/iterators.patch
@@ -0,0 +1,70 @@
+--- plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CompoundIterator.java~	2010-02-19 12:12:49.000000000 +0000
++++ plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CompoundIterator.java	2010-08-09 23:16:39.201246659 +0000
+@@ -25,7 +25,7 @@
+ 	private final Iterator<? extends Object> iteratorIterator;
+ 	private Iterator<T> currentIterator;
+ 
+-	private T nextObject = noElement();
++	private Object nextObject = NO_ELEMENT;
+ 
+ 	/**
+ 	 * Creates a compound iterator that will iterated over the elements
+@@ -47,8 +47,9 @@
+ 		if (!positionNext())
+ 			throw new NoSuchElementException();
+ 
+-		T nxt = nextObject;
+-		nextObject = noElement();
++		@SuppressWarnings("unchecked")
++		T nxt = (T) nextObject;
++		nextObject = NO_ELEMENT;
+ 		return nxt;
+ 	}
+ 
+@@ -76,9 +77,4 @@
+ 		nextObject = currentIterator.next();
+ 		return true;
+ 	}
+-
+-	@SuppressWarnings("unchecked")
+-	private static <T> T noElement() {
+-		return (T) NO_ELEMENT;
+-	}
+-}
+\ No newline at end of file
++}
+--- plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/MatchIteratorFilter.java~	2010-02-19 12:12:48.000000000 +0000
++++ plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/MatchIteratorFilter.java	2010-08-09 23:20:33.572246380 +0000
+@@ -21,7 +21,7 @@
+ 
+ 	private final Iterator<? extends T> innerIterator;
+ 
+-	private T nextObject = noElement();
++	private Object nextObject = NO_ELEMENT;
+ 
+ 	public MatchIteratorFilter(Iterator<? extends T> iterator) {
+ 		this.innerIterator = iterator;
+@@ -35,8 +35,9 @@
+ 		if (!positionNext())
+ 			throw new NoSuchElementException();
+ 
+-		T nxt = nextObject;
+-		nextObject = noElement();
++		@SuppressWarnings("unchecked")
++		T nxt = (T) nextObject;
++		nextObject = NO_ELEMENT;
+ 		return nxt;
+ 	}
+ 
+@@ -63,9 +64,4 @@
+ 		}
+ 		return false;
+ 	}
+-
+-	@SuppressWarnings("unchecked")
+-	private static <T> T noElement() {
+-		return (T) NO_ELEMENT;
+-	}
+-}
+\ No newline at end of file
++}