Enable multilib support, bug #505006.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 104 insertions, 9 deletions

diff --git a/sys-apps/keyutils/ChangeLog b/sys-apps/keyutils/ChangeLog
index 2638989f54c5..884434138a2d 100644
--- a/sys-apps/keyutils/ChangeLog
+++ b/sys-apps/keyutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/keyutils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.40 2014/03/01 04:44:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.41 2014/05/14 23:01:12 mgorny Exp $
+
+*keyutils-1.5.9-r1 (14 May 2014)
+
+  14 May 2014; Michał Górny <mgorny@gentoo.org> +keyutils-1.5.9-r1.ebuild:
+  Enable multilib support, bug #505006.
 
 *keyutils-1.5.9 (01 Mar 2014)
 
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 73ce52d12328..83aca0abcfe0 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -7,17 +7,26 @@ DIST keyutils-1.5.8.tar.bz2 64880 SHA256 6c7da37272eb39abc2ebafc9ba4a580d7cf8725
 DIST keyutils-1.5.9.tar.bz2 74683 SHA256 4da2c5552c688b65ab14d4fd40fbdf720c8b396d8ece643e040cf6e707e083ae SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2 WHIRLPOOL 0509cce076a32d2f319f596506d4aaeb83e1853ee6337e6a3041e6957e9098f4482ae56a9c6455605b72b3f34701a890e9be666b6fdd752ff14a3d3564dcba19
 EBUILD keyutils-1.5.5.ebuild 2161 SHA256 e66586007b06f8a0ae6f3c515bdfed3efb95e2b1e54de4d6ee8b795d09d7a47f SHA512 dec3f3c4afae48898ce6713473d2d92e128d5f20961c88dc2341300e688afe6d93bab1e03e2b2982d8d5826147e7b001fc85986087486df6333f822bf605b49b WHIRLPOOL 60fb2820a673fedd56548aba7031c4cb435cf5bd3c2999d73012116e55daaaff3d6daa952f7c48cf3d12a17c90a01de2d21c5af0f81c3fdb1710aa51c95eec55
 EBUILD keyutils-1.5.8.ebuild 2173 SHA256 f672e30e23bccf463c1ebc0cf3aabc75420eb17294e67164d63df9d864c5bfb9 SHA512 97835426ef8916420757cf911204376acee2548fdeace07688db5970ee0356feeda48f5efaa2ec4a2a381e74b49cf4cdc30e27561802efc8c791d9ec7ced24fb WHIRLPOOL 7bc0d1a607b86d8327c26eeb8cead421fe32461ddb8b36f610a1722b032b6a643776642be5edf1c11c400bdc8666181524dc3e2676d5800d2771d1b0c7204373
+EBUILD keyutils-1.5.9-r1.ebuild 2429 SHA256 9d568bb51f16c4d2ce1aca130a6015cf65e03da1519bd0ccdfb2c19c35b12568 SHA512 3d75e4d3e1f623f21f4fab001cad5794b5f7c14982ac7826e816139501bf8383c985110e68b5e2e1b954afcaeadef8bb3a010b4ff83a6634a19ddc02eae5edac WHIRLPOOL 6e8210230928793f3c34bd811023587fd1f1b90ede9f0d64341e1a7b81d1d8eb2828edd0b6a606453d0e1ae13dba3022d1588f2701c945e812b4ac9d6d2a680c
 EBUILD keyutils-1.5.9.ebuild 2162 SHA256 72f2197c3ecf07656a55b0bdcf9bc799a010771f1113f9bd0f6136003145abe6 SHA512 960700b46d94d7c56ab87001f382f31f31b368cb3c6c827f033bcbf29ee6cd4e19d2b530b18a0dbd56e503436bac1d26965e09349afd5ff591c4941a63a21877 WHIRLPOOL 033f835d5f1fbdcb2bd11fbe865616156725105984e22d3514df981017dab0a963f9a734f4135dc9f31906c0f804ee76c0d2d6cbd0dfd5a50343b94e8cb42227
-MISC ChangeLog 5678 SHA256 738d4ea24ea6862b696add0a40e9f99ce65180ec0358b04132cede4440ec7a7f SHA512 5b91a892dc60d5f1b413914a7db256ca7606be5885990cccc7b0157089ddefd3450e5e5123eb639975e6dc6d76d6f55e9a0b12eabf633f35c700a19d97893b57 WHIRLPOOL c77cdde24a4978e72fdddac0da1c235fd5e7e8d3ac5d0720e23b544c4f7c15c6ec6186145240d643c32e720fd0ad80eb192b3c159486740bf89982b4f4ef5d76
+MISC ChangeLog 5827 SHA256 b042a60976ca811d7090928c8203d7a5fd7d0b30ab3cc99ecd36a866dd1f6267 SHA512 0ed78c8b6b40a6f30704868b0bca5175876790ca81be163eabd7da7145ce4d4062c0c8d2f4e9cec12b8041f3e98c561aa61165acbf7c97cf2b49cf2a27ce5719 WHIRLPOOL 1155651e6665302a30a1548e4062150a0a475a500960c276111a7f83f98f76670e5d4f0b23c8a30c185d14836d8bbb93c7d085a755f073d36be40db34bbb9e4a
 MISC metadata.xml 227 SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8 SHA512 1e52da091741cb67f6a61955ebf0c314c3634d5cab187a27820fa76f36307cb9c404271360de061f9b2076dfa1e4f3fadb46a3834ad9fc6685fbc437e5c7c789 WHIRLPOOL 0baafc1e244b376dc66e10952a10ec634fabb384431da1bec9be95bb344109c7943c6e74ae249070a9c5ee93410714e2c9343a65e01309bac7918239b6492820
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTEWXGAAoJEEqz6FtPBkyj8YoH/1Ce6LQDnpeEI3NBBgum3nMD
-5QTXOwyQne89uezU6uTlLhLNunbvcDRKoMvLmUPfhUsx6uCjsFhGeEV7S9wB7Etv
-obt9OyKgPusqR7T/Ba/qwTEYAnlVOoISi+EOaDr5PhjEzI1uSqb2cD75CYhbjj7q
-WXj7c9ACsH526BtHwrVDpd9STeYkM0jc6PaXNQUY6ykUEDebAkut5qzvZLUby++H
-pPuzEEvmzMxUVIkk3yyEQtA/+XEfI8MclkVbvYMYdUyC0u1YDzrjjr/oznCEwyDB
-yJPczX8pVomiRRm4MF4agDaRZWsNSSoTiHL6sIDUkveoTqlSh1my3nfW5iazWi0=
-=ZRnv
+iQJ8BAEBCABmBQJTc/W5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHc0QAJmHxfgwTVy5vnEbZ8xvkfrp
+noXy9nmHlo6emdDp2Qnej+HPAaox/6icZIMnO60Rv+UxoDm2h2uBly5tqFItTq+G
+pdvbIHFcn34Gdu/850jjXyPLqSwRXzuwiDmfnF39E6Vx+bZIGuk+vGnOQEpbvVaw
+UGNeUMau9fgy/KqOUeR5+kybajQKec8DNyNTEvobXtC4DfACWk/10OtaxFtn7lGt
+pvFsqbjbIAq8mbsUL0VzXEgAYNC21zDy+nN6v3QeKleRtLa348GZ0NQfoo+gufPU
+jdJVbZQQ1Tr8EFXk+5EiZaqGdAHCu3vtp/LfY7AuIhwWHcZtSA1hMkP16QeIZsTf
+BRhZ4kOjscF2Z6BzXZgzytOcDV+tx4k6BP3i/W/vrcZmXg6CS/tUPXeSh3iZ9oAG
+Xt/VTtvCot5e9kjLpvSx5YBDXKFwZJZzWjwsMzELjrnR8DISkJC7imKC0QSx4TMk
+zqTafow9TF9zPyoN7yHHBarB0fhPI7gtxJao1Z6BIGeT/bz+ZPLA/+AIRcVDNQC2
+w+81cwY/UEkjThAQSx4m/jnBdChlwQ4AFflQA7gWOIz3UcwR4OjrYC1z0tJwwKqk
+P+a6ZnSjqzvnBWhFrGfGrQxzxcN/PySEpWtNWmBO6kQdz4DLV6h2uH2MPpXoeozC
+ixkJUDjVOECCPaKyekMz
+=jB0W
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
new file mode 100644
index 000000000000..497f4c7ea7db
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild,v 1.1 2014/05/14 23:01:12 mgorny Exp $
+
+EAPI="5"
+
+inherit multilib eutils toolchain-funcs linux-info multilib-minimal
+
+DESCRIPTION="Linux Key Management Utilities"
+HOMEPAGE="http://people.redhat.com/dhowells/keyutils/"
+SRC_URI="http://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+pkg_setup() {
+	CONFIG_CHECK="~KEYS"
+	use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
+	ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
+	ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
+
+	# 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`.
+	sed -i -r \
+		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
+		tests/{Makefile*,*.sh} || die
+	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
+	# Some tests call the kernel which calls userspace, but that will
+	# 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
+}
+
+multilib_src_compile() {
+	tc-export CC
+	tc-export AR
+	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
+
+	emake
+}
+
+multilib_src_test() {
+	# Execute the locally compiled code rather than the
+	# older versions already installed in the system.
+	LD_LIBRARY_PATH=${BUILD_DIR} \
+	PATH="${BUILD_DIR}:${PATH}" \
+	emake test
+}
+
+multilib_src_install() {
+	default
+	multilib_is_native_abi && gen_usr_ldscript -a keyutils
+}
+
+multilib_src_install_all() {
+	dodoc README
+}