gentoo resync : 30.04.2018

8 files changed, 3 insertions, 41 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 19d3f86c9783..fc26fd5627f4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index a8a4835b59e5..29816a8283d3 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1,4 +1,4 @@
-AUX commons-math-2.1-r1-buildfixes.patch 770 BLAKE2B 99782f38b6efdfa94b0b69390bc04d487ef20698fe1bea456c8919ea88a635d009b10c8d27e7124f0e4f0bb9a1c97110a959421cbd4f6aee70ebb9f5821bb812 SHA512 75a0174c839425a7f1387ef582a08899b7433dcc2090d773642ea120dc220c69d741fef5b44508ad9fdb3e2f24d8fe2b9dfc92146985f88416dae8178a5d7798
+AUX commons-math-2.1-r2-buildfixes.patch 770 BLAKE2B 99782f38b6efdfa94b0b69390bc04d487ef20698fe1bea456c8919ea88a635d009b10c8d27e7124f0e4f0bb9a1c97110a959421cbd4f6aee70ebb9f5821bb812 SHA512 75a0174c839425a7f1387ef582a08899b7433dcc2090d773642ea120dc220c69d741fef5b44508ad9fdb3e2f24d8fe2b9dfc92146985f88416dae8178a5d7798
 AUX commons-math-3.2-build.xml 12448 BLAKE2B 04021b793945a00a95152ef98772dfb5735cce14307d33772701a6240a8d5a094b2156faf4fc775454c0c369df066f9404a0d5a5671f809647ae1e5389648ec4 SHA512 7f7d4a469843b218e90e3482360101058f027cf7d2319f1f7a5a4af7c09b6e4b05237c594eb217d5ffc3f07793fcabaa733be52686148af94a12727e4fda89ed
 DIST commons-math-2.1-src.tar.gz 1099423 BLAKE2B 83c52abc10eebb6c749aec218aa435df4cd05106e6bcbead5061df7381d168aa9392ab70dce8eb0b8e254d6d95a372cacddc8f7714198a186a95a04a394bda9d SHA512 53ed8c0400402c588d824c15365ebe60bef41697ff9728270a9fdc3ac30eb60c4c397caf939ccda839eb701453d98af4eac9eae2090575fcfdee4df2d6f6045b
 DIST commons-math3-3.2-src.tar.gz 2602474 BLAKE2B a818ca5ab1b9799359bad1c84d2774329c7c2605aeea3e13769eed9f1578d412555ad90a8de68971daa42b270d4bcd5fbf0fe79714e839d41b08077e32633125 SHA512 132c4725be582e25f67a955c7b3b8c7ef155606d8f4da07770464c422ded6b5e6efd1a13a6e98cff222f4fcac73606d512ee1ab9e3b1c4befcc1ba16ab68787b
diff --git a/dev-java/commons-math/files/commons-math-2.1-r1-buildfixes.patch b/dev-java/commons-math/files/commons-math-2.1-r2-buildfixes.patch
index 6d768969e79c..6d768969e79c 100644
--- a/dev-java/commons-math/files/commons-math-2.1-r1-buildfixes.patch
+++ b/dev-java/commons-math/files/commons-math-2.1-r2-buildfixes.patch
diff --git a/dev-java/jad-bin/Manifest b/dev-java/jad-bin/Manifest
deleted file mode 100644
index b0eb12762c0d..000000000000
--- a/dev-java/jad-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jadls158.zip 389972 BLAKE2B 1bb59583fee60a805b47ea7fa0cb14090912719ea827453447777873c7c17dadb39b17938207dd56ef6f2ccf0fbaed7bbf953b68b9bd66c3f8694cf771bd423e SHA512 5f16c51f676990ea6cf76cbee4c9fbf93273fb6a4474a136c032457fcb29c9507508b543d3f65a212cd4e21d14671f0b4368ce5a42dc7c542e75883a911a5ebf
-EBUILD jad-bin-1.5.8e-r1.ebuild 501 BLAKE2B 3c87591b68f8d7e8495c9f382b229952cb78be16aa33d99736d106fce2b6ef483f9fe07a075cd1d6d5e9357a96eb6ca43666d03613384e86051e85c064dab267 SHA512 3429618780d3234c4146fac6eeb177c3d125e58f81e09082b4d5347de054628ee49cf734a63d778bb797e5a46a404c64f128e562295d781b8196270f3928f8ff
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild b/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
deleted file mode 100644
index 9ea62a8c3be6..000000000000
--- a/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Jad - The fast JAva Decompiler"
-HOMEPAGE="http://www.kpdus.com/jad.html"
-SRC_URI="http://www.kpdus.com/jad/linux/jadls158.zip"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="freedist"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-RESTRICT="strip"
-QA_PREBUILT="*"
-
-src_install() {
-	into /opt
-	dobin jad || die "dobin failed"
-	dodoc Readme.txt || die "dodoc failed"
-}
diff --git a/dev-java/jad-bin/metadata.xml b/dev-java/jad-bin/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-java/jad-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index e96fa38a36e5..b042aa87800c 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -3,5 +3,5 @@ DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dcc
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 EBUILD protobuf-java-3.4.1.ebuild 2094 BLAKE2B a0a5f55af03a0ddbb447c00a407318e704518d2202b93d8cff929fb8bc9b5954d31e148ea0fbff642e6279b71552034aaf8d3e655f839e510a3520e2f6bd38a7 SHA512 c2646fff280006c14db9fc3fca89375137723d7fe3001b7a76825963af5e822cadc32e99fe66540f6471f99757800158a04bb0607169f17b970763c33333e38c
 EBUILD protobuf-java-3.5.1.1.ebuild 2091 BLAKE2B 3bef86c71300d1e06e603a43c15beef0a9fdf66d052923720b060422344741b6f49366b67782db63bcf2e41261163ff9720c0bf1b7d9b660034963f08b7a4792 SHA512 92aaecdf9edd8e1b6980f7279928ae7dffaa4f3716e2af21c65c501445d633d8a8da9c154fed0dc2253c8a04d69952d99d379417d6e992afa56e32f464d029d0
-EBUILD protobuf-java-3.5.2.ebuild 1813 BLAKE2B d46d3e2830806281fd67d804e13c2d88a090733270383f7c1e449b2b66f4ff012e15f0c62fa36a3ce32cd254f7b65f8f7a6849c8265e12fda2f6a9c5bd157c52 SHA512 c8f393561a64baa471ebabab77f8300837f548d9a2c03cd616a596f746fd0061599a9cedd642855f697f3b3e812b3cf789a76c03b875a900016f9fa6bcf77771
+EBUILD protobuf-java-3.5.2.ebuild 1811 BLAKE2B 0114b523f2e6a9d31003d18d5af53ee0162e0b503bff86095e994575f98907ba8fce8bbca41e7e1949affdcb15309b4b08250aafb74c323983342d152b7d3bfb SHA512 40fe36e82e8d93e4733370b64795a68302eafb94368814c5c13e1616d68117d46dda0ad4c720665c7687c67944afb07005e9e0bdd1df74d72ad79cf2c7a432eb
 MISC metadata.xml 796 BLAKE2B 730596798d9434732683c07bf8f4df861e3a2a4f0b681b642f6226e749729cbba260623c3d116e0dcc059fcce12df365e7ef1890139a570de37bf5d994d9035d SHA512 10479327785c7afbb86288465782b3c4af5b8901a5d63c7989bdebdecdda2ea44990b99cf74e0a1ed87d686e74991b65237a1e3e04b6b87bee510c70e810503b
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
index d6b0900c590a..64135cabdb97 100644
--- a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
 
 DEPEND="~dev-libs/protobuf-${PV}