gentoo resync : 30.06.2018

3 files changed, 4 insertions, 4 deletions

diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index 4434745be3f3..e843c8694d0e 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -203,7 +203,7 @@ DIST scala-2.12.4-sbt-deps.tar.xz 34841672 BLAKE2B 0f1577bba65eb5863013014b16627
 DIST scala-2.12.4-vizant.jar 15910 BLAKE2B 393ddd38ff2528b9c54fbb2b79111858a2dfeab66e4b10daf4e23d113963edb3002db8c9415fe47557736a63ecef4b198bd90b87a54240a9a43823fdab0f3082 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390
 DIST scala-2.12.4.tar.gz 5999529 BLAKE2B 5dfeadb9ac9562dd825f6a41f9cabdd353f669a58dc3aaec714d6155e9e598296c1e31dcc8956a24a97103e3449fb8f8c3a9ebe5e52dd405572d59ccae89c5e6 SHA512 cad6d54777a3ad4d26df5b4d5cecbbdb4a91ecb17cbf791fe259735221d33f9dd17a14e86f5e3520464078ad9ef68581e722e3c0d7494436bf356c79a9d31697
 EBUILD scala-2.11.1-r2.ebuild 7608 BLAKE2B 8bf202a892071f2392a0a07854145317b7c768619287ca1e4be0b3fcf5aae4ca31f16944791b017e751ba5faa8ccfe2a42a9a84dd92dd25febfe81bb395a99c5 SHA512 bed490fb58b2d882c6c8905416fc5366b1626de013faeda455878064d57c4c7b283e94b7e7b3c92ac63de5cdbaafbd38c44afd9bda9dd22bc07e4bbf419cc521
-EBUILD scala-2.11.11.ebuild 7836 BLAKE2B 451ae5848c76ffe7fa330f3f7307ec3750a07ebaad50b6ee76798e28f6d58e10bdbe796979d9232cd3156103caa8b73a22f2b05190e0e9c4b0e5aa7aac1585b0 SHA512 a33a615bd6dc944453430ca0a0ba93d3711c11bf9475797c08735ddf986a7c8ddb6ceaac03f24f8ad023c3eb61de4ccad76e542a83ecf1aeffde69f4df052d74
+EBUILD scala-2.11.11.ebuild 7834 BLAKE2B 924beb59c89a63bb4c41c4fdb249a9089e71f8deb693e248b55f7effa381cf2274ca7a7b0839cfe98097a59de4ebeb0a29fb0d5865c5cc0363e96d1d7a037d3b SHA512 931fdfcfafd543caa8100bd0acd7222cadfec4ef1bae79d165a2040a173dac45a910e415700442ec7ca7b3bdf936b68a271e389a377844a7ee22953e60401f2a
 EBUILD scala-2.11.2-r2.ebuild 7693 BLAKE2B 067c5ecdc422b2971b54b12b87c7eee674e0e07a98252946d3e5461dfaf2544796fc931668a614c33804dd257bb1d1cfafb93b7bcd4499800c8c53994f0e5e77 SHA512 4410f23191285f1421297c27ce2a08dd10be00d6cc86f5110e6d3f1687c72f510bbde51b19df3473f0b0867635e3ac192914ee179306244bfe9d9268effc09f9
 EBUILD scala-2.11.4-r1.ebuild 7673 BLAKE2B 99b3ea92ff426f2d154438812af32b261f4ff0ef383e04ab055107fa1864cd154051349b47001445358b1291ff1b5100525323ac31803649151c5d3f03aa6848 SHA512 25b6ad67483d4fba45c7613220b1920c887bbd6865b1818290b4fb529cae69491be6aa85aef74b47e8880b805719c38aef94eb0ffa6e05157f588f0a0b6f81e2
 EBUILD scala-2.11.4-r2.ebuild 7657 BLAKE2B f0229634e3d987fba291f89297f52f5513654357de6f0f582b79be4ade4e56306579f1cec6feb72e63415567aadcf6759fbe9bc7c8fa1059061a371edc0c81ef SHA512 07b86645e7e3aad9dd81d9c1233166b23f3f3aa2094148f229fb3640dee416c451b4d50b2b17c9e788bb65214613cca6a2b76ff9d2a1c01d71dedff790e89230
@@ -212,5 +212,5 @@ EBUILD scala-2.11.7-r1.ebuild 7847 BLAKE2B 90a0fe6f856c62a96965d9a46bdfff57cd73f
 EBUILD scala-2.11.8.ebuild 7847 BLAKE2B 55f1ae01e1b4265ad52855de5350527512da10a1898f29da41304370b8c5e48741630efa91b2bdf1bad02f5ecf1dc51425010fee72a787d2acc284455aae6d08 SHA512 7ae265e05b3f0cf4300590247bcb92065a6c79a3c1c54f27e1e69481235fb2f57ff3b57b6fd8ad59ca18adcec453a48770f9c274b70cc92def9aee8e4fe9943c
 EBUILD scala-2.12.1.ebuild 7356 BLAKE2B 8b84cb6d082f86b2999e6af29dff5581d671cb9ebb73605c9dfdcfaf5e5feca93a1e7d9a6f26fa9a47bfdeba531af70b3df590dcc00489a7cf0661de79b89362 SHA512 e3ce17cc76e0726241187bff85275f45d1b7645b636ea97c61723f66921a5277410138865c8b8672a7ccf4e60d0bf3c88a3b65c3137d4afebf45edf86452282a
 EBUILD scala-2.12.2.ebuild 7268 BLAKE2B 45b1c9cde361d9a9ed8c8cc24e6471c5e3d6db140794f3fec3a1e45681df620e9d35b9ff40a1dc40af6c311683ebba462975473c0682ee73e8987aca29f703de SHA512 9e4be16fcdc8b774f7e3bf32b0559ff2c0490646fa6a73d64c2af75013fd66624a5560d0bffa298745cd51c763ff18ef6010b6ba2ccd89a75f0391c49d2922c0
-EBUILD scala-2.12.4.ebuild 7277 BLAKE2B 65b20d93fd5e6fe36834161041cb4492e5366ac2b817f8cf17b1e228db24876f1e17ed23ca71da8f1611d854cf21192208d66a4c779d8f0e6535a716c50e434f SHA512 20adffc5b5d159bbd74968a2886b3c4aee56508cdcc761952c0356ec0a67a8e056e5312b4755fe0b92704053d577413cd7a568526ad6996d4e6e9fad0a604f7f
+EBUILD scala-2.12.4.ebuild 7275 BLAKE2B 0d0fd9b3598c5e02d6d23180ed2eb3f5297c1f11f6afed71d9248495cbc0fccbfbb16ed06865718e0897bd4003d3c77e741fbbd34a7d647584d43c2aed762eec SHA512 c7d313adc7580a6aed48b1b04ecdc15a1a0698c9568b4dca1039660921c6b47781d54b52cae588c63d1bf6a8598c884094276d61978c2aa77fc43d963d23a139
 MISC metadata.xml 478 BLAKE2B d23bdb99144c333f9ae563a08a78c2ccabdefc22e88207f89c0492c444b574677eeec648a38f105fa8e114a8a8a373dc9487cc36e1eb825cdf814bc1d76d402a SHA512 cca0d7d9cb94bfaad3f93382456248626e83ed8358798ff4b11c600cadee3b88b28b89e914fe5d42c16e170969ded1b35efd1af61953476347f620b9a973d718
diff --git a/dev-lang/scala/scala-2.11.11.ebuild b/dev-lang/scala/scala-2.11.11.ebuild
index 9809a7fcfcb2..40bafa3a7db5 100644
--- a/dev-lang/scala/scala-2.11.11.ebuild
+++ b/dev-lang/scala/scala-2.11.11.ebuild
@@ -64,7 +64,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="binary emacs"
 
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
index 767fdd498239..b36402420d49 100644
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ b/dev-lang/scala/scala-2.12.4.ebuild
@@ -70,7 +70,7 @@ SRC_URI="
 		https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )"
 LICENSE="BSD"
 SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="binary emacs"