gentoo resync : 19.01.2018

4 files changed, 1 insertions, 98 deletions

diff --git a/sci-visualization/zhu3d/Manifest b/sci-visualization/zhu3d/Manifest
index df4e743d3fe1..728071b7abb8 100644
--- a/sci-visualization/zhu3d/Manifest
+++ b/sci-visualization/zhu3d/Manifest
@@ -1,6 +1,4 @@
-AUX zhu3d-4.2.4-gold.patch 286 BLAKE2B bb94d4a2597203eb95bf4780db39e15fed9b1a3a31ef540122e8340fd782d0f2c788854beccd6136c230240ff971c162b4a0e3e204042285a08eb33e1fba440b SHA512 85b25013ee480b9a2a5e50a19cc7edad95ad9d01de2b92fb6b71b57d9ffbaba0db3a07a3665bed30ec3af53b9794fe51b40f393aa2663892daf22620883dbc50
 AUX zhu3d-4.2.6-qt5.patch 6547 BLAKE2B acbe896190b365238c29ff9b831ebaf743e4a58ef027b5ceb70fd285a06b86dcd8e0d73773dc18864291922f69bc1bdebdcb4710f6138ce788d8280560817ddf SHA512 77e2049483385921ff3e535d0174d820845566d3e5a3ee9c63fac034c3b4c17c5df067e6ba41d4e0111ebc4eefcfe01299e0bf48ee20aa1e26b134b1386c626b
 DIST zhu3d-4.2.6.tar.gz 953395 BLAKE2B 0ef7fdb18718266fdbee56f202a67f637088519ed1a3e7bd00b085acff630af6b56df25d7e8485879fbd478f57294c2c9feb6a1396a10c9ce6d4f437b824c74c SHA512 105c68e0bfff7b2dbb71d3ed713033e82a729db7d3d8f6e3de038ced53db0829e0b0b146e6b042d954983af830c6834921be58d72bde90012461047d5d99dfd1
 EBUILD zhu3d-4.2.6-r1.ebuild 1771 BLAKE2B 0cadd90a050433c417ced829637df0ba5a24a649f339dc6f77cdfbec146cb56ae400c9ac0700efcf78b477abdd84e62bfd963490b966837b7a9866eaf58b9ed0 SHA512 add73a1524baf370ff00e0314dc5b5a1c3452be43fe7bf907497981f393358564fb15e7c5622ebc41e72bf82b8ca08548f3e95eb8c9ce9e81e3ad321acba798b
-EBUILD zhu3d-4.2.6.ebuild 1699 BLAKE2B 555739ead128948e87fd32284826a0ef9edad09b9daebef29fe34df7d696f3afc9afa11af34a4ecdb4674f571cf8e2ecff8860fb8872975cadb230c8d179bd0d SHA512 cf992943b63b9085fc820e183e3123e131345f8796478af745cea9fe088e7a3fc0e2a5d1d182e611e956da79647418d0b01d1d022f0890b5c2fe7ba56f9c10ad
-MISC metadata.xml 1079 BLAKE2B 827123ad86ecb2ba035fb9d7d761368e08119dc6062b2459700f07afca50b98fe37582217182f56baa60f93fe203042c5850e917c8520b03233d444f1f996f75 SHA512 e2dc5d4280f984fda378812a03ccda688f99a0dfe70d3ec50ee080a6cf32f66cd2ab2c99ec6c41b95f3282fb302839b13e8caa0785961ba2f6445fbbd36c01ac
+MISC metadata.xml 816 BLAKE2B d117901e2ca6fc6461aa41c56453da30f7e68b8d3c409e6d618ed6bcbb92a72453afee572de822f09038f492c7ea8b9ef7020cd08ce7375301f82316ed5a83c1 SHA512 361ff45d40fadfd080b0d77def6581fd9efa8ff5d3aee9b09c0a650fa6c65af426dc0af215b99f956abbf76baff9c82c2d6bbf1df805591f2b4b57fb9312709e
diff --git a/sci-visualization/zhu3d/files/zhu3d-4.2.4-gold.patch b/sci-visualization/zhu3d/files/zhu3d-4.2.4-gold.patch
deleted file mode 100644
index 64a6ad42b3d4..000000000000
--- a/sci-visualization/zhu3d/files/zhu3d-4.2.4-gold.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/metadata.xml b/sci-visualization/zhu3d/metadata.xml
index e07884452afe..e112f3bfca7b 100644
--- a/sci-visualization/zhu3d/metadata.xml
+++ b/sci-visualization/zhu3d/metadata.xml
@@ -16,11 +16,4 @@
   <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>
diff --git a/sci-visualization/zhu3d/zhu3d-4.2.6.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.6.ebuild
deleted file mode 100644
index 3b66a050cc08..000000000000
--- a/sci-visualization/zhu3d/zhu3d-4.2.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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}"/${PN}-4.2.4-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"
-}