public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/zhu3d/
@ 2017-12-08 20:39 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2017-12-08 20:39 UTC (permalink / raw
  To: gentoo-commits

commit:     207abf03d48ca06c4f98739199454a5ff9813552
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  8 20:28:56 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Dec  8 20:28:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=207abf03

sci-visualization/zhu3d: x86 stable (bug #608260)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sci-visualization/zhu3d/zhu3d-4.2.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/zhu3d/zhu3d-4.2.6.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.6.ebuild
index d7c48e1a7d1..21f3efb2720 100644
--- a/sci-visualization/zhu3d/zhu3d-4.2.6.ebuild
+++ b/sci-visualization/zhu3d/zhu3d-4.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/zhu3d/
@ 2018-01-09  0:39 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-01-09  0:39 UTC (permalink / raw
  To: gentoo-commits

commit:     4aa960f27b88669b95e16f3009155e53747acd4b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 00:30:30 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 00:38:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aa960f2

sci-visualization/zhu3d: Drop old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-visualization/zhu3d/Manifest           |  1 -
 sci-visualization/zhu3d/zhu3d-4.2.4.ebuild | 76 ------------------------------
 2 files changed, 77 deletions(-)

diff --git a/sci-visualization/zhu3d/Manifest b/sci-visualization/zhu3d/Manifest
index 6f0ad0f808c..219446e875e 100644
--- a/sci-visualization/zhu3d/Manifest
+++ b/sci-visualization/zhu3d/Manifest
@@ -1,2 +1 @@
-DIST zhu3d-4.2.4.tar.gz 942827 BLAKE2B b6ee693e2f90e34039aa4391e4fc4a6ad9da0f7a139f49134551845c5038a90fb663bc40ce3aea1141cce75c6cba18545557bbe61c16782837bb9e068d3fa1e1 SHA512 7b38fa8da837d0f64ca32face6fe9e1d7d97893c13c3f91bce93c712914dc0ce163137e091423135080c1b1219ebed435ef7dbab3a74edf26c133d7ddb1c6c1e
 DIST zhu3d-4.2.6.tar.gz 953395 BLAKE2B 0ef7fdb18718266fdbee56f202a67f637088519ed1a3e7bd00b085acff630af6b56df25d7e8485879fbd478f57294c2c9feb6a1396a10c9ce6d4f437b824c74c SHA512 105c68e0bfff7b2dbb71d3ed713033e82a729db7d3d8f6e3de038ced53db0829e0b0b146e6b042d954983af830c6834921be58d72bde90012461047d5d99dfd1

diff --git a/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild
deleted file mode 100644
index eabd53772ce..00000000000
--- a/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-LANGS="cs de es fr zh"
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Interactive 3D mathematical function viewer"
-HOMEPAGE="https://sourceforge.net/projects/zhu3d"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	virtual/glu
-	virtual/opengl
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-gold.patch" )
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	local datadir=/usr/share/${PN}
-	sed \
-		-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:" \
-		-i ${PN}.pri || die "sed zhu3d.pri failed"
-
-	sed \
-		-e "/# Optimisation/,/# Include/d" \
-		-i 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"
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/zhu3d/
@ 2018-01-09  1:11 Ulrich Müller
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2018-01-09  1:11 UTC (permalink / raw
  To: gentoo-commits

commit:     5c5fb385de94eda4cadb2ca5b4c079752ad6e625
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 01:10:03 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 01:10:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5fb385

sci-visualization/zhu3d: Migrate from LINGUAS to L10N.

Call explicit dodoc rather than einstalldocs, in order to be selective
on languages. Replace dohtml by insinto and dodoc.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
index bbd09ac9b8e..ac1712166ff 100644
--- a/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
+++ b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
@@ -12,7 +12,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+
+LANGS=(cs de es fr zh)
+IUSE="${LANGS[@]/#/l10n_}"
 
 DEPEND="
 	dev-qt/qtcore:5
@@ -25,9 +27,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( {readme,src/changelog}.txt )
-HTML_DOCS=( doc/. )
-
 PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
 
 src_prepare() {
@@ -54,18 +53,17 @@ src_install() {
 	# not working: emake install INSTALL_ROOT="${D}" || die
 	dobin zhu3d
 
-	einstalldocs
+	dodoc readme.txt src/changelog.txt
 
-	local lang
-	for lang in ${LANGS} ; do
-		if use linguas_${lang} ; then
+	docinto html
+	dodoc doc/*.png doc/${PN}_en.html
 
-			insinto /usr/share/${PN}/system/languages
+	local lang
+	insinto /usr/share/${PN}/system/languages
+	for lang in "${LANGS[@]}" ; do
+		if use l10n_${lang} ; then
 			doins system/languages/${PN}_${lang}.qm
-
-			if [ -e doc/${PN}_${lang}.html ] ; then
-				dohtml doc/${PN}_${lang}.html
-			fi
+			[[ -e doc/${PN}_${lang}.html ]] && dodoc doc/${PN}_${lang}.html
 		fi
 	done
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/zhu3d/
@ 2018-01-09  2:35 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-01-09  2:35 UTC (permalink / raw
  To: gentoo-commits

commit:     31831e9aa81c162e07ef15270da5056a2256e64b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 02:34:53 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 02:34:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31831e9a

sci-visualization/zhu3d: Run eqmake5 in src_configure

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
index ac1712166ff..8704bda7f1f 100644
--- a/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
+++ b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
@@ -43,9 +43,7 @@ src_prepare() {
 	sed \
 		-e "/# Optimisation/,/# Include/d" \
 		-i ${PN}.pro || die "optimisation sed failed"
-}
 
-src_configure() {
 	eqmake5 zhu3d.pro
 }
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/zhu3d/
@ 2018-01-09 15:51 Ulrich Müller
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2018-01-09 15:51 UTC (permalink / raw
  To: gentoo-commits

commit:     6394e926e5a6b85b6bf7f6f823bbc7348c1bd6b8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 14:52:39 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 15:37:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6394e926

sci-visualization/zhu3d: Add linguas_* as local USE flags.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-visualization/zhu3d/metadata.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-visualization/zhu3d/metadata.xml b/sci-visualization/zhu3d/metadata.xml
index cc3c6e1d3cb..e07884452af 100644
--- a/sci-visualization/zhu3d/metadata.xml
+++ b/sci-visualization/zhu3d/metadata.xml
@@ -12,8 +12,15 @@
   random search. The OpenGL-viewer supports zooming, scaling, rotating
   and translating as well as filed lightning or surface properties.
   Special effects are transparency, textures, fog and motion blur.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="sourceforge">zhu3d</remote-id>
   </upstream>
+  <use>
+    <flag name="linguas_cs">Czech locale</flag>
+    <flag name="linguas_de">German locale</flag>
+    <flag name="linguas_es">Spanish locale</flag>
+    <flag name="linguas_fr">French locale</flag>
+    <flag name="linguas_zh">Chinese locale</flag>
+  </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/zhu3d/
@ 2020-05-21  9:17 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-05-21  9:17 UTC (permalink / raw
  To: gentoo-commits

commit:     28368e30a2933572602e61a152050c895aac438c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 21 09:10:33 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 21 09:17:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28368e30

sci-visualization/zhu3d: EAPI-7 bump

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
index e20dc4f875c..abb07c87530 100644
--- a/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
+++ b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit desktop qmake-utils
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-05-21  9:17 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-09  2:35 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/zhu3d/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2020-05-21  9:17 Andreas Sturmlechner
2018-01-09 15:51 Ulrich Müller
2018-01-09  1:11 Ulrich Müller
2018-01-09  0:39 Andreas Sturmlechner
2017-12-08 20:39 Thomas Deutschmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox