[gentoo-commits] repo/gentoo:master commit in: dev-java/soylatte-jdk-bin/

[Fabian Groffen]

commit:     f9261abf270429c1766e661063a1656dc200fb32
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 07:39:41 2015 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 07:39:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9261abf

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

Package-Manager: portage-2.2.20-prefix

 dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 762a975..f69bd3d 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}