--- dracut-033-r1.ebuild 2013-09-25 22:31:38.000000000 +0100 +++ dracut-033-r2.ebuild 2013-09-30 11:42:23.900904597 +0100 @@ -4,7 +4,7 @@ EAPI=4 -inherit bash-completion-r1 eutils linux-info multilib systemd +inherit bash-completion-r1 eutils linux-info systemd add_req_use_for() { local dep="$1"; shift @@ -112,6 +112,7 @@ DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules README.testsuite TODO ) +MY_LIBDIR="/usr/lib" # # Helper functions @@ -171,7 +172,7 @@ } src_configure() { - local myconf="--libdir='/usr/$(get_libdir)'" + local myconf="--libdir='${MY_LIBDIR}'" myconf+=" --bashcompletiondir=$(get_bashcompdir)" if use dracut_modules_systemd; then @@ -189,8 +190,13 @@ src_install() { default - local my_libdir="/usr/$(get_libdir)" - local dracutlibdir="${my_libdir#/}/dracut" + local dracutlibdir="${MY_LIBDIR#/}/dracut" + + # fix multilib-strict properly (non-symlinked /usr/lib should not contain + # executable binaries) + exeinto /usr/sbin + doexe install/dracut-install + rm -f ${D%/}/${dracutlibdir}/dracut-install echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"