Version bump; use eqmake4 and pkg_setup from qt4 eclass

svn path=/sunrise/; revision=4370

diff --git a/sci-visualization/zhu3d/ChangeLog b/sci-visualization/zhu3d/ChangeLog
index fb49d18fa726e8bb78d7e882dd5e222286ec49c7..e0fb8712b04c75df0421080c739a40a6f7628d67 100644 (file)
--- a/sci-visualization/zhu3d/ChangeLog
+++ b/sci-visualization/zhu3d/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Aug 2007; Jakub Moc <jakub@gentoo.org> +zhu3d-2.9.8.ebuild,
+  -zhu3d-2.3.ebuild:
+  Version bump; use eqmake4 and pkg_setup from qt4 eclass
+
   01 Jul 2007; Jakub Moc <jakub@gentoo.org> zhu3d-2.3.ebuild:
   Use full path to qmake
 

diff --git a/sci-visualization/zhu3d/Manifest b/sci-visualization/zhu3d/Manifest
index f6cda4eea833e557dc2993b9997045ffc8e18192..5a29e5610d6a1e80cdac1a09a7d9343013ef22cc 100644 (file)
--- a/sci-visualization/zhu3d/Manifest
+++ b/sci-visualization/zhu3d/Manifest
@@ -1,4 +1,4 @@
-DIST 43071-zhu3d-2.3.tar.gz 756961 RMD160 9d9e0e60628787d1eac85c6792fc039cf9d97765 SHA1 56cada0d376a95e10b7c8c776bcf3246971573b3 SHA256 51627dbff0396fd2ee97aab723ea02ea9e6c14fe95138916e70eeef9fd764e45
-EBUILD zhu3d-2.3.ebuild 1120 RMD160 3d151c49b89499f12db9251297918dbe5d8206b9 SHA1 58d223be52d8cd2cab300756e1e3251ea57d8073 SHA256 dca571a7a218a01ebdb842fc4f69b2427d04d470f2a7bde63aff0a13326efddb
-MISC ChangeLog 1571 RMD160 06b21e6154742cb092b0529feffb8172df805f49 SHA1 e432442c2231b20599c612ad3b845c94fec0351c SHA256 9ceeba93289a76e0a52064b73a13c40d895c29ebf6013234c7e9416215bdd566
+DIST 43071-zhu3d-2.9.8.tar.gz 766039 RMD160 9f717c80bc247d132c1f5b8d164e8666357a9714 SHA1 a4b1ac793aafca70ea6bcb22052582975d27cccc SHA256 e43eac79baead93d66f2f900a3e4b1ebace736e9be0ca1af9606c4f895ac2628
+EBUILD zhu3d-2.9.8.ebuild 957 RMD160 28e5ac6251378c7d2ef8bcdc941c16100f00e983 SHA1 58bd24c59ab61ca5277063890fd08308fb2146ef SHA256 50fbd9a77e6d2a015d76cb78a4026992d36f97f9d6ebcd10cef5c0237634b7b3
+MISC ChangeLog 1716 RMD160 a817861154c6c38c7da1ecefacca3d374e02efdb SHA1 b219a81bcc4608976b956491d307712e9be76a6d SHA256 3cb3a225ae99a1af24e429240cedf08e6df5a9d4bc28945b7c8e185b1df47a9d
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/sci-visualization/zhu3d/zhu3d-2.3.ebuild b/sci-visualization/zhu3d/zhu3d-2.9.8.ebuild
similarity index 67%
rename from sci-visualization/zhu3d/zhu3d-2.3.ebuild
rename to sci-visualization/zhu3d/zhu3d-2.9.8.ebuild
index 30988d2b0ecaa93675e6497451b1513c05950578..af96d06990059c669004e3ff7ff2da1dbe781d2f 100644 (file)
--- a/sci-visualization/zhu3d/zhu3d-2.3.ebuild
+++ b/sci-visualization/zhu3d/zhu3d-2.9.8.ebuild
@@ -8,7 +8,7 @@ KEYWORDS="~x86"
 
 DESCRIPTION="View and animate up to three functions in 3D-space in a completely interactive manner."
 HOMEPAGE="http://www.kde-apps.org/content/show.php?content=43071"
-SRC_URI="http://www.kde-apps.org/content/files/43071-zhu3d-${PV}.tar.gz"
+SRC_URI="http://www.kde-apps.org/CONTENT/content-files/43071-zhu3d-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
@@ -16,16 +16,10 @@ IUSE=""
 DEPEND="$(qt4_min_version 4.0)
                virtual/glu"
 RDEPEND="${DEPEND}"
-
-pkg_setup() {
-       if ! built_with_use ">=x11-libs/qt-4.0" opengl; then
-               eerror "x11-libs/qt-4* has to be built with opengl support"
-               die "Missing opengl USE flag for x11-libs/qt"
-       fi
-}
+QT4_BUILT_WITH_USE_CHECK="opengl"
 
 src_compile() {
-       /usr/bin/qmake SYSDIR="/usr/share/${PN}/system" DOCDIR="/usr/share/doc/${P}/html" || die "qmake failed"
+       eqmake4 ${PN}.pro SYSDIR="/usr/share/${PN}/system" DOCDIR="/usr/share/doc/${P}/html"
        emake CXX=$(tc-getCXX) || die "emake failed"
 }
 
@@ -33,7 +27,6 @@ src_install() {
        dobin zhu3d
 
        dodoc readme.txt
-
        dohtml doc/*
 
        insinto /usr/share/${PN}