gentoo resync : 13.01.2018

3 files changed, 41 insertions, 9 deletions

diff --git a/media-gfx/qvv/Manifest b/media-gfx/qvv/Manifest
index 13453653be63..cfc96a023eb4 100644
--- a/media-gfx/qvv/Manifest
+++ b/media-gfx/qvv/Manifest
@@ -1,3 +1,4 @@
-DIST qvv-4.02.tar.gz 1837213 BLAKE2B 7cb780fbdfe8135e3c96057f8505248eb385daaaf71690b813b7e1822732e3987a4d3cd98f2229f7957803e387046a14fd21cafd1a67b1002bed084a6709c925 SHA512 2cd82b4c1a1664e2ab2df4b9de21c6504c44baa634e370a0365257f0b5c906d3588af371e754b2a26d86527568aded40112095f55141e159f54ce8d8b663bc6c
-EBUILD qvv-4.02.ebuild 628 BLAKE2B df0f11b9852859b6034755c973906366b4496d3decaf97008c6bed79ef5195aa9cb8d123ace61190ba1b53e9600ca715c6c488ea2d6408d2baad4ccea722e2ca SHA512 c87e5e78d2ee582c8379cd948ce4d99caa8580c9ed14d5bef3a18566ad549998342c51e9ec1fe41c57a60b7e1870c446b50aafe49c0bcf874c0810dbe2cc6661
+AUX qvv-4.04-toLatin1.patch 1008 BLAKE2B bd7a9a6fb8b8051d8ea4e9a7a2c563969eeafbf8b87ae49691f669e8da2318bbad570a2fed917030cdbce644595f1f8b31c5c629291e2b04cdb10dbd20584656 SHA512 2f4f2b8265a6bb7b92fd4b993527877ff3961388088a281a68659f838d9ac57436f59a74b8fb37ec3a02b1eb7624bcb2ccb59c02a555cb91cfdbce41e45c46a9
+DIST qvv-4.04.tar.gz 4580207 BLAKE2B 0f73f455ca5f7446312043c53322668a7824fdbcadb0eff1e98698f14bfbaac7c57a1ac1e7e42164ed1071e319f90d1aa5d57cf865c31d3242bdfd954875c12a SHA512 102c51f7eb146d4ddcbfee16fcf93bc08f874268c2838c1358d314daf466639c5506adc2ba99231cb5f2f7074a980545c1640241396964012e9991b946d7839d
+EBUILD qvv-4.04.ebuild 765 BLAKE2B c7442c9c9dd728a89aee6d47c511301b780a88f238e6607cb0a08de6dd4261c1f5b7a5ca641d27d882d91d74bf30d69b70ef21e11381a05343d9442606dc6484 SHA512 cf340c63a1413618f926bc4754bf89d46bf989d355dcd39ac220b1cf015e5a7dfa0e1da79f7512a2a917e9e54e7eefc10acad04b0dc64370b827b9275bf372be
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/qvv/files/qvv-4.04-toLatin1.patch b/media-gfx/qvv/files/qvv-4.04-toLatin1.patch
new file mode 100644
index 000000000000..3db2b32ad4bc
--- /dev/null
+++ b/media-gfx/qvv/files/qvv-4.04-toLatin1.patch
@@ -0,0 +1,22 @@
+From 61b243ccc907f34115a00572e2d8f2bfa2682e6c Mon Sep 17 00:00:00 2001
+From: Vladi Belperchinov-Shabanski <cade@datamax.bg>
+Date: Thu, 26 Feb 2015 16:08:51 +0200
+Subject: [PATCH] toascii-tolatin1-fix
+
+---
+ src/qvv_main_win.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qvv_main_win.cpp b/src/qvv_main_win.cpp
+index 3516f87..0ade17c 100644
+--- a/src/qvv_main_win.cpp
++++ b/src/qvv_main_win.cpp
+@@ -783,7 +783,7 @@ int QvvMainWindow::deleteItems( int current_only )
+ 
+     //qDebug() << "DELETE YES: " << file_name << " RESBUTTON: " << QVariant( confirm->activated_button ).toString();
+ 
+-    QString path_hash = QVariant( QCryptographicHash::hash( cdir.absolutePath().toAscii(), QCryptographicHash::Sha1 ).toHex() ).toString();
++    QString path_hash = QVariant( QCryptographicHash::hash( cdir.absolutePath().toLatin1(), QCryptographicHash::Sha1 ).toHex() ).toString();
+     QString trash_file_name = trash_can + "/" + path_hash + "." + item->text( 1 );
+ 
+     int moved_ok = 0;
diff --git a/media-gfx/qvv/qvv-4.02.ebuild b/media-gfx/qvv/qvv-4.04.ebuild
index 59fb3f5f3b7a..bd8c0105b3bc 100644
--- a/media-gfx/qvv/qvv-4.02.ebuild
+++ b/media-gfx/qvv/qvv-4.04.ebuild
@@ -1,28 +1,37 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils qt4-r2
+EAPI=6
+
+inherit desktop qmake-utils
 
 DESCRIPTION="QVV Image Viewer and Browser"
 HOMEPAGE="http://cade.datamax.bg/qvv/"
-SRC_URI="http://cade.datamax.bg/qvv/${P}.tar.gz"
+SRC_URI="https://github.com/cade-vs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-qt/qtgui:4"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"
 
+DOCS=( ANFSCD GPG_README HISTORY README todo.txt )
+
+PATCHES=( "${FILESDIR}"/${P}-toLatin1.patch )
+
 src_configure() {
-	eqmake4
+	eqmake5 src/${PN}.qt5.pro
 }
 
 src_install() {
+	einstalldocs
 	dobin qvv || die "dobin failed"
 	doicon images/qvv_icon_128x128.png || die "doicon failed"
 	make_desktop_entry qvv QVV qvv_icon_128x128
-	dodoc ANFSCD GPG_README HISTORY README todo.txt || die "dodoc failed"
 }