From: Lars Wendler <polynomial-c@gentoo.org>
Date: Fri, 28 Aug 2015 14:13:42 +0000 (+0200)
Subject: sys-libs/uid_wrapper: Workaround for bug #558340
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8be7c918959fdf01f06fd5bd3ccb69cfe13e387d;p=gentoo.git

sys-libs/uid_wrapper: Workaround for bug #558340

Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---

diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.1.0.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.1.0.ebuild
index 06496d0a8fe5..5957140b8eec 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.1.0.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.1.0.ebuild
@@ -16,3 +16,10 @@ IUSE="test"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
+
+# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
+# Because of this we cannot use cmake-multilib_src_configure() here.
+multilib_src_configure() {
+	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
+	cmake-utils_src_configure
+}
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.1.1.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.1.1.ebuild
index dcfc934ed9e5..a7773d31ac95 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.1.1.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.1.1.ebuild
@@ -17,3 +17,10 @@ IUSE="test"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
+
+# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
+# Because of this we cannot use cmake-multilib_src_configure() here.
+multilib_src_configure() {
+	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
+	cmake-utils_src_configure
+}