--- /usr/portage/dev-db/sqlite/sqlite-3.8.2.ebuild 2013-12-08 17:02:54.000000000 +0100 +++ dev-db/sqlite/sqlite-3.8.2.ebuild 2013-12-25 17:23:13.183787422 +0100 @@ -4,7 +4,7 @@ EAPI="5" -inherit autotools eutils flag-o-matic multilib versionator +inherit autotools eutils flag-o-matic multilib versionator multilib-minimal SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))" DOC_PV="${SRC_PV}" @@ -24,15 +24,19 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc icu +readline secure-delete static-libs tcl test" -RDEPEND="icu? ( dev-libs/icu:= ) - readline? ( sys-libs/readline ) - tcl? ( dev-lang/tcl:= )" +RDEPEND="icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) + readline? ( sys-libs/readline[${MULTILIB_USEDEP}] ) + tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20131008-r6 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" DEPEND="${RDEPEND} doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip - dev-lang/tcl + dev-lang/tcl[${MULTILIB_USEDEP}] )" amalgamation() { @@ -59,9 +63,11 @@ # At least ppc-aix, x86-interix and *-solaris need newer libtool. # use prefix && eautoreconf + + multilib_copy_sources } -src_configure() { +multilib_src_configure() { # `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag. if amalgamation; then if use debug; then @@ -133,11 +139,11 @@ $(amalgamation || echo --enable-tcl) } -src_compile() { +multilib_src_compile() { emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" } -src_test() { +multilib_src_test() { if [[ "${EUID}" -eq 0 ]]; then ewarn "Skipping tests due to root permissions" return @@ -146,10 +152,12 @@ emake $(use debug && echo fulltest || echo test) } -src_install() { +multilib_src_install() { emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install prune_libtool_files +} +multilib_src_install_all() { doman sqlite3.1 if use doc; then