gentoo resync : 10.04.2018

16 files changed, 542 insertions, 467 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 87b7230576f6..65f171c49718 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
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
+
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 120bb03beb88..a981cf9e50db 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,5 +1,4 @@
-AUX mup-5.6-fltk-fixes.patch 811 BLAKE2B 8eb4fd8796f4462cc1080d78a150739b448abc240c54d09d301253473a5caf006c0cdce005d05b05578031571badd2b47e4c5c03337c124a0e854cc3aeab08c0 SHA512 a63e6ce5a5a91430a9a2f602e8eb14852a66b64bf696fc3eafd3b7c4ee298320116692febcbef0fb4985f1c0a8cc16f4675902c953cc950ca8e614f3adc9d5f8
-AUX mup-5.7-Makefile.patch 10945 BLAKE2B 7b1e53111833c3e35adc1d85425597e3ab13a3f1c1356e7086a85c2934cd029a2713c81815558c0c8529aa23c5b1f6938065486202c2f77c6ea16ac6fca488e7 SHA512 6e87882f8e6fe1e625caf5fe500a551829d5b2bcf7b01af48347afa0c8335d1236da0221dbe21930521190d77df7e5b5dfe719bc7158e46c6fcbfc0bc6bea5c6
-DIST mup57src.tar.gz 2178380 BLAKE2B 03f4da751e841d77f1a481da98c801501b481b0cda1ac2a19c7b45ff362cc6f14b882d4a5954f4fc0a4b05a5b249ee79ff0ba23378c0b3bff3e29ea445f21673 SHA512 19085f15ce2654f23349e304599f920ca601735b2430e7b4b54927a861c598cd9227a273b4444a1582d491c1e3dbaaf7f12001e4fade57191e10c0f7815ac629
-EBUILD mup-5.7.ebuild 951 BLAKE2B 6d0baca61b023c1c5ebe2d9397387f85037efb59bf86848e1d7b1f7787617031c3ea0619896ed2c491bd6741ed9617a998ee3d363108d61dd0711a7e8cc1a883 SHA512 442ec73345c0b38c5d9190c1cb5daa1605f8b2899888fcdb4781ab2a9d5fcb19f9852d0815fe08418a48a2137c0c53bca110a522ca659e965b17f34c1708e538
+AUX mup-6.6-makefile.patch 2563 BLAKE2B 32f32af677b83ef0889c073d0cde368c3119ef7b654531cf407a6d8796c374d78979e56095d7ce3f68ee037e0a3b3205147366b12909bac70a8d64a5c6b04ec8 SHA512 d6609bc8ee5d327bb1252d5d536b9bd5f67e58add6552fbc63456a9773eeff6c5fff2029ad754b48cc8539a001fdd6bffd74368e8e1e7085e83ea7247eb87251
+DIST mup66src.tar.gz 2514430 BLAKE2B d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb SHA512 3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35
+EBUILD mup-6.6.ebuild 902 BLAKE2B f364d62ab4d9058c7fe1da69dcbdd3fef7f8ef5e8904f8633831e216e9d93915fb97dacec518f41f5a0e3fd06da5b8193693a6a373ecb1998d1eec0ba58430f1 SHA512 c39de5f32cbe018e3bea77f61d120e43ed64184f075c3479c919cca0c2b2cb2afc6cd33744e364c4f763ab717b1377e3173e4abc0b33867b30d8cda05869775b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mup/files/mup-5.6-fltk-fixes.patch b/media-sound/mup/files/mup-5.6-fltk-fixes.patch
deleted file mode 100644
index e4429c3679bf..000000000000
--- a/media-sound/mup/files/mup-5.6-fltk-fixes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- mup-5.6.orig/mupmate/Config.C
-+++ mup-5.6/mupmate/Config.C
-@@ -264,7 +264,7 @@
- //-----------------------------------------------------------------
- 
- // List of standard FLTK fonts, and info to map name to menu entry.
--static struct Font {
-+static struct FlFont {
- 	const char * name;
- 	Fl_Font	value;
- 	int menu_offset;
---- mup-5.6.orig/mupmate/Edit.C
-+++ mup-5.6/mupmate/Edit.C
-@@ -201,8 +201,7 @@
- 	// a previous Replace/Find Next
- 	int start, end, isRect, rectStart, rectEnd;
- 	bool at_pattern = false;
--	if (editor_p->buffer()->highlight_position(&start, &end, &isRect,
--						&rectStart, &rectEnd)) {
-+	if (editor_p->buffer()->highlight_position(&start, &end)) {
- 		int place = editor_p->insert_position();
- 		if (place == end && (end - start == pattern_p->size())) {
- 			if (casematch_p->value()) {
diff --git a/media-sound/mup/files/mup-5.7-Makefile.patch b/media-sound/mup/files/mup-5.7-Makefile.patch
deleted file mode 100644
index a36a0042ca24..000000000000
--- a/media-sound/mup/files/mup-5.7-Makefile.patch
+++ /dev/null
@@ -1,405 +0,0 @@
---- mup-5.7.orig/makefile
-+++ mup-5.7/makefile
-@@ -1,252 +0,0 @@
--
--# Makefile for Mup (and auxiliary programs mupdisp, mkmupfnt, and mupmate).
--# This is not an optimal makefile; instead it tries to be very simple,
--# and easy to understand, so it can be easily modified, if needed.
--
--# On most Linux/Unix type systems, just doing
--#	make install
--# as root will probably work.
--# (You really only need to be root to copy the products into
--# the system directories. If you change PREFIX
--# to point to some other writeable area, you wouldn't need to be root.)
--# For Apple Mac OX X, see the notes for what to change (CFLAGS and X_LIBS)
--# If you only want the Mup program itself, you can do
--#	make mup/mup
--# The other programs are optional:
--# - mupdisp runs Mup and then runs GhostScript on the result.
--#   You can run Mup directly, and use gv, GSview, ghostview or any other
--#   PostScript viewer on the Mup output, as an alternative to mupdisp.
--# - mkmupfnt is only needed if you want to use fonts beyond the basic
--#   standard PostScript fonts.
--# - mupmate is a graphical user interface front end for Mup.
--#   It is not needed if you intend to only use Mup via command line interface.
--
--# The mupdisp and mupmate programs require X libraries and headers (www.x.org).
--# The mupmate program requires FLTK libraries and headers (www.fltk.org).
--
--# If you want mupdisp to support Linux console mode, make sure you have
--# the svgalib package installed, then find the two commented-out lines below
--# related to Linux console support, and uncomment them.
--
--# If you are building on a system that does not support make,
--# you can look at what this makefile does for how to build.
--# Mup itself is generally easy to build.
--# You just go to the mup directory and run your C compiler on
--# all the .c files in directory, and link with the math library,
--# Typically this is done using a command something like:
--#	cc *.c -lm
--# For more information on building Mup, see:
--#	http://www.arkkra.com/doc/dosbld.html
--#	http://www.arkkra.com/doc/otherbld.html
--#	http://www.arkkra.com/doc/unixbld.html
--
--# Lines you might conceivably want to change have comments by them,
--# explaining how you might want to change them.
--# Any line without any comment by it is very unlikely to ever need changing.
--
--#-----------------------------------------------------------------------
--
--# These define where to put the Mup products.
--# You could change this to /usr/local or your own space if you like.
--PREFIX = /usr
--BINDIR = $(PREFIX)/bin
--MANDIR = $(PREFIX)/man/man1
--DOCDIR = $(PREFIX)/share/doc/packages/mup
--
--# This is the name of your C compiler.
--# cc would be another common choice.
--CCOMPILER = gcc
--
--# This is the name of your C++ compiler.
--# CC would be another common choice.
--CPPCOMPILER = g++
--
--# -O option turns on optimization for most C compilers.
--# You can add other options, if you like, as appropriate for your C compiler.
--# Another common addition would be -g to get debugging information.
--# For Mac OS X, you should probably add
--#	-Dunix
--# and if you want universal binaries, add
--#	-arch i386 -arch ppc
--# and if you want backward compatibility to older versions, add something like
--#	-mmacosx-version-min=10.1
--# Or in other words:
--# CFLAGS = -O -Dunix -arch i386 -arch ppc -mmacosx-version-min=10.1
--CFLAGS = -O
--
--# You can change this if your X libraries and headers are somewhere else
--# (like /usr/X11R6).
--X_LOCATION = /usr/X11
--
--# If you installed fltk somewhere other than $(X_LOCATION)/lib
--# set this to find them, as in
--# FLTK_LIB_LOCATION = -L/usr/local/lib
--FLTK_LIB_LOCATION =
--
--# The X libraries to link with Mupmate.
--X_LIBS = -lXext -lX11 -lXpm
--# On Mac OS X replace that with
--# X_LIBS = -framework Carbon
--
--# The FLTK header files are under $(FLTK_INCLUDE)/FL
--FLTK_INCLUDE = $(X_LOCATION)/include
--
--# You can use fltk_jpeg or jpeg library, whichever you have
--JPEGLIB = fltk_jpeg
--
--# You can use fltk_png or png library, whichever you have
--PNGLIB = fltk_png
--
--# You can use fltk_z or z library, whichever you have
--ZLIB = fltk_z
--
--#-----------------------------------------------------------------------
--
--MUP_SRC =  \
--	mup/abshorz.c \
--	mup/absvert.c \
--	mup/assign.c \
--	mup/beaming.c \
--	mup/beamstem.c \
--	mup/brac.c \
--	mup/charinfo.c \
--	mup/check.c \
--	mup/debug.c \
--	mup/errors.c \
--	mup/font.c \
--	mup/fontdata.c \
--	mup/globals.c \
--	mup/grpsyl.c \
--	mup/ifgram.c \
--	mup/lex.c \
--	mup/locvar.c \
--	mup/lyrics.c \
--	mup/macros.c \
--	mup/main.c \
--	mup/mainlist.c \
--	mup/map.c \
--	mup/midi.c \
--	mup/midiutil.c \
--	mup/mkchords.c \
--	mup/musfont.c \
--	mup/nxtstrch.c \
--	mup/parstssv.c \
--	mup/parstuff.c \
--	mup/phrase.c \
--	mup/plutils.c \
--	mup/print.c \
--	mup/prntdata.c \
--	mup/prntmisc.c \
--	mup/prnttab.c \
--	mup/prolog.c \
--	mup/range.c \
--	mup/rational.c \
--	mup/relvert.c \
--	mup/restsyl.c \
--	mup/roll.c \
--	mup/setgrps.c \
--	mup/setnotes.c \
--	mup/ssv.c \
--	mup/stuff.c \
--	mup/symtbl.c \
--	mup/tie.c \
--	mup/trantab.c \
--	mup/trnspose.c \
--	mup/undrscre.c \
--	mup/utils.c \
--	mup/ytab.c
--
--MUP_HDRS = \
--	mup/defines.h \
--	mup/extchar.h \
--	mup/globals.h \
--	mup/muschar.h \
--	mup/rational.h \
--	mup/ssvused.h \
--	mup/structs.h \
--	mup/ytab.h
--
--MUPDISP_SRC = \
--	mupdisp/at386.c \
--	mupdisp/do_cmd.c \
--	mupdisp/dos.c \
--	mupdisp/genfile.c \
--	mupdisp/init.c \
--	mupdisp/linvga.c \
--	mupdisp/mupdisp.c \
--	mupdisp/xterm.c
--
--MUPDISP_HDRS = mupdisp/dispttyp.h mupdisp/mupdisp.h
--
--MUPDISP_BITMAPS = mupdisp/help.bm mupdisp/waitmsg.bm
--
--MKMUPFNT_SRC = mkmupfnt/mkmupfnt.c
--
--MUPMATE_SRC = \
--	mupmate/Config.C \
--	mupmate/Edit.C \
--	mupmate/File.C \
--	mupmate/Help.C \
--	mupmate/Main.C \
--	mupmate/Preferences.C \
--	mupmate/Run.C \
--	mupmate/utils.C \
--	mupmate/license.C \
--	mupmate/regform.C \
--	mupmate/template.C
--
--MUPMATE_HDRS = \
--	mup/defines.h \
--	mupmate/Config.H \
--	mupmate/Edit.H \
--	mupmate/File.H \
--	mupmate/Help.H \
--	mupmate/Main.H \
--	mupmate/Preferences.H \
--	mupmate/Run.H \
--	mupmate/utils.H \
--	mupmate/globals.H \
--	mupmate/resource.h
--
--MUPMATE_OTHER_FILES = \
--	mupmate/mup32.xpm
--#---------------------------------------------------------------
--
--all: mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
--
--mup/mup: $(MUP_HDRS) $(MUP_SRC)
--	$(CCOMPILER) $(CFLAGS) -o $@ $(MUP_SRC) -lm
--
--mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
--	$(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
--	# For Linux console mode support, comment out the previous line
--	# and uncomment the following line
--	# $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ $(MUPDISP_SRC) -lvga -lX11 -lm
--
--mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
--	$(CCOMPILER) $(CFLAGS) -o $@ $(MKMUPFNT_SRC)
--
--mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
--	$(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \
--	-I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
--	$(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
--	-l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm
--
--install:	all
--	mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide
--	cp mup/mup $(BINDIR)/mup
--	cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt
--	cp mupdisp/mupdisp $(BINDIR)/mupdisp
--	# For Linux console mode support, uncomment the following line
--	# chown root $(BINDIR)/mupdisp ; chmod 4755 $(BINDIR)/mupdisp
--	cp mupmate/mupmate $(BINDIR)/mupmate
--	cp mupprnt $(BINDIR)/mupprnt
--	cp docs/*.1 $(MANDIR)
--	cp docs/README* docs/*.txt docs/*.ps docs/*.mup $(DOCDIR)
--	cp docs/uguide/* $(DOCDIR)/uguide
--
--clean:
--	rm -f mup/*.o mupdisp/*.o mkmupfnt/*.o mupmate/*.o
--
--clobber:	clean
--	rm -f mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
---- mup-5.7.orig/Makefile
-+++ mup-5.7/Makefile
-@@ -0,0 +1,147 @@
-+PREFIX = /usr
-+BINDIR = $(PREFIX)/bin
-+MANDIR = $(PREFIX)/share/man/man1
-+CC = gcc
-+CXX = g++
-+CFLAGS = -O2 -pipe
-+CXXFLAGS = -O2 -pipe
-+X_LOCATION = /usr
-+FLTK_LIB_LOCATION = -L/usr/lib/fltk-1
-+X_LIBS = -lXext -lX11 -lXpm
-+FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1
-+JPEGLIB = jpeg
-+PNGLIB = png
-+ZLIB = z
-+
-+MUP_SRC =  \
-+	mup/abshorz.c \
-+	mup/absvert.c \
-+	mup/assign.c \
-+	mup/beaming.c \
-+	mup/beamstem.c \
-+	mup/brac.c \
-+	mup/charinfo.c \
-+	mup/check.c \
-+	mup/debug.c \
-+	mup/errors.c \
-+	mup/font.c \
-+	mup/fontdata.c \
-+	mup/globals.c \
-+	mup/grpsyl.c \
-+	mup/ifgram.c \
-+	mup/lex.c \
-+	mup/locvar.c \
-+	mup/lyrics.c \
-+	mup/macros.c \
-+	mup/main.c \
-+	mup/mainlist.c \
-+	mup/map.c \
-+	mup/midi.c \
-+	mup/midiutil.c \
-+	mup/mkchords.c \
-+	mup/musfont.c \
-+	mup/nxtstrch.c \
-+	mup/parstssv.c \
-+	mup/parstuff.c \
-+	mup/phrase.c \
-+	mup/plutils.c \
-+	mup/print.c \
-+	mup/prntdata.c \
-+	mup/prntmisc.c \
-+	mup/prnttab.c \
-+	mup/prolog.c \
-+	mup/range.c \
-+	mup/rational.c \
-+	mup/relvert.c \
-+	mup/restsyl.c \
-+	mup/roll.c \
-+	mup/setgrps.c \
-+	mup/setnotes.c \
-+	mup/ssv.c \
-+	mup/stuff.c \
-+	mup/symtbl.c \
-+	mup/tie.c \
-+	mup/trantab.c \
-+	mup/trnspose.c \
-+	mup/undrscre.c \
-+	mup/utils.c \
-+	mup/ytab.c
-+
-+MUP_HDRS = \
-+	mup/defines.h \
-+	mup/extchar.h \
-+	mup/globals.h \
-+	mup/muschar.h \
-+	mup/rational.h \
-+	mup/ssvused.h \
-+	mup/structs.h \
-+	mup/ytab.h
-+
-+MUPDISP_SRC = \
-+	mupdisp/at386.c \
-+	mupdisp/do_cmd.c \
-+	mupdisp/dos.c \
-+	mupdisp/genfile.c \
-+	mupdisp/init.c \
-+	mupdisp/linvga.c \
-+	mupdisp/mupdisp.c \
-+	mupdisp/xterm.c
-+
-+MUPDISP_HDRS = mupdisp/dispttyp.h mupdisp/mupdisp.h
-+MUPDISP_BITMAPS = mupdisp/help.bm mupdisp/waitmsg.bm
-+MKMUPFNT_SRC = mkmupfnt/mkmupfnt.c
-+
-+MUPMATE_SRC = \
-+	mupmate/Config.C \
-+	mupmate/Edit.C \
-+	mupmate/File.C \
-+	mupmate/Help.C \
-+	mupmate/Main.C \
-+	mupmate/Preferences.C \
-+	mupmate/Run.C \
-+	mupmate/utils.C \
-+	mupmate/license.C \
-+	mupmate/regform.C \
-+	mupmate/template.C
-+
-+MUPMATE_HDRS = \
-+	mup/defines.h \
-+	mupmate/Config.H \
-+	mupmate/Edit.H \
-+	mupmate/File.H \
-+	mupmate/Help.H \
-+	mupmate/Main.H \
-+	mupmate/Preferences.H \
-+	mupmate/Run.H \
-+	mupmate/utils.H \
-+	mupmate/globals.H \
-+	mupmate/resource.h
-+
-+MUPMATE_OTHER_FILES = \
-+	mupmate/mup32.xpm
-+
-+all: mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
-+
-+mup/mup: $(MUP_HDRS) $(MUP_SRC)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm
-+
-+mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
-+
-+mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC)
-+
-+mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
-+	-I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
-+	$(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
-+	-l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm
-+
-+install:	all
-+	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)
-+	cp mup/mup $(DESTDIR)$(BINDIR)/mup
-+	cp mkmupfnt/mkmupfnt $(DESTDIR)$(BINDIR)/mkmupfnt
-+	cp mupdisp/mupdisp $(DESTDIR)$(BINDIR)/mupdisp
-+	cp mupmate/mupmate $(DESTDIR)$(BINDIR)/mupmate
-+	cp mupprnt $(DESTDIR)$(BINDIR)/mupprnt
-+	cp docs/*.1 $(DESTDIR)$(MANDIR)
diff --git a/media-sound/mup/files/mup-6.6-makefile.patch b/media-sound/mup/files/mup-6.6-makefile.patch
new file mode 100644
index 000000000000..0350a6e80447
--- /dev/null
+++ b/media-sound/mup/files/mup-6.6-makefile.patch
@@ -0,0 +1,69 @@
+Fix header/library locations for fltk, respect LDFLAGS, and allow the ebuild to
+handle docs install.
+
+--- mup-6.6/makefile
++++ mup-6.6/makefile
+@@ -80,12 +80,12 @@
+ 
+ # You can change this if your X libraries and headers are somewhere else
+ # (like /usr/X11R6).
+-X_LOCATION = /usr/X11
++X_LOCATION = /usr
+ 
+ # If you installed fltk somewhere other than $(X_LOCATION)/lib
+ # set this to find them, as in
+ # FLTK_LIB_LOCATION = -L/usr/local/lib
+-FLTK_LIB_LOCATION =
++FLTK_LIB_LOCATION = -L/usr/lib/fltk
+ 
+ # The X libraries to link with Mupmate.
+ # Depending on how fltk was compiled, you may be able to omit
+@@ -99,7 +99,7 @@
+ #FLTK_VERSION=FLTK_1_1
+ 
+ # The FLTK header files are under $(FLTK_INCLUDE)/FL
+-FLTK_INCLUDE = $(X_LOCATION)/include
++FLTK_INCLUDE = $(X_LOCATION)/include/fltk
+ 
+ # You can use fltk_jpeg or jpeg library, whichever you have
+ # or depending on how fltk was compiled, you may not need it at all
+@@ -251,25 +251,25 @@
+ 	flex -t extras/lex.l > mup/lex.c
+ 
+ mup/mup: $(MUP_HDRS) $(MUP_SRC)
+-	$(CCOMPILER) $(CFLAGS) -o $@ $(MUP_SRC) -lm
++	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm
+ 
+ mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
+-	$(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
++	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
+ 	# For Linux console mode support, comment out the previous line
+ 	# and uncomment the following line
+ 	# $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ $(MUPDISP_SRC) -lvga -lX11 -lm
+ 
+ mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
+-	$(CCOMPILER) $(CFLAGS) -o $@ $(MKMUPFNT_SRC)
++	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC)
+ 
+ mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
+-	$(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \
++	$(CPPCOMPILER) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
+ 	$(FLTK_VERSION) -I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
+ 	$(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
+ 	$(JPEGLIB) $(PNGLIB) $(ZLIB) -lm
+ 
+ install:	all
+-	mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide $(ICONDIR) $(LIBDIR)
++	mkdir -p $(BINDIR) $(MANDIR) $(ICONDIR) $(LIBDIR)
+ 	cp mup/mup $(BINDIR)/mup
+ 	cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt
+ 	cp mupdisp/mupdisp $(BINDIR)/mupdisp
+@@ -278,8 +278,6 @@
+ 	cp mupmate/mupmate $(BINDIR)/mupmate
+ 	cp mupprnt $(BINDIR)/mupprnt
+ 	cp docs/*.1 $(MANDIR)
+-	cp docs/README* docs/*.txt docs/*.ps docs/*.mup $(DOCDIR)
+-	cp docs/uguide/* $(DOCDIR)/uguide
+ 	cp $(MUPMATE_OTHER_FILES) $(ICONDIR)
+ 	cp $(MUP_LIB_FILES) $(LIBDIR)
+ 
diff --git a/media-sound/mup/mup-5.7.ebuild b/media-sound/mup/mup-6.6.ebuild
index 0624047a5fe2..19665203aa80 100644
--- a/media-sound/mup/mup-5.7.ebuild
+++ b/media-sound/mup/mup-6.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils multilib toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="Program for printing music scores"
 HOMEPAGE="http://www.arkkra.com/"
@@ -10,33 +11,34 @@ SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
 
 LICENSE="Arkkra"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/fltk:1
+	>=x11-libs/fltk-1.3:1
 	x11-libs/libXpm
-	virtual/jpeg
-	media-libs/libpng"
+	virtual/jpeg:0
+	media-libs/libpng:0="
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${PN}-5.6-fltk-fixes.patch
-	sed -i -e "s:/lib:/$(get_libdir):g" Makefile || die "sed failed"
+	default
+	sed -i -e "s:/lib:/$(get_libdir):g" makefile || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
-		CFLAGS="${CFLAGS}"
+	emake CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc docs/{*.txt,README0}
-	dohtml docs/{*.html,uguide/*}
+	docinto html
+	dodoc docs/{*.html,uguide/*}
 	docinto sample
 	dodoc docs/{*.mup,*.ps}
 }
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index de6571c065b6..5874b0cf01be 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -1,7 +1,9 @@
 DIST pragha-1.3.3.tar.bz2 679754 BLAKE2B e9e785998d5ae805aa8427d18d1cbdcdd1e23224ce18b3927933c0986fd8793dec9457eedcb005be498b37940cc3c7e36e68940ccaa675f4b350931315c3d997 SHA512 3dc87d4e75cd9f145c3921af4c09140a705611d72176fd80db2d89048bc22c8edda5f87bce75f26e0cce4f6934c927e814e5c54fec7820116485cf4e04e876a9
 DIST pragha-1.3.90.tar.bz2 760153 BLAKE2B 22cb90225cad5b19ecd95691bafd11f55b35e5f2b59e877c2c998b2e4744f1298f28469bdb11f00598f31fc154c55427d000a995d952112b238cf84302993564 SHA512 877d27814927ab67a0b1defe70d753466e3ad14a0274a2168eb2521ded4eddeb04bce5177869b19ca57b38e7374047ee36982cce3f7e8a75b801cd060f8460d2
+DIST pragha-1.3.91.1.tar.bz2 755933 BLAKE2B db24a8752cfc52ded17a15555f3e39f2792c4f9717bca75a158d4672812fbee8d502149c08daa15113aa0de0fb1fe6f417d8a36c1b1b98c73f47d0319edca0a9 SHA512 ec0617ce0e1ead5ce2783c7bfb26cc4a2fc3f15a6f79ba887a02fc8a3dd01551ff91a41e90acc7fb23793a2261a340acdb80b9268fd08b5fa7dd26dd337fb07b
 DIST pragha-1.3.91.tar.bz2 740279 BLAKE2B c42f1b6d0c7071b56080d8feb8a11c9ba00b1339bc653a61cc80f09e1f076b2183091dbe2cbc42e7aa7347826492fa77cbbac980c25999ce3968a8e74dbc3623 SHA512 49b03ef69e7d12086e324a2088b4540eaebc01fd56247c43f069bd1b9fadbdd1b5f27af87b5086cc3e9a957281c3f7ff72c8ce3b0a6474514714a017ca5e0ab5
 EBUILD pragha-1.3.3.ebuild 2288 BLAKE2B 0cad8db3ec862e8e731135eb2e53c2e6fadcc397476512153b1d72531eb74521b4f97c99c3a929f8968046ec98581a41719e75c0c8bee5dd15e2d77a9c7c0215 SHA512 90a7562ed5be7146fb86ea61befd6d145230235020d88f99a0762d2749b05640591343e680b3580654840ebb34ff1c9b1174ee28f73e28fe79c030ab739c6f73
 EBUILD pragha-1.3.90.ebuild 2502 BLAKE2B ad6086767bf4d14ba02311377ee5009ca66e8a87265119f1476191c81641867804eaa7484b7c04133ca82e4651b4e1cc45f1820227c7d6fa3be609fe2122197f SHA512 27c0cbe0ed8ad4bdb76a0d18dd0d60bdacac7506f36bc68165675c17845b514cdd5a913be34702809b6186a0d26e40fb412e36d1faed1bdd1f86335fcb737d8d
+EBUILD pragha-1.3.91.1.ebuild 2591 BLAKE2B 510d140f805df182ed3313410f798aa004281f9827d7911715e08083b8e88e0d757e4aa51298c3f13e2edd0ad70a35eb6a8b6b8aecde5c342bec57e28dd4280a SHA512 3dd07e0038eed6ec79b6919a63cb6a79feb04a08d3bf44d4b2dda746cea5f7ac35a1b0b80594aa304de275a33d0262753868a83abadcf6d42ef900c961ff2b95
 EBUILD pragha-1.3.91.ebuild 2591 BLAKE2B 510d140f805df182ed3313410f798aa004281f9827d7911715e08083b8e88e0d757e4aa51298c3f13e2edd0ad70a35eb6a8b6b8aecde5c342bec57e28dd4280a SHA512 3dd07e0038eed6ec79b6919a63cb6a79feb04a08d3bf44d4b2dda746cea5f7ac35a1b0b80594aa304de275a33d0262753868a83abadcf6d42ef900c961ff2b95
 MISC metadata.xml 1215 BLAKE2B d7a5bf01af7aa7047342f674cc33ee8ad9ea20dd9b0a496f1954830057bc51932530755429d54faa599da6b2817907100057153436a47a731892a8d8f91aece3 SHA512 9700873ef8ee962e9ba0057d8489b22e73ebaf55a6bda1cd58f062167f15f1b8d08e0c9061e45b4fd71040932e394a9006c00a95a944bf45ef7b65d48f922f34
diff --git a/media-sound/pragha/pragha-1.3.91.1.ebuild b/media-sound/pragha/pragha-1.3.91.1.ebuild
new file mode 100644
index 000000000000..eddc94284005
--- /dev/null
+++ b/media-sound/pragha/pragha-1.3.91.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A lightweight music player (for Xfce)"
+HOMEPAGE="https://github.com/pragha-music-player/pragha"
+SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
+	>=dev-libs/glib-2.42:=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	>=media-libs/taglib-1.8:=
+	>=x11-libs/gtk+-3.14:3=
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	cdda? ( >=dev-libs/libcdio-0.90:=
+		>=dev-libs/libcdio-paranoia-0.90:=
+		>=media-libs/libcddb-1.3.0:= )
+	glyr? ( >=media-libs/glyr-1.0.1:= )
+	grilo? ( media-libs/grilo:0.3=[network] )
+	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
+	koel? ( dev-libs/json-glib:= )
+	lastfm? ( >=media-libs/libclastfm-0.5:= )
+	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
+	mtp? ( >=media-libs/libmtp-1.1.0:= )
+	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
+	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
+	rygel? ( >=net-misc/rygel-0.26:= )
+	soup? ( >=net-libs/libsoup-2.38:= )
+	udev? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.10
+	sys-devel/gettext
+	virtual/pkgconfig
+	xfce-base/exo"
+REQUIRED_USE="glyr? ( peas )
+	grilo? ( peas )
+	koel? ( soup )
+	libnotify? ( peas )
+	mtp? ( udev )
+	rygel? ( peas )
+	soup? ( peas )
+	udev? ( peas )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable peas libpeas-1.0)
+		$(use_enable glyr libglyr)
+		$(use_enable lastfm libclastfm)
+		$(use_enable cdda libcdio)
+		$(use_enable cdda libcdio_paranoia)
+		$(use_enable cdda libcddb)
+		$(use_enable playlist totem-plparser)
+
+		$(use_enable libnotify)
+		$(use_enable keybinder)
+		$(use_enable udev gudev-1.0)
+		$(use_enable mtp libmtp)
+		$(use_enable koel json-glib-1.0)
+		$(use_enable soup libsoup-2.4)
+		$(use_enable rygel rygel-server-2.6)
+		$(use_enable grilo grilo-0.3)
+		$(use_enable grilo grilo-net-0.3)
+		# avoid trying to use 0.2 & 0.3 simultaneously
+		# https://github.com/pragha-music-player/pragha/issues/124
+		--disable-grilo-0.2
+		--disable-grilo-net-0.2
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index 1410bb174952..25fe73398398 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,5 +1,8 @@
 AUX qtscrobbler-0.10-Makefile.patch 1359 BLAKE2B d5470ce7341b1765e345b13f97056f13bc556498e9b748b2b1a9f847c900c84680f570588bb5c1b6600195c45deae01d85d93bc98ab51fddbfa222e88bd43668 SHA512 13c6256dc3121fad8b52e479a4700c807229dd8b29f4d8f79492df9e1c2e06e9d28ab50cbccc73a706f2ec3cbd9be7ffc2274bc015862afa4ea1297a73a6d004
 AUX qtscrobbler-0.10-free.patch 623 BLAKE2B 0ae65ab0d6ae115b34cdfeffbe634269896e11e91e92155c627fda0f88dbb630255f67087949c3fe825ee5ccbd472ce701fa856b2648e8b044f26879634ba346 SHA512 42d4093e033883fd2dda4313a2c731d418fbbf6ae70a2d79003622f917791560eedf9ea185029bca25416b34ac51bbc1b7e78bb597a33d89b92e6abab89f4226
+AUX qtscrobbler-0.11_pre20130123-qt5.patch 5444 BLAKE2B 5e8ef860627e3f8a1b5c6d7a845d4b71c2ae473a42c1fd9619d9a6a270b50e7214bec232c51faf918d4d220490ea1273e016280e56c3d4b06075fcb9feb528bd SHA512 716dc1d84d1eddcec15ec4b87c0c7454acda58ebb94ed5e7a1f5a79ec0a04d473c6dc9e7eb6649986346743cf8a673bdc25e714c221fefd0f05e0925a0f5b0c3
 DIST qtscrob-0.10.tar.bz2 132507 BLAKE2B 168bc3747bb48e7c5fedbaeb66cf12c4d7230fb240fb9b034b576f739ef55c497cdb6d8383bace8a00ad54890882134598777acc826d8ced195488b932123e92 SHA512 d743976ef26c4f61402187930ac2cfba71bc4d7079e1166bdb34115196c99d3e0093a4df06d4b0eda24ab4f0f6fcce840812fd2d1dff847dc905adc9a74127c5
+DIST qtscrobbler-0.11_pre20130123.zip 298519 BLAKE2B 36d3c3fdf59aa7fd9127c0200b03a6427f6fa27cb40e144f10041a25ba977e40fc5f63547596cf93f797d94e741a4a159c5e1aa48f8742d7738d1c113b22aae8 SHA512 24de4a45d4b31fb3c544b963b97b8716b8472a0dfde1bd2fd6bf101785f22ef07ff34fcd9ce7028fe231b215538bb8e4c3248c234feb870a3adeb4c0b259d646
 EBUILD qtscrobbler-0.10.ebuild 1403 BLAKE2B b3d9506261ad3564f472c8ab2c99576614b78b8e5d5990b941007e1ee40b98020c9dc482bd0e2f1d48d7606f07468474ae1a7bdd4b3fa414f2200c81d1c90dc8 SHA512 37d29012f2666a44ebb8ecca08b65d5563c9ca3bf7c6b0404315c989159af5ac2818b046f7ab8da674b329fff066361099ea6489ab71ce756f866a8679f8d6ff
+EBUILD qtscrobbler-0.11_pre20130123.ebuild 1253 BLAKE2B f2247ef2ccd99c3f228a4af0f283bbb3dcde7e335ef37b202de5c18b6e52d1574c00bec42549456c42df902f368eaac768b1a9856e0a5e2fee1394fee4826e39 SHA512 6434c7fe29af3ea55c4b46135d91e7ac15fc6effdc509a75cb8f367eabac864e6809ae0f024791aa6a7bfabbfb85e89d9928885dcfc8bb18c8a03116228143b5
 MISC metadata.xml 410 BLAKE2B c410c23c16a0ca646666e5eb4e6569661b340b90c0dd824cf43be35963aac14f099aaade7cb2f188ec4d9b9dbc75015ed9afc062a53be92060c775ac31f72140 SHA512 66998d7596e0dabf7b01af9fa59bd2b4b9d74b5cdd6e902ecbabf81683ff5f84ebf0d4d3dd876d19e510c886ceff741f9ebe163a5214c7f845f256b73601a401
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.patch
new file mode 100644
index 000000000000..910471aca6c0
--- /dev/null
+++ b/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.patch
@@ -0,0 +1,194 @@
+Origin: other, https://sourceforge.net/p/qtscrob/patches/15/
+Bug: https://sourceforge.net/p/qtscrob/patches/15/
+Bug-Debian: https://bugs.debian.org/875156
+Description: Port to Qt5
+
+--- a/src/lib/gettrackinfo.cpp
++++ b/src/lib/gettrackinfo.cpp
+@@ -58,7 +58,7 @@
+     data += "&track=" + QUrl::toPercentEncoding(track_info.title);
+     data += "&autocorrect=1";
+     time.restart();
+-    manager->post(request, QByteArray(data.toAscii()));
++    manager->post(request, QByteArray(data.toLatin1()));
+ }
+ 
+ void GetTrackInfo::run()
+--- a/src/lib/lib.pro
++++ b/src/lib/lib.pro
+@@ -13,7 +13,8 @@
+ QT += core \
+     network \
+     xml \
+-    sql
++    sql \
++    widgets
+ 
+ QT -= gui
+ LANGUAGE = C++
+--- a/src/lib/parse-log.cpp
++++ b/src/lib/parse-log.cpp
+@@ -153,9 +153,9 @@
+                 //right number of tabs in the line
+                 scrob_entry temp_entry;
+ 
+-                temp_entry.artist = QString::fromUtf8(log_entry[0].toAscii());
+-                temp_entry.album = QString::fromUtf8(log_entry[1].toAscii());
+-                temp_entry.title = QString::fromUtf8(log_entry[2].toAscii());
++                temp_entry.artist = QString::fromUtf8(log_entry[0].toLatin1());
++                temp_entry.album = QString::fromUtf8(log_entry[1].toLatin1());
++                temp_entry.title = QString::fromUtf8(log_entry[2].toLatin1());
+                 temp_entry.tracknum = log_entry[3].toInt();
+                 temp_entry.length = log_entry[4].toInt();
+                 temp_entry.played = log_entry[5][0];
+--- a/src/lib/submit.cpp
++++ b/src/lib/submit.cpp
+@@ -151,7 +151,7 @@
+     submit_handshake.setHeader(QNetworkRequest::ContentTypeHeader,
+                                "application/x-www-form-urlencoded");
+ 
+-    QByteArray submit_data = QByteArray(data.toAscii());
++    QByteArray submit_data = QByteArray(data.toLatin1());
+     nr_submit = nam_submit->post(submit_handshake, submit_data);
+ }
+ 
+@@ -251,7 +251,7 @@
+     QString time_str = QString::number(QDateTime::currentDateTime().toTime_t());
+ 
+     QCryptographicHash auth_hash(QCryptographicHash::Md5);
+-    auth_hash.addData(QString(context.password_hash + time_str).toAscii());
++    auth_hash.addData(QString(context.password_hash + time_str).toLatin1());
+     QString auth = QString(auth_hash.result().toHex());
+ 
+     QUrl url_handshake = QString( "http://%1/?hs=true&p=%2&c=%3&v=%4&u=%5&t=%6&a=%7" )
+--- a/src/lib/submit.h
++++ b/src/lib/submit.h
+@@ -20,7 +20,6 @@
+ #define SUBMIT_H
+ 
+ #include <QtCore>
+-#include <QHttp>
+ #include <QNetworkAccessManager>
+ #include <QNetworkProxy>
+ #include <QNetworkReply>
+--- a/src/qt/qt.pro
++++ b/src/qt/qt.pro
+@@ -34,6 +34,7 @@
+ TEMPLATE = app
+ TARGET = qtscrob
+ QT += gui
++QT += widgets
+ LANGUAGE = C++
+ INCLUDEPATH += . \
+     src \
+--- a/src/qt/src/about.h
++++ b/src/qt/src/about.h
+@@ -22,6 +22,7 @@
+ #include "ui_aboutWin.h"
+ #include <QApplication>
+ #include <QtGui>
++#include <QLabel>
+ 
+ class QTScrob;
+ 
+--- a/src/qt/src/console.h
++++ b/src/qt/src/console.h
+@@ -22,6 +22,11 @@
+ #include <QTimer>
+ #include <QApplication>
+ #include <QtGui>
++#include <QLabel> 
++#include <QTextEdit>
++#include <QDialog>
++#include <QComboBox>
++#include <QPushButton>
+ 
+ class QTScrob;
+ class QTimer;
+--- a/src/qt/src/help.h
++++ b/src/qt/src/help.h
+@@ -21,6 +21,9 @@
+ 
+ #include <QApplication>
+ #include <QtGui>
++#include <QLabel> 
++#include <QDialog>
++#include <QTextEdit>
+ 
+ class QTScrob;
+ 
+--- a/src/qt/src/progress.h
++++ b/src/qt/src/progress.h
+@@ -21,6 +21,13 @@
+ 
+ #include <QApplication>
+ #include <QtGui>
++#include <QLabel>
++#include <QWidget>
++#include <QProgressBar>
++#include <QDialog>
++#include <QFormLayout>
++#include <QVBoxLayout>
++#include <QPushButton>
+ 
+ class QTScrob;
+ 
+--- a/src/qt/src/qtscrob.cpp
++++ b/src/qt/src/qtscrob.cpp
+@@ -41,7 +41,7 @@
+ 	logTable->setHorizontalHeaderLabels(tableLabels);
+ 	logTable->setAlternatingRowColors(true);
+ 	logTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+-	logTable->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
++	logTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+     logTable->installEventFilter(this);
+ 
+     recalc_timestamp = scrob->get_gmt();
+@@ -600,7 +600,7 @@
+ 		case 5:
+ 			if (!logTable->item(r, c)->text().isEmpty())
+ 			{
+-				char rating = logTable->item(r, c)->text().toAscii().data()[0];
++				char rating = logTable->item(r, c)->text().toLatin1().data()[0];
+ 				if ('L' == rating || 'S' == rating)
+ 					tmp.played = rating;
+ 			}
+--- a/src/qt/src/qtscrob.h
++++ b/src/qt/src/qtscrob.h
+@@ -23,12 +23,20 @@
+ #include <QtGui>
+ #include <QApplication>
+ #include <QMainWindow>
++#include <QTableWidget>
++#include <QMenu>
++#include <QMenuBar>
++#include <QStatusBar>
++#include <QFile>
++#include <QFileDialog>
++#include <QTextEdit>
+ #include <QMessageBox>
+ #include <QByteArray>
+ #include <QtDebug>
+ #include <QSettings>
+ #include <QDateTimeEdit>
+ #include <QLabel>
++#include <QWidget>
+ #include "libscrobble.h"
+ #include "common.h"
+ #include "missingtimeprogress.h"
+--- a/src/qtscrob.pro
++++ b/src/qtscrob.pro
+@@ -1,4 +1,4 @@
+-VER = $$find(QT_VERSION, ^4\\.[6-9]+.*)
++VER = $$find(QT_VERSION, ^4\\.[6-9]+.*|^5)
+ isEmpty(VER) {
+     message("Qt >= 4.6 required!")
+     !isEmpty(QT_VERSION) error("Qt found:" $$[QT_VERSION])
+@@ -17,6 +17,7 @@
+ system($$QMAKE_LUPDATE -silent language/language.pro)
+ system($$QMAKE_LRELEASE -silent language/language.pro)
+ 
++QT += widgets
+ TEMPLATE=subdirs
+ SUBDIRS=lib qt cli
+ CONFIG += ordered
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
new file mode 100644
index 000000000000..6a3e9163a25b
--- /dev/null
+++ b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=33ed278b9b543554fd6a556fd391eb4c78faab07
+MY_PN=qtscrob
+MY_P=${MY_PN}-${PV}
+inherit desktop gnome2-utils qmake-utils toolchain-funcs
+
+DESCRIPTION="Updates last.fm profiles using information from supported portable music players"
+HOMEPAGE="http://qtscrob.sourceforge.net/"
+SRC_URI="https://sourceforge.net/code-snapshots/git/q/qt/${MY_PN}/code.git/${MY_PN}-code-${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	media-libs/libmtp:=
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
+
+src_configure() {
+	pushd src >/dev/null
+	eqmake5 ${MY_PN}.pro
+	popd >/dev/null
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_install() {
+	newbin src/cli/scrobbler qtscrobbler-cli
+
+	newbin src/qt/qtscrob qtscrobbler
+	newicon src/qt/resources/icons/256x256/qtscrob.png qtscrobbler.png
+	make_desktop_entry qtscrobbler QtScrobbler
+
+	einstalldocs
+}
+
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }