gentoo resync : 10.01.2018

4 files changed, 244 insertions, 28 deletions

diff --git a/sci-visualization/zhu3d/Manifest b/sci-visualization/zhu3d/Manifest
index cd30a6672f19..df4e743d3fe1 100644
--- a/sci-visualization/zhu3d/Manifest
+++ b/sci-visualization/zhu3d/Manifest
@@ -1,6 +1,6 @@
 AUX zhu3d-4.2.4-gold.patch 286 BLAKE2B bb94d4a2597203eb95bf4780db39e15fed9b1a3a31ef540122e8340fd782d0f2c788854beccd6136c230240ff971c162b4a0e3e204042285a08eb33e1fba440b SHA512 85b25013ee480b9a2a5e50a19cc7edad95ad9d01de2b92fb6b71b57d9ffbaba0db3a07a3665bed30ec3af53b9794fe51b40f393aa2663892daf22620883dbc50
-DIST zhu3d-4.2.4.tar.gz 942827 BLAKE2B b6ee693e2f90e34039aa4391e4fc4a6ad9da0f7a139f49134551845c5038a90fb663bc40ce3aea1141cce75c6cba18545557bbe61c16782837bb9e068d3fa1e1 SHA512 7b38fa8da837d0f64ca32face6fe9e1d7d97893c13c3f91bce93c712914dc0ce163137e091423135080c1b1219ebed435ef7dbab3a74edf26c133d7ddb1c6c1e
+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.4.ebuild 1688 BLAKE2B 5cf6ac6aff4105ed9d32d0dc3cf46b38a41ee5cbc67db362cd4ca80b3bac215a7545b1390d5943c5cd2eefec46a2f33d7c286b00f8deba9f7be819da5fdc5b8f SHA512 d4211b40d38eef8b5b72cb8fa7c0d180ec6638bbdb2247383658ad89d60fb1128c0e9152bf3b101e3ce349e5e97a7d8fd721a0ffad46651d7e739cea6dc660d8
+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 814 BLAKE2B c4027db6bf8a5c7479bcc4e7b44ec47a119a17cd1a2e87ab6d37c34ea88fc04aa2a5f21958967e12002295f48d5d756296a55024dbb6db8e420a732a581bae44 SHA512 6444c71fc9c956d40342f4928b0d452ae4f60852b27b607fa2b67615e211842dffe1bb6d4694268411ff08b431e08a4f32e50d8d19e0c0654d296c6231b0062d
+MISC metadata.xml 1079 BLAKE2B 827123ad86ecb2ba035fb9d7d761368e08119dc6062b2459700f07afca50b98fe37582217182f56baa60f93fe203042c5850e917c8520b03233d444f1f996f75 SHA512 e2dc5d4280f984fda378812a03ccda688f99a0dfe70d3ec50ee080a6cf32f66cd2ab2c99ec6c41b95f3282fb302839b13e8caa0785961ba2f6445fbbd36c01ac
diff --git a/sci-visualization/zhu3d/files/zhu3d-4.2.6-qt5.patch b/sci-visualization/zhu3d/files/zhu3d-4.2.6-qt5.patch
new file mode 100644
index 000000000000..e1d956c8c079
--- /dev/null
+++ b/sci-visualization/zhu3d/files/zhu3d-4.2.6-qt5.patch
@@ -0,0 +1,205 @@
+From 4557d1111c030d9fa4449500b5624024abe9fc8a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 9 Jan 2018 01:01:01 +0100
+Subject: [PATCH 1/2] Initial port to Qt5
+
+---
+ src/legedit.cpp    | 14 +++++++-------
+ src/mainwindow.cpp |  2 +-
+ src/property.cpp   |  4 ++--
+ src/usredit.cpp    |  2 +-
+ zhu3d.pro          |  3 +--
+ 5 files changed, 12 insertions(+), 13 deletions(-)
+
+diff --git a/src/legedit.cpp b/src/legedit.cpp
+index b0f5b28..9ce44b0 100644
+--- a/src/legedit.cpp
++++ b/src/legedit.cpp
+@@ -89,13 +89,13 @@ void legWidget::createAxesTable() {
+ 	axesTable->setColumnCount(7);
+ 
+ 	axesTable->setHorizontalHeaderLabels(columnLabels);
+-	axesTable->horizontalHeader()->setResizeMode(0, QHeaderView::Interactive);
+-	axesTable->horizontalHeader()->setResizeMode(1, QHeaderView::Interactive);
+-	axesTable->horizontalHeader()->setResizeMode(2, QHeaderView::Fixed);
+-	axesTable->horizontalHeader()->setResizeMode(3, QHeaderView::Fixed);
+-	axesTable->horizontalHeader()->setResizeMode(4, QHeaderView::Fixed);
+-	axesTable->horizontalHeader()->setResizeMode(5, QHeaderView::Fixed);
+-	axesTable->horizontalHeader()->setResizeMode(6, QHeaderView::Fixed);
++	axesTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Interactive);
++	axesTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Interactive);
++	axesTable->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);
++	axesTable->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);
++	axesTable->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);
++	axesTable->horizontalHeader()->setSectionResizeMode(5, QHeaderView::Fixed);
++	axesTable->horizontalHeader()->setSectionResizeMode(6, QHeaderView::Fixed);
+ 	axesTable->verticalHeader()->show();
+ 	axesTable->setShowGrid(true);
+ 
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index 970f1bf..48d23af 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -1804,7 +1804,7 @@ void MaiWindow::benchmarkSlot() {
+ 	QMessageBox::information(
+ 		this,
+ 		tr("Benchmark"),
+-		result.toAscii().data()
++		result.toLatin1().data()
+ 		);
+ 
+ 	/** Restore and perform updates */
+diff --git a/src/property.cpp b/src/property.cpp
+index eff4442..99216d7 100644
+--- a/src/property.cpp
++++ b/src/property.cpp
+@@ -138,11 +138,11 @@ void iniITL() {
+  ** Copy a QString to a plain old character-string
+ ****************************************************************************/
+ void q2cstrcpy(char *str, const QString qstr) {
+-	strcpy(str, qstr.toAscii().data());
++	strcpy(str, qstr.toLatin1().data());
+ }
+ 
+ char *q2cstrcpy(const QString qstr) {
+-	return qstr.toAscii().data();
++	return qstr.toLatin1().data();
+ }
+ 
+ 
+diff --git a/src/usredit.cpp b/src/usredit.cpp
+index 18b58d5..6088906 100644
+--- a/src/usredit.cpp
++++ b/src/usredit.cpp
+@@ -128,7 +128,7 @@ void usrWidget::createUsrTable() {
+ 	QStringList columnLabel(tr("Item"));
+ 
+ 	usrTable->setHorizontalHeaderLabels(columnLabel);
+-	usrTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
++	usrTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
+ 	usrTable->verticalHeader()->show();
+ 	usrTable->setShowGrid(true);
+ 
+diff --git a/zhu3d.pro b/zhu3d.pro
+index efa3d53..cae8b78 100644
+--- a/zhu3d.pro
++++ b/zhu3d.pro
+@@ -47,8 +47,7 @@
+ TEMPLATE  = app

+ CONFIG   += release

+ TARGET    = zhu3d

+-QT       += opengl

+-

++QT       += opengl printsupport widgets

+ 

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

+ # Workaround for Qt4-4.8.4 and missing reference to 'gluPerspective'

+-- 
+2.15.1
+
+
+From fac5c787ef8e82d92c75c91554508211e1320418 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 9 Jan 2018 01:20:55 +0100
+Subject: [PATCH 2/2] Drop PostScript option, unsupported by Qt5PrintSupport
+
+---
+ src/glwidget.cpp  | 35 -----------------------------------
+ src/picedit.cpp   |  6 ------
+ src/ui/picedit.ui | 10 ----------
+ 3 files changed, 51 deletions(-)
+
+diff --git a/src/glwidget.cpp b/src/glwidget.cpp
+index 1719ec0..6343f1e 100644
+--- a/src/glwidget.cpp
++++ b/src/glwidget.cpp
+@@ -910,41 +910,6 @@ void OGLWidget::savePic() {
+ 			QApplication::restoreOverrideCursor();
+ 			break;
+ 		}
+-
+-		case PS: {
+-			fileName=QFileDialog::getSaveFileName(
+-					this,
+-					tr("Save as *.ps"),
+-					workDir,
+-					"Images (*.ps)");
+-
+-			if(fileName.isEmpty())
+-				return;
+-
+-			/** Complete filename */
+-			if(!fileName.toUpper().endsWith(".PS"))
+-				fileName+=".ps";
+-
+-			/** Set up printer */
+-			QApplication::setOverrideCursor(Qt::WaitCursor);
+-			QPrinter printer(QPrinter::HighResolution);
+-			printer.setOutputFormat(QPrinter::PostScriptFormat);
+-			printer.setResolution(pic.dpi);
+-			printer.setOutputFileName(fileName);    // Enables toFile automatically
+-			printer.setFullPage(true);
+-
+-			/** "Print" over painter */
+-			QImage image=pixmap.toImage();
+-			QPainter painter(&printer);
+-			QRect rect=painter.viewport();
+-			QSize size=image.size();
+-			size.scale(rect.size(), Qt::KeepAspectRatio);
+-			painter.setViewport(0, 0, size.width(), size.height());
+-			painter.setWindow(image.rect());
+-			painter.drawImage(0, 0, image);
+-			QApplication::restoreOverrideCursor();
+-			break;
+-		}
+ 	}
+ }
+ 
+diff --git a/src/picedit.cpp b/src/picedit.cpp
+index 149c9d3..74383a7 100644
+--- a/src/picedit.cpp
++++ b/src/picedit.cpp
+@@ -49,7 +49,6 @@ picWidget::picWidget(QWidget *parent) : QWidget(parent) {
+ 	connect(pngFmt, SIGNAL(clicked()), this, SLOT(pngSlot()));
+ 	connect(jpgFmt, SIGNAL(clicked()), this, SLOT(jpgSlot()));
+ 	connect(pdfFmt, SIGNAL(clicked()), this, SLOT(pdfSlot()));
+-	connect(psFmt,  SIGNAL(clicked()), this, SLOT(psSlot()));
+ }
+ 
+ 
+@@ -71,11 +70,6 @@ void picWidget::switchBox() {
+ 				qual->setEnabled(false);
+ 				dpi->setEnabled(false);
+ 				break;
+-		case PS:
+-				psFmt->setChecked(true);
+-				qual->setEnabled(false);
+-				dpi->setEnabled(true);
+-				break;
+ 	}
+ }
+ 
+diff --git a/src/ui/picedit.ui b/src/ui/picedit.ui
+index 12e6148..9a498f2 100644
+--- a/src/ui/picedit.ui
++++ b/src/ui/picedit.ui
+@@ -263,16 +263,6 @@
+           </property>
+          </widget>
+         </item>
+-        <item>
+-         <widget class="QRadioButton" name="psFmt" >
+-          <property name="toolTip" >
+-           <string>PostScript</string>
+-          </property>
+-          <property name="text" >
+-           <string>PS</string>
+-          </property>
+-         </widget>
+-        </item>
+        </layout>
+       </item>
+       <item row="0" column="0" >
+-- 
+2.15.1
+
diff --git a/sci-visualization/zhu3d/metadata.xml b/sci-visualization/zhu3d/metadata.xml
index cc3c6e1d3cb3..e07884452afe 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>
diff --git a/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
index eabd53772ce1..8704bda7f1f0 100644
--- a/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild
+++ b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-LANGS="cs de es fr zh"
-
-inherit eutils qt4-r2
+inherit desktop qmake-utils
 
 DESCRIPTION="Interactive 3D mathematical function viewer"
 HOMEPAGE="https://sourceforge.net/projects/zhu3d"
@@ -13,21 +11,26 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LANGS=(cs de es fr zh)
+IUSE="${LANGS[@]/#/l10n_}"
 
 DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
 	virtual/glu
 	virtual/opengl
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4"
+"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-gold.patch" )
+PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
 
 src_prepare() {
-	qt4-r2_src_prepare
+	default
 
 	local datadir=/usr/share/${PN}
 	sed \
@@ -39,26 +42,26 @@ src_prepare() {
 
 	sed \
 		-e "/# Optimisation/,/# Include/d" \
-		-i zhu3d.pro || die "optimisation sed failed"
+		-i ${PN}.pro || die "optimisation sed failed"
+
+	eqmake5 zhu3d.pro
 }
 
 src_install() {
 	# not working: emake install INSTALL_ROOT="${D}" || die
 	dobin zhu3d
 
-	dodoc {readme,src/changelog}.txt
-	dohtml doc/*.png doc/${PN}_en.html
+	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
 
@@ -72,5 +75,6 @@ src_install() {
 	doins -r system/*.zhu system/icons
 
 	doicon system/icons/${PN}.png
-	make_desktop_entry ${PN} "Zhu3D Function Viewer" ${PN} "Education;Science;Math;Qt"
+	make_desktop_entry ${PN} "Zhu3D Function Viewer" \
+		${PN} "Education;Science;Math;Qt"
 }