[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

[Mike Frysinger]

commit:     83fea39722d9a5a51a8643dba2a946e74b0b2560
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 15:44:29 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri May 20 15:44:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83fea397

sys-apps/lshw: leverage usex to simplify code a bit

 sys-apps/lshw/lshw-02.17b-r2.ebuild | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.17b-r2.ebuild 
b/sys-apps/lshw/lshw-02.17b-r2.ebuild
index bf6c999..1318e27 100644
--- a/sys-apps/lshw/lshw-02.17b-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.17b-r2.ebuild
@@ -50,19 +50,13 @@ src_compile() {
        tc-export CC CXX AR
        use static && append-ldflags -static
 
-       local sqlite=$(usex sqlite 1 0)
-
-       emake SQLITE=$sqlite all
-       if use gtk ; then
-               emake SQLITE=$sqlite gui
-       fi
+       emake SQLITE=$(usex sqlite 1 0) all $(usex gtk 'gui' '')
 }
 
 src_install() {
-       emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+       emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 
'install-gui' '')
        dodoc README docs/*
        if use gtk ; then
-               emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui
                make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" 
"/usr/share/lshw/artwork/logo.svg"
        fi
 }