gentoo resync : 10.02.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
commit: 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree: cee0a97398040001220ece3cd48c3d568bcddb4a /media-sound
parent: 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)
53 files changed, 665 insertions, 342 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 3408f440fcb1..6cdf1be2f38b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index ed875a44f20e..2d95452652e8 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -5,6 +5,6 @@ DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B c4b6660ee9718054cc13c6b4f
 DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
 EBUILD clementine-1.3.1_p20180416.ebuild 5175 BLAKE2B b66494abab89a91ed12929a31c5253ab9c2190f3a95f5443a15ec8244a51704cafa734d754dc6928393addccfbfe1f081c9ecfe217a83e15e808a79207878e8e SHA512 302a93dc77c533bc65c10de9f82d1ed5da2f42c40c83392b4b1a32da3fd4e25f530e07edcf704780a93abce026ddc41c4b3054ea94964f4a1cc79658eb5e5ad7
 EBUILD clementine-1.3.1_p20181201.ebuild 5254 BLAKE2B 71f4a4ac2cdbcd23cf1a5e4f9e098e0841872306db1fef39189ee53ff2e18aa086095cbdcaf1977932e61be509213edbcd0783054b683ec9d7dcdc78ba8f2178 SHA512 40a9aa0d2bf16e68cd4b749adfeb0ebf46987a84554371f3c85d959f3c46eaf8c48067a9643cfb827850d0a2a3b51e82fb2eb5d90598386bf4394b6bdf2358e7
-EBUILD clementine-1.3.1_p20190127.ebuild 5210 BLAKE2B 64ae03883bd8f11022d3dc57fbb1911986a9e648af52174afc3ba7144b725e69673be6b84b7f7aa880cbb2ac97971d1cded04fdc020809f1000489929c35280b SHA512 3c975e954e62a8603f6dd54235865e7ce88a46f96f705c871d4f387fe6d6045d8f53c276f07da57379cfaa1ecf3fb0f4d3edc8a15d1a26973614fb0ddfa77c8b
+EBUILD clementine-1.3.1_p20190127.ebuild 5196 BLAKE2B 1d7d01762691fe1d59e969fb8f7eb0a8ca6b7ad0ef865fe491d6346107db844a7ce808c05c6fbaf675a6908b0c76dad18022d8789bb94d0bd29d38d38f84df16 SHA512 c6fde549b1f6a21b76c5d5faa70df34e7a661fa1c9e4d9e4fa9a2aa1eb02319931929ce5bee19eca9e966be121bb64f70e45f905b690ce74ba044133f9feb9af
 EBUILD clementine-9999.ebuild 5153 BLAKE2B 1f43fd1abb60716a257dea4892036352fa419fa38ec606c9cfe7a12ebf10e31d817f44f8e7744eb043cf71e8a08057bccd58c5bc8416185d22dc4f8bd23cf8bc SHA512 ca24106145c5fe3a1ecf1a80fd6667ef02330a3da854b33e35cc0e303023e60bc177fc51cf89c9a050ddc99eb7c00a4bf017359b2824be6bdf94d08edd451cbe
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
index e80f66f40cc1..6e7d542ac49e 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
@@ -81,6 +81,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
 	dev-qt/linguist-tools:5
+	dev-qt/qtopengl:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	sys-devel/gettext
@@ -88,7 +89,6 @@ DEPEND="${COMMON_DEPEND}
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
-	projectm? ( dev-qt/qtopengl:5 )
 	pulseaudio? ( media-sound/pulseaudio )
 	seafile? ( dev-cpp/sparsehash )
 	skydrive? ( dev-cpp/sparsehash )
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 96193b115a5b..7c250031958c 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,3 +1,5 @@
 DIST exaile-3.4.5.tar.gz 3662446 BLAKE2B 13343a5468a4f7f309e173e5195d356d62e10efc20c99cc70a1f0215fafa073eeec19b4e35ae52e11a62575a72263ad11ebdf105fcdd066654f8d6c2b1ff6864 SHA512 9337b86ed2f6a13071615bd46a7a05a6564011a4e1fef4cb42925336864c07854cfe497d8defe65c4e287fd9546de6a51543180c5ce6a84525506e57209914be
+DIST exaile-4.0.0rc3.tar.gz 3627782 BLAKE2B 1c986309798d4cb78969a7443e4c29e02ca3a9c8e316264641ffafe97dd46b6a1745988230c13469ce2d9c37aadf7b07eee5bcd5836f33b1b2d25e3ebb69f574 SHA512 d3822a7d88934c90a2856074f177a346b19896ecca54f33e7506d37a0b25170983c057feaae162c2685780e7f0d1a6edc8ce7addbcc04cacf2d2b25e0c9f36de
 EBUILD exaile-3.4.5.ebuild 1273 BLAKE2B 8b3c72922d2831f2986a29e2564cc918457087f853aed9c6d062d6053064f13ca0cad51243b2f9a7b1f4a43888f8d42a6ec503d261c175c19bca4b16f31a550a SHA512 f7bf1db46bde640508dc3efa6cafc6cdedffca9b11aa9bcecdd9aeaaf5f87285966f287416a534d4def09d137bc3a89f38b35882143bf692bd80f93688fa4f73
-MISC metadata.xml 380 BLAKE2B 9d0cff24c31104dac5ff1d9911df1bc67c25f6765b723591ae1a0849f539c44469d10956105dddefdb377375a01099331eb0b223627fbcb3459c6994b4db2507 SHA512 763f538de48767038faac1b7ffed4ac1422be573b6e2e01ff6679e8aeff00f2d14a3fc6bcf40e742a639f36f13cfe893fea77e5fd4f8a273af5d8cfa8db529bf
+EBUILD exaile-4.0.0_rc3.ebuild 1864 BLAKE2B 23fbc21fb61f762cfb3c1dd7f1d3d1addfaf81e25b8714e2f76ef1784e5830931c69fb646fb59581b983b0a461811ffaf0d108c35f119044022826fa96a9f497 SHA512 e9f9062e921f0a29b974506f31b6179cce857f9966aa8d9c86bce2ce4ef9d3bd7a5c954477ba1a8dd69892c278ef20ef622da785ac5d73103e9a0bc8190fb82e
+MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942
diff --git a/media-sound/exaile/exaile-4.0.0_rc3.ebuild b/media-sound/exaile/exaile-4.0.0_rc3.ebuild
new file mode 100644
index 000000000000..f3e1373fd4ab
--- /dev/null
+++ b/media-sound/exaile/exaile-4.0.0_rc3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit python-single-r1 xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
+	KEYWORDS="~amd64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-${PV/_/}"
+fi
+
+DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
+HOMEPAGE="https://www.exaile.org/"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+IUSE="cddb libnotify nls scrobbler"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/gobject-introspection[${PYTHON_USEDEP}]
+	dev-python/bsddb3[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
+	>=media-libs/gst-plugins-base-1.6:1.0
+	>=media-libs/gst-plugins-good-1.4:1.0
+	>=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
+	media-plugins/gst-plugins-meta:1.0
+	>=x11-libs/gtk+-3.10:3[introspection]
+	cddb? ( dev-python/cddb-py )
+	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+RESTRICT="test" #315589
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_compile() {
+	use nls && emake locale
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		LIBINSTALLDIR=/usr/$(get_libdir) \
+		DESTDIR="${D}" \
+		install$(use nls || echo _no_locale)
+
+	python_optimize "${D}/usr/$(get_libdir)/${PN}"
+	python_optimize "${D}/usr/share/${PN}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-sound/exaile/metadata.xml b/media-sound/exaile/metadata.xml
index 3f99551b683a..56d330882f09 100644
--- a/media-sound/exaile/metadata.xml
+++ b/media-sound/exaile/metadata.xml
@@ -9,4 +9,7 @@
 		<remote-id type="launchpad">exaile</remote-id>
 		<remote-id type="github">exaile/exaile</remote-id>
 	</upstream>
+	<use>
+		<flag name="scrobbler">Enable audioscrobbler/last.fm support</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/forked-daapd/Manifest b/media-sound/forked-daapd/Manifest
index b9c907f29b5f..35a46652155f 100644
--- a/media-sound/forked-daapd/Manifest
+++ b/media-sound/forked-daapd/Manifest
@@ -4,4 +4,4 @@ AUX daapd.initd 583 BLAKE2B 0d84bdf5eb458568e07b2e3866dc36e95f1a2e169055345383b5
 AUX forked-daapd-23.2-fix-arg-enable.patch 2272 BLAKE2B a32aafa2779f3c276def8c522215f46dc6289230d3b055d5ae0389590b9d71eadb7e96a919266089eead0b567ad880b4c836bb596f569d64cda1365f3c87285b SHA512 48768ab213334c2324435a82cb58982100e8467001284bf589816e983982d4916198e659afad1fd7ca8e437c48971fb5ed7eeafcfa0118965d91fac839bfafe4
 DIST forked-daapd-23.2.tar.gz 325895 BLAKE2B 31fd3362ed3a46721aec7b48efafb2fd77a4bb549362ee1717e2166409ce0f24a65c5ea95d4278860cb0e3ad717bcdaf7c3a744678dc591263f5cd4c4a965991 SHA512 11b5c6c16c0c9e20f1c196941cd09602d90b5e2ed0765e4fac25c6aeba388706bd7ede9f6c467227c245f2597466e8658f9db75073ee8b47b16f947514eb1511
 EBUILD forked-daapd-23.2-r1.ebuild 1706 BLAKE2B 3f8e975f12e33b4bb199bced28400914ebde21282e7738ef007f77ff1ea7ebb84c7f6eef584b08dca54d8077af8e6560618e82cbf09576c05986b77a138a0226 SHA512 84eedde4fb1a319bf4a9eec0b7c49ba0e46ca35c9c59742086e7866b7b3b8e71ae36987c71d7a31ff6bde49d6480736ef528e879886fed4da7d58e5c4835158e
-MISC metadata.xml 793 BLAKE2B aa9497c2700a6b0fa38496b637d9a65124bccc571ad2afc76ceca831b2fcacca09a31f318ad7eba39d0848476e14057a1e61d3cb1c7880a425c936f979909dbd SHA512 43ef73e58b7e999ee49ac1af5fcf1861e19debcad5cb783f3cec5e977badef997be362520932b97e404b39c5578df91b26821289733458cf1125d41572bf4d34
+MISC metadata.xml 709 BLAKE2B 2117c8cbf0c60b7ebe4b8b049ef4404bac1a352a7ba57eaf2f2f96b0e907cb89d434a1d8a65a322a7ea4af412f65d7815e112821638b61caa229cbca7838a2b7 SHA512 70fe2587d026889937545d2f7c72429f3ff09edf8d95296c1a4047cff829863614c9f63981f63686b67de6ea33c4b78b8622091cdb14cb6531d3af80dbb294b0
diff --git a/media-sound/forked-daapd/metadata.xml b/media-sound/forked-daapd/metadata.xml
index 4f9e72da3bf6..6c5d7e30e1be 100644
--- a/media-sound/forked-daapd/metadata.xml
+++ b/media-sound/forked-daapd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>stasibear@gentoo.org</email>
-		<name>Erik Mackdanz</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription>
 		This is a much updated version of the original
 		forked-daapd 0.19 (non-gcd), a Linux/FreeBSD DAAP
diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest
index d0022686c949..296108a910fd 100644
--- a/media-sound/gtick/Manifest
+++ b/media-sound/gtick/Manifest
@@ -1,3 +1,5 @@
 DIST gtick-0.5.0.tar.gz 650541 BLAKE2B ecffe2ce04438352f3c294eee550d3d73268102960e9447bdea03c9ddfce20a223fb018f8dc92ab98a778f9a24718e2d740a2631d130da8eb4ea065761da0110 SHA512 916295cb4101e6b958e1a51195dcc0cc0e088f0b2a2e52afaf8becd93782277cbf9cd51ae4e0b3edbbc66994912b6f7be755632ff85a47aabb8fb87b4acb14ef
-EBUILD gtick-0.5.0.ebuild 744 BLAKE2B fea5c826ef47a51e71d707a0e689032938402b26134fee89d83cfe21548bc34c875f752f4e9daa34683c284d1b633795385c5ef999f39e836410d38856ccfcb4 SHA512 8f9f8870ceba8aee864a22a4ab6b1885928be6cc76bbe8f55b6e249c20d7c12ac9dd4241115434ecf46f96096a3df073a92e013e5dbbc6a28989da9806bde2d1
+DIST gtick-0.5.4.tar.gz 641902 BLAKE2B f1832f46b559908ae0c40bd0f6a08e145a0ba58a6cf2f8e7235b4f3f0b9141ea514cf52c51cef24d745ce360423daab855c42b5f6719664be65bf5f254650c1d SHA512 28ea6f38952c376f1f684e7b598d1032063f7fdf3454cdb86735cb835079312c0d1c30dfeade7272f5399296f2a2ede5b81524036a9ac0d91e0878865fab446e
+EBUILD gtick-0.5.0.ebuild 743 BLAKE2B 019c11b01476e74c91e5d78a073b8dc1ec53e1f6d80a1a4f52b99118bb31972b84979bd1df849d34b3b34d13da87041edbc48266dde7dc8d0a77552c8986f6e2 SHA512 7afb0f2bde050105746fedcf2cae36e83afeb90c5b1decfe94b96ad0f81a3908cddb388031f88fcfe5f68d84e630b1eea341ba3913ab64a53390f26ede5f2e2f
+EBUILD gtick-0.5.4.ebuild 828 BLAKE2B 9608d8d8880912a6e846c62a6cdd3d4ff2e51e22c1dd2b379d6e2be8a1e4b7b861c70944748e4b9d2ccca9e0e8f523457678e461d9776e7c979648ee301b36f4 SHA512 1bc9bc4ed28e4c3b187b8f33e5e1d0d48b9e49182b35b3e96788154a7b690ec92e0f9719983a531b3f20130b5a718661f4068448ac3adce8a94f92b32d397761
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/gtick/gtick-0.5.0.ebuild b/media-sound/gtick/gtick-0.5.0.ebuild
index 444515a7a386..01b14460e320 100644
--- a/media-sound/gtick/gtick-0.5.0.ebuild
+++ b/media-sound/gtick/gtick-0.5.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 inherit eutils
 
 DESCRIPTION="a metronome application supporting different meters and speeds ranging"
-HOMEPAGE="http://www.antcom.de/gtick"
-SRC_URI="http://www.antcom.de/gtick/download/${P}.tar.gz"
+HOMEPAGE="https://www.antcom.de/gtick"
+SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-sound/gtick/gtick-0.5.4.ebuild b/media-sound/gtick/gtick-0.5.4.ebuild
new file mode 100644
index 000000000000..6d5842684e83
--- /dev/null
+++ b/media-sound/gtick/gtick-0.5.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+DESCRIPTION="Metronome application supporting different meters and speeds ranging"
+HOMEPAGE="https://www.antcom.de/gtick"
+SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="nls sndfile"
+
+RDEPEND="x11-libs/gtk+:2
+	media-sound/pulseaudio
+	sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i "/GenericName/d" ${PN}.desktop || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with sndfile)
+}
+
+src_install() {
+	default
+	newicon src/icon48x48.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "GTick"
+}
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index 389801b39452..ead1bf125764 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -1,5 +1,6 @@
+AUX mpc-0.31-nodoc.patch 403 BLAKE2B d829c6f40005531ec7657054549b5fa9acd32d15d41ca8685b4292aac804af52f2f4754b557b69663d4240e6690fe4ab19a15b72459cea321944afacf2a179f3 SHA512 2a028d57fbd76290bc300d0546b52571b6c7c29cf8d2f53cb859b5250c55ae631fe15c8589a1b11c5fef5dacff2ad8535dbfae6c8b2b72dc8a4dc795dfc658b6
 DIST mpc-0.30.tar.xz 41968 BLAKE2B e7d1156f4fe933c360196a1fdaadeb7b51f12b3c6d7bd2f98f80359485acb9d55ea7afb98c82696078b325ab3662bf33b20653d5e0edf0f52c64624c679dd0b6 SHA512 72d6f742de87ca1a9a09c73987786fa7c93b2829242135b210a9a2269e0319ba9e37367dae1043461ea870087faf5c349425025ce6c02aa9dd513ae90cbe8221
 DIST mpc-0.31.tar.xz 43896 BLAKE2B 2b65307983dfd0bc2738b3e4b1379b43b6fec712352f25a6158adefd2065eb3ff8be194e482fc441c74b69feeb8fba277d7061fb80ee6d7d72432f3284f61fb2 SHA512 48df7d85df704ae901ee0a07193daf9738b682b71a24ebd5bf4458aa562acd11b582f83adcfca814faa9a014ef565cb6c23df837b83a569fd6050f9f3802e6fe
 EBUILD mpc-0.30.ebuild 821 BLAKE2B 11cb4a54988476db7b20eb7ea4c79cc0c974146bbb0dfa1a991cb2abbb26b68e19ad2256c44b87ad0baf061a66c97bb8ec249d4fcaf5a286ee2424ab8c2db4e6 SHA512 7cfb2d1d2c06181f5205b34f4c5f8a184c34995eca8107336e2268569a195e807f7910d1f5588523e5bbe6442724e430f7cdcc2f0fecee0fe6dab62104e607cf
-EBUILD mpc-0.31.ebuild 870 BLAKE2B df930ab67691618ed141d743fbafb702d324dd6652bceead49b69e7c6f3aa8e035b1d2cb336bca6685a5d28bfd135c24f75177983b6b44573ccba66c6d40298b SHA512 2adbd8c19282c054700e3634fedd29477da4d5345159ee6494189b3a5f52cef62e9b31bfc77b26b8d51d15a9ab68df70f54319ae9d4dd9e94f547b033de9a629
+EBUILD mpc-0.31-r1.ebuild 1235 BLAKE2B e2009c9410ecd84a8aaf3ef2c873a48e3998606678d48ff7e5932cdaafba4bcf6004ee3fab0446a31546296e74cd4d12bbdbc40968680a073a8f29558b72222c SHA512 86417d83305e4cb2434f2e5c9c412907d524cdbb6ddd71b895d30eba9bacd7bf94538033965c7708d392b3048dd1fc1b09ba87fb60ab7baa75b58424ecf74861
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-sound/mpc/files/mpc-0.31-nodoc.patch b/media-sound/mpc/files/mpc-0.31-nodoc.patch
new file mode 100644
index 000000000000..55afa828ffc3
--- /dev/null
+++ b/media-sound/mpc/files/mpc-0.31-nodoc.patch
@@ -0,0 +1,12 @@
+--- a/meson.build	2018-10-24 10:31:33.000000000 +0200
++++ b/meson.build	2019-02-09 22:49:02.890387140 +0100
+@@ -109,9 +109,6 @@
+   install: true
+ )
+ 
+-install_data('AUTHORS', 'COPYING', 'NEWS', 'README.rst',
+-  install_dir : join_paths(get_option('datadir'), 'doc', meson.project_name()))
+-
+ install_data(
+   'contrib/mpd-m3u-handler.sh', 'contrib/mpd-pls-handler.sh',
+   'contrib/mpc-completion.bash',
diff --git a/media-sound/mpc/mpc-0.31-r1.ebuild b/media-sound/mpc/mpc-0.31-r1.ebuild
new file mode 100644
index 000000000000..63e630daea44
--- /dev/null
+++ b/media-sound/mpc/mpc-0.31-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 meson
+
+DESCRIPTION="Commandline client for Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc iconv test"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	iconv? ( virtual/libiconv )
+	test? ( dev-libs/check )
+"
+DEPEND="media-libs/libmpdclient"
+RDEPEND="${DEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${P}-nodoc.patch" )
+
+src_prepare() {
+	default
+
+	# use correct docdir
+	sed -e "/install_dir:.*contrib/s/meson.project_name()/'${PF}'/" \
+		-i meson.build || die
+
+	# use correct (html) docdir
+	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
+		-i doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Diconv=$(usex iconv enabled disabled)
+		-Dtest=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newbashcomp contrib/mpc-completion.bash mpc
+}
diff --git a/media-sound/mpc/mpc-0.31.ebuild b/media-sound/mpc/mpc-0.31.ebuild
deleted file mode 100644
index 2429ef0a37b6..000000000000
--- a/media-sound/mpc/mpc-0.31.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 meson
-
-DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="iconv test"
-
-RDEPEND="media-libs/libmpdclient"
-
-DEPEND="${RDEPEND}
-	dev-python/sphinx
-	iconv? ( virtual/libiconv )
-	test? ( dev-libs/check )"
-
-BDEPEND="virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local emesonargs=(
-		-Dtest=$(usex test true false)
-		-Diconv=$(usex iconv enabled disabled)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newbashcomp contrib/mpc-completion.bash mpc
-}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index f61ad09cb59b..4c9a17ed31ab 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,5 +6,5 @@ AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
 DIST mpd-0.21.4.tar.xz 663648 BLAKE2B c9226d2b02b1035091d3af535c269aec3fead779bf17d95b858706affb84089ca85250452884ed5ee96008724735abf80cdfa4d2de14d9928748284d753a4638 SHA512 454fde206f98f89a58ac773037963ac895ee6ce3e7d1032c49b980a3bfbbb69782a62900a5c09e4b39f24b2d1bcd380d7b520935563dd3b8d02f701389389ca7
 EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
-EBUILD mpd-0.21.4-r1.ebuild 8226 BLAKE2B 9b35e85135238e84fcca184b6c0e0be83232589f4903a1ff35b4bbff45d44db3e5d790ccf6e0d574e32bf5e007c902d4bb2258f0b206fbbbf33ca049353f2ce2 SHA512 bf0282817fbe58f1cd9210bb3f3b3bc69ef4257857b17471772de1f6f5205d5ecdb97fa43752f55ce606ec2837099f2c2d11ddc113955b3a4fe9c6df7a8174cb
+EBUILD mpd-0.21.4-r1.ebuild 8177 BLAKE2B 88d64da9c7cf7db53408fab1160e457220b53d3b22f568ff5271c952c313a06bc535990efe4de1eaee31fd87269834dc236220b557a41a71e4d517319224da68 SHA512 44df6319722f18c8096c083e0c214e8e9a64a924178805d9359edc0a9576eafe00756d8537ca6425761b3835dbef055bd70e5c9fe9fd98f6cb8b3a6252ecbb8a
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.4-r1.ebuild b/media-sound/mpd/mpd-0.21.4-r1.ebuild
index 5a07765cd9dc..51216f324c5a 100644
--- a/media-sound/mpd/mpd-0.21.4-r1.ebuild
+++ b/media-sound/mpd/mpd-0.21.4-r1.ebuild
@@ -5,8 +5,6 @@ EAPI=7
 
 inherit flag-o-matic linux-info meson systemd user
 
-MESON_AUTO_DEPEND="no"
-
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
 SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
@@ -111,8 +109,7 @@ DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.58:=
 	test? ( dev-cpp/gtest )"
 
-BDEPEND=">dev-util/meson-0.47.1
-	 virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.18.conf.patch
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 2da136295a5b..20aed140d9cc 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -2,9 +2,13 @@ AUX musescore-2.1.0-pch.patch 1045 BLAKE2B c6deca9a34f687d5f8f9048e91049a0706a39
 AUX musescore-2.1.0-qt-5.11.patch 575 BLAKE2B 1dd0dfea52f73dc3d031dcead6ba07ac55195b264f393c39f0c411d6fc3f9d974f78a6948a9918ca67381e5c2c0b67750a5ccf0ac4a2ed2a8d1000434157d8a8 SHA512 5a6ec5aedaae257223fec6137dcc5ded44d6a4478f183c61220cd7d3c4b96c0fe591ff12070e4962979bb5c6d93a8c87a3003d3bcb449b1fe0977072e55615ed
 AUX musescore-2.1.0-qt-5.12.patch 2451 BLAKE2B 5c4f0143f262a451551f438607d8d09ff98f2fb23bbea09a74c00b1699ac9d284e582acacbcb224e0a02878a65744a2c202ae80e8a9045056abe68888b52a6a5 SHA512 529d48f961c21b89195dcad44c9d5105724c71bacbd30846dfc183f0ff5654b20a58cdffbe0b8fc7730f851d39652e4315dbb407ebd91994ebc061c6dcee2447
 AUX musescore-2.1.0-qtsingleapplication.patch 1176 BLAKE2B 6218c930ba69595f6ad674d225b95a34e8b7fec4b93f9bd23ca7f0c3201c4af04056c1b23c191be2764d350afae36d1f586555358141e9efb50e6a622ab9c5ab SHA512 fc1300940b6101f985a607fa3c1e3ebc2d3b88335f57bb9cb2b442e0253c24cc31a5d1d07c1dfc507234a0146bfd480ea546ac8b63ffbfcef1635d5086326bf0
+AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb
+AUX musescore-3.0.1-porttime.patch 637 BLAKE2B 2272e64f8b6944fd25567dc1eafcded49cf6f92ad8da3d16a897f4fa854e9638826fc1bc66a79e1d0032020b8217b9d65b4d9272ce0018effacb439ee64a4b63 SHA512 a3379adb9b8adc5fb6c430694bb34cd832948c68a5cdc2e3ddc148f34e8367ec7674c679da5881a417bdb90f8cec1415d41fefb7a5dd420c298b4bfa2ffb2a15
+DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5 SHA512 91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
 DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a SHA512 5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc
 DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2
-DIST musescore-9999-fix-buildsystem.patch.bz2 4019 BLAKE2B 0a80141d36fe8cf1bb4ac92f330c0b401a8686fa661b02842f49ee67d5fdeef339ae6909091637e22c81dddfa128b884c9bdaecdc540274896251424b40b78ae SHA512 6ac113314e3dc93856002df5b89f86728873869075db5e2b99f29f6b69c5ddbd178f89305656370b09d8180eb44b7a56623f06a8e674a522390c8dc59e32ad89
+DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
 EBUILD musescore-2.1.0-r1.ebuild 2089 BLAKE2B bc9bb75457814eb081a678140065da6e2b9dce7f33f2047f81fe87960573631af79418eeefa52da485b2c60e809b6091e4347683e4803a59d7cf0758d97d1582 SHA512 d9279a30d2820169719a861702107d39d4a10ca055ddb29c16342a9bc23b09f7c65ad7e70b5afcadd13943ea0cc26a9073c177b9a1dc6ee4ea67ce87bb4ea569
-EBUILD musescore-9999.ebuild 2050 BLAKE2B 8c7c0f41b3c956c6a960b791db44b8c9d39f7ba6d3fb12b2b18253c5160e272fd3f6e75abf421fdbe2caf34628c8f55775d4b18b28b92d7717ca5fdcd5c8be06 SHA512 550226b2ea764ee2f03c8ca71ff601adeb5822dd629e94fc52435879a069128e886ccdd1e9f42feba482f193129113e0b16173d07379709c5cd123e79177c29d
+EBUILD musescore-3.0.1-r1.ebuild 2628 BLAKE2B 4b5b7e0ebfc7bb79d63832bd60604accacecc22cb87ef379ecce5e7f4e54af42a1279b15303c82a5e6f2be6b68e8fe25e40e93cb628ecce7b1e14a73f6dc45f1 SHA512 649f6970cf0fa353061d143977feb1d965ba6ac23259c0ad538f28f46808efb98e532abe0ff8e4d66951a3ba389e79885f20c2a5295eab7d04d2f19efafdb8a9
+EBUILD musescore-9999.ebuild 2634 BLAKE2B b97c89d8ce5b5b63c762030be4d2912d8f7c658c568fb06210d06964ea046f7f189ab9685792cd328abee7d0b9eb2cb186e639e3f40b410fe0b41a5ce38e54dd SHA512 6de966e26fe26664bf7348fa35d0ce027c6703f4f23c86c131f3419ba72dc803caee766fb821339d84521175be2691c301ccec1e8c0d6b6379f5dbd0ada58454
 MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
diff --git a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
new file mode 100644
index 000000000000..fd5ade55ed42
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6437963..2a173b9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -660,7 +660,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
+     # Compress man pages if gzip is installed (don't on OpenBSD)
+     # Note: Compressing man pages is normal on Linux but not OpenBSD
+     find_program( GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional)." )
+-    if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++    if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+         message(STATUS "Found 'gzip'. Man pages will be compressed.")
+         set(MAN_TARGET ${MAN_BUILD})
+         set(MAN_EXTENSION ${MAN_EXTENSION}.gz)
+@@ -677,7 +677,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
+             COMMAND echo "Man pages have been compressed ready for installation."
+             VERBATIM
+             )
+-    else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++    else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+         if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+             message(STATUS "System is OpenBSD: Man pages will not be compressed.")
+         else (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+@@ -687,7 +687,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
+             COMMAND echo "Man pages will be installed uncompressed."
+             VERBATIM
+             )
+-    endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++    endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+     # Install man pages in either compressed or uncompressed form
+     install( FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc)
+     # Create symlink alias for man pages so `man musescore` = `man mscore`
diff --git a/media-sound/musescore/files/musescore-3.0.1-porttime.patch b/media-sound/musescore/files/musescore-3.0.1-porttime.patch
new file mode 100644
index 000000000000..b9bddf1d9d97
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.0.1-porttime.patch
@@ -0,0 +1,13 @@
+diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
+index fcf9332..59db47a 100644
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -715,7 +715,7 @@ else (MINGW)
+            if (APPLE)
+                set(PORTMIDI_LIB portmidi)
+            else (APPLE)
+-               set(PORTMIDI_LIB -lportmidi -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
++               set(PORTMIDI_LIB -lportmidi) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
+            endif (APPLE)
+            target_link_libraries(mscore ${PORTMIDI_LIB})
+        endif (USE_PORTMIDI)
diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild b/media-sound/musescore/musescore-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..a433e8b66362
--- /dev/null
+++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MIN_VERSION="3.11"
+inherit cmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.3.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024
+	dev-qt/qtsvg:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/freetype-2.5.2
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( virtual/jack )
+	mp3? ( media-sound/lame )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-man-pages.patch"
+	"${FILESDIR}/${P}-porttime.patch"
+)
+
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DDOWNLOAD_SOUNDFONT=OFF
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
+		-DBUILD_ALSA="$(usex alsa)"
+		-DBUILD_JACK="$(usex jack)"
+		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_PORTAUDIO="$(usex portaudio)"
+		-DBUILD_PORTMIDI="$(usex portmidi)"
+		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+		-DSOUNDFONT3="$(usex vorbis)"
+		-DBUILD_WEBENGINE="$(usex webengine)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake-utils_src_make -j1 lrelease manpages
+	cmake-utils_src_compile
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 051ffdcc6ae9..cd2dec78e2d4 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils git-r3 xdg-utils
+CMAKE_MIN_VERSION="3.11"
+inherit git-r3 cmake-utils xdg-utils gnome2-utils
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
+# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.3.tar.bz2"
 EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -47,16 +50,26 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${WORKDIR}/${P}-fix-buildsystem.patch"
+	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+	"${FILESDIR}/${PN}-3.0.1-porttime.patch"
 )
 
 src_unpack() {
 	git-r3_src_unpack
-	default_src_unpack
+	unpack ${A}
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DDOWNLOAD_SOUNDFONT=OFF
 		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
 		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
 		-DUSE_SYSTEM_FREETYPE=ON
@@ -67,7 +80,7 @@ src_configure() {
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
 		-DSOUNDFONT3="$(usex vorbis)"
-		-DBUILD_WEBEBENGINE="$(usex webengine)"
+		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
 	cmake-utils_src_configure
 }
@@ -81,9 +94,11 @@ src_compile() {
 pkg_postinst() {
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 8daaffd80963..3cc605213810 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,5 +1,6 @@
+AUX ncmpc-0.33-mandir.patch 884 BLAKE2B efe04cbaecc0c44511f9a4e9eb0bcc29da1ab53a72418cadfcf467ffe13490e243e05d268cddb7aea6150033df03bb01f2b49ecfee5854eaaa776f15d2e1259d SHA512 ca6afc19c2bf900abb770ed915ed8dd583bb0ad04d29291796f8b7bf083d6de1fecac2168aa0ca72413534ce74bf598132521c5b9c59c6aace51c20598935b23
 DIST ncmpc-0.31.tar.xz 249816 BLAKE2B c9c42fc1ba5cb79cab9a9cc86831ba8ca82bb57981885be81b218d57f529ac7ca9adfbb0de1e0bc7dca8215ecf5fdae1481b73ff6d0dfb69c2020390d0c6a1a2 SHA512 0d3fed08f54afd9aef6342928a3f3b63a973d86ec6510f54c59271316aad856cd1a493e193f676971d90c40ef26486789e8580f2df528bd031251265c48a5eac
 DIST ncmpc-0.33.tar.xz 226344 BLAKE2B d52fdcb17adda1d3d61645715029552804edbf8ed95d2f19e0a25ba11f66cf0e7921748aebceb63e8e32b8d31fbc2d387dfbed6bd5c6a735d5ffa4b17d9b4fa3 SHA512 47730003c9a8ad5b6e682de4b4d3c8882d3266659fcd73ea131d1bba3d6b4d9ac66bb1a3522d63cb238ca9e22d8035907b9d7621a0b5106763770b17325f53b9
 EBUILD ncmpc-0.31.ebuild 1783 BLAKE2B 897668f216ced813cc97c2ff2ca45d977f171fcb43603e859f8d36910e7bd3c1c0cf4868393484876cdd5c6111153bbf1762d5506a184d146dc8d36889f229f2 SHA512 dec7ce858c61367633a2a4ac2869067c37492eaef9455a209a275d3514fc3a15933daa129d111b0c828f0608f3d418ef3f3d5d225e9f682691c6e702f3bb8250
-EBUILD ncmpc-0.33.ebuild 1922 BLAKE2B 12ccee76195f41dda18d07239f7b2d5976bfc3de0356ae0a6e5b8b22c3accb47a4d768bf1eff1c6f081de84f1e22c5c47abdf1f6d068b6ec535041728db2baa3 SHA512 e9b361a9f9a5c2588a16c3697fe849619774115205cedb4c225c30f536777188a83bb1d3d5190841260a222ce8bcdfd012e57809d2a7c5db3aabcf48c24dc5d5
-MISC metadata.xml 990 BLAKE2B e06b3b901b9a32b442c8400fa236230f5aa66c567bb971799521e9b1b1df3260e0c28d7769b3666b6caf495ed29c440ef3a83c2a32b4a0c3399a0f7ae5a2abc9 SHA512 ec9e7331521962746ed19da65e086d232fc32806aca80467a4d4eba8df9ac51d74f388b8a6608235263d2ed3831fb0084c9cad499d0aa33eb360872d71194629
+EBUILD ncmpc-0.33-r1.ebuild 2074 BLAKE2B 6c4535a425b2d3febc3f32eabbe400748ceb7cf02235b06c909da777fb6b66f851bc8aae109843e81003e13b484a37cf7160a8f33ebf8268cae3b9618f2a1052 SHA512 8e8e4f24d93397839eb111435314518e1992a2e421d075104c0c6dda7b70d2b5e4b662276bad8c7accbe7fff31ed71df4d8c47b528826e22c5ee0b6d8c813538
+MISC metadata.xml 1049 BLAKE2B 7b19b1d2c404f22864faeb30a96cf87a9eb7429eb4bd0372bc28e03a88a42f827c468fb13fb0b164b8019d8e54a7a8b0f4f6d37c9f33a4f410e930cd00092df8 SHA512 f4b1af0181ec32c85f15e2357db3dd59ea38a820ade7ce658195c61ee0bf2449b06d12a2dd67c40aaaa8895e51fbbd003edd84e54804368d00f0dd1225009cbe
diff --git a/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch b/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
new file mode 100644
index 000000000000..0bc3798bc5e7
--- /dev/null
+++ b/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
@@ -0,0 +1,25 @@
+From 821acdad907d1558c570bca6e2ac63d55905f363 Mon Sep 17 00:00:00 2001
+From: kaliko <kaliko@azylum.org>
+Date: Mon, 10 Dec 2018 13:46:42 +0100
+Subject: [PATCH] Fixed manual install dir
+
+---
+ doc/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index aadea58..f4b491d 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -30,9 +30,9 @@ endif
+ if get_option('manual')
+   custom_target(
+     'Manpage documentation',
+-    output: 'man',
++    output: 'man1',
+     input: ['index.rst', 'conf.py'],
+-    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
++    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@'],
+     build_by_default: true,
+     install: true,
+     install_dir: get_option('mandir'),
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index 240ddfa18ac8..f4eb96c015fc 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="chat-screen">Enable the chat screen</flag>
 		<flag name="help-screen">Enable the help screen</flag>
 		<flag name="key-screen">Enable key editor screen</flag>
+		<flag name="library-screen">Enable library screen</flag>
 		<flag name="lyrics-screen">Enable lyrics screen</flag>
 		<flag name="mouse">Enable curses getmouse support</flag>
 		<flag name="outputs-screen">Enable the outputs screen</flag>
diff --git a/media-sound/ncmpc/ncmpc-0.33.ebuild b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
index 5aa8337eea5c..745b2f2cc692 100644
--- a/media-sound/ncmpc/ncmpc-0.33.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
@@ -5,37 +5,42 @@ EAPI=7
 
 inherit meson
 
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
 HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+artist-screen async-connect chat-screen doc +help-screen key-screen lirc lyrics-screen outputs-screen search-screen +song-screen +mouse nls pcre"
+IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
 
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
 RDEPEND="
 	>=media-libs/libmpdclient-2.9
 	sys-libs/ncurses:0=[unicode]
 	lirc? ( app-misc/lirc )
 	pcre? ( dev-libs/libpcre )
 "
-
 DEPEND="${RDEPEND}
-	>=dev-util/meson-0.47
 	>=dev-libs/boost-1.62
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
 "
 
+PATCHES=( "${FILESDIR}/${P}-mandir.patch" )
+
 src_prepare() {
 	default
 
 	# use correct docdir and don't install license file
-	sed \
-		-e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
 		-e "s/'COPYING', //" \
 		-i meson.build || die
+
+	# use correct (html) docdir
+	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
+		-i doc/meson.build || die
 }
 
 src_configure() {
@@ -44,22 +49,22 @@ src_configure() {
 		-Dcolors=true
 		-Dmini=false
 		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
-		-Dartist_screen=$(usex artist-screen true false)
 		-Dasync_connect=$(usex async-connect true false)
 		-Dchat_screen=$(usex chat-screen true false)
 		-Ddocumentation=$(usex doc enabled disabled)
 		-Dhelp_screen=$(usex help-screen true false)
 		-Dkey_screen=$(usex key-screen true false)
-		-Dlyrics_screen=$(usex lyrics-screen true false)
-		-Doutputs_screen=$(usex outputs-screen true false)
-		-Dsearch_screen=$(usex search-screen true false)
-		-Dsong_screen=$(usex song-screen true false)
+		-Dlibrary_screen=$(usex library-screen true false)
+		-Dlirc=$(usex lirc enabled disabled)
 		-Dlocale=$(usex nls enabled disabled)
+		-Dlyrics_screen=$(usex lyrics-screen true false)
+		-Dmouse=$(usex mouse enabled disabled)
 		-Dmultibyte=$(usex nls true false)
 		-Dnls=$(usex nls enabled disabled)
-		-Dlirc=$(usex lirc enabled disabled)
-		-Dmouse=$(usex mouse enabled disabled)
+		-Doutputs_screen=$(usex outputs-screen true false)
 		-Dregex=$(usex pcre enabled disabled)
+		-Dsearch_screen=$(usex search-screen true false)
+		-Dsong_screen=$(usex song-screen true false)
 	)
 
 	meson_src_configure
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index 7b707e80137c..67f82e4e6568 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,6 +1,8 @@
 AUX fix-missing-gint.patch 629 BLAKE2B 934363d22d7f7fb4eb8f0116418a703d83c50847b249623fe313f007d58a54b99691b611b76b6fcee714d5df9e73d21d25ea4914bd66096cf12e645f28fe703c SHA512 66aaa515cbb7a76f6f87fa527723cc60082ed77efeb02cb8fef784be3ab8a8fbec37ec61d7ff67c4b0cc0074cc281dd238c19cb1fb7686e57bb274b226dc25c9
 DIST pasystray-0.6.0.tar.gz 53835 BLAKE2B ef5abab45a17f6445e8cbd1e37c300aa2c1c25bee3d684d05263b02a507badb1d5ce7a1c76bed94d255e4f2d5e2f18bdfd749e83e98273a52d42ffb12a32f115 SHA512 51fdb5aab22ad10ffe73f6de68115ee1559f09f58cfe4d5201a2f262323ca3476a8b09c7fc02c4144414f44444661edd25d2d39b3de54ed4c662660867da622c
 DIST pasystray-0.7.0.tar.gz 56014 BLAKE2B cba947895fc71a18a43c314486ec3513e844b1df426d0104f321c8ecd28199b6b4adf69f5c10146470a74c5e6f74f505833bd00c4541399a162ddcfb8aac4701 SHA512 a98dae85640c0640f921173cf5a794963e974af64a7a972bbc2a53e69060895b55494934bc1fcfd957f0c94ca90e4d52634bf444e841b2a0a57434e05500161b
+DIST pasystray-0.7.1.tar.gz 56041 BLAKE2B 5f7cae7a55580bf3dfe294e95bbda372c3a679bec000d222964b4027ced2462dfb4a8446d0683f8910e96ab98e1541b3fa9fafc36da530c92d2285f00a1beb65 SHA512 2af5176e6a5bf6d74baf0a0b52b731b7a3b54f787c4e89d945357aab4e186a35e0f77288d69d66743bf4e21f758e0d961cc1f9b339ce513eb4eb2bcab0d754bb
 EBUILD pasystray-0.6.0-r2.ebuild 1098 BLAKE2B db682d8aeb9c5897bd8cfc636d48c08a9836c6a36c9a04dd7ef1c5b05829ddfdec7b122c2021acf0a8999e9c3c0451aae9f47c5385b06243ff6a69fbda86eeb7 SHA512 6a11e33c0ce6cd4f4272978d2371b219e697c554b32a3596519eb9be7b621d3e5aff01ff308b8e912d53be4d767fc2f9e4ded71bf47244ca2d5379fc43e3c4b7
 EBUILD pasystray-0.7.0.ebuild 1003 BLAKE2B 693733b47c7195d7318c89d38873d1895c674c75246ea67ea2cb82a4da21ec694afe08d062a20f2db710144bca3956ef4236911545fa16c01029ccc264c04621 SHA512 3d2c727b59605700b57e5c13cdb8ac1823b871c3efe57a8bf9ad0284c41dfc11aba99b4fc3aecc22842f612551cc07d1a113585688e9f983a9f75830ce6e0fea
+EBUILD pasystray-0.7.1.ebuild 1003 BLAKE2B 7014b29997fa4af405d08531bf062d4c6d853b6e42f0f60a6b4b4c62eca8b757733f76dcf103b825a8c3692187eb0d1e9aa9b3ae5481e93af1cb7da8b53df194 SHA512 d046d55450f7a29b6f5ac2ce8ac578a76d5cbc10cba3f629ea0d99a5dde57ef8f6f6610389a01db504654094f03a623f2b52ea26901f549776ccc90c0355f681
 MISC metadata.xml 635 BLAKE2B 54e8f3a6f865a0caafaf253e37c517e84c5a41414c2456d34780522c25b8998cd50b2306e24d55e9c6c45e4e62bf6fc60e2f5098f63fd23e42778b0b067cb922 SHA512 97fb650bc38171c10b3678940a72b5100874aa84820b962e1b892d82555c8527bf19976076fa0017c400d7955716e7eb4747bcd8cc372198b5c84f6ec4086495
diff --git a/media-sound/pasystray/pasystray-0.7.1.ebuild b/media-sound/pasystray/pasystray-0.7.1.ebuild
new file mode 100644
index 000000000000..b1c33c69dc35
--- /dev/null
+++ b/media-sound/pasystray/pasystray-0.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils autotools xdg
+
+DESCRIPTION="PulseAudio system tray"
+HOMEPAGE="https://github.com/christophgysin/pasystray"
+SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libnotify zeroconf"
+
+RDEPEND="
+	>=dev-libs/glib-2.48.2
+	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	zeroconf? ( >=net-dns/avahi-0.6 )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable libnotify notify) \
+		$(use_enable zeroconf avahi)
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 5da7dbc2e614..229d4943e8f9 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1,8 +1,6 @@
-DIST pianobar-2016.06.02.tar.bz2 46262 BLAKE2B 1e466dc438630c090e78cec5a54488ae6c0595695a6e97c164ecd3a0bb630d73663c4955bb795a0c9c89b79aa9c384d228c0ac28200d1f8ab9edcbe02b43ae85 SHA512 943e4b7bdfa5690f73378c6454666ec972f4d33faa0549ec087fb0ffeb5584e7ec26cef39dfd0134eefe2723638cc41f29c76eecb306c295c067996443958027
-DIST pianobar-2017.08.30.tar.bz2 46664 BLAKE2B 2ab90efab273e2af707924072252b1de77f41629407b0cb65850fad2ff32fd2a56480f4074d30aa68bb2add3fa9350d9d3e2fd1c3e19db420d1caf4a07291090 SHA512 35019bd387a323c85928e8979c075c7b2a8d88115066a55068dd62279760200fcadf022f7000a40e198bebc3cfc5507913da7c9c06ae220cba6fe3910a6bca54
 DIST pianobar-2018.06.22.tar.bz2 47455 BLAKE2B f1d61709f7c95438352f29a075120c4794c666d9406fb9e6dea47930f2715a0538588d29510097487c5bc06d77ccc44f393fff1561545e21bb71f739151a712a SHA512 0fc2d90324da576266f063573549399e4354b8e83678632fadb80864e82c432a1a90a3092085f0155fc136b726ba59eabb26586a1ba11c5ce668c3a89a218133
-EBUILD pianobar-2016.06.02.ebuild 1011 BLAKE2B d8b7cfcc510558f726bd9bae9d615d51c2b3a044cf95800fe4bc0e796c772aeb92dd0113db1941a1fc29394f2d6160e74e0731c82b8071fe8df2a28f0ab18840 SHA512 bef989c331007c3e8e68673a243e8a852fa845d3e8595cb0fb32106854c6078d1f14d8d6124b535e13af323a36ab51338bd1371afc8a410b02ce055ac68d1a48
-EBUILD pianobar-2017.08.30.ebuild 1076 BLAKE2B 2b9cd4f57b910f0c48cdc297d2ec8ee02790c7686c93b8c0bc482ecbd7305742a2cfe75b5acd20a0331de9dc0d7dec481d8789ae9a9f43b711d5503e68952c7a SHA512 83f739c2210c43095752259acff9f3ac0e9586d05a4011d5c98e70b54cb6723337cdc2c47585370ca8bb07813f75777c0959ddbee325102000a097fc8251d98e
+DIST pianobar-2019.01.25.tar.bz2 48340 BLAKE2B 09078b0fdf43baab99c343a86d5f1c1e0ee7ab39e2af20e7cdde6c21320a74d82ed9bc02e821b02ab045329944aa7d273d637c80bcb0ce96692281dc2e1a0568 SHA512 bfcec235ff01e40a2f650166a29020276b43b241008fd5eb8b84944744b1ce6262cf3be140354404c9410b88d6910e4bcf77b4de787742a7898bbc8511fef0f6
 EBUILD pianobar-2018.06.22.ebuild 1074 BLAKE2B 1a92b84e3f89536777996c5c63b917229820e197b3170178e15b61107c92bdde532c750757c1c5ebf2bf0162f9328279a5a129c538b9b53069dead349bfb1e15 SHA512 b2e8b898cbf353bba7bca795c4bdeb773dbd1c21c780b65b948d08cd1219f08fa5766fe3d97c8214ba4a32c4dfadf14b83f8424ffc1d60fb8fc36cf0c407d542
-EBUILD pianobar-9999.ebuild 1076 BLAKE2B 2b9cd4f57b910f0c48cdc297d2ec8ee02790c7686c93b8c0bc482ecbd7305742a2cfe75b5acd20a0331de9dc0d7dec481d8789ae9a9f43b711d5503e68952c7a SHA512 83f739c2210c43095752259acff9f3ac0e9586d05a4011d5c98e70b54cb6723337cdc2c47585370ca8bb07813f75777c0959ddbee325102000a097fc8251d98e
+EBUILD pianobar-2019.01.25.ebuild 1073 BLAKE2B 5d28f29d27cf29d32cedba2d8e1eea1cac17a7aa7181aa82d7cdfdf2dc866730baeb343cd4e4c3189e87dc900c77940876bfc665948c8f45d854de8adec82157 SHA512 95b6254277503f6920356d7b48aff0644a4441ae32bcfbeff35092ed56d4507fa7f3d4bea2e8cdf6b2d3e163435701f4a1b9cbb4e7b7998ab55893a1cf3c684c
+EBUILD pianobar-9999.ebuild 1073 BLAKE2B 5d28f29d27cf29d32cedba2d8e1eea1cac17a7aa7181aa82d7cdfdf2dc866730baeb343cd4e4c3189e87dc900c77940876bfc665948c8f45d854de8adec82157 SHA512 95b6254277503f6920356d7b48aff0644a4441ae32bcfbeff35092ed56d4507fa7f3d4bea2e8cdf6b2d3e163435701f4a1b9cbb4e7b7998ab55893a1cf3c684c
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/pianobar/pianobar-2016.06.02.ebuild b/media-sound/pianobar/pianobar-2016.06.02.ebuild
deleted file mode 100644
index 0e3bb2a1d58e..000000000000
--- a/media-sound/pianobar/pianobar-2016.06.02.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PromyLOPh/${PN}.git"
-else
-	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A console-based replacement for Pandora's flash player"
-HOMEPAGE="https://6xq.net/pianobar/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND="media-libs/libao
-	net-misc/curl
-	dev-libs/libgcrypt:0=
-	dev-libs/json-c:=
-	>=virtual/ffmpeg-9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	append-cflags -std=c99
-	tc-export CC
-	emake V=1 DYNLINK=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
-	dodoc ChangeLog README.md
-
-	use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
-
-	docinto contrib
-	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
-	docompress -x /usr/share/doc/${PF}/contrib
-}
diff --git a/media-sound/pianobar/pianobar-2017.08.30.ebuild b/media-sound/pianobar/pianobar-2019.01.25.ebuild
index 9d1f513a05ea..dff31a20e216 100644
--- a/media-sound/pianobar/pianobar-2017.08.30.ebuild
+++ b/media-sound/pianobar/pianobar-2019.01.25.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs flag-o-matic
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/media-sound/pianobar/pianobar-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild
index 9d1f513a05ea..dff31a20e216 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs flag-o-matic
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/media-sound/sidplay/Manifest b/media-sound/sidplay/Manifest
index 5d729c8a3b9e..654ab46d8fa4 100644
--- a/media-sound/sidplay/Manifest
+++ b/media-sound/sidplay/Manifest
@@ -1,5 +1,6 @@
 AUX sidplay-2.0.9-gcc43.patch 1097 BLAKE2B 38c060522fad4f8e71a0a6eab3bb32d01292b60b9adfa7f7cf6f5cd9708b944d5597ab3ceb34dd9d38f1b07513772f8430035cb29ce8723bc3f87f6e858d21a8 SHA512 4e2c717389e9fa7aa7a459138a42f411342def25fa6f236f64e4c306419402d7d9ece7e9376ad492d7a3fa4db9fee3c9bbffd2d3d13669a0366da990fa8e38c6
 AUX sidplay-2.0.9-gcc44.patch 3726 BLAKE2B 6d775f8a1cfb2e33d1ed9a07f51100c6ceb4da52f25de15ed4be504058b43293916661a94ba768fc898a55898ea5268659cd0548f0e8cd15ee1cf4ea3b519463 SHA512 41f319b4e232d199478d586b8a397493e1cc6a8eaa6b4eb5bec272b520ff8ffa078ac72b3eddf4f2865614bfe1f8e28df5ad3f2699bc74684c476a24b7795f75
 DIST sidplay-2.0.9.tar.gz 362140 BLAKE2B 4b5b5d9aff566f8840c4a1f405f64f1d64b642d32d85eca355a4d97bcd03056456c9b49dedd6eca63d5174893206e90693a2555ff35835f6f037ba964bccaae2 SHA512 38d334b7e649d6043b48705edf3c4cd27d01283b95f42d1b46bb7cf266ca0d5f6fac4a7dfd398578a3278d293342e4d4d09cde8d443d60a8d50e4abbe127afe5
+EBUILD sidplay-2.0.9-r1.ebuild 475 BLAKE2B 2b55b670e2418744b3d01233d5a2e9aad56a53ef8e79fe758be3262d170c82b915f08e3c2d2b780d0348cc7aec50c2d6c1759cb225bdbd86ba90e4107a742cdd SHA512 26c966f556bc00559035f291b90310af937ffb030a09fc4751d7ee6d01fae37e52d1853ac89701850ede241859e10a5d039cf4e278c8ca52a23f76d07381b2de
 EBUILD sidplay-2.0.9.ebuild 474 BLAKE2B aa119bd74a9af90d3c7f0af88db174d70c13f57b0e09127b6f225e23aeec807c8d8dcfb2966d4cd58cca808f0c81155ce6ec96c2e84f2d9afb968c0019c5a9e5 SHA512 b2b76c35af776ea6890f2a853f8ae051b0d6829b70dcac5c4a59843884e6d67f108e588e9c1d7834754518bca9891fb7eb09da144565d980fbaea29819ae43eb
 MISC metadata.xml 331 BLAKE2B 41bbcd40272e97e1e0b10fd8e9471db6bfa393ac15eead124bd6e5885b1a35d746bd5be4ced94ed97d31ea130ed17aee55f81b6582e1895813661e3cf07e55b6 SHA512 83c0e6c0f4c7a85a10c96db7cb2eadffab0ef5e4614b0a091a4e14bb9a37b90d0d509bec47bf75d03853ab39a06ca12bcb5cd89f89e09901340a76c7b5c392e8
diff --git a/media-sound/sidplay/sidplay-2.0.9-r1.ebuild b/media-sound/sidplay/sidplay-2.0.9-r1.ebuild
new file mode 100644
index 000000000000..b10d636702c8
--- /dev/null
+++ b/media-sound/sidplay/sidplay-2.0.9-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C64 SID player"
+HOMEPAGE="http://sidplay2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sidplay2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ppc ~sparc x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="media-libs/libsidplay:2"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc43.patch"
+	"${FILESDIR}/${P}-gcc44.patch"
+)
diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
index f4c8915675fa..5ab5cc753cdf 100644
--- a/media-sound/sidplayfp/Manifest
+++ b/media-sound/sidplayfp/Manifest
@@ -1,7 +1,5 @@
-DIST sidplayfp-0.3.3.tar.gz 454452 BLAKE2B d791698972bc8e4cc31c9c29b42f6af8a7024cb64bb9c3f24389bef01f1bd3d4c194eb84c82ebb85a73fd10e07a0fc2374afa38273aee0642a9ad3daaad59883 SHA512 f979af0c6ead38a9cd3a95cb27ebb26390506bbfbea192345f9873c62e064f18d7dc529ead22c35d46b4ebe8af6808d42f4d015d61ce48d7318daa1a7f613fbf
-DIST sidplayfp-1.1.0.tar.gz 221706 BLAKE2B d6c0b4a70872fab235a46783cf2ec077a5746c175fb6d2fcb5e057cb76f249a3a75c16ff0e3ebb0f2a2546e49ef8310b445c4b86c8ba262b6bef1d86895e6e48 SHA512 2e0986b9bb5b571e1e38c7e92b836a2e39f6dd84fd26161891b3117976c2d98e615e13819f68d0984094b085d50b53205a74a71b371ba005b1ddf3cb00d5274c
 DIST sidplayfp-1.4.0.tar.gz 181746 BLAKE2B ec21d900dbfaabe7d8e976acce0c4a53c60b4be8cfb6bc1e53005949f52a0dc28ff90e6087e57e77db571e987cdbc644eacbaaa3a78ef8868c4a48771e2c9603 SHA512 ac91cc26622b211408c50bcef14dcda78b8da81b43a8f334d91a02b89bd6dac0b3e3adaeb84545e6dbcef97354ba6c2dc555e4f0a2ff0298c6710fe1c6cbbd5f
-EBUILD sidplayfp-0.3.3.ebuild 732 BLAKE2B 7f4071bfa8e6d907327ac60c66b452b8527ff21ee15780db66c75ba30847fa8cafdf53a6273356034c5338bec23220e345a7fe24165ea46aaf4e320c244f2bee SHA512 b3c8dd5128140efd0cb3c80be09a2947aafa7d1c5bd446f02130ad24b4fca6fc6d80c8d7731ab69c3027b564849b509364d29fb49c558deef1132c978744a925
-EBUILD sidplayfp-1.1.0.ebuild 841 BLAKE2B c05d7b89aa0c31d1cb804afd82f145208440fce909fcf21c93fb61d9000258bd390a9766764c9c9cc2fa86ac7e41e2b17ba3127a53ed384aaa1ab50cda0ba930 SHA512 71904f83eb8679b3431329ad77cdb171cef0cd1a16f4cb86b8ee0b3a8428a563a2d4668c24ea0cbcc0c604873d52c3a91e5ecefbd331c50af5e6b540e4d575ad
+DIST sidplayfp-1.4.4.tar.gz 183711 BLAKE2B 31ff002d4cd54e827117e2b2f86d253ee1e0bc07fb6ac777653109585c059311205e141e339a8d8cde08209e1c35776d6f0a0ccf0ad754f78eb5e5f4bafd3cfb SHA512 8375a249da80a10d9c0ef55b35c5b047bf0249393026ad8ff25fb8a2660151f1d482fe581a85c6982b3c70ea257807ce17e1c6011874f10c64bec54a1982ec04
 EBUILD sidplayfp-1.4.0.ebuild 894 BLAKE2B 711fcd7d7e4593a836b8f87431a15c11c55031e17404ce8df9564f9a9a50dcafc1d07c1a019de05a90249d8da66cb2cc4b6a4626a65871f67a5c3f1a4be2199c SHA512 cc2cddba953f2e6bc010072cdc4c279e6b0962a90bcc3348f6d91be67e07c1c5f54f98f43b3fac16d6656941bfb2797f78234318c6343759f1eb4f0a1c661db3
+EBUILD sidplayfp-1.4.4.ebuild 880 BLAKE2B 4cd44b11980ba9ede820c59c0eddf795d7eda5bce49e351f1340c159b718f24a0e124c01d5279e9e9a0eeeaa211c1be781e8644a26e1f7845cf7a3867503ec59 SHA512 bed6279bea87e497e959af4ac3d6467fd79e4b2ab3f54747dc0d4f99fe2d434ef7299c0a6155580c58bc87962b1a14a445f48712e9f7d74e00ef64f0eecf9d4f
 MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e
diff --git a/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild b/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild
deleted file mode 100644
index 94a9199284b6..000000000000
--- a/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa oss pulseaudio"
-
-RDEPEND=">=media-libs/libsidplayfp-0.3.8
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	oss? ( virtual/os-headers )"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_configure() {
-	local output=wav
-	use oss && output=oss
-	use alsa && output=alsa
-	use pulseaudio && output=pulse
-
-	econf --enable-driver=${output}
-}
diff --git a/media-sound/sidplayfp/sidplayfp-1.1.0.ebuild b/media-sound/sidplayfp/sidplayfp-1.4.4.ebuild
index eefcd503753a..40dc1277bbd0 100644
--- a/media-sound/sidplayfp/sidplayfp-1.1.0.ebuild
+++ b/media-sound/sidplayfp/sidplayfp-1.4.4.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
-DESCRIPTION="A sidplay2 fork with resid-fp"
+DESCRIPTION="Sidplay2 fork with resid-fp"
 HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+alsa oss pulseaudio"
 
-RDEPEND=">=media-libs/libsidplayfp-1.1.0
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	>=media-libs/libsidplayfp-1.8.0
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( media-sound/pulseaudio )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	oss? ( virtual/os-headers )"
 
 DOCS=( AUTHORS README TODO )
 
 src_prepare() {
-	use alsa || { sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die; }
-	use pulseaudio || { sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die; }
+	default
+	if ! use alsa; then
+		sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die
+	fi
+	if ! use pulseaudio; then
+		sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die
+	fi
 }
 
 src_configure() {
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index c075832b88b1..aed9ea5c707f 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,7 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.0.96.181.gf6bc1b6b-12_amd64.deb 105145290 BLAKE2B 1ffb55ac3684d021b181e27d1183c5f0c1bd22ad8e6decbd64b0172a7925e824b6f74d40edbb1ae4401bf954860f47d9d1ffad6d879e85e02406869709d817cd SHA512 8ecff0657849058863deb8fce9304d4c9aa5a511f8043a0ba52d138a29979d3217da7568ab2058271f3e448206406fc0e1651ba7d438f677b1a2036ecb5937e2
 DIST spotify-client_1.0.98.78.gb45d2a6b-10_amd64.deb 105135826 BLAKE2B e1641a738f8e03c86d9b28ac902ed9857e1bb406b03e7a1c59c522e86a211b13cfd442bf84f79af4302d32a4b1c041e8ef7297990e70912d8c0a5108838e0500 SHA512 f20f2c998a205f189a19f332b2e738a0ec98a34520765c0e1d27d95d92f7c9c2f78da32f9edcc61146be87e8d8df7d3521d2e84b427cd25586b9fe6bec8d1602
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
-EBUILD spotify-1.0.96.ebuild 3430 BLAKE2B 2078bd77d0f4e59f7a09181cab4fac996c34fbfd47fa0194eed1a691951fc425043e4a6a97a4cfb50f4b52cb5e14bf32dbf75fccad31aa166a7ebffd817f50f6 SHA512 2e8d7f6033d2bb79bd9d6bf244f737ac48b268640f6252b3db10f0f152e6cc4e3ea6b85296df1cde00a40e5357627b6825dae0a11364fd935ff8d4ac23729d27
 EBUILD spotify-1.0.98.ebuild 3429 BLAKE2B 436b23f7857907ba883d7ade7eedfe1ecbfe15f2b2f787c1a832bc4d888c13aa5098b9a495f38c200795775476501465d6fb63e39e1b0cbf5e6da9093ee76c48 SHA512 9f431988b6adf74319efce9aee404684bf495604db5d5b1a0cfa241c43cd026e4646bfc19ad1d66572bf451423be832761750ebfda1a43b10d50f283b37d70f2
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.96.ebuild b/media-sound/spotify/spotify-1.0.96.ebuild
deleted file mode 100644
index 6de8d1d091fb..000000000000
--- a/media-sound/spotify/spotify-1.0.96.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="181.gf6bc1b6b-12"
-#BUILD_ID_X86=""
-#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
-#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify systray pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=">=dev-util/patchelf-0.9_p20180129"
-# zenity needed for filepicker
-RDEPEND="
-	dev-libs/openssl:0
-	dev-libs/nss
-	gnome-base/gconf
-	gnome-extra/zenity
-	media-libs/alsa-lib
-	media-libs/harfbuzz
-	media-libs/fontconfig
-	media-libs/mesa
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	dev-python/pygobject:3
-	dev-python/dbus-python
-	libnotify? ( x11-libs/libnotify )
-	pulseaudio? ( media-sound/pulseaudio )
-	systray? ( gnome-extra/gnome-integration-spotify )"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 3dee88187639..be566e56d65e 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -1,10 +1,9 @@
 AUX teamspeak.initd-r1 559 BLAKE2B fa37f29a3a03579d091da5cd01785dd93e15f38c070e06589619a3843ab85a86197be836ee0c8fe630c4ad8872c3efaf4e160b215a45cef3ebe8a07f9d749b82 SHA512 0fcfc65290ececdb3bf07cf2d88edeb325dc738aad6c7ae4ce0838fb272190f6a2667ed20a484fe92a0d4d9b529927b31a4df6ddcc2d4e917677f1d589d4f356
 AUX teamspeak.service 418 BLAKE2B fad43e28b976db44b290937654f3fa503a7a17dbba17e7d01c8931a18bf63615b0a125dec420f35e2517dacfd760750957997fcf58e69bcd2ca0721b4e2054ae SHA512 a31633591ae97224f3aefef25ed9d50e6cedf252c94559f7c424065ae815e0724c75e1c71337283933283cc77626d106ba5e15f3cce5c5dfddfc74a1f99160ba
 AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b911b11175932d2b3031dabcfa29d2bafe37742a05cea5e6dc8913abfdba140f9c2203515eb5da4444b3bbdd1 SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db
-AUX ts3server-bin 323 BLAKE2B ab3fb5522ffef33d4517d76f01c91091cb1322e1433ac158c2aaaf18c56f44a74875e3ae82e7c39209207291a668104bc4d08d54dbff7042e4faebc0e54104cf SHA512 578bee3c35fc6bc5a06ceebbab1aaeab6201fdb32a13e9c2473dffd78282690f57b1bc277a973006fb573cf9f1a11c0643c0479ff1a9e1318c015437086c6c42
 AUX ts3server.ini-r1 723 BLAKE2B 3c5f77686b602ec052477c32e2b38ecc6812760b487ce4e6cd7616bd8aa57ef3aa186374805a1f5a073e755429a98bdb677ba400c7db3b833edc1e2e3db3a729 SHA512 cf1eb76d4fe7a8305b758439925be56ea4f34254ee3c66e796a3ba7cec38dd40009f455672429906c31631f4877fc70d6fde16a904239da2fa62d121b43d0481
 AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497fe8e4bd537a39a101d2658a44b72568a671e301bbb1888099907cbc36c2aba42b89a2215f19ffa8e0acfd3f417a08ba8d SHA512 861f0074e4521947fa44e2decfff172bb14f9b905c37dfc37afedcd5f42d864de7712aa0a6ff7eb17b8f885098abb720b29b16c658955c3c8aab73e451def6a8
-DIST teamspeak3-server_linux_amd64-3.5.1.tar.bz2 8455161 BLAKE2B 3a85c00982567be779279877868b814101ec543f3f58046ca49b45e2d94a9d4aaab2b2de057302e5125dd3a2f5c831715a426f9d30a26e0164845d205cb5d842 SHA512 f4091aa594636dc6556204fc3a4b86d3e7a6fa4e3f889585326e025db7fc1944fa416be5378829abd60a44a71714ead5712e002825abe352f907cefaa91cea9f
-DIST teamspeak3-server_linux_x86-3.5.1.tar.bz2 8326316 BLAKE2B 7533d44b6bdb54edf22b932797890563f50ad520a2ebcb9305c328559dcddfc5ac41bbfe892014ddd9201018f2b715ec69b8c655585761883928833b6106ea6a SHA512 03c9b3aecc962c968b954da440fea5186612c63d00ae8927af539e2e09e0b7a3b07289f3645933e69c742ad9a4ff57c5cb7617aa37d0ddfff765da4123a8c21c
-EBUILD teamspeak-server-3.5.1.ebuild 3103 BLAKE2B 60ca145f36cd21e0f132e6b46dac673311c96d07d4e1ceaa653dd4df81bc167649b71a0a0f8b38c48f3086ff60d78073c6c91617fee21a82ee2fce0f0c88b899 SHA512 c6ec9da9ef15d7469ce4eab3a47e9932aebf4b6ecd9239e8de1869db3c1fc62bf0db3740eb20c90ced1862cc0e852f9adb5686cee8123ce1a318bea42ca190c3
+DIST teamspeak3-server_linux_amd64-3.6.1.tar.bz2 8523183 BLAKE2B 1b6bd2850547ae6f86f348c988660ceab3786c16ff920e433b2e942ab2b995f8e2b9814213bddf012762cb540e2c10cc12641408e7528f9e424984f84e900104 SHA512 185559df9129b61322b7b0fda4c021e0bbfad0eecacd78c45e9467a29cd2eb5a822bed214312255f641869b4218c93931b6145fb17acacda7eab23bca5a9a8fc
+DIST teamspeak3-server_linux_x86-3.6.1.tar.bz2 8391111 BLAKE2B ad11dfe38b99db314ba73799a94fd047cf07a9f33990a0bcca99490af8cb1a4c054d3722c3bde634545f1e922d67f1d6bba57e03029f57d0999d1164f99240c4 SHA512 ca693e9bb2d6b4f994ac0934621ec9050e5b985fd34c534677754cb37a4586aa2e6ec78dea440bd919f8dce18acd238befc54d6aa73829eb94f2536ff3050ef7
+EBUILD teamspeak-server-3.6.1.ebuild 3063 BLAKE2B 13c327003913aedacad85326a3782077c8fbeb22f9fac8311b11754f01b5c05e664fb8fae1f31fada242c578df1ea88893923d5544dc2cdd3fd7ad19412c6257 SHA512 c5bb099281f5176d16209988c98b363be7f78d466bcfd285a096079c9c78c7ba4357a5162bb750a57058644f36b8e17c8662899793a98b8e76b35f5ef13fd691
 MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
diff --git a/media-sound/teamspeak-server/files/ts3server-bin b/media-sound/teamspeak-server/files/ts3server-bin
deleted file mode 100644
index 3deb9dd87e5f..000000000000
--- a/media-sound/teamspeak-server/files/ts3server-bin
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Sets BASEDIR for teamspeak3-server
-BASEDIR="/opt/teamspeak3-server"
-
-# Work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
-export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-
-# Launch teamspeak3-server
-cd "${BASEDIR}" && exec "${BASEDIR}/ts3server" $*
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.5.1.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.6.1.ebuild
index dda16c3b435a..d944f47933ef 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.5.1.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit systemd user
 
@@ -50,9 +50,9 @@ src_install() {
 
 	exeinto /opt/teamspeak3-server
 	doexe ts3server
-	doexe "${FILESDIR}"/ts3server-bin
+
 	dodir /opt/bin
-	dosym ../teamspeak3-server/ts3server-bin /opt/bin/ts3server
+	dosym ../teamspeak3-server/ts3server /opt/bin/ts3server
 
 	exeinto /opt/teamspeak3-server
 	doexe libts3db_sqlite3.so libts3_ssh.so
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 10fdfe772c35..71af8a1bcc0a 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,7 +1,8 @@
+AUX upmpdcli-1.3.6.initd 391 BLAKE2B 73220691754159e11d2b15f1f16a462cd80eb5b60dda8b6a45f2b9f4d56a1c054912989088f506f8bb98757606cf232debd60595c3b5f44cef391b7c1bff7af6 SHA512 562ea92fc43f15d00f0afe3ecf57d1925997e2be9245959ee1e0e50604fa64c486ee56589188db8cf34dd1175a3f59423f7822fc2967a27c9b18f259bb1d455d
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
-AUX upmpdcli.initd 394 BLAKE2B e2b31b58d2f1edb6a490a7244524572cb89062005a47f463c2df857a9a380a541547c65a0de28bc33945f9bb2762390a186adebb5bc36b633af713b54bff3155 SHA512 49dc040957a0af4b6d2b50eb1ee9e41f6b593358a7acd66ee809b06cc775e330757f9952843499f6d1cac6cedcd73b1907a51f31f6721ca9d3fb7719bc496709
-DIST upmpdcli-1.2.16.tar.gz 429958 BLAKE2B d484e98ca7774e6d55e42937152efda9bc2127afd6a222575055c48cd7cf5d61f6b578d80a3eca75d7299570cc9d3acc78b1e0c461f4a064528fdb9cb62eee22 SHA512 1fd5b1939f7140f2e54401967308dd155e0f72406188b82e8ccc9178f5feeb0d37cfcd28dd220dd5437d06f49955cc83d70f0bb7c3659452ccb2e73f8846a226
+AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
 DIST upmpdcli-1.3.6.tar.gz 515712 BLAKE2B 6de6a3af2e474a3f8d12865e3cdd420f31955e88a0eb1c8ffd019809666c4c613631d642b34bb5fa473fceb7207613d90584fdf856b6a49899f9c2aa31b2b471 SHA512 280b02116786c86fd5f1e472fa9070b3a6d846acd670e36d476b150d4a3e91e5a6d1546b7053b1f35a2e0de553c8517640934af010d371d3cbed248592be502d
-EBUILD upmpdcli-1.2.16.ebuild 992 BLAKE2B 55ad9cf6e1ad47cd2e2853db83ff192491689771aeba636f5199dad6fcc5d0d157a7fbaa5528eaa36b962219b34859ac631f3144d9632da94d6e07d1b720d76e SHA512 05a5ee2f3670dcd0ea351d1555a8712b59b712a4074da0211383ca46dd8d39b9e9a45f31b59ae230b02289d14581b220f4c5cbebca79d0fa308630c9925e6fb7
-EBUILD upmpdcli-1.3.6.ebuild 1042 BLAKE2B ac46e84fce1f8ffc7326ff257de334e288c17ef07d2f6778a3629b50c95137fc019d2cee829fdf25d0c09202bee3ecb837ff9c69f1478713ecaab344075e0071 SHA512 ba56672d1a1ef71d34bcd4a92df0a69ab11438a784a31faea1447ce766cd08ddb083e76f695bc502ef0338671243e9907f347b45c98dbf3107e87cced0ef033f
+DIST upmpdcli-1.4.0.tar.gz 469357 BLAKE2B edd46e86f367ff2f88346cfb4cb249dae4463095553bb220fbd9a4078315044ec7591f58c30a0f20840a9f217230e46bc3b3569989a0ae2c05a44aa140c234c4 SHA512 1ed1f0a89a02610d70fb9e380dcbdbd8d636bc4a0964a16d27bd7c04126674f7f14e50e5fe521a430a06ea04ecef1275c7ad5f1c276daae1c285b73cceba9dec
+EBUILD upmpdcli-1.3.6.ebuild 1048 BLAKE2B f28c7d3156e79ede24518503fa2760583b9fe6f4af2f0c122c0a327bc1cb693123fdbbf1007dbb87e101f44dd9312a269f960cf6c7c8c982e2eadf33211f36ec SHA512 fb8f49ca57a4479fd7e2cc4a403649f0fc7424c784c2826488e2069f6916a955baab7b4b00da515f2c5db68e868b328307a48284a0e2af5dab93e40c1423ae90
+EBUILD upmpdcli-1.4.0.ebuild 1260 BLAKE2B c0e4f83b38aa554fe246e2e65ec7152f4460ba1ed7c73a5ab7240d9279852f79cace506da9ca529872b9173bfbd166692ad62fb67ded6c96bed57cefabc03e48 SHA512 e07f423e06f57ee86484f066c16a2c7cbe416d8f845406269161eb61e4f1ff5467016e62ae4847497a72c0ab83cd798f81bc6108113e4b2e7abcb5b1dca4c87b
 MISC metadata.xml 424 BLAKE2B 255b763f479850aab6630f6b5c27eb84ea66692004c85cfafd9ad08edbfa9fe08d745c49f02bc27b126dc883ffc8c22c1d3a248cc94d163b88e8946bdb0d9362 SHA512 283c31f284c8789a0e74d8df0c5324add6875b3eb48a7dd91cb036102bda21465df2ea76656c5015ef050651765fd1fd80f66351deff9d31a2462d1009579ecc
diff --git a/media-sound/upmpdcli/files/upmpdcli-1.3.6.initd b/media-sound/upmpdcli/files/upmpdcli-1.3.6.initd
new file mode 100644
index 000000000000..f37623e8f2c1
--- /dev/null
+++ b/media-sound/upmpdcli/files/upmpdcli-1.3.6.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+pidfile=/var/run/upmpdcli.pid
+command=/usr/bin/upmpdcli
+config="${config:-/etc/upmpdcli.conf}"
+command_args="-c ${config}"
+command_args_background="-D"
+
+depend() {
+    need localmount mpd
+}
diff --git a/media-sound/upmpdcli/files/upmpdcli.initd b/media-sound/upmpdcli/files/upmpdcli.initd
index 43618aeca4ea..de11d277486e 100644
--- a/media-sound/upmpdcli/files/upmpdcli.initd
+++ b/media-sound/upmpdcli/files/upmpdcli.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
@@ -10,5 +10,5 @@ command_args="-c ${config}"
 command_args_background="-D"
 
 depend() {
-    need localmount mpd
+    need localmount
 }
diff --git a/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild b/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild
index 72972052488f..dc2832f79f0f 100644
--- a/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,14 +11,14 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="thirdparty"
 
 DEPEND="
 	dev-libs/jsoncpp
 	media-libs/libmpdclient
 	net-libs/libmicrohttpd
-	net-libs/libupnpp
+	<net-libs/libupnpp-0.17.0
 "
 RDEPEND="
 	${DEPEND}
@@ -33,7 +33,7 @@ pkg_setup() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newinitd "${FILESDIR}/${P}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 	systemd_dounit systemd/upmpdcli.service
 }
diff --git a/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild b/media-sound/upmpdcli/upmpdcli-1.4.0.ebuild
index 54eaba576366..f1851fb80b75 100644
--- a/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit user
+inherit systemd user
 
 DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
 HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
@@ -11,19 +11,18 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="thirdparty"
 
 DEPEND="
 	dev-libs/jsoncpp
 	media-libs/libmpdclient
 	net-libs/libmicrohttpd
-	net-libs/libupnpp
+	>=net-libs/libupnpp-0.17.0
 "
 RDEPEND="
 	${DEPEND}
 	thirdparty? ( dev-python/requests )
-	media-sound/mpd[curl]
 "
 
 pkg_setup() {
@@ -35,10 +34,16 @@ src_install() {
 	default
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit systemd/upmpdcli.service
 }
 
 pkg_postinst() {
 	einfo
+	einfo "This package no longer assumes that upmpdcli is driving an"
+	einfo "mpdinstance on the same host (https://bugs.gentoo.org/670130)."
+	einfo "Probably it is though, so be sure your mpd is built with"
+	einfo "USE=curl."
+	einfo
 	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
 	einfo "detects sc2mpd at run-time, capabilities are added"
 	einfo "including internet radio support.  See upstream docs"
diff --git a/media-sound/ventrilo-server-bin/Manifest b/media-sound/ventrilo-server-bin/Manifest
index 631ebbac3a48..a1381ccc536f 100644
--- a/media-sound/ventrilo-server-bin/Manifest
+++ b/media-sound/ventrilo-server-bin/Manifest
@@ -1,5 +1,5 @@
 AUX 3.0.3-conf.d.ventrilo 84 BLAKE2B 73d9732a8a53bff8600cde7ef5ff940fae859d03e499cf137d236c9f8996425c0a56e9d3cfa1e05275c2023a00ff276917896a0a74a128dc3dcc065bb2cc98f1 SHA512 cd4a8bcf8c18d5cc0871e0ed53749fe84bc65be57e51bd4faa79430dd0baa9d394cdf205fcd4259bd92580edf7fb8eb94545a307f7bd11514b7ad4bce33efb9a
 AUX 3.0.3-init.d.ventrilo 654 BLAKE2B bfb8ad3ab959623c085758e2a4accbaf13ad2bb550fe5611770bec13fbabecd1cb74f305c89934ae685be006b9e483debecac1f6c659ba7b6c62948f73cc51fb SHA512 55c4245de9045b012ff85fe3b025318522c7eb01f96671d5b8c48ad2ea4ba5778d25320ea7b9bec86d64cbfa8d13aaae88b0080d5547c43792ce5427b5ac6917
 DIST ventrilo_srv-3.0.3-Linux-i386.tar.gz 211494 BLAKE2B e75fba4c9f660de84913728aa0ad08af65b07004368640e47810110c0f694634d00421226accd904f23e2141e6be849da31b3604fe441f6ad610db2a1eb58147 SHA512 ac4b38d7ee5cb66b88507e5cfb810d28b98252dfbabdb8d3777ae4b4dfd7a793ae8e0ee0a4d3a03cf7d0d1b1b34162e5f026c7217d296201e48607e44f04e79f
-EBUILD ventrilo-server-bin-3.0.3.ebuild 1089 BLAKE2B d4837d2604840d689f62406639f8501c917039b77088008872dd5d2f5822c7aaa17f7024acb0bade772ef60388e6fafc6a058fd377083941f9b461f7d79277f8 SHA512 2e357c734d33fcdccd5822a79b813b08442308776613b4a04b70cc46cbd115797c20be4173a6f268f4c14b2dff75ac266661707906815062a20b7c82e4495148
+EBUILD ventrilo-server-bin-3.0.3.ebuild 1099 BLAKE2B 36d00715745dd71ae31cd47036c1116325f8d6d9303dfaec06399ad14c09168186bb124d2fa9435e208fcde989a33df73dff9b643113bf8c5921404447c25818 SHA512 35a66a5322e1326f8481b9ae2f045570ed87876670b158c9333a30c9ddd59412679986ffc30f72dfd2463668c2b5eb31cd635e24646938e916d433633fef4a9f
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/ventrilo-server-bin/ventrilo-server-bin-3.0.3.ebuild b/media-sound/ventrilo-server-bin/ventrilo-server-bin-3.0.3.ebuild
index 5169edac46b7..7a7003f7e730 100644
--- a/media-sound/ventrilo-server-bin/ventrilo-server-bin-3.0.3.ebuild
+++ b/media-sound/ventrilo-server-bin/ventrilo-server-bin-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -31,7 +31,7 @@ pkg_setup() {
 pkg_nofetch() {
 	elog "Please visit http://www.ventrilo.com/download.php"
 	elog "and download the Linux i386 - 32bit ${PV} server."
-	elog "Just save it in ${DISTDIR} !"
+	elog "Just save it into your DISTDIR directory!"
 }
 
 src_install() {
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index a209b4fb0381..ff1909223a28 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,4 +1,5 @@
-AUX zynaddsubfx-3.0.3-docs.patch 559 BLAKE2B cde5e6e4a3bfe0c03e013549a723f2415d0b3a5809ca3fac268e537af5cfdac71e1d9cc108ce708b2e509bc1705bb8dfd2aed31a15e5bb58356979f38fcfdbc5 SHA512 3771f0ea2d3fb3c3df4749e95312f026765af20b8531e93d37033d50ede8c4ecb90ab0879ce474db7ec9c9d6a606c8e64a22e82116ff85b8775a8ad804f5d448
+AUX zynaddsubfx-3.0.3-docs.patch 414 BLAKE2B 7988269f161ae948e63a05f9d84b986cf2a5c8644c594d14b431bb3366ac3e468d1668d1b03d1ad3e899e93a992c2b9722338f1a6ea1052994613ff7acce8eff SHA512 867cb63e0b057bf0930f8a2d7dfe50a547df740cb135dc21824b986f194c2384dd57e882f0ed2617c1e1306a88804849878eee4d825bf02908378acf0e00fb75
 DIST zynaddsubfx-3.0.3.tar.bz2 7989258 BLAKE2B 7b71dc358ed3d0248eafb1c4638b05cc7ea8dbb05fd36c40643bb8f9160ee462c229d1604a52e795b6787d9131cea92512ad783c137c9cbe17cf8d56461a581f SHA512 e60e22656388d444114959859c12014ec79d7ba555b0d217ad98ad06e273916eea0eee521bb9dbfdef5be34205280d355b44a8f15760eeff06b16410d560b5d7
+EBUILD zynaddsubfx-3.0.3-r1.ebuild 1920 BLAKE2B 1efefa9809a8712e8d5e6873390ee84e2454fb445f03504cd1e06b4fb67100dca63f771ee959fb2294c54cee4418a0d50acc72d9fcfbd449f0aa3547a65fd56e SHA512 db94f5e26b35651c9791ab93b81fa87abb807ee96c7c4b3d3554e909af458cf352fad5d19f42c4e67d28f7daca88f9611e84bba3e3f44d4888e74e6380b869e8
 EBUILD zynaddsubfx-3.0.3.ebuild 1567 BLAKE2B c4e2e6b115c326e769ed98d95262d8545b576f3b809c403fcbae03717dfc40e8ccebced31acd82281a3712452e4b1206bba427239492a045d856920df3409fbf SHA512 e18092a175c36dc1958ee03bc388c330685a806aaa227e45a6ead4cde139e656dd9d7b82eac851875821fb6c465e176e438894c78f6bfa5c1f09bdf95fa0cd35
-MISC metadata.xml 340 BLAKE2B 1e630f1735f05b15bcc045f0146e81e932bfe6f08262a40518d15ababe8fe73e04f597b0aa7dd026e316a501276885fe5b842ccf7177c0880f754d1481c46c82 SHA512 c59fcb3065e3b34c3e3e23a8db07dbe245a8addcf7a6958834b5715bc0a8319c8d0cfa3b40925e7e9838df031843a5218bbcf91721ce57bee2632111dc27d4a3
+MISC metadata.xml 427 BLAKE2B 80fb772abd373ede6be0c3b99fd252f059ebbc6efa5ab1dffee1c0a517289cb199a7ca58c7db4942565dd96c2749fbecf0a9e82382a2387e5c785ced868b4312 SHA512 dc8afdd20a8f6e7d052dc69f4a17698b481db997ef36e199fce32e8ed586a0a0c6d9c881fc378bcd20e57ffe0f4ec1389680ee9ed0fa04ad8b13aa082112e490
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
index b094986ea86a..2a35e0544c8a 100644
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
@@ -1,7 +1,5 @@
-Index: zynaddsubfx-2.5.2/CMakeLists.txt
-===================================================================
---- zynaddsubfx-2.5.2.orig/CMakeLists.txt
-+++ zynaddsubfx-2.5.2/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -28,9 +28,6 @@ include(CTestConfig.cmake)
  #Currently the only directory that uses cmake
  add_subdirectory(src)
diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml
index bca5422640b4..63c95289a8f5 100644
--- a/media-sound/zynaddsubfx/metadata.xml
+++ b/media-sound/zynaddsubfx/metadata.xml
@@ -5,6 +5,9 @@
 		<email>proaudio@gentoo.org</email>
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
+	<use>
+		<flag name="dssi">Enable support for DSSI Soft Synth Interface</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">zynaddsubfx</remote-id>
 	</upstream>
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..42707c6895ba
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa doc dssi +fltk jack lash portaudio"
+
+REQUIRED_USE="|| ( alsa jack portaudio )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	>=dev-libs/mxml-2.2.1
+	media-libs/liblo
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	dssi? ( media-libs/dssi )
+	fltk? (
+		>=x11-libs/fltk-1.3:1
+		x11-libs/libX11
+		x11-libs/libXpm
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-docs.patch )
+
+DOCS=( ChangeLog HISTORY.txt README.adoc )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use dssi; then
+		sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+	if ! use jack; then
+		sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
+	fi
+	if ! use lash; then
+		sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+	if ! use portaudio; then
+		sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+
+	local mycmakeargs=(
+		-DPluginLibDir=$(get_libdir)
+		$(cmake-utils_use_find_package alsa Alsa)
+		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake-utils_use_find_package fltk FLTK)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r instruments/*
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
commit	6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree	cee0a97398040001220ece3cd48c3d568bcddb4a /media-sound
parent	1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)