Version bump and fix bug #248387

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 23 insertions, 79 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/Manifest b/sci-visualization/zhu3d/Manifest
index b230eb89da4c..e549b940a991 100644
--- a/sci-visualization/zhu3d/Manifest
+++ b/sci-visualization/zhu3d/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST zhu3d-4.1.2.tar.gz 895727 RMD160 7616b51b37dbe47539dac2f72fb066511d27924f SHA1 5fc3a44f86cee6f4da1853f7910f03e76459da19 SHA256 029cce39bfc9346a2113b31feb4586fdea2498da707bb35003cee37ce39b423f
-DIST zhu3d-4.1.6.tar.gz 907815 RMD160 2dbd0015ff0d894ba576a5b0e6a7748a877fac16 SHA1 05d3519ba26e5204b5dc744e6fbb32a914716ca9 SHA256 c5692a87c98f58461187a6da3b7deb6a91ff5c1fad9a06d379904d950c9638a3
-EBUILD zhu3d-4.1.2.ebuild 1340 RMD160 3428fe170f40fe7256e9b3706b7d8261bc73dc8d SHA1 d2fdd7c0487aa350b6c0643cd9c6680b7971d4ed SHA256 9ebd57e8448eb457843346736e664e103222c4d985290c74bbfead388bd75ffd
-EBUILD zhu3d-4.1.6.ebuild 1370 RMD160 7dd2854015c73f1f63ab8406f2c8fd1cbd5b1c6a SHA1 67f776b7c001250161f4873e6a86c62110947726 SHA256 4ee1157d39ccaac8259018fa7d89dfa04f036aaf322cebcb76e9014e5121ce90
-MISC ChangeLog 1566 RMD160 97dded5883632eb6eaaeda5c0315a44f17eed814 SHA1 f82947b0219179fcceae61a6d7dbea8ffae7dfd6 SHA256 042cd592441eb47d818fb5b5a906d97a7e2c07f8c98040ae5cb9ad3c99542032
+DIST zhu3d-4.1.8.tar.gz 912556 RMD160 d90745d7bd9a92e95bf6b01098a6fb58d72d793b SHA1 64c5c808a6402a572a768638daf16ab6d8da0dc2 SHA256 973540704e87ede45d0a7ce7cd1b7905eb87a0e7b5b97d6d0cb3a746a1ed4dd1
+EBUILD zhu3d-4.1.8.ebuild 1264 RMD160 0c7b902dea0a2fc0a82d257314660c303fbd3d9a SHA1 de853b16d7da7c31c25db9b609c083aa01b0e5a4 SHA256 520de141c10e9b86081cd2c16f5d5c2d2e1e33c1036960f491e7ee1d053686c4
+MISC ChangeLog 1751 RMD160 efc0e05f7407f8bc1df565d492f76fdd217222d8 SHA1 ab73641c34f0e412893aab3b2c0f87e8b1de0a59 SHA256 19552aac1eaf2328ac3d7180c0506f5dc52eaf528179d915888c738d546dc3e5
 MISC metadata.xml 626 RMD160 e4b4b6bb1ffaabe89c4ab8fb3fb56481b06f53f6 SHA1 5c06fda3cd449a5bbe5c2cd185ca469468ac47d9 SHA256 e53cbaae0bd1770ab05ded6d02bc32fb9dfbb387f81efefc31469f8d35086e01
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkqmYMACgkQ1ycZbhPLE2CYcACfQjwNjYSui4/9RL0eLy1Q86V2
-ViIAnjH+6cwcStA8ZqqFvaMRSDajOliK
-=0O3L
+iEYEARECAAYFAkmBkF0ACgkQ1ycZbhPLE2AWhACgmhO/UGOgYtZceYJkEeH4gJqu
+swIAniRe4IikXIUmEZWSwNU+QYb6d6VC
+=/TTE
 -----END PGP SIGNATURE-----
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() {