[gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/

[Patrice Clement]

commit:     9b1cdc9741e6a0950bd9690aed3a40db19e72f86
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Thu Jan 14 15:04:36 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 15:04:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b1cdc97

media-gfx/librecad: cleanup

 media-gfx/librecad/librecad-2.0.9.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/media-gfx/librecad/librecad-2.0.9.ebuild 
b/media-gfx/librecad/librecad-2.0.9.ebuild
index 01275c7..fb31be3 100644
--- a/media-gfx/librecad/librecad-2.0.9.ebuild
+++ b/media-gfx/librecad/librecad-2.0.9.ebuild
@@ -42,12 +42,13 @@ S="${WORKDIR}/LibreCAD-${PV}"
 
 src_prepare() {
        # currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
-       use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+       if ! use 3d; then
+               sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+       fi
 }
 
 src_configure() {
-       if use qt4
-       then
+       if use qt4; then
                eqmake4 -r
        else
                eqmake5 -r
@@ -59,9 +60,9 @@ src_install() {
        use tools && dobin unix/ttf2lff
        insinto /usr/share/${PN}
        doins -r unix/resources/*
-       use doc && dohtml -r librecad/support/doc/*
+       use doc && instinto html && dodoc -r librecad/support/doc/*
        insinto /usr/share/appdata
        doins unix/appdata/librecad.appdata.xml
-       doicon librecad/res/main/"${PN}".png
+       doicon librecad/res/main/${PN}.png
        make_desktop_entry ${PN} LibreCAD ${PN} Graphics
 }