diff --git a/dev-util/eclipse-sdk-bin/Manifest b/dev-util/eclipse-sdk-bin/Manifest
index 6e83aa704..b3e0a676f 100644
--- a/dev-util/eclipse-sdk-bin/Manifest
+++ b/dev-util/eclipse-sdk-bin/Manifest
@@ -1,2 +1,30 @@
-DIST eclipse-java-neon-2-linux-gtk-4.6.2.tar.gz 167301233 SHA256 44b8c068a9a199817852b58325b90add3905e27ed33f4eb89197f6eb4c7c3be0 SHA512 b9ab913cb697ed3810c53dd9ee87aa831edb043e3e1bd6d5d04007a51ae61a367f6f851e5c436709eb610e0abdce3a155fdfb175e07aafeeab8ef8d7decdd169 WHIRLPOOL b808146bac1cf6b58e0c8549de0c9ce30fcf3b885d4901febd55edb60d3a04c6af650797ed9bb1719e5bc8d1a1708d0e01f722d4e8afba94a21329bb352d1ce5
-DIST eclipse-java-neon-2-linux-gtk-x86_64-4.6.2.tar.gz 167449069 SHA256 b276ee8af940d37b9339ecb639c23953a25584af8564526be06e0cc95f2f6a60 SHA512 7cd7c5a020bb4a8644fdaa1b4e3b1b9daab34edd17677e28b2cdd7934f2a6432320fbba241e4fb91349ae056405721522e4bfe29970a3934d49a3e8385558691 WHIRLPOOL 4d5190375a23f149e1c2b09ffa0c9858b6dc4b70b760dbb549544a179933f3bc037f9779330bb9b5ab6f009a3fe15024728cd8d5f41c7f00d95942ae09786b39
+AUX eclipse-bin-4.4 1402 BLAKE2B 82b74113ca7c7f989922117dfab66b36ef69393fe4cebda632cd6b54d04e5bbdd9ab1aadfc365167529e5db205d7c19516f96cf9cebf85194e1f2b79a57b6885 SHA512 149f1a170fdabcb9aab6fa2812172030f4878a52c8d12aa7090e813fee843f3955d9fb4f738eca0fbd35b9dadaff7ba1bbd5570e34c3b274bfd4e86b8c23318a
+AUX eclipse-bin-4.5 1402 BLAKE2B 82b74113ca7c7f989922117dfab66b36ef69393fe4cebda632cd6b54d04e5bbdd9ab1aadfc365167529e5db205d7c19516f96cf9cebf85194e1f2b79a57b6885 SHA512 149f1a170fdabcb9aab6fa2812172030f4878a52c8d12aa7090e813fee843f3955d9fb4f738eca0fbd35b9dadaff7ba1bbd5570e34c3b274bfd4e86b8c23318a
+AUX eclipse-bin-4.6 1402 BLAKE2B 82b74113ca7c7f989922117dfab66b36ef69393fe4cebda632cd6b54d04e5bbdd9ab1aadfc365167529e5db205d7c19516f96cf9cebf85194e1f2b79a57b6885 SHA512 149f1a170fdabcb9aab6fa2812172030f4878a52c8d12aa7090e813fee843f3955d9fb4f738eca0fbd35b9dadaff7ba1bbd5570e34c3b274bfd4e86b8c23318a
+AUX eclipse-bin-4.7 1402 BLAKE2B 82b74113ca7c7f989922117dfab66b36ef69393fe4cebda632cd6b54d04e5bbdd9ab1aadfc365167529e5db205d7c19516f96cf9cebf85194e1f2b79a57b6885 SHA512 149f1a170fdabcb9aab6fa2812172030f4878a52c8d12aa7090e813fee843f3955d9fb4f738eca0fbd35b9dadaff7ba1bbd5570e34c3b274bfd4e86b8c23318a
+AUX eclipse-bin-4.8 1402 BLAKE2B 82b74113ca7c7f989922117dfab66b36ef69393fe4cebda632cd6b54d04e5bbdd9ab1aadfc365167529e5db205d7c19516f96cf9cebf85194e1f2b79a57b6885 SHA512 149f1a170fdabcb9aab6fa2812172030f4878a52c8d12aa7090e813fee843f3955d9fb4f738eca0fbd35b9dadaff7ba1bbd5570e34c3b274bfd4e86b8c23318a
+AUX eclipse-bin-4.9 1402 BLAKE2B 82b74113ca7c7f989922117dfab66b36ef69393fe4cebda632cd6b54d04e5bbdd9ab1aadfc365167529e5db205d7c19516f96cf9cebf85194e1f2b79a57b6885 SHA512 149f1a170fdabcb9aab6fa2812172030f4878a52c8d12aa7090e813fee843f3955d9fb4f738eca0fbd35b9dadaff7ba1bbd5570e34c3b274bfd4e86b8c23318a
+AUX eclipserc-bin-4.4 859 BLAKE2B 2372f4f011d1b11d1e529b35853854966ea79e19c5578193e80ba91afc09a5a0c520ec59c4ec291ec53fc1c90c2267ea8f98708382fedd99921f1ad60935bf40 SHA512 9dca096a94ed4e3cd09e8ab9eb026014ce961deb913f2adfe63b2d027bf56b2f893b890effddba01c178ecd404b010695da01f7e24e94ff1a345847462783487
+AUX eclipserc-bin-4.5 859 BLAKE2B 2372f4f011d1b11d1e529b35853854966ea79e19c5578193e80ba91afc09a5a0c520ec59c4ec291ec53fc1c90c2267ea8f98708382fedd99921f1ad60935bf40 SHA512 9dca096a94ed4e3cd09e8ab9eb026014ce961deb913f2adfe63b2d027bf56b2f893b890effddba01c178ecd404b010695da01f7e24e94ff1a345847462783487
+AUX eclipserc-bin-4.6 859 BLAKE2B 2372f4f011d1b11d1e529b35853854966ea79e19c5578193e80ba91afc09a5a0c520ec59c4ec291ec53fc1c90c2267ea8f98708382fedd99921f1ad60935bf40 SHA512 9dca096a94ed4e3cd09e8ab9eb026014ce961deb913f2adfe63b2d027bf56b2f893b890effddba01c178ecd404b010695da01f7e24e94ff1a345847462783487
+AUX eclipserc-bin-4.7 859 BLAKE2B 2372f4f011d1b11d1e529b35853854966ea79e19c5578193e80ba91afc09a5a0c520ec59c4ec291ec53fc1c90c2267ea8f98708382fedd99921f1ad60935bf40 SHA512 9dca096a94ed4e3cd09e8ab9eb026014ce961deb913f2adfe63b2d027bf56b2f893b890effddba01c178ecd404b010695da01f7e24e94ff1a345847462783487
+AUX eclipserc-bin-4.8 859 BLAKE2B 2372f4f011d1b11d1e529b35853854966ea79e19c5578193e80ba91afc09a5a0c520ec59c4ec291ec53fc1c90c2267ea8f98708382fedd99921f1ad60935bf40 SHA512 9dca096a94ed4e3cd09e8ab9eb026014ce961deb913f2adfe63b2d027bf56b2f893b890effddba01c178ecd404b010695da01f7e24e94ff1a345847462783487
+AUX eclipserc-bin-4.9 859 BLAKE2B 2372f4f011d1b11d1e529b35853854966ea79e19c5578193e80ba91afc09a5a0c520ec59c4ec291ec53fc1c90c2267ea8f98708382fedd99921f1ad60935bf40 SHA512 9dca096a94ed4e3cd09e8ab9eb026014ce961deb913f2adfe63b2d027bf56b2f893b890effddba01c178ecd404b010695da01f7e24e94ff1a345847462783487
+DIST eclipse-java-2018-09-R-linux-gtk-4.9.0.tar.gz 194641740 BLAKE2B 9b4d895e713d2b43c2eef2e8c781b5864b548de55cbfe873b506a261650a42a56d5ab3bacbbcfa7641b9fb302fb37a14fa14a8c9b00e4d37073e28690d332a86 SHA512 24208e95b972e848d6b65ed8108d9e81584cf051397f2f43fb6269f5a625b8d7552ad77c7980a1a5653c87f06776e2926fd85607aae44e44657b4f6cc9b3e2e3
+DIST eclipse-java-2018-09-R-linux-gtk-x86_64-4.9.0.tar.gz 194820279 BLAKE2B 345dc26bf364c8f55f2c864c4ac53101a8243a117bb9a7e920103ca30e6775182aedf3e15c9a730c5bd0844bf00cba86036fc351a24cabf1333c851703b75557 SHA512 9dac5d040cdabf779de3996de87290e352130c7e860c1d0a98772f41da828ad45f90748b68e0a8a4f8d1ebbbbe5fdfe6401b7d871b93af34103d4a81a041c6a5
+DIST eclipse-java-mars-R-linux-gtk-4.5.2.tar.gz 169974282 BLAKE2B b102833e991c8d385d343d6b8301e992b66cd1e566efbadd58de63cfd48d0ee4a79ad9c89844bb44f38fbf66218ac82a7b40c098c7a2bed05d727ab7b53c250d SHA512 de17412b82c6150268142e99858f26641b465c1c296a1a13d413a47226dc9a01db26bd07985c926b5fe80e0225ff7b3e0ef35137fce31e0bb261ae5cc96cc888
+DIST eclipse-java-mars-R-linux-gtk-x86_64-4.5.2.tar.gz 170118332 BLAKE2B 411dfb7d0d5a31fb1c7d3367ce58697a94efdcc9a7e6b955e235017ad2b4b8d952fb6cf830228674425ce2b47af33adc2db85f791496754babe22b840f6a85a1 SHA512 9997a23d29e95c91177cd7460291caab46f04ca9b4af52b724c0d61577a16fa69b0aa4cdd01322aba21a05da24380d3f9395f799be4af8fc41c373353573a517
+DIST eclipse-java-neon-3-linux-gtk-4.6.3.tar.gz 167943703 BLAKE2B 88082363915bf6300a585284f0d7d8805d3424d74e824586d0b78fbb16e6ad9127c8cd4fa172078ada422143c2d41147298312048bec21657ffba9198be7b9fc SHA512 bc7008af20563d737ad88cc9da3fabd97be7049ff13f85cb969747c4ac74d33fa95b4bb993e290179096a72e3ea11600725483ff8dd06eab79b3100698a9a8e2
+DIST eclipse-java-neon-3-linux-gtk-x86_64-4.6.3.tar.gz 168093851 BLAKE2B b2d4780066ba5cf6279f81814299e71a09fb3cc28bc248ac3b1ea3030384551360e4046b7058c71207cb5d507bbbffaafc8e933281ac97baf628b231859cd643 SHA512 d1e406ae050b02771cf97ff87b394c50ecb7220f14194efbeb3511c142b66f32d4426c8f88b26e5225059b9796b940dd221e0dc3bf0780991fac65f5b4e362a8
+DIST eclipse-java-oxygen-2-linux-gtk-4.7.2.tar.gz 186991132 BLAKE2B e49f9ab43a08b8277d9bd484efb4200ca48e875d4431b697bb03b7d266983a1b4c71555f5e79cee19e95e2b265de491f90a627febcf792fb46c95585a480c6d5 SHA512 0f41757ca65f031290b6419a36493f356fea7be48c8bf47478bd32cf02c7dcda24eb6a0ed6053f90bced43f707d5675bdd12fbfbedb897299c87f7aa4a449095
+DIST eclipse-java-oxygen-2-linux-gtk-x86_64-4.7.2.tar.gz 187103425 BLAKE2B f4806fc5a940f1629531152ef153d5e6e65aefff6acb4357627d7cbfa9f81d70320161ba4584a5f0d32d7e4d3bc247f3548614b776d1072c2b99fe281a37b9da SHA512 761c1aac58fb3b1431cfbff0ac392fddeb651bb8f884d37964bb9ee0e82521302cdca7c80b1253a811ce0c6f5f3271ef4e884b037fab43146eb4de42a6572711
+DIST eclipse-java-oxygen-3-linux-gtk-4.7.3.tar.gz 187111488 BLAKE2B 9bad8aa2be242ab0a2f50858743c460f48a5486fd2407361ce01ded98e633c551998c567685f05ceda27d935f0766dc085b32dd40405abe2a658598c5b867ec0 SHA512 25f01169805c0598d0918b5a790bf521dd3b6ac76d265cbdd76a3f3dc21fc549ee03581c6cb27e914e395d34bb977edf553c2c98c2127f08b93e67a267ff4aca
+DIST eclipse-java-oxygen-3-linux-gtk-x86_64-4.7.3.tar.gz 187218250 BLAKE2B 82951e9cd04a64b6da0240e234c9f904cff7979fb6188f21db91a030e9eb147621882b3c4f979da9c973b28967dfc1b8b2cb672baeb9a45e917f943e470c376f SHA512 c8238731def1d61cbf69fd2f5602af61fc5b3e9f6e9bdaa8057c01ecd2b071c3717ec69195e1f03f52f1dc8b3eff3172daf3192d519e8d104e0d6d411b7478c2
+DIST eclipse-java-photon-R-linux-gtk-4.8.0.tar.gz 201370116 BLAKE2B 5699db5384a0bbe9260fd66b0cd2b345afad7b393e5249ab2ccd7fb21c2b982e16f859cece03fc82a92ab684e2ee2d10b9fe20e98863c69ac8ac2655038bfb35 SHA512 526b6814808937ce54fc67699f373ce83c1d4781be44a2a4d3e96c59e0d11beb4b58dbda6060e9f1202628f12cde795936b52c83c5846922935dc82dfd16a5c6
+DIST eclipse-java-photon-R-linux-gtk-x86_64-4.8.0.tar.gz 201489834 BLAKE2B 01928c812a6dd89653ad938afc661856e32f7c2ecd4728abee4cde3eb14a9471d18de7479d98e03926fdab8e256ee1d2bb9c210a57732eed20ab81eaa67870fc SHA512 1fa541e3bb7b1dac01ba01a9a54445f7acc718edfbb00a8edb5af9b0ece46367e8841b8f0d0cc59cf2a0948465d10ae6420c0dcebc46582248514cc2026287c3
+EBUILD eclipse-sdk-bin-4.5.2.ebuild 1312 BLAKE2B 08bbce2a2059f5842fab89287377c28e94adb296001d981dd00cdfbbeaf6c1cc6e3f27da6b293de0096dd3a3da34832d3fbf30fb6f39e95c2c05662ad80a0442 SHA512 693c17828f5265cfb0c780f626f67949a75f7200d625eb7fdc6e477b4030320a95abc08ec43a24df753a28b3f68a2e4939e0d0a860a6f45c7b271635a05987cf
+EBUILD eclipse-sdk-bin-4.6.3.ebuild 1315 BLAKE2B 70032ecbb67f2f672c32ab6f83757d45b6ee2b06884a2aa7cedb1546c569a4a16847e61871c4fe92c537043a458be1133d2c38fc0ebe2841ce6bcb3b7d3caf24 SHA512 cf3c2815513355deeeb947b3dc5fa98c5a23e7414925d0a1dd3491cc935bb3c4005b775fc22ad2713abbf2a550baea5f51841aa83e41ed711f063da4d1e42c8d
+EBUILD eclipse-sdk-bin-4.7.2.ebuild 1319 BLAKE2B 843fab9b3492f7c2a484b78c625a74543a65b24fab346b97fa4bebf62bc39c3751762ac062a37451cfb0cb45725333f395498df142d2c66f02650efe8c41e811 SHA512 207fc38d73fbaca8f0f4dc750150528d56a45f6a49f4e34d485690709c7bb01d2d65ca4ce7f0c64c5a9c5df4f8293f94b27111e20489e362b8db8326f4ae20a4
+EBUILD eclipse-sdk-bin-4.7.3.ebuild 1319 BLAKE2B f698be65032f7e31cc7921a2295784a95d332e6304d820785ad2ad19e921acbefac00bce874b7cf9c0e8f5c34d0af2cbfd5126e5d4ae5b72bc0c1470e5ca9e95 SHA512 fba7ab714c914e8e5d49564d9766c360505830eb39b6d4e3ebf4c14349cceb29bb6a10d5da0fada08e701d245f2f677502352afb86bf9004a5b5efd2f7853044
+EBUILD eclipse-sdk-bin-4.8.0.ebuild 1319 BLAKE2B ffe94d2022f905c134c2b5ea71f0bd71dc0f9330937fcb8654605f9275c5e1ade4f7c62da4b4ff66137e61479299f1c41ae38bbb34206adbae95d3c4102663e9 SHA512 a982f83fca32fd46bc12f538eefd5a94c7a4ca881c4cfb576dfc6de4a3ff0e5660c42245fbbf6e0bce33bf32dae2e5ece3e28c8b15ad998273c63e4cebafa24f
+EBUILD eclipse-sdk-bin-4.9.0.ebuild 1314 BLAKE2B 2fb78a32f7d62fc687b818ffbb7f71e67ed1c5712cf394260f8173d903029196ac89d0712cce65c8bc866424bf41442d4b274bb05f34060764819f918d845295 SHA512 699fa7cfa891ebeda57fece15e94ca04c3f587b004b0f7263b0529572dca1f3ad76b5da155a3c4a777a909000a28cec37f325a3ac5ab188a0cfa50bad1722d39
diff --git a/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.5.2.ebuild b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.5.2.ebuild
new file mode 100644
index 000000000..7e2f3c23d
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.5.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils versionator
+
+SR=R
+RNAME="mars"
+
+SRC_BASE="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${RNAME}/${SR}/eclipse-java-${RNAME}-${SR}-linux-gtk"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org"
+SRC_URI="
+	amd64? ( ${SRC_BASE}-x86_64.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-x86_64-${PV}.tar.gz )
+	x86? ( ${SRC_BASE}.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-${PV}.tar.gz )"
+
+LICENSE="EPL-1.0"
+SLOT="4.5"
+KEYWORDS="x86 amd64"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jdk-1.6
+	x11-libs/gtk+:2"
+
+S=${WORKDIR}/eclipse
+
+src_install() {
+	local dest=/opt/${PN}-${SLOT}
+
+	insinto ${dest}
+	doins -r features icon.xpm plugins artifacts.xml p2 eclipse.ini configuration dropins
+
+	exeinto ${dest}
+	doexe eclipse
+
+	dohtml -r readme/*
+
+	cp "${FILESDIR}"/eclipserc-bin-${SLOT} "${T}" || die
+	cp "${FILESDIR}"/eclipse-bin-${SLOT} "${T}" || die
+	sed "s@%SLOT%@${SLOT}@" -i "${T}"/eclipse{,rc}-bin-${SLOT} || die
+
+	insinto /etc
+	newins "${T}"/eclipserc-bin-${SLOT} eclipserc-bin-${SLOT}
+
+	newbin "${T}"/eclipse-bin-${SLOT} eclipse-bin-${SLOT}
+	make_desktop_entry "eclipse-bin-${SLOT}" "Eclipse ${PV} (bin)" "${dest}/icon.xpm"
+}
diff --git a/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.6.2-r1.ebuild b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.6.2-r1.ebuild
deleted file mode 100644
index 4e8224624..000000000
--- a/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.6.2-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils versionator java-utils-2
-
-SR="$(get_version_component_range 3-)"
-RNAME="neon"
-
-SRC_BASE="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${RNAME}/${SR}/eclipse-java-${RNAME}-${SR}-linux-gtk"
-
-DESCRIPTION="Eclipse SDK"
-HOMEPAGE="http://www.eclipse.org"
-SRC_URI="
-	amd64? ( ${SRC_BASE}-x86_64.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-x86_64-${PV}.tar.gz )
-	x86? ( ${SRC_BASE}.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-${PV}.tar.gz )
-	"
-
-LICENSE="EPL-1.0"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="lombok"
-
-CDEPEND="
-	>=dev-java/commons-httpclient-3.1:3
-	>=dev-java/icu4j-56.1:56
-	>=dev-java/javax-inject-1:0
-	>=dev-java/jsr250-1.2:0
-	>=dev-java/xml-commons-resolver-1.2:0
-	"
-DEPEND="${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.8
-	x11-libs/gtk+:3
-	lombok? ( dev-java/lombok-bin )
-	${CDEPEND}"
-
-S="${WORKDIR}"/eclipse
-
-HTML_DOCS="readme/"
-
-_unbundle_single() {
-	local mode="${1}" destination_jar="${2}" package="${3}" package_jar="${4}"
-	local abs_destination_jar="${PWD}/${destination_jar}"
-	local backup_dir="${T}"/${destination_jar##*/}.dir
-
-	if [[ "${mode}" = delete ]]; then
-		# Backup META-INF/MANIFEST.MF with checksums
-		# Then delete .jar file
-		mkdir -p "${backup_dir}"/META-INF
-		unzip -p "${destination_jar}" META-INF/MANIFEST.MF \
-				| sed -e '/^Name:/d' -e '/^SHA1-Digest:/d' -e '/^\s*$/d' \
-				> "${backup_dir}"/META-INF/MANIFEST.MF || die
-		rm "${destination_jar}" || die
-	elif [[ "${mode}" = wire ]]; then
-		einfo "Replacing bundled ${destination_jar}..."
-		# Create new .jar based on system-wide build
-		# In the process, apply META-INF/MANIFEST.MF backup
-		java-pkg_jar-from "${package}" "${package_jar}" "${destination_jar}"
-		local source_jar="$(readlink -f "${destination_jar}")"
-		rm "${destination_jar}" || die
-
-		cp "${source_jar}" "${destination_jar}" || die
-		( cd "${backup_dir}" \
-				&& [[ -f "${abs_destination_jar}" ]] \
-				&& zip "${abs_destination_jar}" META-INF/MANIFEST.MF >/dev/null
-		) || die
-	fi
-}
-
-_unbundle_known() {
-	local mode="${1}"
-
-	# https://wiki.gentoo.org/wiki/Eclipse/Building_From_Source
-	_unbundle_single "${mode}" plugins/com.ibm.icu_56.1.0.v201601250100.jar icu4j-56 icu4j.jar
-	_unbundle_single "${mode}" plugins/javax.annotation_1.2.0.v201602091430.jar jsr250 jsr250.jar
-	_unbundle_single "${mode}" plugins/javax.inject_1.0.0.v20091030.jar javax-inject javax-inject.jar
-	_unbundle_single "${mode}" plugins/org.apache.commons.httpclient_3.1.0.v201012070820.jar commons-httpclient-3 commons-httpclient.jar
-	_unbundle_single "${mode}" plugins/org.apache.xml.resolver_1.2.0.v201005080400.jar xml-commons-resolver xml-commons-resolver.jar
-}
-
-src_prepare() {
-	_unbundle_known delete
-
-	ewarn 'Binary dependencies left to unbundle:'
-	ewarn "$(find -type f -name '*.jar' -not -wholename '*/org.eclipse*' | sort | sed 's,^\./,,')"
-
-	_unbundle_known wire
-
-	cp "${FILESDIR}"/${P}-eclipse-bin "${T}/eclipse-bin-${SLOT}" || die
-	cp "${FILESDIR}"/${P}-eclipserc-bin "${T}/eclipserc-bin-${SLOT}" || die
-	sed "s,%SLOT%,${SLOT},g" -i "${T}"/eclipse{,rc}-bin-${SLOT} || die
-
-	eapply_user
-}
-
-src_install() {
-	local dest=/opt/${PN}-${SLOT}
-
-	insinto ${dest}
-	doins -r features icon.xpm plugins artifacts.xml p2 eclipse.ini configuration dropins
-
-	exeinto ${dest}
-	doexe eclipse
-
-	einstalldocs
-
-	dobin "${T}"/eclipse-bin-${SLOT}
-	insinto /etc
-	doins "${T}"/eclipserc-bin-${SLOT}
-	make_desktop_entry "eclipse-bin-${SLOT}" "Eclipse ${RNAME^}/${PV} (bin)" "${dest}/icon.xpm"
-}
diff --git a/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.6.3.ebuild b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.6.3.ebuild
new file mode 100644
index 000000000..0246ff541
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.6.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils versionator
+
+SR=3
+RNAME="neon"
+
+SRC_BASE="https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${RNAME}/${SR}/eclipse-java-${RNAME}-${SR}-linux-gtk"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org"
+SRC_URI="
+	amd64? ( ${SRC_BASE}-x86_64.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-x86_64-${PV}.tar.gz )
+	x86? ( ${SRC_BASE}.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-${PV}.tar.gz )"
+
+LICENSE="EPL-1.0"
+SLOT="4.6"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jdk-1.8
+	x11-libs/gtk+:2"
+
+S=${WORKDIR}/eclipse
+
+src_install() {
+	local dest=/opt/${PN}-${SLOT}
+
+	insinto ${dest}
+	doins -r features icon.xpm plugins artifacts.xml p2 eclipse.ini configuration dropins
+
+	exeinto ${dest}
+	doexe eclipse
+
+	dohtml -r readme/*
+
+	cp "${FILESDIR}"/eclipserc-bin-${SLOT} "${T}" || die
+	cp "${FILESDIR}"/eclipse-bin-${SLOT} "${T}" || die
+	sed "s@%SLOT%@${SLOT}@" -i "${T}"/eclipse{,rc}-bin-${SLOT} || die
+
+	insinto /etc
+	newins "${T}"/eclipserc-bin-${SLOT} eclipserc-bin-${SLOT}
+
+	newbin "${T}"/eclipse-bin-${SLOT} eclipse-bin-${SLOT}
+	make_desktop_entry "eclipse-bin-${SLOT}" "Eclipse ${PV} (bin)" "${dest}/icon.xpm"
+}
diff --git a/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.7.2.ebuild b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.7.2.ebuild
new file mode 100644
index 000000000..73b345e8b
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.7.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils versionator
+
+SR="2"
+RNAME="oxygen"
+
+SRC_BASE="https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${RNAME}/${SR}/eclipse-java-${RNAME}-${SR}-linux-gtk"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org"
+SRC_URI="
+	amd64? ( ${SRC_BASE}-x86_64.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-x86_64-${PV}.tar.gz )
+	x86? ( ${SRC_BASE}.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-${PV}.tar.gz )"
+
+LICENSE="EPL-1.0"
+SLOT="4.7"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jdk-1.8
+	x11-libs/gtk+:2"
+
+S=${WORKDIR}/eclipse
+
+src_install() {
+	local dest=/opt/${PN}-${SLOT}
+
+	insinto ${dest}
+	doins -r features icon.xpm plugins artifacts.xml p2 eclipse.ini configuration dropins
+
+	exeinto ${dest}
+	doexe eclipse
+
+	dohtml -r readme/*
+
+	cp "${FILESDIR}"/eclipserc-bin-${SLOT} "${T}" || die
+	cp "${FILESDIR}"/eclipse-bin-${SLOT} "${T}" || die
+	sed "s@%SLOT%@${SLOT}@" -i "${T}"/eclipse{,rc}-bin-${SLOT} || die
+
+	insinto /etc
+	newins "${T}"/eclipserc-bin-${SLOT} eclipserc-bin-${SLOT}
+
+	newbin "${T}"/eclipse-bin-${SLOT} eclipse-bin-${SLOT}
+	make_desktop_entry "eclipse-bin-${SLOT}" "Eclipse ${PV} (bin)" "${dest}/icon.xpm"
+}
diff --git a/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.7.3.ebuild b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.7.3.ebuild
new file mode 100644
index 000000000..3b1a1ba13
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.7.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils versionator
+
+SR="3"
+RNAME="oxygen"
+
+SRC_BASE="https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${RNAME}/${SR}/eclipse-java-${RNAME}-${SR}-linux-gtk"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org"
+SRC_URI="
+	amd64? ( ${SRC_BASE}-x86_64.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-x86_64-${PV}.tar.gz )
+	x86? ( ${SRC_BASE}.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-${PV}.tar.gz )"
+
+LICENSE="EPL-1.0"
+SLOT="4.7"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jdk-1.8
+	x11-libs/gtk+:2"
+
+S=${WORKDIR}/eclipse
+
+src_install() {
+	local dest=/opt/${PN}-${SLOT}
+
+	insinto ${dest}
+	doins -r features icon.xpm plugins artifacts.xml p2 eclipse.ini configuration dropins
+
+	exeinto ${dest}
+	doexe eclipse
+
+	dohtml -r readme/*
+
+	cp "${FILESDIR}"/eclipserc-bin-${SLOT} "${T}" || die
+	cp "${FILESDIR}"/eclipse-bin-${SLOT} "${T}" || die
+	sed "s@%SLOT%@${SLOT}@" -i "${T}"/eclipse{,rc}-bin-${SLOT} || die
+
+	insinto /etc
+	newins "${T}"/eclipserc-bin-${SLOT} eclipserc-bin-${SLOT}
+
+	newbin "${T}"/eclipse-bin-${SLOT} eclipse-bin-${SLOT}
+	make_desktop_entry "eclipse-bin-${SLOT}" "Eclipse ${PV} (bin)" "${dest}/icon.xpm"
+}
diff --git a/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.8.0.ebuild b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.8.0.ebuild
new file mode 100644
index 000000000..978c1d187
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.8.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils versionator
+
+SR="R"
+RNAME="photon"
+
+SRC_BASE="https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${RNAME}/${SR}/eclipse-java-${RNAME}-${SR}-linux-gtk"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org"
+SRC_URI="
+	amd64? ( ${SRC_BASE}-x86_64.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-x86_64-${PV}.tar.gz )
+	x86? ( ${SRC_BASE}.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-${PV}.tar.gz )"
+
+LICENSE="EPL-1.0"
+SLOT="4.8"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jdk-1.8
+	x11-libs/gtk+:2"
+
+S=${WORKDIR}/eclipse
+
+src_install() {
+	local dest=/opt/${PN}-${SLOT}
+
+	insinto ${dest}
+	doins -r features icon.xpm plugins artifacts.xml p2 eclipse.ini configuration dropins
+
+	exeinto ${dest}
+	doexe eclipse
+
+	dohtml -r readme/*
+
+	cp "${FILESDIR}"/eclipserc-bin-${SLOT} "${T}" || die
+	cp "${FILESDIR}"/eclipse-bin-${SLOT} "${T}" || die
+	sed "s@%SLOT%@${SLOT}@" -i "${T}"/eclipse{,rc}-bin-${SLOT} || die
+
+	insinto /etc
+	newins "${T}"/eclipserc-bin-${SLOT} eclipserc-bin-${SLOT}
+
+	newbin "${T}"/eclipse-bin-${SLOT} eclipse-bin-${SLOT}
+	make_desktop_entry "eclipse-bin-${SLOT}" "Eclipse ${PV} (bin)" "${dest}/icon.xpm"
+}
diff --git a/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.9.0.ebuild b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.9.0.ebuild
new file mode 100644
index 000000000..018c05ad4
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.9.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+
+inherit eutils versionator
+
+SR="R"
+RNAME="2018-09"
+
+SRC_BASE="https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${RNAME}/${SR}/eclipse-java-${RNAME}-linux-gtk"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org"
+SRC_URI="
+	amd64? ( ${SRC_BASE}-x86_64.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-x86_64-${PV}.tar.gz )
+	x86? ( ${SRC_BASE}.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-linux-gtk-${PV}.tar.gz )"
+
+LICENSE="EPL-1.0"
+SLOT="4.9"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jdk-1.8
+	x11-libs/gtk+:2"
+
+S=${WORKDIR}/eclipse
+
+src_install() {
+	local dest=/opt/${PN}-${SLOT}
+
+	insinto ${dest}
+	doins -r features icon.xpm plugins artifacts.xml p2 eclipse.ini configuration dropins
+
+	exeinto ${dest}
+	doexe eclipse
+
+	dohtml -r readme/*
+
+	cp "${FILESDIR}"/eclipserc-bin-${SLOT} "${T}" || die
+	cp "${FILESDIR}"/eclipse-bin-${SLOT} "${T}" || die
+	sed "s@%SLOT%@${SLOT}@" -i "${T}"/eclipse{,rc}-bin-${SLOT} || die
+
+	insinto /etc
+	newins "${T}"/eclipserc-bin-${SLOT} eclipserc-bin-${SLOT}
+
+	newbin "${T}"/eclipse-bin-${SLOT} eclipse-bin-${SLOT}
+	make_desktop_entry "eclipse-bin-${SLOT}" "Eclipse ${PV} (bin)" "${dest}/icon.xpm"
+}
diff --git a/dev-util/eclipse-sdk-bin/files/eclipse-sdk-bin-4.6.2-eclipse-bin b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.4
similarity index 67%
rename from dev-util/eclipse-sdk-bin/files/eclipse-sdk-bin-4.6.2-eclipse-bin
rename to dev-util/eclipse-sdk-bin/files/eclipse-bin-4.4
index d71ee1407..261fa1448 100644
--- a/dev-util/eclipse-sdk-bin/files/eclipse-sdk-bin-4.6.2-eclipse-bin
+++ b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.4
@@ -1,28 +1,28 @@
-#! /bin/bash
+#! /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
-# Copyright (c) 2015, Sebastian Pipping <sping@gentoo.org>
-# Copyright (c) 2016, Stefan Langenmaier <stefan.langenmaier@gmail.com>
 #
 # Licensed under the GNU General Public License, version 2
 #
 
-[[ -f "/etc/eclipserc-bin-%SLOT%" ]] && . "/etc/eclipserc-bin-%SLOT%"
-[[ -f "$HOME/gentoo/.eclipserc" ]] && . "$HOME/gentoo/.eclipserc"
+SLOT="%SLOT%"
+
+[ -f "/etc/eclipserc-bin-${SLOT}" ] && . "/etc/eclipserc-bin-${SLOT}"
+[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc"
 
 ECLIPSE_HOME=${ECLIPSE_HOME:="/opt/eclipse-sdk-bin-%SLOT%"}
 ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse"
 
-if [[ ! -x "${ECLIPSE_BIN}" ]] ; then
+if [ ! -x "${ECLIPSE_BIN}" ] ; then
 	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
 	exit 1
 fi
 
-if [[ $(id -u) -eq 0 ]] ; then
+if [ $(id -u) -eq 0 ] ; then
 	echo "Do not run eclipse as root user! Exiting ..." > /dev/stderr
 	exit 1
 fi
@@ -33,18 +33,14 @@ case "$(java-config -f)" in
 		;;
 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}"
 
-# lombok support
-[ -n "${LOMBOK_JAR}" ] && [ -f "${LOMBOK_JAR}" ] && VM_ARGS="${VM_ARGS} -javaagent:${LOMBOK_JAR}"
-
 # Fix for JRE 1.5.
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib
 
-# option to switch GTK backend
-[ -n "${SWT_GTK3}" ] && export SWT_GTK3="${SWT_GTK3}"
-
 exec "${ECLIPSE_BIN}" -vm $(java-config --java) "$@" "${ECLIPSE_USER_ARGS}" -vmargs ${VM_ARGS} 
diff --git a/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.5 b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.5
new file mode 100644
index 000000000..261fa1448
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.5
@@ -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="%SLOT%"
+
+[ -f "/etc/eclipserc-bin-${SLOT}" ] && . "/etc/eclipserc-bin-${SLOT}"
+[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc"
+
+ECLIPSE_HOME=${ECLIPSE_HOME:="/opt/eclipse-sdk-bin-%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-bin/files/eclipse-bin-4.6 b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.6
new file mode 100644
index 000000000..261fa1448
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.6
@@ -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="%SLOT%"
+
+[ -f "/etc/eclipserc-bin-${SLOT}" ] && . "/etc/eclipserc-bin-${SLOT}"
+[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc"
+
+ECLIPSE_HOME=${ECLIPSE_HOME:="/opt/eclipse-sdk-bin-%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-bin/files/eclipse-bin-4.7 b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.7
new file mode 100644
index 000000000..261fa1448
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.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="%SLOT%"
+
+[ -f "/etc/eclipserc-bin-${SLOT}" ] && . "/etc/eclipserc-bin-${SLOT}"
+[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc"
+
+ECLIPSE_HOME=${ECLIPSE_HOME:="/opt/eclipse-sdk-bin-%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-bin/files/eclipse-bin-4.8 b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.8
new file mode 100644
index 000000000..261fa1448
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.8
@@ -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="%SLOT%"
+
+[ -f "/etc/eclipserc-bin-${SLOT}" ] && . "/etc/eclipserc-bin-${SLOT}"
+[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc"
+
+ECLIPSE_HOME=${ECLIPSE_HOME:="/opt/eclipse-sdk-bin-%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-bin/files/eclipse-bin-4.9 b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.9
new file mode 100644
index 000000000..261fa1448
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/files/eclipse-bin-4.9
@@ -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="%SLOT%"
+
+[ -f "/etc/eclipserc-bin-${SLOT}" ] && . "/etc/eclipserc-bin-${SLOT}"
+[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc"
+
+ECLIPSE_HOME=${ECLIPSE_HOME:="/opt/eclipse-sdk-bin-%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-bin/files/eclipse-sdk-bin-4.6.2-eclipserc-bin b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.4
similarity index 77%
rename from dev-util/eclipse-sdk-bin/files/eclipse-sdk-bin-4.6.2-eclipserc-bin
rename to dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.4
index 2b148245f..dfeef9586 100644
--- a/dev-util/eclipse-sdk-bin/files/eclipse-sdk-bin-4.6.2-eclipserc-bin
+++ b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.4
@@ -14,16 +14,7 @@ ECLIPSE_XMX=256m
 # 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.
+# Else you will get crashes related to OutOfMemory in PermGen exceptions. 
 
 #ECLIPSE_PERMSIZE=64m
 #ECLIPSE_MAX_PERMSIZE=128m
-
-# Eclipse 4.5 Mars has some visual issues with GTK>=3.16
-# SWT_GTK3=1 - to enable GTK3
-# SWT_GTK3=0 - to enable GTK2
-SWT_GTK3=1
-
-# Default lombok.jar
-# can also be unset/overwritten by the user
-LOMBOK_JAR=/usr/share/lombok/lib/lombok.jar
diff --git a/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.5 b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.5
new file mode 100644
index 000000000..dfeef9586
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.5
@@ -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
diff --git a/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.6 b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.6
new file mode 100644
index 000000000..dfeef9586
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.6
@@ -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
diff --git a/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.7 b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.7
new file mode 100644
index 000000000..dfeef9586
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.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
diff --git a/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.8 b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.8
new file mode 100644
index 000000000..dfeef9586
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.8
@@ -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
diff --git a/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.9 b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.9
new file mode 100644
index 000000000..dfeef9586
--- /dev/null
+++ b/dev-util/eclipse-sdk-bin/files/eclipserc-bin-4.9
@@ -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
diff --git a/dev-util/eclipse-sdk-bin/metadata.xml b/dev-util/eclipse-sdk-bin/metadata.xml
deleted file mode 100644
index ac59091a0..000000000
--- a/dev-util/eclipse-sdk-bin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>maintainer-wanted</herd>
-	<use>
-		<flag name='system-icu'>Use the system-wide <pkg>dev-java/icu4j</pkg></flag>
-		<flag name='lombok'>Pull in <pkg>dev-java/lombok</pkg>, it can still be overwritten on a per-user basis</flag>
-	</use>
-</pkgmetadata>
-
-
diff --git a/profiles/default/package.keywords/calculate b/profiles/default/package.keywords/calculate
index 34d2bccc4..0e7b9fc01 100644
--- a/profiles/default/package.keywords/calculate
+++ b/profiles/default/package.keywords/calculate
@@ -1,7 +1,7 @@
 # from the overlay
 ~app-crypt/shim-signed-0.2 amd64 x86
 ~dev-python/soaplib-1.0.0 amd64 x86
-~dev-util/eclipse-sdk-bin-4.6.2 amd64 x86
+~dev-util/eclipse-sdk-bin-4.9.0 amd64 x86
 #~games-action/oolite-1.86 amd64 x86
 ~games-util/steam-launcher-1.0.0.54 amd64 x86
 ~media-plugins/deadbeef-archive-reader-20160215 amd64 x86