--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -, +, @@ --- dev-libs/libffi/libffi-3.0.12.ebuild +++ dev-libs/libffi/libffi-3.0.12-r1.ebuild @@ -6,7 +6,7 @@ MY_P=${P/_/-} -inherit eutils libtool multilib toolchain-funcs +inherit eutils libtool multilib toolchain-funcs autotools-multilib DESCRIPTION="a portable, high level programming interface to various calling conventions." HOMEPAGE="http://sourceware.org/libffi/" @@ -17,12 +17,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug pax_kernel static-libs test" -RDEPEND="" +RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20121202 )" DEPEND="test? ( dev-util/dejagnu )" S=${WORKDIR}/${MY_P} -DOCS="ChangeLog* README" +DOCS=( "${S}"/ChangeLog{,.libffi,.libgcj,.v1} "${S}"/README ) pkg_setup() { # Check for orphaned libffi, see http://bugs.gentoo.org/354903 for example @@ -45,15 +45,12 @@ src_configure() { use userland_BSD && export HOST="${CHOST}" - econf \ - $(use_enable static-libs static) \ - $(use_enable pax_kernel pax_emutramp) \ + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable pax_kernel pax_emutramp) $(use_enable debug) -} - -src_install() { - default - prune_libtool_files + ) + autotools-multilib_src_configure } pkg_preinst() {