--- /usr/portage/sys-apps/acl/acl-2.2.52.ebuild 2013-12-23 09:01:32.000000000 +0100 +++ /usr/portage/sys-apps/acl/acl-2.2.52.ebuild 2014-01-04 13:41:31.918615474 +0100 @@ -4,7 +4,7 @@ EAPI="4" -inherit eutils toolchain-funcs +inherit eutils toolchain-funcs multilib-minimal DESCRIPTION="access control list utilities, libraries and headers" HOMEPAGE="http://savannah.nongnu.org/projects/acl" @@ -15,9 +15,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux" IUSE="nls static-libs" -RDEPEND=">=sys-apps/attr-2.4" +RDEPEND=">=sys-apps/attr-2.4[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) + abi_x86_32? ( + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + !<=app-emulation/emul-linux-x86-baselibs-20131008-r8 + )" src_prepare() { sed -i \ @@ -26,9 +30,12 @@ include/builddefs.in \ || die strip-linguas po + + # same as https://savannah.nongnu.org/bugs/index.php?39736 + multilib_copy_sources } -src_configure() { +multilib_src_configure() { unset PLATFORM #184564 export OPTIMIZER=${CFLAGS} export DEBUG=-DNDEBUG @@ -40,10 +47,13 @@ --bindir="${EPREFIX}"/bin } -src_install() { - emake DIST_ROOT="${D}" install install-dev install-lib || die - use static-libs || find "${ED}" -name '*.la' -delete +multilib_src_install() { + emake DIST_ROOT="${D}" install install-dev install-lib # move shared libs to / - gen_usr_ldscript -a acl + multilib_build_binaries && gen_usr_ldscript -a acl +} + +multilib_src_install_all() { + use static-libs || prune_libtool_files --all }