From 4e36250a3d1690cd17ec0871dd2cbc8f9041e676 Mon Sep 17 00:00:00 2001
From: Guido Kroon <guido@kroon.email>
Date: Tue, 17 Sep 2019 21:35:54 +0200
Subject: [PATCH] sonarscanner-bin: 4.0.0.1744 bump

---
 dev-util/sonarscanner-bin/Manifest                  |  2 +-
 .../files/sonarscanner-bin-system_jre.patch         |  4 ++--
 ...92.ebuild => sonarscanner-bin-4.0.0.1744.ebuild} | 13 ++++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename dev-util/sonarscanner-bin/{sonarscanner-bin-3.3.0.1492.ebuild => sonarscanner-bin-4.0.0.1744.ebuild} (92%)

diff --git a/dev-util/sonarscanner-bin/Manifest b/dev-util/sonarscanner-bin/Manifest
index ef2399ee2..4168f519a 100644
--- a/dev-util/sonarscanner-bin/Manifest
+++ b/dev-util/sonarscanner-bin/Manifest
@@ -1 +1 @@
-DIST sonar-scanner-cli-3.3.0.1492-linux.zip 73866903 BLAKE2B 5c343145f24de82d49b275ecc5b76f7dcdde36e3611749077b98f84f376c47de5ad5f9c3f60e46c576026079f19d9da9963efcd390e68bbf1cfb1b788fa1bc00 SHA512 8e74b8ffc4239fbd81efe221b6c48d02a379507fd1e9d5371645d0cd779a68fae404af8a8ca74a035515ede8c0f139c0f230bfd6182b8415dad373be35e67550
+DIST sonar-scanner-cli-4.0.0.1744-linux.zip 42392358 BLAKE2B 998ba879250e9e8d8a87012aa3f3b86bfd31f1959b95018cea26f5979558965b08ace1e4843310cfaf547c117c5b0ed027bceef2e7ee53962aa08cb9b4523d58 SHA512 d65f83ea8f33c6f1b687cfe9db95567012dae97d2935ca2014814b364d2f87f81a1e5ab13dcd5ea5b7fda57f3b2d620a2bd862fb2d87c918c8e2f6f6ff2eca29
diff --git a/dev-util/sonarscanner-bin/files/sonarscanner-bin-system_jre.patch b/dev-util/sonarscanner-bin/files/sonarscanner-bin-system_jre.patch
index cadaee94d..c15831e4d 100644
--- a/dev-util/sonarscanner-bin/files/sonarscanner-bin-system_jre.patch
+++ b/dev-util/sonarscanner-bin/files/sonarscanner-bin-system_jre.patch
@@ -1,5 +1,5 @@
---- a/sonar-scanner-3.3.0.1492-linux/bin/sonar-scanner	2019-01-08 12:17:50.000000000 +0100
-+++ b/sonar-scanner-3.3.0.1492-linux/bin/sonar-scanner	2019-02-04 16:26:21.922525000 +0100
+--- a/sonar-scanner-4.0.0.1744-linux/bin/sonar-scanner	2019-06-25 14:41:00.000000000 +0100
++++ b/sonar-scanner-4.0.0.1744-linux/bin/sonar-scanner	2019-09-17 19:27:00.000000000 +0100
 @@ -37,7 +37,7 @@
    exit 1
  fi
diff --git a/dev-util/sonarscanner-bin/sonarscanner-bin-3.3.0.1492.ebuild b/dev-util/sonarscanner-bin/sonarscanner-bin-4.0.0.1744.ebuild
similarity index 92%
rename from dev-util/sonarscanner-bin/sonarscanner-bin-3.3.0.1492.ebuild
rename to dev-util/sonarscanner-bin/sonarscanner-bin-4.0.0.1744.ebuild
index 40a0ec716..9380b7d00 100644
--- a/dev-util/sonarscanner-bin/sonarscanner-bin-3.3.0.1492.ebuild
+++ b/dev-util/sonarscanner-bin/sonarscanner-bin-4.0.0.1744.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=6
+EAPI=7
 
 inherit user eutils
 
@@ -15,7 +14,7 @@ MY_P="sonar-scanner-cli-${MY_PV}-linux"
 SRC_URI="https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/${MY_P}.zip"
 RESTRICT="mirror"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="embedded_jre"
 
 S="${WORKDIR}/sonar-scanner-${MY_PV}-linux"
@@ -28,11 +27,15 @@ INSTALL_DIR="/opt/sonar-scanner"
 src_unpack() {
 	unpack ${A}
 
+	# TODO remove unneeded files
+}
+
+src_prepare() {
 	if ! use embedded_jre; then
 	   epatch "${FILESDIR}/${PN}-system_jre.patch"
 	fi
 
-	# TODO remove unneeded files
+	eapply_user
 }
 
 src_install() {