gentoo resync : 28.04.2018

4 files changed, 5 insertions, 66 deletions

diff --git a/media-sound/coquillo/Manifest b/media-sound/coquillo/Manifest
index 29ec85538bc5..2cf4d2697a3d 100644
--- a/media-sound/coquillo/Manifest
+++ b/media-sound/coquillo/Manifest
@@ -1,5 +1,3 @@
-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
+DIST coquillo-2.0_pre20180422.tar.gz 86061 BLAKE2B 606fa36a91e22ffc618fafb9fc8fa15d13403eb3acbec2ea64296709ddaea26861be872bb8f401a8eff3385b058b8dc4d391faa08d0334630e831185df0b9612 SHA512 2abedb24debcb05cdfb17bae535f7b8f8d2e897e2200d1d802757fe4a53e616fa3a7fc2a2222c1c1e3cf385416e44514fa129c7c880568b3c616f3afe2b3f069
+EBUILD coquillo-2.0_pre20180422.ebuild 825 BLAKE2B 4cc8ca6126ebfa779198108f1e91fd655d965ab689e03a29e359c47adbd2eb71d63b18f4c28b7709aceecedff53b2e4dc20c366ecf877e0bae11fdf153589b99 SHA512 d46bbb0c02179893c1dd328699bad65886f01e9a8088309e01c818e97000b5d39c782cd2e8e1a4d08f7cdd5a4ee8b1ceb132da7e25e0cb43ec033c4e2dfcadd9
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/coquillo/coquillo-2.0_pre20180303.ebuild b/media-sound/coquillo/coquillo-2.0_pre20180422.ebuild
index 4ffd1266f3e7..6eb3618c703c 100644
--- a/media-sound/coquillo/coquillo-2.0_pre20180303.ebuild
+++ b/media-sound/coquillo/coquillo-2.0_pre20180422.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-COMMIT=dc8f1c6751242d6c0416472fd91d972d110be67a
+COMMIT=05e97cb24d0d296d3becea9854fcb0562302ab4a
 inherit desktop qmake-utils
 
 DESCRIPTION="GUI audio tagger based on Qt and taglib"
@@ -29,17 +29,13 @@ 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
+	doicon extra/${PN}.png
+	domenu extra/${PN}.desktop
 	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
deleted file mode 100644
index e781535a4300..000000000000
--- a/media-sound/coquillo/files/coquillo-2.0_pre20180303-linking.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index ba2c02a7821c..000000000000
--- a/media-sound/coquillo/files/coquillo-2.0_pre20180303-qt-5.11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-