x11-libs/libqglviewer: Some minor improvements

[~andy/sunrise] / x11-libs / libqglviewer / libqglviewer-2.3.1.ebuild

diff --git a/x11-libs/libqglviewer/libqglviewer-2.3.1.ebuild b/x11-libs/libqglviewer/libqglviewer-2.3.1.ebuild
index 210c794920148a60c5c9a2fa4b2a39b8f4d71822..c5f129924eed49f03bd3b64387c79be477704402 100644 (file)
--- a/x11-libs/libqglviewer/libqglviewer-2.3.1.ebuild
+++ b/x11-libs/libqglviewer/libqglviewer-2.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit kde-functions qt4
+inherit qt4
 
 MY_P="libQGLViewer-"${PV}
 
@@ -15,37 +15,33 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND="virtual/opengl
+DEPEND="virtual/opengl
        >=x11-libs/qt-4.3"
 
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}/QGLViewer
 
 src_compile() {
-       set-qtdir 4
-       cd QGLViewer
-       eqmake4 QGLViewer.pro -o Makefile \
-               PREFIX=/usr || die "qmake QGLViewer failed"
+       eqmake4 QGLViewer.pro -o Makefile PREFIX=/usr
        emake || die "emake QGLViewer failed"
 
        cd ../designerPlugin
        eqmake4 designerPlugin.pro -o Makefile \
                INCLUDE_DIR=.. \
-               LIB_DIR=../QGLViewer || die "qmake designerPlugin failed"
+               LIB_DIR=../QGLViewer
        emake || die "emake designerPlugin failed"
 }
 
 src_install() {
-       cd QGLViewer
        INSTALL_ROOT="${D}" emake install_target install_include || die "install QGLViewer failed"
 
        cd ../designerPlugin
        INSTALL_ROOT="${D}" emake install_target || die "install QGLViewer failed"
 
-       dodoc ../README
+       dodoc ../README || die "installing README failed"
 
        if use doc ; then
-               dohtml -r ../doc/*
+               dohtml -r ../doc/* || die "installing html files failed"
                insinto /usr/share/doc/${PF}
-               doins -r ../examples
+               doins -r ../examples || die "installing examples failed"
        fi
 }