From: Andreas K. Hüttel <dilfridge@gentoo.org>
Date: Mon, 9 Oct 2017 23:44:14 +0000 (+0200)
Subject: sci-electronics/klayout: Fix libdir. It helps to be awake when coding. Bug 633898.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8863c60796c3e6e5c4434a4669f50bc22368e23b;p=gentoo.git

sci-electronics/klayout: Fix libdir. It helps to be awake when coding. Bug 633898.

Closes: https://bugs.gentoo.org/633898
Package-Manager: Portage-2.3.11, Repoman-2.3.3
---

diff --git a/sci-electronics/klayout/klayout-0.24.10.ebuild b/sci-electronics/klayout/klayout-0.24.10.ebuild
index 5f3954deb383..f4dfd05c1ec8 100644
--- a/sci-electronics/klayout/klayout-0.24.10.ebuild
+++ b/sci-electronics/klayout/klayout-0.24.10.ebuild
@@ -41,9 +41,9 @@ each_ruby_configure() {
 		-platform linux-gentoo \
 		-bin bin \
 		-ruby ${RUBY} \
-		-qtbin /usr/lib64/qt4/bin \
+		-qtbin "/usr/$(get_libdir)/qt4/bin" \
 		-qtinc /usr/include/qt4 \
-		-qtlib /usr/$(get_libdir)/qt4 || die "Configuration failed"
+		-qtlib "/usr/$(get_libdir)/qt4" || die "Configuration failed"
 }
 
 each_ruby_compile() {
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index d6a39fafedfe..ad17c9f8d608 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -48,7 +48,7 @@ each_ruby_configure() {
 	./build.sh \
 		-expert \
 		-dry-run \
-		-qmake /usr/lib64/qt5/bin/qmake \
+		-qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
 		-ruby "${RUBY}" \
 		-python "${PYTHON}" \
 		-build . \