gentoo resync : 30.06.2018

3 files changed, 3 insertions, 62 deletions

diff --git a/dev-util/scala-ide/Manifest b/dev-util/scala-ide/Manifest
index 119efa5a4f8f..532b07211a15 100644
--- a/dev-util/scala-ide/Manifest
+++ b/dev-util/scala-ide/Manifest
@@ -1,6 +1,3 @@
-DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86.tar.gz 237898838 BLAKE2B 0d5044340945d6a5d1630c3e48790fb4f8af17b2fb9a54e14138b18891ccd9409cb6f95bf07d9061813b14a9b7449322903f4e12d0bb12211f6f4bb9383a9065 SHA512 b8fcac4e0eeace0d146028e2f1551cdd3f58d38830430080e7aa5ccd581ae6a31992a5d1f39b6e8fcb30979953f0b9777166d2de73d7310621c9e7fa2e620f3d
-DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 238040666 BLAKE2B 8b425a726eaf62ce71b25f77ab376d04e00900ad640dddbd08f434cd0c78e6c18f41b9c7a8495711600765a3e864cbdfc2757c984290ccb76b3bc59a1ff28caa SHA512 70f3a481065f79532a4a0463e2549e4ecb0590e6d6e1ca7704629eced4393a7e4f7b22cd7c368a852c1d8f63cff949db02a7dd7f1be71cd30f52219c5cfbefd5
 DIST scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz 281266580 BLAKE2B dd7e38385228e5bcb5d9997324e5f9abeba8b9c1a09bb503eb0b10368df89ee48357900123e230341880356f24eb1e3138326970e4dc6bd85204a48422a464b4 SHA512 622f930b665b1187baaa416f3172dc6b48551148c6267fa251e1ab17cdc5c78cccce07371ce909e59af0202d7e9a0126aa9e1d22798e0498f217e7e541e0e1a8
-EBUILD scala-ide-4.3.0.ebuild 1171 BLAKE2B 8d9575f448760a492eb488c9594be70ca87faeb3226593fe2029cce119eab2ceaad65c3ef7362888e66b21189d833af467e9cbae883e5bded2c8a87ec6221830 SHA512 6dc5f301005ffa914ee5856fb8c4cfa4a37a0ec2ebaa053f5570a15a5caeea3ead88bc7bae163658bc278c6b8e8478c730dc57252d685b2c92a8e95020d448b0
-EBUILD scala-ide-4.7.0.ebuild 1177 BLAKE2B 1174e007a21c222012924cc8422ed3328338978c7b07aeb2d37d2e9fd2a15b060527882a4f698394347b21adb5162b184305e360b64cee1a75b49bbb76df8205 SHA512 e10e0ae0b9829c7fc9852e20e922152cb4f7ec73539edd2bbcb58fb0eeb03756e84c6a045f5b17b333592cf085471b68f1b309e542f078276a51c77f26e91d12
+EBUILD scala-ide-4.7.0.ebuild 1174 BLAKE2B 2334d098ca53d551ba7d2895d0094c92c55fa59377c9be72d63aee6e29748e9895b5059275f10dfb29d70444b215311cba56737b56e229c07e4eb02375fb72dc SHA512 a844721fe8fb090d445b44fa31b291310bd03ce75b4d5ea36f6b4a3a57eb436cefcdb6d2253dc00c7f391188017ceec6f59d54d4bc3914954a6f3e9ed98fae60
 MISC metadata.xml 317 BLAKE2B 47b0d918ff9d4f2287fc0c43a022b978a816aa0d96362cf449210cd6b13810ed1352dbe69c5bea8281cdd3f3d03f4dcf714589e414b27abd5cd8c648e3d64994 SHA512 506fab7ebaa9e1caf96f239d6d85978171b98282ebe22a4948f61df62ce05a4c22772d81159cec9a99dd9a127b602e7593615204142e295d88835f9385a64bc8
diff --git a/dev-util/scala-ide/scala-ide-4.3.0.ebuild b/dev-util/scala-ide/scala-ide-4.3.0.ebuild
deleted file mode 100644
index f562273c4257..000000000000
--- a/dev-util/scala-ide/scala-ide-4.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-opt-2
-
-# scala-ide -> scalaide
-S_PACK="${PN/-/}-pack"
-
-# scala-ide -> scala-SDK-${PV}
-S_SDK="${PN%-*}-SDK-${PV}"
-
-SRC_URI_AMD64="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20151201/${S_SDK}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
-SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20151201/${S_SDK}-vfinal-2.11-linux.gtk.x86.tar.gz"
-
-DESCRIPTION="The Scala IDE"
-HOMEPAGE="http://www.scala-ide.org"
-KEYWORDS="amd64 x86"
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-SLOT="0"
-LICENSE="BSD"
-
-RDEPEND=">=virtual/jdk-1.6
-	|| (
-		dev-lang/scala
-		dev-lang/scala-bin
-	)"
-
-MY_D="/opt"
-
-src_unpack() {
-	default
-	unpack ${A}
-	mv "${WORKDIR}"/eclipse "${WORKDIR}"/"${P}" || die
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/"${P}"/eclipse "${WORKDIR}"/"${P}"/"${PN}" || die
-}
-
-src_install() {
-	cd "${D}" || die
-	dodir "${MY_D}"
-	insinto "${MY_D}"
-	doins -r "${WORKDIR}"/"${P}"
-	insopts -m 0755
-	insinto "${MY_D}"/"${P}"
-	doins "${WORKDIR}"/"${P}"/"${PN}"
-	dosym ${MY_D}/${P}/${PN} /usr/bin/${PN}
-}
diff --git a/dev-util/scala-ide/scala-ide-4.7.0.ebuild b/dev-util/scala-ide/scala-ide-4.7.0.ebuild
index 352b17b81120..e7e17c02f4c6 100644
--- a/dev-util/scala-ide/scala-ide-4.7.0.ebuild
+++ b/dev-util/scala-ide/scala-ide-4.7.0.ebuild
@@ -16,11 +16,10 @@ SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-oxygen-212-201
 
 DESCRIPTION="The Scala IDE"
 HOMEPAGE="http://www.scala-ide.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SRC_URI="
 	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
+	x86? ( ${SRC_URI_X86} )"
 
 SLOT="0"
 LICENSE="BSD"