Version bump. Migrates to qt4-r2.eclass. Respects LINGUAS. Tidies/fixes /usr/share installation. Bump to EAPI4. Minor other improvements. Thanks kensington bug #410157

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 108 insertions, 3 deletions

diff --git a/sci-visualization/zhu3d/ChangeLog b/sci-visualization/zhu3d/ChangeLog
index 83cca9994bc0..7f8ed0b3e5ad 100644
--- a/sci-visualization/zhu3d/ChangeLog
+++ b/sci-visualization/zhu3d/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/zhu3d
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/zhu3d/ChangeLog,v 1.18 2010/09/16 18:18:35 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/zhu3d/ChangeLog,v 1.19 2012/03/29 18:37:48 bicatali Exp $
+
+*zhu3d-4.2.4 (29 Mar 2012)
+
+  29 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +zhu3d-4.2.4.ebuild,
+  +files/zhu3d-4.2.4-gold.patch:
+  Version bump. Migrates to qt4-r2.eclass. Respects LINGUAS. Tidies/fixes
+  /usr/share installation. Bump to EAPI4. Minor other improvements. Thanks
+  kensington bug #410157
 
   16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> zhu3d-4.2.2.ebuild:
   virtual/glu -> virtual/opengl
diff --git a/sci-visualization/zhu3d/Manifest b/sci-visualization/zhu3d/Manifest
index cefac90203a4..2a5f2250463a 100644
--- a/sci-visualization/zhu3d/Manifest
+++ b/sci-visualization/zhu3d/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX zhu3d-4.2.4-gold.patch 286 RMD160 bf97da40375a3fe87e06f0786f0f1925d8aa11bb SHA1 bf4e01e72731d953cda4bb886825b7d72c001259 SHA256 5641b806a3666123ad79535400373eb4d0ca17d27965ee2b054e29b84cf07fb2
 DIST zhu3d-4.2.2.zip 7571623 RMD160 1e34c8490f7c1150125cf31d954b29a4fb80aa4c SHA1 79d2c811364fe6732cd9821397fdf07cfa570ed2 SHA256 dfc0a7ed18bff6763174f95c76dd027e5ee25149f252e1d59fbf9125f20e8b58
+DIST zhu3d-4.2.4.tar.gz 942827 RMD160 b4dfebcd6a8ee042776022a1120d8086ec781301 SHA1 c54e0f14a5d6ee99660626f7dbeb852c24af00b5 SHA256 bb40273b69c2b0b3aa295fd4d239cbda68cdc576d728b7ca0de3491e46e7f88f
 EBUILD zhu3d-4.2.2.ebuild 1323 RMD160 c2539b95ab52e9a171d8c352011e08dc65acfa99 SHA1 947e4c0b7b91981bebfa5791712f5b58ba94ac73 SHA256 16238f9f1614d2a1561c1cf2af1e1ae47cdf68b981e8b6c8e638d1bfb6691d3a
-MISC ChangeLog 2688 RMD160 decd889acbd14f4934d78c2a82029c050fb1d9a0 SHA1 70819ca0343dd4c17cd17ebee373e17ea31e656f SHA256 869900d63f76d9d7acd1c605210d32e8bf5fe1fe71c1697ecbc04508151721dc
+EBUILD zhu3d-4.2.4.ebuild 1772 RMD160 e0dc31729a06aafe032c907f4c3f45360a1b1a56 SHA1 be11e0f448ac098a684ce3cdb07b477055dff5e1 SHA256 07f78e0aa4b2c526a0e850aadc3c19c2a54c9d8643eedcb21953fd051df39ba4
+MISC ChangeLog 2999 RMD160 feae8fdcecb949fdcf789a32b2bd5bb815fe5abb SHA1 aad7aaf63dab88773b4243a02c2691ce5ed22e4a SHA256 e1202b5f5327a4d40449f528ac8f892973e9962052e8e8f6e35e856e639b26eb
 MISC metadata.xml 626 RMD160 e4b4b6bb1ffaabe89c4ab8fb3fb56481b06f53f6 SHA1 5c06fda3cd449a5bbe5c2cd185ca469468ac47d9 SHA256 e53cbaae0bd1770ab05ded6d02bc32fb9dfbb387f81efefc31469f8d35086e01
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk90rAQACgkQ1ycZbhPLE2DMSgCeLeWh25iJ3V7n/0sE3CrHs1h6
+FzQAoLOvnuIkXQzjB2fGdQXkefN/Z6Kz
+=5hrA
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/zhu3d/files/zhu3d-4.2.4-gold.patch b/sci-visualization/zhu3d/files/zhu3d-4.2.4-gold.patch
new file mode 100644
index 000000000000..64a6ad42b3d4
--- /dev/null
+++ b/sci-visualization/zhu3d/files/zhu3d-4.2.4-gold.patch
@@ -0,0 +1,11 @@
+--- zhu3d.pro
++++ zhu3d.pro
+@@ -48,7 +48,7 @@
+ CONFIG   += release

+ TARGET    = zhu3d

+ QT       += opengl

+-

++LIBS     += -lGLU

+ 

+ # ============================================================================

+ # Optimisation switches. For both GCC/ICC compilers -O3 is default.

diff --git a/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild
new file mode 100644
index 000000000000..86c95c6632ba
--- /dev/null
+++ b/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild,v 1.1 2012/03/29 18:37:48 bicatali Exp $
+
+EAPI=4
+LANGS="cs de es fr zh"
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Interactive 3D mathematical function viewer"
+HOMEPAGE="http://sourceforge.net/projects/zhu3d"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4"
+REPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gold.patch" )
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	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=:DOCDIR=/usr/share/doc/${PF}/html:" \
+		${PN}.pri || die "sed zhu3d.pri failed"
+
+	sed -i -e "/# Optimisation/,/# Include/d" zhu3d.pro \
+		|| die "optimisation sed failed"
+}
+
+src_install() {
+	# not working: emake install INSTALL_ROOT="${D}" || die
+	dobin zhu3d
+
+	dodoc {readme,src/changelog}.txt
+	dohtml doc/*.png doc/${PN}_en.html
+
+	local lang
+	for lang in ${LANGS} ; do
+		if use linguas_${lang} ; then
+
+			insinto /usr/share/${PN}/system/languages
+			doins system/languages/${PN}_${lang}.qm
+
+			if [ -e doc/${PN}_${lang}.html ] ; then
+				dohtml doc/${PN}_${lang}.html
+			fi
+		fi
+	done
+
+	insinto /usr/share/${PN}
+	doins -r work/textures
+
+	insinto /usr/share/${PN}/work
+	doins -r work/*.zhu work/slideshow
+
+	insinto /usr/share/${PN}/system
+	doins -r system/*.zhu system/icons
+
+	doicon system/icons/${PN}.png
+	make_desktop_entry ${PN} "Zhu3D Function Viewer" ${PN} "Education;Science;Math;Qt"
+}