gentoo resync : 03.11.2018

27 files changed, 67 insertions, 406 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index bb4b77cb43db..4bce2c8ae457 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-email/Manifest b/dev-java/commons-email/Manifest
index a0e3d4707e60..98fe5c009faa 100644
--- a/dev-java/commons-email/Manifest
+++ b/dev-java/commons-email/Manifest
@@ -1,4 +1,6 @@
 AUX commons-email-1.4-build.xml 10956 BLAKE2B ed6aca64d4aa19035754ccff5c1acd4a8351d60144b2794c2116e8c0175a3cd1879d25afa97e9ca066d3f525481bd0ecd2ade32c152ec822cd1fe0ced7993cad SHA512 2555322efb15f1f4d26d78bea3638ae20b002c431891ec5ab8a45ef88df23b67f0ac0caf3fbba17e8f32fc2474eb09ae481bed05eb2b612386f31df5b0007cdb
 DIST commons-email-1.4-src.tar.gz 288876 BLAKE2B 17de5c947e68db988b5999ab95f122570a9f52f0557bbdb9a483676576a81d6cfb150058a0ed530bc8dde8732313839e320f4bd7ecfc088b483947dde5760441 SHA512 2a62256e284b9f4f428cf8544e46e81aa521476c41243df1c4f8a9e1bd4bcea3c768346aaab862b8c2a8b271c6012a38164c6d62867d2849a3ee0c2820fe422c
+DIST commons-email-1.5.jar 62954 BLAKE2B fe3970fcdb55f4b6859ff30b4da4f71e96ad8d47e76c280d6f0eb0040d18a39bcf1461eee48fc71733b11c24006328c45c5a7252261410bd4717186116f95732 SHA512 db88b00724a0ea5b103758beeae3a9d61d455edc4a2bbe39f7906565a73dff967b91fd73b64668e5d4ec7993faf23bd69096727b998544c73a7bfb08f9c45988
 EBUILD commons-email-1.4.ebuild 1089 BLAKE2B 017b1443086d1eee4e3778a95e8b2bf3ad1f06e5c8146448d57f1ab83917df2631f101f2a20c23d1cdc9e5705939152a7534eaab69f07ceec69c342af7d49799 SHA512 a85d7e3ec14da9425519bf15ba4f4e576fcf9ed0dc5c3482ed9ecde53168ea067b16bf0aef6b06668ff0b6a0a224a20b1943c3a834b73764b870b52676cddb83
+EBUILD commons-email-1.5.ebuild 619 BLAKE2B ac892f6124f0fa2beb5300e4c4dd94bdbe98d3e2253cff77e40858b3769b127a57be4dc781cd5d4f1ea4502a1d698f47c4cfe5fc621ac9357543a1bddba552dd SHA512 8613c27dd04706405f1974882200330541aaa57ae034fa34a4ba23a9cfbc6992168668e0a3a13910816bb9cdc29c1e55e485b5426050b528929291b22c10204e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-email/commons-email-1.5.ebuild b/dev-java/commons-email/commons-email-1.5.ebuild
new file mode 100644
index 000000000000..4f247bbbe5b3
--- /dev/null
+++ b/dev-java/commons-email/commons-email-1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Commons Email aims to provide an API for sending email"
+HOMEPAGE="https://commons.apache.org/email"
+SRC_URI="https://repo1.maven.org/maven2/org/apache/commons/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/oracle-javamail:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="oracle-javamail"
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index f3df38aa906b..5ccbdd4755bd 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -4,6 +4,6 @@ DIST commons-math-2.1-src.tar.gz 1099423 BLAKE2B 83c52abc10eebb6c749aec218aa435d
 DIST commons-math3-3.2-src.tar.gz 2602474 BLAKE2B a818ca5ab1b9799359bad1c84d2774329c7c2605aeea3e13769eed9f1578d412555ad90a8de68971daa42b270d4bcd5fbf0fe79714e839d41b08077e32633125 SHA512 132c4725be582e25f67a955c7b3b8c7ef155606d8f4da07770464c422ded6b5e6efd1a13a6e98cff222f4fcac73606d512ee1ab9e3b1c4befcc1ba16ab68787b
 DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
 EBUILD commons-math-2.1-r2.ebuild 903 BLAKE2B 2b390b4109fd875bc79f957b2fc22a0e3ce1536476ed331bd57e32d1e90417200002f14045cd7af145f0a1a172e23773531682ac427f0a20e905cb10b8ae305f SHA512 aacd02d27d30d7f27c5bb35cad318b21a4235b0264282527244d892f509e3e0032eaf5407bfbab9b6c4f548c7e9efcbe68629bf0502899c1e9c6d32fb8ad9a4e
-EBUILD commons-math-3.2.ebuild 1315 BLAKE2B a0fe207cc34dae87b52df7709e27f9fc4588e591347d507f8b69cf46ded1eb0b2d23943a93af9997ab215146873fd60479628c80fbcc72dcf8cd1d3c5dc1b72f SHA512 a1f5e7f79e7b36e011a16ed87de7aecf5a9cf8ae8570cdc5fff90a79505bde6120c475df96e188129daec1c436d0409e1260136849c36edafef29e9a70389329
+EBUILD commons-math-3.2.ebuild 1331 BLAKE2B 455f0a53dbbea8b5d7ca7d5ee16920489381495edd5e830c542bac42997a59c0affcc47daebbd6a2777c3f7d2ff0e7d45f79f8565f375b1118fd36cc442c8832 SHA512 447a793d84a98442e647a1e77cdc06bf6b69de8a337aaa40fa3fbe713f031686cba4ff3a21c5500346a29072976ff77d209f09f7057324727ac97818f43af8aa
 EBUILD commons-math-3.6.1.ebuild 693 BLAKE2B da9523bb624ece2699913f23672a5374ec63ef447252fdbc27e67efedfb3c402d7679b55cabfc883000e758f8845e16128ab503dc3eb1b5e76be9fb72e858d65 SHA512 7e927986aa818cd297864fb3ceef5f23a75befa6001b924df7256448c2f021888bd13f406ef31339ff8dc4eb89954ee5807ebdb1a4fe0ae763c18fa9d90e5bd0
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-math/commons-math-3.2.ebuild b/dev-java/commons-math/commons-math-3.2.ebuild
index 7d4b8f2dc93e..0fcdf307223b 100644
--- a/dev-java/commons-math/commons-math-3.2.ebuild
+++ b/dev-java/commons-math/commons-math-3.2.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
 HOMEPAGE="https://commons.apache.org/math/"
-SRC_URI="mirror://apache/commons/math/source/${MY_P}-src.tar.gz"
+SRC_URI="https://archive.apache.org/dist/commons/math/source/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3"
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 702491bd50be..91cf6515ae9c 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-EBUILD java-config-2.2.0-r4.ebuild 1090 BLAKE2B 70acd02e5f352e21994971306284950949791531f979751daef89e270d7f7709e3e119d39adf0ab0e1673b17b23f38171a897c8baf197ed56118ce2fb51b2f77 SHA512 046161fcc2afe66dcd832e86f37fc44fcb268410d3b01cf0f424214142df1dbd4a9ca8c83bf94c3468c33a60c68b53e862a3c3c3fc56c7d8469f8a264a5f51c0
+EBUILD java-config-2.2.0-r4.ebuild 1091 BLAKE2B c3790b2b3f92d86365dbfb8b2e8a4b3495d094ed814cccc34af69a234378a4e8efa58c71383c74b33c1b82ba3e51292a6491b032d1cd12c9668a9b6ba69f20ea SHA512 0edf4e4de728350fadc225db5d9e7c4e1cce0ecdc93090c8a0d66fc430d3051a06151efed7f6f18ca85557214419fcd16e3be0cac1063934f50c2674a55432a9
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 2d0a08658067..6cec0799a1cf 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-java/jboss-marshalling/Manifest b/dev-java/jboss-marshalling/Manifest
index dd0b1bb692ba..ea4815777002 100644
--- a/dev-java/jboss-marshalling/Manifest
+++ b/dev-java/jboss-marshalling/Manifest
@@ -1,4 +1,3 @@
 DIST jboss-marshalling-1.3.0.CR9-sources.jar 174155 BLAKE2B 1c1a25910eb9d9d40f4f3cbb8bb6d7d59272e4806a39b602e1e336269eb3fa95d83a89b46967919d2e02b5647f43e42495f36777d82e706f1853b717f3e0e44e SHA512 d7a1ae24ec50acf20f8150cf6e741a846e9a5837f9d8e4c06d8429793f69b95a7c03449ba5a6debb00bd22b596b6f801e25e0f38ccce7ac25cafd601e2ef7058
-EBUILD jboss-marshalling-1.3.0-r1.ebuild 588 BLAKE2B 8fac0c5ad50ea655f1f11c8620cfd28dc8254926e9ad4b67662cf9dc443166002432105597f222e6ac41dd1c17f4d7f2d34e9cacf53cb54e66777bc36be6088a SHA512 7f517568ba25e4661a5c58f0eb64b9438d71e750aca3ef2c265a61ae40bbc07edc0816e55f08c3f1a66eb54d7bb0f8166de1f4dc93e89b326783ebac35e10311
-EBUILD jboss-marshalling-1.3.0.ebuild 606 BLAKE2B c7da32dfa5bae1633f678ee6f0ddc1bca320ef225228b37f58a8963caf94de293ef42eba656fe20dacd332e82f737a74acef260038af35272e0c3cae939c4492 SHA512 12589e07068598074c588c73e944b6f985b74361b2fc5d737c427c951d6253469a0f2616353e0e50055ede05dc578bd7146bf985864a06ddad9ba67210b60758
+EBUILD jboss-marshalling-1.3.0-r2.ebuild 571 BLAKE2B 49d7cb8507674c85df97a16f8245bdb93549d1d002dfeea6c1767069757709f0d9307f40dbde98d86b00820c24cd0d9fe16dc5e8dce64d372d27e6ffb3c44e3a SHA512 dde122309e99843c6f5cb7ffe054890ac320c616d9ed50b69010a0937f585595467a40f18ae699c1ac183030b28e92f74ae1dd747ca3386e1004078292cc8d8e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r1.ebuild b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r2.ebuild
index 8aec3b3085ba..6838bf02f21b 100644
--- a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r1.ebuild
+++ b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
@@ -12,15 +12,15 @@ HOMEPAGE="http://jbossmarshalling.jboss.org/"
 SRC_URI="http://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
-CDEPEND="dev-java/jboss-modules:0"
+CDEPEND="
+	dev-java/jboss-modules:0"
 
 RDEPEND="${CDEPEND}
 	>=virtual/jre-1.7"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	app-arch/unzip"
+	>=virtual/jdk-1.7"
 
 JAVA_GENTOO_CLASSPATH="jboss-modules"
diff --git a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild
deleted file mode 100644
index 8c31574bdf5e..000000000000
--- a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-HOMEPAGE="http://jbossmarshalling.jboss.org/"
-SRC_URI="http://download.jboss.org/jbossmarshalling/jboss-marshalling-${PV}.CR9-sources.jar"
-DESCRIPTION="Compatible alternative to the JDK serialization API"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-CDEPEND="dev-java/jboss-modules:0"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-
-JAVA_SRC_DIR="org"
-JAVA_GENTOO_CLASSPATH="jboss-modules"
diff --git a/dev-java/jboss-modules/Manifest b/dev-java/jboss-modules/Manifest
index cf4b942fbd3f..961dca84b46f 100644
--- a/dev-java/jboss-modules/Manifest
+++ b/dev-java/jboss-modules/Manifest
@@ -1,5 +1,3 @@
-DIST jboss-modules-1.3.0.tar.gz 187838 BLAKE2B 80190bf98c95edafd9b786ea6db64825bc8682c11fdeb86a2fe6c17bcd2c7fa949771b98e69d1bd0e48606357e1103149a9ed159d7f7dca91b3f068d272f4daa SHA512 407858cec3a82ad81262ef1feb28e3c3c259b23f3ed768f8714b28dcb8e2cc6bd68a47f82c8422d2c40ee9d0777a14c968c432a5f10f852bbd08ae434e249e56
-DIST jboss-modules-1.3.3.tar.gz 189899 BLAKE2B 127477514543540665c326494088f3a3637b6e5e50710403c915bb473725dd04cf79880721a2e4ecc617c1d608f35f15c1b9d37a70ac01fb16b264a44e7f27a3 SHA512 2d95d8f2661250fe3458feed9d1edc810abc5741ef0b631336927817820ec92b8f5b4ee0a329392c6ad82c68f67c5f831b294ca44dbf66bb9ca866e8ad70b535
-EBUILD jboss-modules-1.3.0.ebuild 650 BLAKE2B 4b7be841fe89388d329cbc0f5e2b3a263083ee4c8cc3012b60c750e35b1385c1beda955ce83f4b7daf4d2b13d45fa73ec5c4f6bd3b31af535d74c0e26fa77348 SHA512 8204523c0301788c5be83b0420c0994495a7139ddbf97b45eb3830bcf06f86fc31733a87236b32c4d26600abe20abb383d8ad751fe7548f0f889b8aae6414e49
-EBUILD jboss-modules-1.3.3.ebuild 665 BLAKE2B bfedf4a4dce0d91cc0cad12c5959e0f59cbd1f416dfac84408e0acc517a8bd164e9b917b1224a2c41d25a2337c9936585ab9c80c2c8a763c5a6d4aeef3165129 SHA512 a38305bf2c7e704a1c75ed52d7585474e442507bca09d5d033d4344ae43379abb4a702d83977c83bfa1cfe53f4fd9f02cc14139e437b66c344b8fd704b8057f1
+DIST jboss-modules-1.3.3.tar.gz 189906 BLAKE2B f291391a9292731ab9fa00d9ce94817138ea502dbeac282cac0bbb08e070ef64f72dbd5e1cec570afa6452245197fda004173d04b838d806b40a2f808e539321 SHA512 d8e19c59105358070cc7e48a0be29ee68751155d5ac88723dbf32659e73ab4bd9afddf119fec66af8c9420a7e406e77f2eb4a164fbd9c1867b91414de71ddbb7
+EBUILD jboss-modules-1.3.3-r1.ebuild 663 BLAKE2B ee026114a7d019a5fdf3390acf27335b6b7dec3396698671ef97491056ef63ccc8e69e2d998ef892e05448cc8a2e88af666e81ff6021706482f8ed67a555d3f5 SHA512 01f7215314f01082d6d5050ae1a86d776cf3efba2b1124f4c087e085e35aead0d368c9d75669deadd33dcde03d40c1e6c67c2d5273be46ed06b1b95d3ab554dd
 MISC metadata.xml 328 BLAKE2B 70528967605fb41f0541ebc752a11e64f759840e46d6489d8da3c532b3fc253e3e2ff7807bc625a7e2c6150c7e2688059e240df8dc58a161764af0404d9c1400 SHA512 56f41e4a3acd01abe24d0ad6211e1b5f1822462ed8a3724a26fffa4e9631f310888c0b8b213d71cbe1804ac524a637e5e02cb5d4f99d2414debc560cfba5a86a
diff --git a/dev-java/jboss-modules/jboss-modules-1.3.0.ebuild b/dev-java/jboss-modules/jboss-modules-1.3.0.ebuild
deleted file mode 100644
index 9e346706f5cd..000000000000
--- a/dev-java/jboss-modules/jboss-modules-1.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JBoss modular classloading system"
-HOMEPAGE="http://www.jboss.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.Final.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7"
-
-S="${WORKDIR}/${P}.Final/"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	rm pom.xml || die
-	mkdir -p target/classes || die
-	cp -vr "${S}"/src/main/resources/* target/classes/ || die
-}
diff --git a/dev-java/jboss-modules/jboss-modules-1.3.3.ebuild b/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild
index 5038df77e9c1..0c0d308bfc73 100644
--- a/dev-java/jboss-modules/jboss-modules-1.3.3.ebuild
+++ b/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 JAVA_PKG_IUSE="source" # doc (needs APIviz)
 
@@ -14,7 +14,6 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.Final.tar.gz -> ${P}.tar.g
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND=">=virtual/jre-1.7"
 DEPEND=">=virtual/jdk-1.7"
@@ -23,7 +22,8 @@ S="${WORKDIR}/${P}.Final/"
 
 JAVA_SRC_DIR="src/main/java"
 
-java_prepare() {
+src_prepare() {
+	default
 	rm pom.xml || die
 	mkdir -p target/classes || die
 	cp -vr "${S}"/src/main/resources/* target/classes/ || die
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index 88bc3189f396..b136615ba4b8 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,5 +1,5 @@
 DIST jopt-simple-4.6.tar.gz 107082 BLAKE2B 622144647b24049861398cc99ca3cc268baae045f8ca23cdd5bddb2e656bc97d17397ae752ca9a6edc91b8486e1e55ce19ba335d2afadf6c6df4f858faf43a1e SHA512 c2f467521f6419f91206f6036d420671b02106beadff3fc51d1893e6f3f6302b8fcbb31957327b9e40cbfd7a7d55030e0c999d9570d7e29fe7a4375bab10ed76
 DIST jopt-simple-5.0.tar.gz 119502 BLAKE2B 975a0d338fa3154963954fd3b218c944dded023b3a2da59ee2671c73450a578dbf1aee8e52b9f715839e15c1937e0a493c4b37518b73038aa017e1d0ec1ca06a SHA512 f440c62cb307aad7cab64f091c82f78e11a117e60aaadf71883c149a622576531272de3d67859f6df093df658bb0bfb435d9bb33bc729bcda24dcc99d27369ff
-EBUILD jopt-simple-4.6.ebuild 648 BLAKE2B 9c669a9e6b2fa635d1a6c377d5aced31b77faa2d77d890446b3f200ab06e3e526030ecc9c1620cf1cbefef2dd383a3ae2e1ce1041d548bb60373e31f0619c3b5 SHA512 da9587440b79faedaf962e68f16d1c4d95040e594709f3a7f2bd67b02e04c922200e178cda019d9a0bc7a3f32301edab1686c5317611654b0dd9cff786eec6af
+EBUILD jopt-simple-4.6.ebuild 645 BLAKE2B c13723071a5b22bb69aa309832ad929cca1bc53ed98a52e96cf3e8a46b5479ad5f3be2a4ca225ab9f95d1d274a6134491adab2eaec2cb8cb47709357da4764c2 SHA512 dca4886b9b353edb9fcb197726cc1aafdb828edf1fa125b1c7b037dc3794f92933391ccb0a092056458cf3bace76928944cfa50246bfb07470395d1730114046
 EBUILD jopt-simple-5.0.ebuild 648 BLAKE2B 137db3a025327e0e9cc2c57c465f9f8734f523e350ad91263f33ffb3edb761ac99c9f84a897a60387694a61d5cb46c67dd12579dd68dca8321b5e70428ac1934 SHA512 3c2863dbcc4613fe33bdf4e3afac16d8f006e0c958315ad35cfbfb4428a519cf743a2532f8a831c37fc0a5bad7608daecd2aac27fc23588e4d8a95bdcf51903a
 MISC metadata.xml 320 BLAKE2B 618d24786328b35f3b25fb733c2add95fdb6fc602ddd451ec972662f5c80787f4f2283285e7a753d6dc66a4c2a7efca3aaa196cf329311f1b4799737e974b714 SHA512 e64ac86acc3088038b5ebcca26f7481730c5bdcda5d7fe05fcadbf66a4ba7d472b9787c288c1b8b4ed077d2a960cd9be3fa1645deba813de3b55e7ead642b61a
diff --git a/dev-java/jopt-simple/jopt-simple-4.6.ebuild b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
index 496fbd46f1c0..197957670e4c 100644
--- a/dev-java/jopt-simple/jopt-simple-4.6.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pholser.github.com/jopt-simple/"
 SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="4.6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index 5047b7dc5ae2..071cf282bbbb 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -1,8 +1,5 @@
 AUX leinrc 37 BLAKE2B 0c5df00ef323caebf53e52246ca87b066a1b6104fb03fc7e3548dba0947ecf53c33bf4e8215fc098212293915d9808b961c0df527f30d7f6316b4aff84bf3b69 SHA512 f948d5f355d43fdee6cf68d0dad39f53f72b341649869a6ca161f5d8c83bf30434ed03c51a7e01aaefa422ff4e93ca3db5680fd4c2af92f5393acde6e8aec7d0
-DIST leiningen-2.7.0-standalone.jar 15366772 BLAKE2B f8156298f0b0fc2dc87b7534796c81864ccbff350b69d9d1f303120ae2c24efbeefd874cc132dd37a25f08e5cafa5ebe3bf23168f466ebd4da9ae1535a9ed3a3 SHA512 d42288c696d5b4d86c41a0ca9b8e748cdb9200c3adc23161b9b97b8c2f3da9c5bd811e2ddae265bf11d323b1449291e9914bf1e222aaf403e73ceef4084ed082
-DIST leiningen-2.7.0.sh 4301 BLAKE2B f08d161c1c45c994ec361636891f72cf560248e33aacebacd821d3af96d7d5215d9cfdf17a4dd62e10d7dde34abaa42578956a0a38fa33e5226a44052426d155 SHA512 241357de3f19dfe1c729c14d1540140fccdd6a6c7bae76d6ccfe7a28cdff95b01f52a671ccd2d6712e11ff33115c720906e34a5118ff6bb6d232520d77125f5d
-DIST leiningen-2.7.1-standalone.jar 15370238 BLAKE2B 8b33bb04fc8d9c9d45a557833e2a7febf1cf1130081a39e9d22cdf6df23677f1b2bf4578a1b7e2f44635ceb5178f343584b8104acbb3f94ae8af9a60613af4ca SHA512 6f0ac01917b273c063dd16d8a5e98cba0265ba19766ce6a2c1e160367e3514e637c969f831384845e752cde015e1357eecac7141259e279584577f4f527bc08a
-DIST leiningen-2.7.1.sh 4581 BLAKE2B 966db930da0d4855dc4ee84d1035fce5d05f6938032db31302489e9a729e4516bb1adfd3fb8e49d39c1fe031ee9d725c8f36112ddb678120f96aded332b20742 SHA512 88e52f843a9b3cc4ebe2d8ffef1bec5e52a9e1e492d69b75c1482f7a97f6bcb766360502a5f1270ced1f4c1419af8b0cccd79219dc333a7305d3e4b58082d1e6
-EBUILD leiningen-bin-2.7.0.ebuild 1525 BLAKE2B 7c249a7d3cc79fd6bd42b0604272c9bafcd29109541490f710852fe29e7928ea5448521916ef191d803dcb4424d7bb93af188370652d4a7b87151f038e90f57f SHA512 0eb203650b4d4f98188ee7e6f66cece8757f39155a26f17c16041d027c90785eccca5fa9535c99f20a55e471f46baad3bf0f4de11bdaf4b6311b7d722ed43ce3
-EBUILD leiningen-bin-2.7.1-r1.ebuild 1549 BLAKE2B 7ced587689ba587f317b08d3b0f3a4456f4f736fcc8a97f5ea9b8ca131113a459cd09bdfe827631c3a0b60908cd10162eb85aab45638578fd4a8a167710d7b67 SHA512 cd6b352eaf5fb136622075031a2f1033f86db1393c3ab31e0fb5395e69aa758ed7fe357227fbfccd8db07f056dd0a259dea4451356a974453f32438355192b4f
+DIST leiningen-2.8.0-standalone.jar 13541842 BLAKE2B 79697751b9da90a3f61bd4b8722436d1af1ce9f8db5c0e3a68d15d006f2afcb9518ab2034554b9b8a8e5f8bb991b304d51b8f45fb9a77d7337718035dc271e7d SHA512 e16359b2d211f9a72eeb9b672a94155f49531cbb731df11451b76ec30ad83be4a22e0b2ecc582bb01fdadd6822f56f27d42fa214df222f6c95e0fde64cb305ed
+DIST leiningen-2.8.0.sh 4335 BLAKE2B 951cc9b69e726bbb84c88b8b6407386c878cb1521c5cd79c7ce39ed48805cd24e9af0102f21cd7e852a024830b151751d42e7524f729bcca40f0e7de013ceb8b SHA512 08a5e2fc68ac3bd34dc32558088bd2ff79c9d72c54a610cfcd8c79fa5dcb98ad28d6950cb91b88081d024d5be881a168c2f9235c7888aa36c0f0e7e1f124169f
+EBUILD leiningen-bin-2.8.0.ebuild 1549 BLAKE2B 121745ac21ffc2a35bc7fcf9faf3cc60a94125445f426b6cbcc96dad0be74f0a94060ecf5f1490239c1cfc5e1eaff8e597a4f2823474c9c82ea201280f7e9912 SHA512 538011051c64acaf051b4b7b97e23e8a32655fe038520e4585d5d90d071ae6241c61e366b71e5b8d5178d2c1acd573d4b51796cfc2e1513cfb296232e9eee2af
 MISC metadata.xml 408 BLAKE2B 5c7a156b3dce1942e988302fb75ffbb3fc3738bb4aeb21203804b61a46f313fcbe2b8314702b9361afe21d33db68d9643217eaa3db3f08b7f001f29100e06eca SHA512 be76fcdb5d5ab199c951e2b563976b5c2bfe4f95000822073dccd71305f2409e90488e4c0fa726e503cbb533b16ca6a85599d84cadcf15d46e8070c3e5d0a5d3
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild
deleted file mode 100644
index 4f07d80fc893..000000000000
--- a/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Automate Clojure projects without setting your hair on fire"
-HOMEPAGE="https://leiningen.org/"
-SRC_URI="
-	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
-	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
-"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-RESTRICT="test"
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't mkdir ${S}"
-	cd "${S}"	|| die "Can't enter ${S}"
-	for file in ${A}; do
-		einfo "Copying ${file}"
-		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
-	done
-}
-
-src_prepare() {
-	einfo "Copying leinrc"
-	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
-	einfo "Patching leinrc"
-	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
-
-	einfo "Renaming lein-pkg"
-	# Rename generically to help user patching
-	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
-
-	einfo "Patching lein"
-	java-pkg_init_paths_
-	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${JAVA_PKG_JARDEST}/${PN}.jar|" "${S}/lein" \
-		|| die "Can't patch LEIN_JAR in lein"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/lein"
-	java-pkg_newjar "${MY_PNV}-standalone.jar"
-	insinto /etc
-	doins "${S}/leinrc"
-	fperms 0644 "/etc/leinrc"
-}
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.7.1-r1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.8.0.ebuild
index a6174af9f139..dd80a3d2fd2f 100644
--- a/dev-java/leiningen-bin/leiningen-bin-2.7.1-r1.ebuild
+++ b/dev-java/leiningen-bin/leiningen-bin-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest
index a9019f8dce8d..840fcd6edfaa 100644
--- a/dev-java/sbt-bin/Manifest
+++ b/dev-java/sbt-bin/Manifest
@@ -1,15 +1,5 @@
-DIST sbt-0.12.4.tgz 980711 BLAKE2B 0739e50610a26faa169b582160319ccfda3dc5b23588010b715fea508686bfa11dc9a62b647d0cd7b272a54d9e8fee75b6de838ef9fc7c13760079e68ad64c5e SHA512 0f8d67d8bcdfe2c7fad04e663cb626e302fc42ba7675376c97f22a73cbf21f40fde08078f2a74a723b9a5d0a24177c7b551e65942a4f73237d27ba8ea18b0add
-DIST sbt-0.13.15.tgz 60301163 BLAKE2B a07e9a62990e0f1c04b078b0344731a063e4fc8509c317a6c28ff68d83008d0fd518250ad301d8134a057688e6094a750be5171916b9a38facfdddf88542b5a5 SHA512 9e8a4f92970b96ddb93c0f6d9bfb394bc10648511e65d2f3e7637c580877c91acfa0e5f73fc11b9992dab6b5c142ead314609f47c2aac3eb6da11d879f3da8a8
-DIST sbt-0.13.6.tgz 1066241 BLAKE2B b4cf59409b82fc851e9978421b324da549dd376d89b37887681d7d6d9a42c7e938c82d5ce21ff42e5ddd5cb0030b0682ff44097db427302f4264da63dbb138ff SHA512 428f6e597f34d3eba94f19dd83334a1b188ae24300eda508fac597197b11e9850163c30552917c42c647470faab328663e96274536dc9f3a4df8355aa4f9d976
-DIST sbt-0.13.7.tgz 1058904 BLAKE2B b199c28b97364434dc7b7d3a25e9c6598160c9900621f4c470abab6b415c66bec9ba2d573beee5064efc2a6466ee79acfea53514b29ab0994b25353199fa7c40 SHA512 6022ed88b2d25f947ab068b7971e51fdcf8df77cea3d0a03eceff6df4442f013fd13cbeda11cdfcc35cc23ee85e1661986c53921f48d4350e2fa8bf0ae5f3e1f
-DIST sbt-0.13.8.tgz 1059183 BLAKE2B 5ad55bda946891cde52bbae0483ed3ffa7507a0467a75ae1bed6f08e7befa7dfa04c61efeeda59d31586db432cc7f406347f4f68b2c0c172516b1a4eb1bec477 SHA512 79479308c631b78b71196dfe4f8b26bd9b75727272c17432fce5ddd61a0dcaf4e261dd1eb9a8376b1e7a836ba6d84917819d181c35d19b543360d803193286d8
-DIST sbt-0.13.9.tgz 1049367 BLAKE2B de8f70de43aa6ccd816c90b82ee92295d7b33fd43226fadce48f9bd00c515838ae275e513ed438a5b758541a75520d86b0b6f93e3a3d01f468b3b338fe672667 SHA512 cf0deb1a5a07ce3690a831a2ee0f499a5c904cd9a9038873ab78773717a12ce4dec668e00c3dd6b89e7919357c32b26ff97a78613de5c6252b495bc7fdc763f3
 DIST sbt-1.1.4.tgz 45858350 BLAKE2B 792b05bf9bf16968c6580f070e042395b13580c6137a6592ca66bc3b02df3b27676b49364db8c6d2ec259b22b09a7e7a2d364e940890be38a96ba079066c4fa2 SHA512 7b278ecd22d4778482c61ec2e9650c8dd199c341aaaa624fee6b7f8989203de3d4dac24c4181ee08f0da50c69901321a1e11a535f0911241c9f6bfdfab5e94b8
-EBUILD sbt-bin-0.12.4.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
-EBUILD sbt-bin-0.13.15.ebuild 861 BLAKE2B c69df18ba3556eda5140032c214a853748d86ecf37e3ccbbef8774611464f9a28af4e3372cc81fca9d78b2058a06b1b58a57e93a5fe8d3fc4c25c318b16de84e SHA512 8d527e1b536e867dd105c36d5290f7684750c8ba2c345230445c75a3f53aab8d9518f92cbd91f7ed67937be807295c4f2e1bdd8714c20932c42ec7b6d5ba9ac2
-EBUILD sbt-bin-0.13.6.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
-EBUILD sbt-bin-0.13.7.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
-EBUILD sbt-bin-0.13.8.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
-EBUILD sbt-bin-0.13.9.ebuild 850 BLAKE2B ef58cb7bf510704e1d54be27b5bc36e3eb72a5d990fe6e42c5551fe51cad66d3ff9249d80eedfb5ac8bcc179a44c6868d44c06ed0b291a2f7edb08258f3ca6dc SHA512 decf00ce779fbf95fce552c8a65770dc36d440048ad132466b6933dc6565b5f2df901097d9cf7c14a95f99e1c8599c7aa25b3b7a10efaa55109771666794e259
+DIST sbt-1.1.5.tgz 49603901 BLAKE2B b458600bec2610fd76e5ca21633738b6815bf6c3e2918814147c904b97ab80b972a15b31f555777d0aa7f2e4613eef9b109745476d0cd7166506573aa2a72873 SHA512 bb538d88ec5ee7bb08b5eed6e7e250c45ee25419952473e4f093391316f936b26cc181f21c7b3501b9126a5c1f21b10514adffea4f9a09f7920203ba6330c2d4
 EBUILD sbt-bin-1.1.4.ebuild 860 BLAKE2B b17b66c3d6a2f845a87bba126f99050e9e3cd19dce5650d8d91968730bb79a471f0c2224eb7aeaad8df7ad6447974bfe982ce39071c647f50f3f37c9ab33d2e6 SHA512 31a2bf25148fcbf9e387f51c535dd18cba311181ddd01cb6aa19637bb6269e83f596c70fb3d4bdeedb6e7d1136886722cdc54112747f9c07d41098a9f72d43df
+EBUILD sbt-bin-1.1.5.ebuild 860 BLAKE2B b17b66c3d6a2f845a87bba126f99050e9e3cd19dce5650d8d91968730bb79a471f0c2224eb7aeaad8df7ad6447974bfe982ce39071c647f50f3f37c9ab33d2e6 SHA512 31a2bf25148fcbf9e387f51c535dd18cba311181ddd01cb6aa19637bb6269e83f596c70fb3d4bdeedb6e7d1136886722cdc54112747f9c07d41098a9f72d43df
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild b/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild
deleted file mode 100644
index 0e22428166d5..000000000000
--- a/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="sbt, a build tool for Scala."
-HOMEPAGE="https://scala-sbt.org"
-SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	>=virtual/jre-1.7
-	!dev-java/sbt"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/sbt" "${S}" || die
-}
-
-java_prepare() {
-	java-pkg_init_paths_
-}
-
-src_install() {
-	local dest="${JAVA_PKG_SHAREPATH}"
-
-	rm -f bin/sbt.bat || die
-	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
-		bin/sbt-launch-lib.bash || die
-
-	insinto "${dest}/lib"
-	doins bin/* || die
-
-	insinto "${dest}"
-	doins -r conf || die
-
-	fperms 0755 "${dest}/lib/sbt" || die
-	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
-}
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild
deleted file mode 100644
index 0e22428166d5..000000000000
--- a/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="sbt, a build tool for Scala."
-HOMEPAGE="https://scala-sbt.org"
-SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	>=virtual/jre-1.7
-	!dev-java/sbt"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/sbt" "${S}" || die
-}
-
-java_prepare() {
-	java-pkg_init_paths_
-}
-
-src_install() {
-	local dest="${JAVA_PKG_SHAREPATH}"
-
-	rm -f bin/sbt.bat || die
-	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
-		bin/sbt-launch-lib.bash || die
-
-	insinto "${dest}/lib"
-	doins bin/* || die
-
-	insinto "${dest}"
-	doins -r conf || die
-
-	fperms 0755 "${dest}/lib/sbt" || die
-	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
-}
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild
deleted file mode 100644
index 0e22428166d5..000000000000
--- a/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="sbt, a build tool for Scala."
-HOMEPAGE="https://scala-sbt.org"
-SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	>=virtual/jre-1.7
-	!dev-java/sbt"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/sbt" "${S}" || die
-}
-
-java_prepare() {
-	java-pkg_init_paths_
-}
-
-src_install() {
-	local dest="${JAVA_PKG_SHAREPATH}"
-
-	rm -f bin/sbt.bat || die
-	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
-		bin/sbt-launch-lib.bash || die
-
-	insinto "${dest}/lib"
-	doins bin/* || die
-
-	insinto "${dest}"
-	doins -r conf || die
-
-	fperms 0755 "${dest}/lib/sbt" || die
-	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
-}
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild
deleted file mode 100644
index 0e22428166d5..000000000000
--- a/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="sbt, a build tool for Scala."
-HOMEPAGE="https://scala-sbt.org"
-SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	>=virtual/jre-1.7
-	!dev-java/sbt"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/sbt" "${S}" || die
-}
-
-java_prepare() {
-	java-pkg_init_paths_
-}
-
-src_install() {
-	local dest="${JAVA_PKG_SHAREPATH}"
-
-	rm -f bin/sbt.bat || die
-	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
-		bin/sbt-launch-lib.bash || die
-
-	insinto "${dest}/lib"
-	doins bin/* || die
-
-	insinto "${dest}"
-	doins -r conf || die
-
-	fperms 0755 "${dest}/lib/sbt" || die
-	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
-}
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild
deleted file mode 100644
index 0e22428166d5..000000000000
--- a/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="sbt, a build tool for Scala."
-HOMEPAGE="https://scala-sbt.org"
-SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	>=virtual/jre-1.7
-	!dev-java/sbt"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/sbt" "${S}" || die
-}
-
-java_prepare() {
-	java-pkg_init_paths_
-}
-
-src_install() {
-	local dest="${JAVA_PKG_SHAREPATH}"
-
-	rm -f bin/sbt.bat || die
-	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
-		bin/sbt-launch-lib.bash || die
-
-	insinto "${dest}/lib"
-	doins bin/* || die
-
-	insinto "${dest}"
-	doins -r conf || die
-
-	fperms 0755 "${dest}/lib/sbt" || die
-	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
-}
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.15.ebuild b/dev-java/sbt-bin/sbt-bin-1.1.5.ebuild
index d02047237519..7d39ba4f4053 100644
--- a/dev-java/sbt-bin/sbt-bin-0.13.15.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.1.5.ebuild
@@ -7,7 +7,7 @@ inherit java-pkg-2
 
 DESCRIPTION="sbt, a build tool for Scala"
 HOMEPAGE="https://scala-sbt.org"
-SRC_URI="https://dl.bintray.com/sbt/native-packages/sbt/${PV}/${PN/-bin}-${PV}.tgz"
+SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index fd1a6f111cd8..582f2794fe8a 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -3,5 +3,5 @@ DIST sbt-0.13.13-ivy2-deps.tar.xz 121677604 BLAKE2B 7f6e508104a99c36f8f928550f7c
 DIST sbt-0.13.13-sbt-deps.tar.xz 34750700 BLAKE2B 5856f19d19255a6c4a373086962f3bff195d03193bb74d8d3aee1cfb2749ef3638f5c26dff7cb7c455c5b4ce67e8cf4fa46bbf9a8363f80dc26092e6df768d81 SHA512 0bfd35a6926545da7340f7ee72e420121f2bb2f83d98d420b7f65b465d207b1b30a48788914e7b1fdf575a4fee870f2632b0717f1a7a2c19e2f2d5794d08b4da
 DIST sbt-0.13.13-src.tar.xz 35911028 BLAKE2B 42157af03ae3567a2acc67cc0c96a9ffe19b69d60fddfde1cd65bbc410c14b09e5da0febb8225e49693c380a444b752296c29a21cc7f2239ee49ccef5128a3ff SHA512 351f18108a23014ee7ffd5c4713f390728fb98b742efdc139e094e64df7800f399d088600d245631635b0f6f4cb69c6cd327aafa3b0bf8a233fcbf0cb4ac5702
 DIST sbt-launch-0.13.13.jar 1210231 BLAKE2B 754abad78cec4f6b040fb63dcb62e549768174b22cf3f9ab7d2419736d4f09b53863cf645b38d7d534deb1c6e897f55d8b1b5fa82462ca9d906c410d22c0c198 SHA512 78e7ce21c610e83a532b04491e13d53b4193205328adce473252d523fe0ca0f3892dba900f01ff6e28d94a17c3ba1ebbe7d85fd6ce9900c48263bc4816da37ef
-EBUILD sbt-0.13.13.ebuild 5721 BLAKE2B 8b60ee0c4f58902e750b8b1a3d76f71a78aaa260e8a7bc53308cc903b71cdeea05b4d3d8758a09fc706036c1a762a1d217751ffc2b47d2eb75859106ccd7d1b4 SHA512 17bf873d8433d4d3f7faeef2cd9c6cb994914eedfac66eb92a8f5feab334c215c43a185c1e3ecbab7d3e6cacbe594e567dd075acb9af9dda48281fb61b5f62b5
+EBUILD sbt-0.13.13.ebuild 5677 BLAKE2B 77ab2c5de7b1098ed49eb9a2570c423e07089eee4cadb4882346b7f654452141e528dbfd5375fe67183faf9d2b06255527f7eb81678c8e81c0cb8683ce35b114 SHA512 3b95619c3a561cba59734f851d2b7d9df5e59073d793d28c3907936b725a540602ec6e8ceab02c037a987dba0920c13cf7c10408785636fc343bfc955cb1d68b
 MISC metadata.xml 525 BLAKE2B c70c7e88be5a5b06cbc422d6f354535711d06590780285ee1fd7e6668a0205795a4295869d61fb91b201df9ec2c275e4d74a07734fcc39bac9d4fbf2632f4b9d SHA512 53269c8f362ba0415988cfb9889a7af2c67a6788d85fbe4d9008fbed1cc0a3d3bddc2a6049c6d0ba23c28e3ad2d65f240a9085ceaccc5d55d4387e4dd90c5505
diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild
index 16862a31628e..7191e9414ff8 100644
--- a/dev-java/sbt/sbt-0.13.13.ebuild
+++ b/dev-java/sbt/sbt-0.13.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,8 +9,6 @@ inherit eutils java-pkg-2 # git-r3
 L_PN="sbt-launch"
 L_P="${L_PN}-${PV}"
 
-SV="2.11"
-
 DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well"
 HOMEPAGE="https://www.scala-sbt.org/"
 EGIT_COMMIT="v${PV}"
@@ -30,10 +28,13 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="binary"
 
-DEPEND=">=virtual/jdk-1.8
-	>=dev-lang/scala-2.11.8:${SV}"
-RDEPEND=">=virtual/jre-1.8
-	>=dev-lang/scala-2.11.8:${SV}"
+DEPEND="
+	>=virtual/jdk-1.8
+	dev-lang/scala"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	dev-lang/scala"
 
 # test hangs or fails
 RESTRICT="test"
@@ -155,7 +156,7 @@ src_test() {
 src_install() {
 	# Place sbt-launch.jar at the end of the CLASSPATH
 	java-pkg_dojar $(find "${WORKDIR}"/.ivy2/local -name \*.jar -print | grep -v sbt-launch.jar) \
-				   $(find "${WORKDIR}"/.ivy2/local -name sbt-launch.jar -print)
+		$(find "${WORKDIR}"/.ivy2/local -name sbt-launch.jar -print)
 	local ja="-Dsbt.version=${PV} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
 	java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "${ja}"
 }