From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 23 Nov 2015 07:39:41 +0000 (+0100)
Subject: dev-java/soylatte-jdk-bin: fix use call in global scope, bug #566532
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f9261abf270429c1766e661063a1656dc200fb32;p=gentoo.git

dev-java/soylatte-jdk-bin: fix use call in global scope, bug #566532

Package-Manager: portage-2.2.20-prefix
---

diff --git a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild
index 762a97588e8c..f69bd3d26dc0 100644
--- a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild
+++ b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild
@@ -23,12 +23,16 @@ RDEPEND="dev-db/unixODBC"
 
 JAVA_PROVIDE="jdbc-stdext"
 
-MY_P=soylatte16-i386-${PV}
-use x64-macos && MY_P=soylatte16-amd64-${PV}
+chdir_s() {
+	local MY_P=soylatte16-i386-${PV}
+	use x64-macos && MY_P=soylatte16-amd64-${PV}
 
-S=${WORKDIR}/${MY_P}
+	cd "${WORKDIR}"/${MY_P}
+}
 
 src_prepare() {
+	chdir_s
+
 	# fix install_names
 	local arch=i586
 	use x64-macos && arch=amd64
@@ -74,6 +78,8 @@ src_prepare() {
 }
 
 src_install() {
+	chdir_s
+
 	local dirs="bin include jre lib man"
 	dodir /opt/${P}