x11-libs/libqglviewer: Some minor improvements

svn path=/sunrise/; revision=7347

diff --git a/x11-libs/libqglviewer/ChangeLog b/x11-libs/libqglviewer/ChangeLog
index 01490d622f53885825d97b6950f129b97825bdf8..ebf1d8b77daa35b496a7e67043c41a3751f21868 100644 (file)
--- a/x11-libs/libqglviewer/ChangeLog
+++ b/x11-libs/libqglviewer/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Nov 2008; Oliver Borm (boroli) <oli.borm@web.de>
+  libqglviewer-2.3.1.ebuild:
+  Some minor improvements
+
   13 Nov 2008; Oliver Borm (boroli) <oli.borm@web.de>
   +libqglviewer-2.3.1.ebuild, +metadata.xml:
   New ebuild for bug 53167, thanks to scarabeus

diff --git a/x11-libs/libqglviewer/Manifest b/x11-libs/libqglviewer/Manifest
index 07ec33eacd47a6b3e2630987c7ab27ccb15d50c0..305545e2ff59443f61f3fd8e9035eba2e4bcfaed 100644 (file)
--- a/x11-libs/libqglviewer/Manifest
+++ b/x11-libs/libqglviewer/Manifest
@@ -1,4 +1,4 @@
 DIST libQGLViewer-2.3.1.tar.gz 2142397 RMD160 46148dfe90d828f1f68d3cb7400767558c8f6943 SHA1 08d86c8eebe796e3bb548bfbd1dee66038d45629 SHA256 120b61aac0ecc03f208f56d171b53bc9ab177d0d0a06a67eab23759836e11f98
-EBUILD libqglviewer-2.3.1.ebuild 1161 RMD160 bf8d1f482d015e3fa6123dd205bd3a6c52a8d526 SHA1 09d64c5b8d08978ca29e6518bebc7701f9328ea4 SHA256 e09e636eae39d80ece7eefb678d33917a9166b6f19c2c9ef435088c3eceea7d7
-MISC ChangeLog 270 RMD160 5155f41368e1d19136cffd2531fabfc2ed3d8d62 SHA1 ecddd55188e74a64aa3590c64b9ddc5b154667a6 SHA256 40a4c1ec7cf6e99134046cec47939876a5cef928890ddba6a4937ac43a381265
+EBUILD libqglviewer-2.3.1.ebuild 1148 RMD160 2cd1ed66a1747751c9769a840497fde7221b1b69 SHA1 8cc6bbf5d7d94b8935534a0cae848bb4d9f9f7a6 SHA256 bc1c2f3c20b2c42067a05116d385d406e62b75af04c2ccc886be1aea3afbde19
+MISC ChangeLog 380 RMD160 1b46e24a9a61aeb5e0036865ed41a96ae1a0002e SHA1 dc569716e622a2e8463d5aa6a2474054093dca12 SHA256 a6a750462e0f8392204498af620f30bf3d498da8a715f3736cf99d3f02173344
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

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
 }