[patch] keyutils-1.5.9.ebuild.patch

keyutils-1.5.9.ebuild.patch (text/plain), 1.74 KB, created by Michael Mair-Keimberger (iamnr3) on 2014-03-18 18:29:17 UTC

--- /usr/portage/sys-apps/keyutils/keyutils-1.5.9.ebuild	2014-03-01 05:44:51.000000000 +0100
+++ sys-apps/keyutils/keyutils-1.5.9.ebuild	2014-03-18 18:27:23.000000000 +0100
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit multilib eutils toolchain-funcs linux-info
+inherit multilib eutils toolchain-funcs linux-info multilib-minimal
 
 DESCRIPTION="Linux Key Management Utilities"
 HOMEPAGE="http://people.redhat.com/dhowells/keyutils/"
@@ -27,15 +27,7 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
-	sed -i \
-		-e '1iRPATH=' \
-		-e '/^C.*FLAGS/s|:=|+=|' \
-		-e 's:-Werror::' \
-		-e '/^BUILDFOR/s:=.*:=:' \
-		-e "/^LIBDIR/s:=.*:=/usr/$(get_libdir):" \
-		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-		Makefile || die
-
+	
 	# The lsb check is useless, so avoid spurious command not found messages.
 	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
 	# All the test files are bash, but try to execute via `sh`.
@@ -47,14 +39,25 @@
 	# run the install keyutils rather than the locally compiled one,
 	# so disable round trip tests.
 	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
+
+	multilib_copy_sources
 }
 
-src_configure() {
+multilib_src_configure() {
+	sed -i \
+		-e '1iRPATH=' \
+		-e '/^C.*FLAGS/s|:=|+=|' \
+		-e 's:-Werror::' \
+		-e '/^BUILDFOR/s:=.*:=:' \
+		-e "/^LIBDIR/s:=.*:=/usr/$(get_libdir):" \
+		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
+		Makefile || die
+
 	tc-export CC
 	tc-export AR
 }
 
-src_test() {
+multilib_src_test() {
 	# Execute the locally compiled code rather than the
 	# older versions already installed in the system.
 	LD_LIBRARY_PATH=${S} \
@@ -62,8 +65,7 @@
 	emake test
 }
 
-src_install() {
-	emake DESTDIR="${ED}" install
+multilib_src_install_all() {
 	dodoc README
 	gen_usr_ldscript -a keyutils
 }