Version bump and fix bug #248387

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 17 insertions, 71 deletions

diff --git a/sci-visualization/zhu3d/ChangeLog b/sci-visualization/zhu3d/ChangeLog
index 3a8554716c66..84ba6a80a2c5 100644
--- a/sci-visualization/zhu3d/ChangeLog
+++ b/sci-visualization/zhu3d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/zhu3d
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/zhu3d/ChangeLog,v 1.9 2008/11/24 12:09:27 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/zhu3d/ChangeLog,v 1.10 2009/01/29 11:17:40 bicatali Exp $
+
+*zhu3d-4.1.8 (29 Jan 2009)
+
+  29 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> -zhu3d-4.1.2.ebuild,
+  -zhu3d-4.1.6.ebuild, +zhu3d-4.1.8.ebuild:
+  Version bump and fix bug #248387
 
 *zhu3d-4.1.6 (24 Nov 2008)
 
diff --git a/sci-visualization/zhu3d/zhu3d-4.1.2.ebuild b/sci-visualization/zhu3d/zhu3d-4.1.2.ebuild
deleted file mode 100644
index e4f34adf49f0..000000000000
--- a/sci-visualization/zhu3d/zhu3d-4.1.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/zhu3d/zhu3d-4.1.2.ebuild,v 1.1 2008/08/30 16:26:19 bicatali Exp $
-
-EAPI=1
-
-inherit eutils qt4
-
-DESCRIPTION="Interactive 3D mathematical function viewer"
-HOMEPAGE="http://sourceforge.net/projects/zhu3d"
-LICENSE="GPL-2"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 )
-		=x11-libs/qt-4.3*:4 )
-		virtual/glu"
-DEPEND="${RDEPEND}"
-
-QT4_BUILT_WITH_USE_CHECK="opengl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	local datadir=/usr/share/${PN}
-	sed -i \
-		-e "s:^SYSDIR=:SYSDIR=${datadir}/system:" \
-		-e "s:^TEXDIR=:TEXDIR=${datadir}/textures:" \
-		-e "s:^WORKDIR=:WORKDIR=${datadir}/work:" \
-		-e "s:^DOCDIR=:WORKDIR=/usr/share/doc/${PF}/html:" \
-		${PN}.pri || die "sed zhu3d.pri failed"
-}
-
-src_compile() {
-	eqmake4 || die "eqmake4 failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	# not working: emake install INSTALL_ROOT="${D}"
-	dobin zhu3d || die
-
-	dodoc {readme,src/changelog}.txt || die
-	dohtml doc/* || die
-
-	insinto /usr/share/${PN}
-	doins -r work system || die
-
-	doicon system/icons/${PN}.png || die
-	make_desktop_entry ${PN} Zhu3D ${PN} \
-		"Education;Science;Math;Qt"
-}
diff --git a/sci-visualization/zhu3d/zhu3d-4.1.6.ebuild b/sci-visualization/zhu3d/zhu3d-4.1.8.ebuild
index 0bea417153fd..b6344b864b04 100644
--- a/sci-visualization/zhu3d/zhu3d-4.1.6.ebuild
+++ b/sci-visualization/zhu3d/zhu3d-4.1.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/zhu3d/zhu3d-4.1.6.ebuild,v 1.1 2008/11/24 12:09:27 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/zhu3d/zhu3d-4.1.8.ebuild,v 1.1 2009/01/29 11:17:40 bicatali Exp $
 
-EAPI=1
+EAPI=2
 
 inherit eutils qt4
 
@@ -16,15 +16,12 @@ IUSE=""
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
-RDEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) >=x11-libs/qt-4.3:4 )
-		virtual/glu"
+RDEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 )
+		x11-libs/qt:4[opengl] )
+	virtual/glu"
 DEPEND="${RDEPEND}"
 
-QT4_BUILT_WITH_USE_CHECK="opengl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	local datadir=/usr/share/${PN}
 	sed -i \
 		-e "s:^SYSDIR=:SYSDIR=${datadir}/system:" \
@@ -34,9 +31,8 @@ src_unpack() {
 		${PN}.pri || die "sed zhu3d.pri failed"
 }
 
-src_compile() {
-	eqmake4 || die "eqmake4 failed"
-	emake || die "emake failed"
+src_configure() {
+	eqmake4
 }
 
 src_install() {