[gentoo-commits] repo/gentoo:master commit in: sys-boot/vboot-utils/

[Zac Medico]

commit:     677fe97fc7adb186a371971c8f3c2d3d2fd07f8e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 04:21:47 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 04:22:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677fe97f

sys-boot/vboot-utils: fix 42_p20150219 /usr/usr prefix for bug 553924

Package-Manager: portage-2.2.20.1

 sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild 
b/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
index de2fbd2..2a6b0cd 100644
--- a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
+++ b/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
@@ -37,6 +37,8 @@ src_prepare() {
        epatch "${FILESDIR}"/${P}-cgpt-static.patch
        sed -i \
                -e 's: -Werror : :g' \
+               -e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \
+               -e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
                Makefile || die
 }
 
@@ -64,10 +66,7 @@ src_test() {
 }
 
 src_install() {
-       _emake DESTDIR="${ED}/usr" install
-       if ! use minimal ; then
-               rm -r "${ED}"/usr/default || die
-       fi
+       _emake DESTDIR="${ED}" install
 
        insinto /usr/share/vboot/devkeys
        doins tests/devkeys/*