mgorny 14/05/14 23:01:12 Modified: ChangeLog Added: keyutils-1.5.9-r1.ebuild Log: Enable multilib support, bug #505006. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.41 sys-apps/keyutils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/ChangeLog?rev=1.41&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/ChangeLog?rev=1.41&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/ChangeLog?r1=1.40&r2=1.41 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- ChangeLog 1 Mar 2014 04:44:51 -0000 1.40 +++ ChangeLog 14 May 2014 23:01:12 -0000 1.41 @@ -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 <mgo...@gentoo.org> +keyutils-1.5.9-r1.ebuild: + Enable multilib support, bug #505006. *keyutils-1.5.9 (01 Mar 2014) 1.1 sys-apps/keyutils/keyutils-1.5.9-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild?rev=1.1&content-type=text/plain Index: keyutils-1.5.9-r1.ebuild =================================================================== # 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 }
