gentoo resync : 10.04.2018

5 files changed, 104 insertions, 22 deletions

diff --git a/media-sound/coquillo/Manifest b/media-sound/coquillo/Manifest
index ccf7111c896d..29ec85538bc5 100644
--- a/media-sound/coquillo/Manifest
+++ b/media-sound/coquillo/Manifest
@@ -1,3 +1,5 @@
-DIST coquillo-1.12-src.tar.gz 570833 BLAKE2B 9f580d3c71528e9343690aaeba94fe2cb1567582b6e26f973b607b80a4d5811a32dd5bb2f001fce5799ea4154eb05e8146af7a542a2440aeefb718a672714e19 SHA512 4d0b7dad811019aa488baa27f0d655dc2ee126fa81c5944aa7de9093306c170863bd323de6f0233efef38e96b21b10f4a04239c0e277d42993667213e2bd2817
-EBUILD coquillo-1.12.ebuild 496 BLAKE2B 4023244de9d93086cb5edd670132dfd54acf5f74e21a353419453a14d6fb3bc2bfede06c721729f68c499f5924ee061b71833b8ed3a3ee8b1f2fcc04cd62c5f8 SHA512 f0183444138f3d228c1798fc60077a6abd23dba4e0d45d2753ff74cb18f26d1c05b8f1025a01beb23f28db6458a8296b86970927dc47ec3430657fc259a7f7e9
+AUX coquillo-2.0_pre20180303-linking.patch 641 BLAKE2B de62b04bb78b23534462b7a6294d6a9bb3d10ec8c884a5c49bd5ab40eea970a25706266c4be2453788810378731d991ed7ae71203718daf96a78612e39f2c35b SHA512 6fba93765c2b73899eb270b70625dbda96a691a3cfbde89b4d8203b80fe51782513a0bf7c7e428ca0fa402f1246976a22465e1b54a0c40a92d5c2e515cff71c7
+AUX coquillo-2.0_pre20180303-qt-5.11.patch 629 BLAKE2B 5e90214cdb9ba99ec659bfbe43ec6d683146e2e0f297997820be10f432fad10514acac59057e29a32b7f6b5816d9b8db958dcbf66a5dd8dabf362dfbd7fa5ae6 SHA512 4376d227a56630f60056ae153f62314f549bd2c279e4724ac7228606ccc35a6d685ea31eb2a1409d0be5c125220cfdf903b6d5b6d91dff37b6877ab661791fb5
+DIST coquillo-2.0_pre20180303.tar.gz 79757 BLAKE2B 3c1ed5898fae6df940d020a812a8cf63b1dd1301c93264e3318adcff60d975f337623672e862f7c064e7354d47d8f0b6e6760060ae259b2736a775db08152f4d SHA512 8d6a1fed843fa59bc80c3fbdf77301ed9092d641e40511b5f6d89bc75d623cbe8df701e372b77f5aa1d944dd202b2489352655eec36d0fe53a593e4a3ea25ab6
+EBUILD coquillo-2.0_pre20180303.ebuild 889 BLAKE2B 41899f1a83023505d2df8dfe93798a964083c609ec24a63415e83db2fc1dc4dff3f8fec94ce656a9754c62cbe62b9a7b3b1d1c8dce4e447c0a9955487b197601 SHA512 21f66ad2dc53adfd445ae247499bcf5e71b11ff32e8517a66c180d470065176bc09c9e6d30ec0bfb244126016f7650b1ee966a66a3722558e06327c45dff5174
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/coquillo/coquillo-1.12.ebuild b/media-sound/coquillo/coquillo-1.12.ebuild
deleted file mode 100644
index 646bf1461800..000000000000
--- a/media-sound/coquillo/coquillo-1.12.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit qt4-r2
-
-DESCRIPTION="GUI audio tagger based on Qt4 and taglib"
-HOMEPAGE="http://qt-apps.org/content/show.php/Coquillo?content=141896"
-SRC_URI="http://cs.joensuu.fi/~sjuvonen/${PN}/${PV}/${P}-src.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/taglib-1.7
-	>=dev-qt/qtgui-4.6:4
-	>=dev-qt/qtcore-4.6:4"
-RDEPEND="${DEPEND}"
diff --git a/media-sound/coquillo/coquillo-2.0_pre20180303.ebuild b/media-sound/coquillo/coquillo-2.0_pre20180303.ebuild
new file mode 100644
index 000000000000..4ffd1266f3e7
--- /dev/null
+++ b/media-sound/coquillo/coquillo-2.0_pre20180303.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=dc8f1c6751242d6c0416472fd91d972d110be67a
+inherit desktop qmake-utils
+
+DESCRIPTION="GUI audio tagger based on Qt and taglib"
+HOMEPAGE="https://www.linux-apps.com/content/show.php/Coquillo?content=141896"
+SRC_URI="https://github.com/sjuvonen/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/musicbrainz:5=
+	media-libs/taglib
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-linking.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+)
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	dobin ${PN}
+	make_desktop_entry ${PN} Coquillo
+	einstalldocs
+}
diff --git a/media-sound/coquillo/files/coquillo-2.0_pre20180303-linking.patch b/media-sound/coquillo/files/coquillo-2.0_pre20180303-linking.patch
new file mode 100644
index 000000000000..e781535a4300
--- /dev/null
+++ b/media-sound/coquillo/files/coquillo-2.0_pre20180303-linking.patch
@@ -0,0 +1,31 @@
+From 16bdcf9f0ab24b7d57b7e065534b87810beff63d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 10 Apr 2018 10:21:29 +0200
+Subject: [PATCH] Fix musicbrainz linking
+
+---
+ coquillo.pro | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/coquillo.pro b/coquillo.pro
+index 63b1cd1..5bbe6a2 100644
+--- a/coquillo.pro
++++ b/coquillo.pro
+@@ -16,13 +16,7 @@ RCC_DIR = build
+ unix {
+   LIBS += -ltag
+ 
+-  exists(/etc/arch-release) {
+-    LIBS += -lmusicbrainz5
+-  }
+-
+-  exists(/etc/debian_version) {
+-    LIBS += -lmusicbrainz5cc
+-  }
++  LIBS += -lmusicbrainz5
+ }
+ 
+ 
+-- 
+2.17.0
+
diff --git a/media-sound/coquillo/files/coquillo-2.0_pre20180303-qt-5.11.patch b/media-sound/coquillo/files/coquillo-2.0_pre20180303-qt-5.11.patch
new file mode 100644
index 000000000000..ba2c02a7821c
--- /dev/null
+++ b/media-sound/coquillo/files/coquillo-2.0_pre20180303-qt-5.11.patch
@@ -0,0 +1,24 @@
+From 03a1b15c2c364368d801da4ebe89ae1083d68b4d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 10 Apr 2018 10:15:33 +0200
+Subject: [PATCH] Fix build with Qt 5.11
+
+---
+ src/processor/parserwidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/processor/parserwidget.cpp b/src/processor/parserwidget.cpp
+index 10320e2..94d60c3 100644
+--- a/src/processor/parserwidget.cpp
++++ b/src/processor/parserwidget.cpp
+@@ -1,6 +1,7 @@
+ 
+ #include <QDebug>
+ #include <QDir>
++#include <QItemSelectionModel>
+ 
+ #include "tags/tagdataroles.hpp"
+ #include "parserwidget.hpp"
+-- 
+2.17.0
+