gentoo resync : 10.11.2019

33 files changed, 291 insertions, 465 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 247c8934722e..b9142fd52fb3 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
new file mode 100644
index 000000000000..70f35da22ad1
--- /dev/null
+++ b/media-sound/cadence/Manifest
@@ -0,0 +1,5 @@
+AUX cadence-add-skip-stripping.patch 2184 BLAKE2B 61db0094b2ae8059c1cf162d553db9624cf84e0d92483bd42678b6be8dd0e25aaf7eb5cde6983e65c54cbe61d2f0f1a507d74a73572662c64e489e8c30b7cc56 SHA512 dda75f3b7f23c9303206fde30ca9c90eaf3999edd8b1d02f5cd3e0680d72dc59b0966ce9100d4274490595f7aa6df3ed6ef6f91ed672840341f9d5083805b239
+DIST cadence-0.9.0.tar.gz 2202265 BLAKE2B 03d38f611df05597d2b4016f263d36f2386be421383a38b51dee519514e6d1ed79bf92ea2a789ea868a25d4c805e9e94cd0971f479b772799bf6bf3170349b4a SHA512 381c9c57c1d96452a91969e134420d63ef06f5ec144050779d0a06a1098e8ed1693c70165b6640e04acc448d382e717e71ead1b29ba5043f0668675850cad7d1
+EBUILD cadence-0.9.0-r2.ebuild 2025 BLAKE2B 835876e65e5f69cbd1f9ad8632596fb5a67264f03efc1bcd06dc6e1b77f84fd6404b49a8aaa6585b5c5244480d5cbb1fa0a60d63dc41d3eacd55db60d2fc831b SHA512 606f7bd2eaccb3d810d20cb7d188b7326f9910a8d1fa469bba08de6f13ae173a05165fa309c1774d170c3a9330255f3adb5dd27cfc5f1e5593d5c9a4702213d2
+EBUILD cadence-9999.ebuild 1969 BLAKE2B e34691fbb5340837032dea941239af229644c03a789c12ef8ad6a7cb3bd7241fc71c6e52a06f0b7629ce99b1dafe701eb7ba1667002a94add3bb592b79a35527 SHA512 1357bce659a45656c0ea11362a18e93731be7b0f9e2d3ec3bd774a101c3149738493c54b57ff2ee188c1a22714508784408b3bee816496d79586eeee07a0f911
+MISC metadata.xml 368 BLAKE2B eeadd7ce43e144ac8baaa0d55a1943cee1b277d2a9bb1a79977c86603035f12d40489c2ae7c6771f36dabccc29ce6b86b66b4f1f6ddefb08cb29d0977794153d SHA512 e851ae0de3b73af5ecc7be20d4dec0fc74bd6c5d976001cfcea1af0a0a79db294b95ca82454efa9883b4a9a6ae2f538b3cd51f77e34032efe8162186f73562da
diff --git a/media-sound/cadence/cadence-0.9.0-r2.ebuild b/media-sound/cadence/cadence-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..c3fac92fcd8d
--- /dev/null
+++ b/media-sound/cadence/cadence-0.9.0-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit python-single-r1 xdg desktop
+
+DESCRIPTION="Collection of tools useful for audio production"
+HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence"
+SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="-pulseaudio opengl"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
+RDEPEND="${PYTHON_DEPS}
+	media-sound/jack2[dbus]
+	dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	pulseaudio? ( media-sound/pulseaudio[jack] )"
+DEPEND=${RDEPEND}
+
+S="${WORKDIR}/Cadence-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-add-skip-stripping.patch )
+
+src_prepare() {
+	sed -i -e "s/python3/${EPYTHON}/" \
+		data/cadence \
+		data/cadence-aloop-daemon \
+		data/cadence-jacksettings \
+		data/cadence-logs \
+		data/cadence-render \
+		data/cadence-session-start \
+		data/catarina \
+		data/catia \
+		data/claudia \
+		data/claudia-launcher || die "sed failed"
+	default
+}
+
+src_compile() {
+	myemakeargs=(PREFIX="/usr"
+		SKIP_STRIPPING=true
+	)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	# Clean up stuff that shouldn't be installed
+	rm -rf "${D}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
+	rm -rf "${D}"/etc/xdg/autostart/cadence-session-start.desktop
+	rm -rf "${D}"/usr/share/applications/*.desktop
+
+	if use !pulseaudio; then
+		rm -rf "${D}"/usr/bin/cadence-pulse2{jack,loopback}
+		rm -rf "${D}"/usr/share/cadence/pulse2{jack,loopback}
+	fi
+
+	# Replace desktop entries with QA issues with these
+	make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt"
+	make_desktop_entry catia Catia catia "AudioVideo;AudioVideoEditing;Qt"
+	make_desktop_entry catarina Catarina catarina "AudioVideo;AudioVideoEditing;Qt"
+}
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
new file mode 100644
index 000000000000..b8f9be329785
--- /dev/null
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit git-r3 python-single-r1 xdg desktop
+
+DESCRIPTION="Collection of tools useful for audio production"
+HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence"
+EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
+KEYWORDS=""
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="-pulseaudio opengl"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
+RDEPEND="${PYTHON_DEPS}
+	media-sound/jack2[dbus]
+	dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	pulseaudio? ( media-sound/pulseaudio[jack] )"
+DEPEND=${RDEPEND}
+
+PATCHES=( "${FILESDIR}"/${PN}-add-skip-stripping.patch )
+
+src_prepare() {
+	sed -i -e "s/python3/${EPYTHON}/" \
+		data/cadence \
+		data/cadence-aloop-daemon \
+		data/cadence-jacksettings \
+		data/cadence-logs \
+		data/cadence-render \
+		data/cadence-session-start \
+		data/catarina \
+		data/catia \
+		data/claudia \
+		data/claudia-launcher || die "sed failed"
+	default
+}
+
+src_compile() {
+	myemakeargs=(PREFIX="/usr"
+		SKIP_STRIPPING=true
+	)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	# Clean up stuff that shouldn't be installed
+	rm -rf "${D}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
+	rm -rf "${D}"/etc/xdg/autostart/cadence-session-start.desktop
+	rm -rf "${D}"/usr/share/applications/*.desktop
+
+	if use !pulseaudio; then
+		rm -rf "${D}"/usr/bin/cadence-pulse2{jack,loopback}
+		rm -rf "${D}"/usr/share/cadence/pulse2{jack,loopback}
+	fi
+
+	# Replace desktop entries with QA issues with these
+	make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt"
+	make_desktop_entry catia Catia catia "AudioVideo;AudioVideoEditing;Qt"
+	make_desktop_entry catarina Catarina catarina "AudioVideo;AudioVideoEditing;Qt"
+}
diff --git a/media-sound/cadence/files/cadence-add-skip-stripping.patch b/media-sound/cadence/files/cadence-add-skip-stripping.patch
new file mode 100644
index 000000000000..eacf0c9a431d
--- /dev/null
+++ b/media-sound/cadence/files/cadence-add-skip-stripping.patch
@@ -0,0 +1,65 @@
+diff --git a/c++/Makefile.mk b/c++/Makefile.mk
+index ec92861..8e9998f 100644
+--- a/c++/Makefile.mk
++++ b/c++/Makefile.mk
+@@ -7,7 +7,6 @@
+ AR  ?= ar
+ CC  ?= gcc
+ CXX ?= g++
+-STRIP ?= strip
+ WINDRES ?= windres
+ 
+ HOSTBINS = $(shell pkg-config --variable=host_bins Qt5Core)
+@@ -22,7 +21,6 @@ DEBUG ?= false
+ ifeq ($(DEBUG),true)
+ BASE_FLAGS  = -O0 -g -Wall -Wextra
+ BASE_FLAGS += -DDEBUG
+-STRIP       = true # FIXME
+ else
+ BASE_FLAGS  = -O3 -ffast-math -mtune=generic -msse -mfpmath=sse -Wall -Wextra
+ BASE_FLAGS += -DNDEBUG
+@@ -38,6 +36,10 @@ ifneq ($(DEBUG),true)
+ BUILD_CXX_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT
+ endif
+ 
++ifneq ($(SKIP_STRIPPING), true)
++LINK_FLAGS += -Wl,--strip-all
++endif
++
+ # --------------------------------------------------------------
+ 
+ # Currently broken
+diff --git a/c++/jackmeter/Makefile b/c++/jackmeter/Makefile
+index 004076d..bfe3230 100644
+--- a/c++/jackmeter/Makefile
++++ b/c++/jackmeter/Makefile
+@@ -31,10 +31,10 @@ OBJS = \
+ all: cadence-jackmeter
+ 
+ cadence-jackmeter: $(FILES) $(OBJS)
+-	$(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@ && $(STRIP) $@
++	$(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@
+ 
+ cadence-jackmeter.exe: $(FILES) $(OBJS) icon.o
+-	$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ && $(STRIP) $@
++	$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@
+ 
+ # --------------------------------------------------------------
+ 
+diff --git a/c++/xycontroller/Makefile b/c++/xycontroller/Makefile
+index 662a7af..b4aac04 100644
+--- a/c++/xycontroller/Makefile
++++ b/c++/xycontroller/Makefile
+@@ -35,10 +35,10 @@ OBJS  = xycontroller.o \
+ all: cadence-xycontroller
+ 
+ cadence-xycontroller: $(FILES) $(OBJS)
+-	$(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@ && $(STRIP) $@
++	$(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@
+ 
+ cadence-xycontroller.exe: $(FILES) $(OBJS) icon.o
+-	$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ && $(STRIP) $@
++	$(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@
+ 
+ # --------------------------------------------------------------
+ 
diff --git a/media-sound/cadence/metadata.xml b/media-sound/cadence/metadata.xml
new file mode 100644
index 000000000000..fd782eeb253b
--- /dev/null
+++ b/media-sound/cadence/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>miroslav.sulc@fordfrog.com</email>
+	<name>Miroslav Šulc</name>
+</maintainer>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index ae9128e9ec65..c06d0a6315a9 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -5,5 +5,5 @@ DIST clementine-1.3.1_p20191004.tar.gz 8528437 BLAKE2B 11c7bd7ac4ad4cdc75e2c5e54
 EBUILD clementine-1.3.1_p20190127.ebuild 5045 BLAKE2B 1a5413ccdf502d0c56cf09c4067161b128e5f8a2fe960e9c3b0dc2b7ed05e13b59fac2a866c11d5d53a715a4d3557b8ce84050e94c5974a9aa357a3dededae1b SHA512 88d87ecba083252f52a4aac810680ea088c49b70216dbe1d9a51f1a7b7d8912c35e8dbcee3879a8475f53fb8db3a5f95449d22b2f185cd179a077b57f6804b92
 EBUILD clementine-1.3.1_p20190609.ebuild 5110 BLAKE2B 2ace372f4b6ba4969d075e8954f0a5bfa5ea78037cb1dfb129b1a4d726990df4a862925a3b901da2ef1d5de088a20d720e4b3a59d5b66778e2bb4a860850daa5 SHA512 3689915216cebe991bd0d5ae9596ea0844f0583ec39f287f9487bd859e6e95d4dcc8c075efc94a69af52df3fbf4af222b2d430e7dedc002b92c0f38b067bf810
 EBUILD clementine-1.3.1_p20191004.ebuild 4615 BLAKE2B 310536c020206dc6754799dc80261ebe2fbb18304923fb61a241484f0bd019c4310e2d3fead5eabd07e89369d3aab54eb87fbc6d365e1000730a47afe453074b SHA512 edca69e331d5547b8e274b5151713ad45bb171bddbe9f3558142be4e6d8da05525297688a0b8f5c1ae2283c9bd364b0297154c5483c323886da694b3d5198965
-EBUILD clementine-9999.ebuild 4544 BLAKE2B 0f73b23c5478fa964180ff29e7e7b0a22b340088074a32bcf152e54206c39736923d6dfb43443d7d3d9e2a9e7c8f924af6d1aaa2938d74b1c1603cf92ecd7d38 SHA512 441b2d6b3e08ad6218fef936fbb1c37103b10ec4367e1d53aba8537d72dd48ea51d040cda1053b970b1224ffa5b1d6ea7f2f63933188fc248729d06b11ec356f
+EBUILD clementine-9999.ebuild 4525 BLAKE2B 1a0b9278c9cd56c0ef4cf0019f92ff29bbaadb34bb480dfd01dc1ae67d575178d9fabc0e8986d9085c061ed7b455ff02d523250f4e6bd787b825005f917ef37e SHA512 e9e585fb5dd850ff7e633aa2efd571dcb7bde3b976d391a20c97db1fab3157c00f5e5d768e351caa5d62be0b670d8662de9812312093ba7c6783f0d1c9dd4a9c
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 3f87ebadac97..4feab71f0716 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -7,7 +7,6 @@ PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa f
 
 MY_P="${P/_}"
 if [[ ${PV} == *9999* ]]; then
-	EGIT_BRANCH="qt5"
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	inherit git-r3
 else
diff --git a/media-sound/entagged-tageditor/Manifest b/media-sound/entagged-tageditor/Manifest
index da68f83fe50d..935ab15dd6e0 100644
--- a/media-sound/entagged-tageditor/Manifest
+++ b/media-sound/entagged-tageditor/Manifest
@@ -1,4 +1,4 @@
-AUX entagged-tageditor-0.35-buildfixes.patch 1861 BLAKE2B 012dd6f4aac22b62990db80bfa8ed176f9d216d5a6444778ea62d1d1c3406505e547bf4e797aa70126272c81d4a77b04b365db8d45e238fa71ec28236c854e12 SHA512 3a13a22f9bc06e55eddf8fdc3786799a652cc4122989f836b2636536ba81fbb44af7c8ac921c861658ec4f3bd51f37ab60079a6cb4aa4045fb799d90a461d477
+AUX entagged-tageditor-0.35-buildfixes.patch 1859 BLAKE2B de254c5d617c074ade950b37b14c9ec49c92f2d22efdf6ccd2d4d156911c4e77220ed0297e5e4f0c6997e62172b5fbc706a567837fafc8d63638e302ee349c35 SHA512 544c91b207744a55320935af689c0987f5798ea931b7bb498dd1b2028defa690bdeb1419de2701ce3a2d35f91b2943f0818dbc63c36581d7019b53c6493a8406
 DIST entagged-tageditor-0.35.tar.gz 4606721 BLAKE2B c7013ed9bbef046bc46897f59e6bf668f835dd80ece83d19ef9ea83f089461cb677cd55a98554310734c36bb97945db7db13eb00cd7ae06e82c0f3ea00e928ae SHA512 cefebce7381d489ccd821933c3a1d330713d4de6cf9366aa699f5017939620589c95a2ee162aabc7bfa6d42d56b5986f4ecaa2f1f77ec586cda5f6780f0a06f3
-EBUILD entagged-tageditor-0.35.ebuild 1121 BLAKE2B 7cf4d2d7ae569f8deadd1c0c318b1e240c3931c2d22c3b7512dedbbfd8008e5578d2d9fa7dc69e197c1156a2c4cc6d10872a6748f7887ed1eb47c84a2556b7a8 SHA512 81b5517bc4ead08d85f8dd37470ce3b4eb733085bfccc42d476cc051a74a2bc98b08e5435bdf44b86a519986cf014d3f6600844d9d2a828ed30568caa7864317
+EBUILD entagged-tageditor-0.35.ebuild 1132 BLAKE2B 59bd583b7eab1724a6c4c777abe57cfb5b3187e8bad93ddd6db89c64e3fd57bee8c2182514b2e7ba3d73555591d958e6729aacf2755ee5bd57cbd6817f97aab0 SHA512 fbceb85a877ead1b15290b19e63951b44074cb7aa8d37c2ac3cdee81eacbabdaea4033f6ecbfb752602d831b214cf83cf17fa576d8f3aa394c58dc04537d6d0c
 MISC metadata.xml 294 BLAKE2B 9f0e6935f2296bed9ad96d9a3c14c1b8fc04785c660279184c86b1f05f411e1f8c77ce267d628fbf33d19e69123d6e1e1007ec7fd87a087a5e8c8945adead4b7 SHA512 d9ab3a99fc847b029f4c1ac9ab321b066de58a68c2e5841147b6a4a25a940c8629f0dd4acb06a057acafc7420009fbd4b3843ed82ce85ece6e32b21aad24690e
diff --git a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
index e5316f528a5a..1113fa708d1e 100644
--- a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
+++ b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils java-pkg-2 java-ant-2
+inherit desktop java-pkg-2 java-ant-2
 
 DESCRIPTION="Open-source audiofile tagger"
 HOMEPAGE="http://entagged.sourceforge.net/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="|| ( GPL-2 LGPL-2.1 )"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
@@ -17,23 +17,23 @@ IUSE=""
 S="${WORKDIR}"
 
 RDEPEND=">=virtual/jre-1.5
-	dev-java/squareness-jlf
-	dev-db/hsqldb"
+	dev-java/squareness-jlf:0
+	dev-db/hsqldb:0"
 
 DEPEND=">=virtual/jdk-1.5
-	dev-db/hsqldb"
+	dev-db/hsqldb:0"
 
 EANT_BUILD_XML="entagged/build.xml"
 EANT_BUILD_TARGET="build"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	java-pkg-2_src_prepare
 	mkdir -p test/entagged/junit || die
 	mv entagged/entagged/junit test/entagged || die
 	rm entagged/*.jar || die
 	java-pkg_jarfrom hsqldb hsqldb.jar entagged/hsqldb.jar
 	cd entagged || die
-	epatch "${FILESDIR}"/${P}-buildfixes.patch
+	eapply "${FILESDIR}"/${P}-buildfixes.patch
 }
 
 src_install() {
diff --git a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch b/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
index 7b470e2dbeb5..709b16b32a58 100644
--- a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
+++ b/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
@@ -1,5 +1,5 @@
---- build.xml	2007-03-23 16:25:25.000000000 +0200
-+++ build.xml.fixed	2007-09-01 09:20:44.000000000 +0300
+--- a/build.xml	2007-03-23 16:25:25.000000000 +0200
++++ b/build.xml	2007-09-01 09:20:44.000000000 +0300
 @@ -30,7 +30,7 @@
  	<property name="entagged_dir" location="."/>

  	<property name="entagged_base_dir" location=".."/>

diff --git a/media-sound/justeport/Manifest b/media-sound/justeport/Manifest
index 27241985bc13..f764818932be 100644
--- a/media-sound/justeport/Manifest
+++ b/media-sound/justeport/Manifest
@@ -1,4 +1,4 @@
 AUX wrapper-script 62 BLAKE2B 2d3d6ae83fca4571efeaff20bf1594ed52946138c0a0d6f2d3b843663714c68a3bf52409809141d07693cfa330b0638b1c12c31fc7ebfe34c5ab8aabf7acc7fc SHA512 039be65c23b038c65908427a5153f2ee52c0b8a21866dca039f9306c55c60c1dc6c6f59482cabebea85d2889f5cbfb5c1a5e2fe920b76a0d94e5609368bed778
 DIST JustePort-0.2.tar.gz 16181 BLAKE2B ed61f1cdd241bfb7693fc125f4907be9ea713e7c61b3991442586e33aee0c77aaa6d1bfb1804297701a1568d727eb0a04cf8f95495e8b5e09a4c6eb35cacc6aa SHA512 b6309b883afb27fc017a259570f458e4456b1a56798fe24f815910703a2636b27f63db53fee3f1cec19520ecfa04dd8f1db92ff48167d831f1827f1b451ad0f1
-EBUILD justeport-0.2.ebuild 832 BLAKE2B 3e6b2abfac809b51cf71ea539dc9d560fe3885987c504ca5b0ec9b0a8870b4ca22afe5f3645eb0c4f2fd62f4be46396660816fa7f21e483081a63f61ad8777aa SHA512 449a9e5713c9137942bea88eace4de0d38279678a8a7e677877fb7a0732c4b496336e8d19818083fe5a7d95af94e3011bcfdcdc658c8f43d15348cce57b29c99
+EBUILD justeport-0.2.ebuild 642 BLAKE2B cab32ddd4d2b093cf7c7d62ad9fc8dbc4246cf0be0eecb8fbdd266d7cb25e366a91ce05ab95353f84fb2181112d8517ede5d103b681e4a1bd7dec6822b696de8 SHA512 0bec9f49046ce26aab3b798bd80f534dca64540660f317c455d684f7ae7c27d0e07cfcb657a03a7710c510bd7295a41b1f66a782db3768b11144aac1e0dd770c
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/justeport/justeport-0.2.ebuild b/media-sound/justeport/justeport-0.2.ebuild
index 2091e8017f7f..9ae648843057 100644
--- a/media-sound/justeport/justeport-0.2.ebuild
+++ b/media-sound/justeport/justeport-0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit mono multilib
 
@@ -11,7 +11,7 @@ DESCRIPTION="Stream audio to your AirPort Express"
 HOMEPAGE="http://nanocrew.net/software/justeport/"
 SRC_URI="http://nanocrew.net/sw/justeport/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -21,20 +21,10 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}"/wrapper-script .
-	sed -i -e "s:LIBDIR:$(get_libdir):" wrapper-script || die "sed failed."
-}
-
-src_compile() {
-	emake || die "emake failed."
-}
-
 src_install() {
 	insinto /usr/$(get_libdir)/justeport
-	doins *.exe || die "doins failed."
-	newbin wrapper-script justeport || die "newbin failed."
+	doins *.exe
+	newbin - justeport \
+		< <(sed -e "s:LIBDIR:$(get_libdir):" "${FILESDIR}"/wrapper-script)
 	dodoc AUTHORS ChangeLog README THANKS
 }
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index b78070427106..1f7b9fa8c3e6 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -11,4 +11,4 @@ EBUILD lilypond-2.18.2-r3.ebuild 3211 BLAKE2B 3e87556e56d9fdf00535b816a952fe5a13
 EBUILD lilypond-2.19.80-r1.ebuild 3343 BLAKE2B df34e0e524e87f4db5d6653dbaae54350e1d57503a1b8aeffd8689af4e35904506f63c14d1973073110119395941064c4c5443370380d9258bc45219911c7302 SHA512 7a4e88ca41f372ee5bdbfc31dbd905e89f91d470097da54b1fcf9d2e865ac72b7007794e492ed99777a3b177d6870ca343b991601b1c6a68b97ebf446ffa19af
 EBUILD lilypond-2.19.83.ebuild 3380 BLAKE2B 6e27d1d0e9aebadd107778c730c4997444e4f8587f39cfff60a00fbfc264889c5db01706e99619077ea5c9ced4920aa24bde007bd1def20d8f86f690fdf1e863 SHA512 4deeef41a1af273e8b52deeaac8f3dc5abc89cf2a0cc50499ea4e7fe82015bad3e7902401d40a6c56d3d333a21d94dc80c183bb102998351203f78d903453dba
 EBUILD lilypond-9999.ebuild 3521 BLAKE2B fba802b73675eed22ebb2d9bdd05a8fa7ff7ccb66c7d8cf7f70d141b540234b1bf21fd74d19d740fe04ba345f4d5dc263eba2710663651f43ac59ad92a25c90f SHA512 28f0b9038116fc5eae0c0b35e7f353ce14fea0aee7fa9f09f503e9582ab1de06dfe48fa2c6fb97ad5362b30eeb5d4b4dc02f017cc19a5135c77b5ba0f1be7393
-MISC metadata.xml 633 BLAKE2B dac41152bf1bacb1e17be7bff2adb0d84c1bf1be3655cb2c32bf70375890fb9bb4be188142e2fa120b11ae14775d85a064bf3603b2f34d99b9b59b1ac30c8fc4 SHA512 b18557745ee11cf04c2950daf88bc1e6a38e05d6610f5740ddf569c914c38a4522706e3b170f318a8380939a9bd5890b6b4db3e6bff02c5f93a7ceb44c6493eb
+MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/metadata.xml b/media-sound/lilypond/metadata.xml
index 75dc5b8e8839..a9cdf5b3658e 100644
--- a/media-sound/lilypond/metadata.xml
+++ b/media-sound/lilypond/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>scheme@gentoo.org</email>
 		<name>Gentoo Scheme Project</name>
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 711526859cc6..0446d3380282 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,7 +1,5 @@
-DIST lollypop-1.0.12.tar.xz 448864 BLAKE2B 65681bc29f8256ad8f9d6dadac7a6d147150a8f779e25c85744a39428176c6887e3a9f90f0af81f432db771806351301712ec2431c3a79bcb230c8c0e6fb055b SHA512 d6ad6fb638ac994c2c0367234c8ab35b79d619b3669c46f27bc1df221e41410f464a0a157faccf0ed1b2b5fbdb9f1ecad10ec7466bdff03231e4724948c8c3a2
 DIST lollypop-1.1.4.16.tar.xz 455312 BLAKE2B 358fae45a4332c10ba59d65d09ae51f28fb7fc026e137289c47951536753796e0b7efa9f3713bccde68e6260f79b1132eb00357be8c53fba04f3c827e97851cf SHA512 08b8ec7c1fbe5f1b8f95f95677012eeb9bd83951ee320470a0da852e0a446818e48ede7de045f6d7b98dff8be139fa69d780dbf03e65904c773f8ec1493f9915
-DIST lollypop-1.2.2.tar.xz 478792 BLAKE2B dbd68faeea0c6bed042c16c4851e787de17b032a00915cea33f039e217db3e0364b434eae7c6eadd47dc556992f91b8604ea42a9c3cab0fb9014827ef9fc480b SHA512 3dd335ea217159985d78b4e521022b5008bc27c12ee83f79e0516d65f92078ef4dea9beac9f15e2ad2c76ccaa4b8520ecb24a1394c9c4e7fb916d9d8b3943812
-EBUILD lollypop-1.0.12.ebuild 1402 BLAKE2B 59520ce1f04d7248a2193f6f2b7206995ab1c2bd76c407ed23c301aa0ac4e3df011070c53291ba6b155214351fbe0cb53a0754394c7ab8c79ddb906ab994ef43 SHA512 d6270ceb393b89098522143716916b0e0c1418b87ff50dbfd22a3f7aff4699f40c14be0786c77e598727a0df50c0e0839416350c120f09a337bc331fde4dff7f
+DIST lollypop-1.2.7.tar.xz 480980 BLAKE2B 9c670b2f64ed6e6a66d743f7d14ac4c360c258f0504dde99cb13e2347b76f600779e004bdd375b90214c450c75c1c446b5f1ba30c6597bf51d6f9fbc5556093f SHA512 f4967bfda276ff2acb496ec2cc27d711caea5385e949c0c222f97ae528d6ffdd3d26336deaec7aa15a926bce229a9d125148367dc3652a9f9ebeaa07521b075d
 EBUILD lollypop-1.1.4.16.ebuild 1402 BLAKE2B 5481a031876dea76a7591479fc79cf6af819ac55c0cbb8a1fab2ffa6dcee1efa24f72fb6b3e51e6f6184de2f2a31aeb92b93323e8a0cb51396b540708f75a985 SHA512 31f72c147a4c921475bff48dab39bc4adeed3df559775138ed378d0cba64b965af88c8d985cc7b35b0bb9e101d2c06ca5a54d03bb3291db101551911e8772f03
-EBUILD lollypop-1.2.2.ebuild 1403 BLAKE2B cfb669dd82e52369359cce87623aaa2e7f974d465c19e344df0949a8d6292da78903e0390d7ae56cc80d5ea1aa09d05c336fe517dd55f1741746a9d1942659c3 SHA512 c776277f350eb0e4f076b0b244dc03b0ffae468ee57b237c1cd59a18109a7c15eaf510ec1721e921620c1098efb106dbc1eae103457e683c231cef2a0fe01dab
+EBUILD lollypop-1.2.7.ebuild 1403 BLAKE2B ac7f4723bb4c12e440e9655b1e134dd609f56325c15b303fa16fcfe40bd478958a79e58eedb15fbbc589e7bb4dc8d41357a4f475b0130b7a33b0d254241f1919 SHA512 a8a6e32fa721b6e2f3f77a6bcbaf382f00515c0ff61d80c58bf7aef6898282cb3f45eb3747767bdf8907aa5abd212b3462324cff8e3fb23dddc44f14501e1264
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.0.12.ebuild b/media-sound/lollypop/lollypop-1.0.12.ebuild
deleted file mode 100644
index 4338c0ccce4b..000000000000
--- a/media-sound/lollypop/lollypop-1.0.12.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-HASH="011cb4140566625941a0fc645ac6d528"
-inherit python-r1 gnome2-utils meson xdg-utils
-
-DESCRIPTION="Modern music player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
-SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
-KEYWORDS="amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}
-	dev-libs/appstream-glib[introspection]
-	dev-libs/glib:2
-	dev-libs/gobject-introspection[cairo]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/gnome-common
-	x11-libs/gtk+:3
-"
-BDEPEND="${DEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	dev-util/intltool
-"
-RDEPEND="${DEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/totem-pl-parser
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/dbus-python
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
-	media-libs/gst-plugins-base:1.0[introspection]
-"
-
-RESTRICT="test"
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/lollypop/lollypop-1.2.2.ebuild b/media-sound/lollypop/lollypop-1.2.7.ebuild
index 138068d27cd6..0195c16327c1 100644
--- a/media-sound/lollypop/lollypop-1.2.2.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
-HASH="aa4fbd92bf338296c28e54710271ccab"
+HASH="08f973788c7ca46d9285eec2ac818edb"
 inherit python-r1 gnome2-utils meson xdg-utils
 
 DESCRIPTION="Modern music player for GNOME"
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 7d141768c0d8..a93dfeb1e879 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,7 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
-DIST mpg123-1.25.11.tar.bz2 909478 BLAKE2B e821826c91acd3c0b4b9e6b83df6c5625f86611ecfdedd2dcc12b0ce8b3389199aa4cf7eea48b597e5b7f740bbe2c7612d27e75897e34bed2a2407e98b2b7a43 SHA512 986338d0f4829ec9e40990cb384746c7abfa80d3b3d5656b6dda73d03e2441c1f28ffbe7f3f82b0008a1c4ebcfa07aeffb493e95f13f7d04cbc818a09f1008ed
 DIST mpg123-1.25.12.tar.bz2 910149 BLAKE2B 4e1b6329fafb4d1e018c6f5fc0846480ef8cfb6811f92d745f7e88d45fa6a8704ad707d110b12709763ac79fe095603c8ece0bbecb54cc2cde4de819083a2078 SHA512 fa3c719c68dbe45b265fd7677d0932b07f6a14e7ffe365ede965ff1637e655c4b57c86f7e4cd60cace7df5fcc93d48e0d44f082931394b7c6ef19f5d11638eff
+DIST mpg123-1.25.13.tar.bz2 910176 BLAKE2B c7881fdfda1d2b5acf27c2bd8b2a25329708b481a500a29b4a6ca89d2fc849c05fa25d35b85782b0d430437853013dba23c3b1519f9e299106317c31786302ba SHA512 2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39
 EBUILD mpg123-1.25.10-r1.ebuild 2838 BLAKE2B 36665cddd86d7d0d206cb5555b11224f54c1fb3905f5d077cad8960fc29a3e76b0df5f6b953d5e037abe06eae5df5a281a670152589715136ceaa28c82064893 SHA512 ce2b633f7332c9923bcffbf84d141b6e65e915fc4485b05d9b44c022ae05ddcdd09027510e5cd2f18feb71c54dc51430a250de84da66bbf830a31967653396f5
-EBUILD mpg123-1.25.11.ebuild 2862 BLAKE2B 5784ece87b256c16378b409bf3a502d99f4eb0810f2cb883b2cce54f3baddcfc653c628c2b3dfb8b95109cb75b0a8c7845003b075df8db7400389d4bd7670db7 SHA512 cd6f6fb1d82b8320fdba5e0a5e47241c380052b84f060665b63758318848c5cdf8c3f9cd01087999c7806c9c026c8336c6b54c2c988c642bb62c0307f00fa593
 EBUILD mpg123-1.25.12.ebuild 2862 BLAKE2B 5784ece87b256c16378b409bf3a502d99f4eb0810f2cb883b2cce54f3baddcfc653c628c2b3dfb8b95109cb75b0a8c7845003b075df8db7400389d4bd7670db7 SHA512 cd6f6fb1d82b8320fdba5e0a5e47241c380052b84f060665b63758318848c5cdf8c3f9cd01087999c7806c9c026c8336c6b54c2c988c642bb62c0307f00fa593
+EBUILD mpg123-1.25.13.ebuild 2862 BLAKE2B 5784ece87b256c16378b409bf3a502d99f4eb0810f2cb883b2cce54f3baddcfc653c628c2b3dfb8b95109cb75b0a8c7845003b075df8db7400389d4bd7670db7 SHA512 cd6f6fb1d82b8320fdba5e0a5e47241c380052b84f060665b63758318848c5cdf8c3f9cd01087999c7806c9c026c8336c6b54c2c988c642bb62c0307f00fa593
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.11.ebuild b/media-sound/mpg123/mpg123-1.25.13.ebuild
index 2a6b18dd31c2..2a6b18dd31c2 100644
--- a/media-sound/mpg123/mpg123-1.25.11.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.13.ebuild
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 0a2247347658..54cfe8d0a119 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -1,9 +1,7 @@
 AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171
 AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653
 AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
-AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def67156039ceff85cbdf77a89cde03f6c096eba0b9d0cce52283f039ea222298e3aa9a8eead7fb8b638ee5aa8c SHA512 e81031efa7cc2736748d5a5fdd001e28cf81430cf25f9f83b9aa8b94714dc787842e76c17c00e3b7a26192d8b4932f1e14bfdde207ee89680f2a696d4f9990a6
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
-AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2
 DIST mumble-1.3.0-rc2.tar.gz 8759830 BLAKE2B 4df1001a174d042221a674a21dcdb7165742cba2428f778eb6ef7fcfe8128734f4207230222971fa97622af3ea81e40b676cc089e45704be3fecf76f97f72a36 SHA512 b31a92cbe9d2d973cb06e5f3bb237de22f0fa5f242e6a8141ffaa735268ca41097bda44445a73ea5dafef6ef3ff7a5050c52c7f9b9f5600d400e57aff6f2e4c4
 DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
 EBUILD murmur-1.3.0.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
diff --git a/media-sound/murmur/files/murmurd-dbus.service b/media-sound/murmur/files/murmurd-dbus.service
deleted file mode 100644
index 46fe5327d4ac..000000000000
--- a/media-sound/murmur/files/murmurd-dbus.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Murmurd - VoIP Server (for Mumble)
-After=network.target mysql.service
-
-[Service]
-User=murmur
-Group=murmur
-Type=dbus
-BusName=net.sourceforge.mumble.murmur
-PIDFile=/run/murmur/murmur.pid
-ExecStart=/usr/bin/murmurd -ini /etc/murmur/murmur.ini
-
-[Install]
-WantedBy=multi-user.target
diff --git a/media-sound/murmur/files/murmurd-no-dbus.service b/media-sound/murmur/files/murmurd-no-dbus.service
deleted file mode 100644
index 8631de20aaa4..000000000000
--- a/media-sound/murmur/files/murmurd-no-dbus.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Murmurd - VoIP Server (for Mumble)
-After=network.target mysql.service
-
-[Service]
-User=murmur
-Group=murmur
-ExecStart=/usr/bin/murmurd -fg -ini /etc/murmur/murmur.ini
-
-[Install]
-WantedBy=multi-user.target
diff --git a/media-sound/protux/Manifest b/media-sound/protux/Manifest
index a55ac47f624d..74a9b4243c0b 100644
--- a/media-sound/protux/Manifest
+++ b/media-sound/protux/Manifest
@@ -1,3 +1,3 @@
 DIST protux-0.50.100.tar.gz 392027 BLAKE2B 3aad4eae28fe866bdff456b79ffcccba0658b97b06c29757757a1f7b8318a27c8e13166c0f6dfa0815276af4358dda031b9c2d869ffc007e9b21fb29d0733970 SHA512 8a7f241c1673193141f456367d40260bd9c1d9ec93130d51abebd14e1dfb03784a2cd21c6c72bce645bd362f138e52e5d41182358ea4b4dad50f892025b6dad7
-EBUILD protux-0.50.100.ebuild 1054 BLAKE2B dd8e61afa8bf605171d9db0d9f7ccda60745945f8cbc6324cdea3badf52d048946d8ade64e4244950762531c6c903defaae1382df8a88e9ff8b9f26bb174e035 SHA512 282de469d5eca446d5ba003253b2c6e6c916bcc26e70ca7a7b619dfcf8a54061ae7e31d9187afa0413191d1c93530b2bec14e61a2ec6c172c2068eed66053e64
+EBUILD protux-0.50.100.ebuild 1038 BLAKE2B 3f726e49643bd9e1a5dbdac1d207b954691789862e9c5b72b090740ac8e087e3c8ed0b12f03f39483762cd830b1f5379f4b4b2c811b172c4a8bebbb14ee52186 SHA512 8c5096a8a58c29e05c35252f57fbd627406bef000af828c7f24bbd738827739dc1e250535f06c7a85893191eb7fe82482ea9e5e36ab1d8733671c9e6befda1fc
 MISC metadata.xml 448 BLAKE2B b42a47762da30e666d97523b56e33df98e97ddedab954c4e19add0cde52d7d8cd73409d723419363ddf683922d697f06d3b8077f78524e62b5ee008c9f5831fa SHA512 6db37340b09ea0b4f18892b7868aeabbc50f4a9d2505332d9f927a9299fd0d13178a8e351f6378f1f5c55b6a9862a08323213995027ebf9f9e2f235c6d857943
diff --git a/media-sound/protux/protux-0.50.100.ebuild b/media-sound/protux/protux-0.50.100.ebuild
index 3b8777e18cbb..f4f130c2bd87 100644
--- a/media-sound/protux/protux-0.50.100.ebuild
+++ b/media-sound/protux/protux-0.50.100.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit java-pkg-2
 
@@ -9,37 +9,38 @@ DESCRIPTION="Professional Audio Tools for GNU/Linux"
 HOMEPAGE="http://protux.sourceforge.net/"
 SRC_URI="http://${PN}.sourceforge.net/releases/${P}.tar.gz"
 
-IUSE="source"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 x86"
+IUSE="source"
 
 DEPEND=">=virtual/jdk-1.5
 	source? ( app-arch/zip )"
 
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 
 	# bug #318589
-	sed -i '/com.sun.jmx.snmp.Enumerated/d' "${S}/src/org/protux/core/GlobalProperties.java" || die
+	sed -i '/com.sun.jmx.snmp.Enumerated/d' \
+		src/org/protux/core/GlobalProperties.java || die
 }
 
 src_compile() {
-	cd src
+	cd src || die
 	ejavac -encoding latin1 $(find . -name "*.java")
 	jar cf ${PN}.jar $(find . -name "*.class") || die
 }
 
 src_install() {
 	java-pkg_dojar src/${PN}.jar
-	dodoc AUTHORS BUGLIST ChangeLog COPYRIGHT INSTALL README TODO || die
+	dodoc AUTHORS BUGLIST ChangeLog COPYRIGHT INSTALL README TODO
 	use source && java-pkg_dosrc src/org
 	# pwd like this because it does not find resources otherwise
 	java-pkg_dolauncher ${PN} \
 		--main org.protux.Main \
 		--pwd /usr/share/${PN}
 	insinto /usr/share/${PN}
-	doins -r resources || die
+	doins -r resources
 }
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 7b052e30fa08..521ba12fcf27 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -3,7 +3,7 @@ AUX teamspeak.service 418 BLAKE2B fad43e28b976db44b290937654f3fa503a7a17dbba17e7
 AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b911b11175932d2b3031dabcfa29d2bafe37742a05cea5e6dc8913abfdba140f9c2203515eb5da4444b3bbdd1 SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db
 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.9.1.tar.bz2 8907155 BLAKE2B 02fe945f6d4db41989cf38c3edfbdddd1c0086d69a1d4f7b3eb5d194f0d48998dd27014aea7c2cb0311ba0be463ac453c3e2c3d5a0825c0c55f02583ae6c7b93 SHA512 aaffb43bc5559736ee9d41f02edb438ceced78e0bc935e6402d2cad6c00b4db6ab42c93df1af7bd9b9254a38aeef908b4024e736d6035e845124c373ed8e096c
-DIST teamspeak3-server_linux_x86-3.9.1.tar.bz2 8781184 BLAKE2B 78fd1678782cc0dc50d85d94a7fa22f61190f84b0d4990366ff10fabbef27499a693c316a181b52fa6db0b127a5819092c026259db7cf5ef49f379abdf821eaf SHA512 ed9f89b19d52d7f49808719d333459c4118148123fe9047be845aac0b05b2e7b120837811f6da1aed891b87ca06606ddb6e0772eaaef2fd8e71775dc7158a819
-EBUILD teamspeak-server-3.9.1.ebuild 3066 BLAKE2B f5b1192fc2a7decb4aec6251d13fc4e3a20a529417545a28dd38bdba5cff782e8a8529289018f22d7f137730dc382a92505b2801acb8e0963f7fc665cf915712 SHA512 890151212a23877783decd18d22f57641af15fc56b7490b77199ff7fc1f6a2c37bab1bd594639cbf3bfbc845152b4fd1f72a5d14ce77ce2c684039c9e558a88b
+DIST teamspeak3-server_linux_amd64-3.10.0.tar.bz2 9242882 BLAKE2B 0315c438305827a4bddd73f07a4f813e2268ec5eefa6f89e45de43afe61b4d8c0e17e0d45317b485472aae5a60ce9afcd393ecd31a9d43304c466eff7db918d6 SHA512 d847fbe18ab2676bcd299773f4070a6e58ba86784f18c9cf9e843cd28adbcdbebff69c9bdc8a5f46f714913f657d8fd603fe1b8c90a938d9e49b06ed0ce0bacb
+DIST teamspeak3-server_linux_x86-3.10.0.tar.bz2 9047531 BLAKE2B 8fa0eba5b9dd4a5274b8b4b626c85326d1d6a8b9d00c17d9b26ac558dd4bfc233e09863bea01a590a0273e5d20c7b1513f0cc80df82366f9c327cf85173e553c SHA512 42baa7ef4d1451c9e4533ef186b0b48a92619a673bf11c4876b0caa908e7e8846fc7307eb01b220a6d12f62273ae7a3c3b5c90f3cf891e490554d254fd552c5e
+EBUILD teamspeak-server-3.10.0.ebuild 3081 BLAKE2B 4ffaceb76c6059ec173428206e9bfcd20dc8082dc2b3423dd64bc8a19dd42cca9e76b701d68bbdcbd15431570391146dd8d86c90bc86307d28fc25b1c7f97f04 SHA512 fc6ca1e7cb834d4e86c8ebda0ebc1337f00c73b93d3f94bf4a2c45f48f4a3323dbb0fc6f9f633fa858c9a8ff9af8f1a8114a653af5ffe420dfce37cea3ff65f5
 MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.9.1.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.10.0.ebuild
index 149df7e77f90..034c317b9ddb 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.9.1.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd user
+inherit systemd
 
 DESCRIPTION="A server software for hosting quality voice communication via the internet"
 HOMEPAGE="https://www.teamspeak.com/"
@@ -19,6 +19,11 @@ IUSE="doc mysql tsdns"
 
 RESTRICT="bindist mirror"
 
+RDEPEND="
+	acct-group/teamspeak
+	acct-user/teamspeak
+"
+
 QA_PREBUILT="
 	opt/teamspeak3-server/libmariadb.so.2
 	opt/teamspeak3-server/libts3db_mariadb.so
@@ -28,11 +33,6 @@ QA_PREBUILT="
 	opt/teamspeak3-server/tsdnsserver
 "
 
-pkg_setup() {
-	enewgroup teamspeak
-	enewuser teamspeak -1 -1 /opt/teamspeak3-server teamspeak
-}
-
 src_unpack() {
 	default
 
@@ -46,7 +46,7 @@ src_install() {
 	diropts
 	keepdir /etc/teamspeak3-server
 
-	touch "${D%/}"/opt/teamspeak3-server/.ts3server_license_accepted || die
+	touch "${ED}"/opt/teamspeak3-server/.ts3server_license_accepted || die
 
 	exeinto /opt/teamspeak3-server
 	doexe ts3server
@@ -114,5 +114,6 @@ src_install() {
 pkg_postinst() {
 	elog "If you have a license,"
 	elog "place it in /opt/teamspeak3-server as licensekey.dat."
-	elog "Please note, that the license must be writeable by the teamspeak user."
+	elog "Please note, that the license must be writeable by the teamspeak user,"
+	elog "as it will be automatically updated every six months."
 }
diff --git a/media-sound/xmms2-scrobbler/Manifest b/media-sound/xmms2-scrobbler/Manifest
index 39bd6ee5e722..034d28688bf0 100644
--- a/media-sound/xmms2-scrobbler/Manifest
+++ b/media-sound/xmms2-scrobbler/Manifest
@@ -4,5 +4,5 @@ AUX xmms2-scrobbler-0.4.0-ldflags.patch 685 BLAKE2B f3cf24b772c857cfbcd9c19e9836
 AUX xmms2-scrobbler-0.4.0-libs.patch 621 BLAKE2B 78ecc5b4bcf8e16607dfed56345ed8c47d29610a81fc47b3377b7c32dac2b3b76224921398efdf879444468ee723ac202259c3a7879496a857f9a29d340f9888 SHA512 7156685a51aa4283dbc584b04c0c68925a5720cb92c3dd1b7d4356336e946d2e162d17a5408e45eebaf9ec2878f77c162f3a540c225a0d27f5662c58edb2e407
 AUX xmms2-scrobbler-0.4.0-no-XPTR.patch 618 BLAKE2B 33a3e91cce78e7f9c6c2cff237643b8aae57be6efda47a114c1059211ac66dbfa9d426c90b6b9bab45f27410df5501b32ad148b99344ad59ce6f87389cbbe3af SHA512 24b7e3b0472cfd277ba3bba8f0bd3fd11de43c7c6d3cfb117d142d4950fd820acfafec7df0a3f17889f847437a29521a786441272a59d599986c5d0a6179fe09
 DIST xmms2-scrobbler-0.4.0.tar.gz 19831 BLAKE2B 84194a2359b825c5571637e4d875003262235f8bce550ffeb54a123c53b1aeee49b7fd21c5549903e24348869abba96ba9b7e78cade4dc44dcbb798f4604d8fa SHA512 2df20693479413a18e487f16e87f0a711866221dcbc8f96c970be55aac2c495fcb84e9e3ea754473c747d33d5d1ef54823f6a050d5054581454f956c86f6236b
-EBUILD xmms2-scrobbler-0.4.0.ebuild 1346 BLAKE2B fe184aa1179e54ea8b8ba17a9181796a980e66db0e5b5cca7bd5bb53b9b55f90173718a8e433d9290dad4dabc66e3405e52400fc2f4d6c2df61712adc4f67fae SHA512 f5b5c31346396da50ec9231d4f4e7d51a1001e09df2eae0cf70bff27f41633360c4e2887c1a275fc1c10c07cf27b4a61807804b76252e7b1252001d5b7dd2cf3
+EBUILD xmms2-scrobbler-0.4.0-r1.ebuild 1295 BLAKE2B 20a1a52b8623d0289fed00615bf6edd68f5a0205c2248323c1e5393bf26b6b6fc6b3de263d6e0f8efe61294af08ffb0d8b8050a7b39587b7e21be802c1e614fd SHA512 8790c750c04698027452121f487ff129858b5ef4e2a6ce1836e3780459446e393974458fe703bb3919e0c89ddce54cc9bf2fbd3cee5982f8d32ea132c605e3d1
 MISC metadata.xml 534 BLAKE2B cba02182ace8baaf5933ba4e01464e323ea0c6dc58c575ebea0850808429f45df267c55d4856394885dcb4f8c69763f1c8aacec5ab401b079c8cee893d8e5f61 SHA512 ee2450fc9a95750c4c86c4413ae4b3a560952a6fcee22f5d27f5ac5ff0388deb8e71131a92972e15415cea0f736be554db3c9c607ac374cddfb9b46ba181da76
diff --git a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
index 6c784004bb5a..f343e1164471 100644
--- a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild
+++ b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="XMMS2 AudioScrobbler client"
 HOMEPAGE="http://code-monkey.de/pages/xmms2-scrobbler"
@@ -18,13 +18,13 @@ RDEPEND="media-sound/xmms2
 	net-misc/curl"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-libs.patch
-	epatch "${FILESDIR}"/${P}-ld-order.patch
-	epatch "${FILESDIR}"/${P}-gcc-7.patch
-	epatch "${FILESDIR}"/${P}-no-XPTR.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-libs.patch
+	"${FILESDIR}"/${P}-ld-order.patch
+	"${FILESDIR}"/${P}-gcc-7.patch
+	"${FILESDIR}"/${P}-no-XPTR.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)" VERBOSE=1
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 5527f286d933..d4c88215adc2 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -7,7 +7,6 @@ AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af182
 AUX xmms2-0.8_p20161122-perl-no-local.patch 697 BLAKE2B 86ab6bb3594fd45e9a9bdbd07d85d3740ed206eea24652161c7fbbdf620c98a6b002b646aba65a3f017e263bb82d6dc7b933fb53540012c2005d65dd2e667b06 SHA512 eb5afb39409c7c199a844d9452ab829a653d2a1ce8f5d9f1361fa995e851914d5a962d25d8116947a265fabc649f8560aa1947a24cf45d954da7743954fc3cd7
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r3.ebuild 7512 BLAKE2B 9f27e34436e26b5b1c21c0b200439949fd1139ab0fc4baaf09ad7040298e4e67036b79d1d29076e7649d32ac5e57e70bb59a32f402d4809dab3ae0b105e5380f SHA512 c396e5fd3908e2652584eb69e935e65beff4a4bf2876cebbae2fbeda0ec3449443aed32f1286914247ba9ae751b84516b0f147bbb44a07b5fbe15630e0c6f1db
-EBUILD xmms2-0.8_p20161122-r4.ebuild 7570 BLAKE2B 2d86795c94d54465b9440f22ee276bd309da2a9f2ae117903c768b8ef1e836280eea4bf1eea13600465b00689f5d1146e6e86a5dc8881fe1f5a3fbf5c8504218 SHA512 2813a46fc3261cc6f0dc538ca5d827cff1e7a1f82043a82815b00ad62305682aba5c0fba73db38d1e46eeaaed4458d4574fc43cd7770cc6b81b2cbfab35104b3
-EBUILD xmms2-0.8_p20161122-r5.ebuild 7697 BLAKE2B d53767b9b76d1824dc8629021f52e0cc501a7a1c08ab5669589c26d9bb66463dcdf23f1e560d39a97a2b7ffae4f863377005866f85f6ad06d95d2d12069b9379 SHA512 f8f59ccf3df8e9d8be357b265155e0b29c466d28e0b85f40897c4daffabe4907e7ab096cee883dd5ed468241ab4c1d03a3ace3f32bb2521be8dca0b3a5cda035
+EBUILD xmms2-0.8_p20161122-r4.ebuild 7598 BLAKE2B 278c96fd9433e15f07c54f132c51d4073a5f0c5afb1140b630f074bff7b7984f86a3c76b57ecd640f4f8d137ac1c0c8445142af45e173c05d9377b9a78fdeb2d SHA512 1b9182a90b7ba652ebe75fd164952b4d055fe5f8f7831d18407ec608e863b3165672f18fa0d6f95b32cfc4fdb2c5272ec925a90470b0dcfdac42f8a8d9f106ef
+EBUILD xmms2-0.8_p20161122-r5.ebuild 7725 BLAKE2B 366b6cc06da399a83a19d58932a78a03856b15c568dcc4d0a888bd391969a166b0366a358900a769a451712447410f3e18c5743ee159d18af08916e3aea618fb SHA512 e30bcd17c146f6ca5b1d5010ccf6e9cbc7b4cdf9480ca56b9f171567ca112c61d3248a95b21728d08f202e149efde8d6bb1e304577cb926645a5209b0abd2e55
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r3.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r3.ebuild
deleted file mode 100644
index 7a6d9e9211da..000000000000
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r3.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
-
-# generated as 'python2 ./utils/gen-tarball.py' from clean git tree
-MY_P="${P%_p*}DrO_o-949-gca15e830"
-
-DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
-HOMEPAGE="https://xmms2.org/wiki/Main_Page"
-#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
-
-IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
-jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
-perl phonehome pulseaudio python ruby samba +server sid sndfile speex
-test valgrind +vorbis vocoder wavpack xml zeroconf"
-
-RDEPEND="server? (
-		>=dev-db/sqlite-3.3.4
-
-		aac? ( >=media-libs/faad2-2.0 )
-		airplay? ( dev-libs/openssl:0= )
-		alsa? ( media-libs/alsa-lib )
-		ao? ( media-libs/libao )
-		cdda? ( dev-libs/libcdio-paranoia
-			>=media-libs/libdiscid-0.1.1
-			>=media-sound/cdparanoia-3.9.8 )
-		curl? ( >=net-misc/curl-7.15.1 )
-		ffmpeg? ( virtual/ffmpeg )
-		flac? ( media-libs/flac )
-		fluidsynth? ( media-sound/fluidsynth )
-		ices? ( media-libs/libogg
-			media-libs/libshout
-			media-libs/libvorbis )
-		jack? ( virtual/jack )
-		mac? ( media-sound/mac )
-		mms? ( virtual/ffmpeg
-			>=media-libs/libmms-0.3 )
-		modplug? ( media-libs/libmodplug )
-		mad? ( media-libs/libmad )
-		mp3? ( >=media-sound/mpg123-1.5.1 )
-		musepack? ( media-sound/musepack-tools )
-		ofa? ( media-libs/libofa )
-		opus? ( media-libs/opus
-			media-libs/opusfile )
-		pulseaudio? ( media-sound/pulseaudio )
-		samba? ( >=net-fs/samba-4.2 )
-		sid? ( media-sound/sidplay
-			media-libs/resid )
-		sndfile? ( media-libs/libsndfile )
-		speex? ( media-libs/speex
-			media-libs/libogg )
-		vorbis? ( media-libs/libvorbis )
-		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
-		wavpack? ( media-sound/wavpack )
-		xml? ( dev-libs/libxml2 )
-		zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	)
-
-	>=dev-libs/glib-2.12.9
-	cxx? ( >=dev-libs/boost-1.32 )
-	perl? ( >=dev-lang/perl-5.8.8 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-
-DEPEND="${RDEPEND}
-	dev-lang/python
-	virtual/pkgconfig
-	perl? ( dev-perl/Module-Build
-		virtual/perl-Module-Metadata )
-	python? ( >=dev-python/cython-0.15.1
-		dev-python/pyrex )
-	test? ( dev-util/cunit
-		valgrind? ( dev-util/valgrind ) )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# used both for building xmms2 and
-	# optionally linking client library
-	# against python
-	python-single-r1_pkg_setup
-}
-
-# use_enable() is taken as proto
-# $1 - useflag
-# $2 - xmms2 option/plugin name (equals to $1 if not set)
-
-xmms2_flag() {
-	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
-
-	local UWORD=${2:-$1}
-
-	case $1 in
-		ENABLED)
-			echo ",${UWORD}"
-			;;
-		DISABLED)
-			;;
-		*)
-			use $1 && echo ",${UWORD}"
-			;;
-	esac
-}
-
-src_prepare() {
-	./waf # inflate waf
-	cd .waf* || die
-	# needs port
-	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
-	cd "${S}"
-
-	eapply "${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
-
-	eapply "${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
-
-	# required to build tarball from git tree
-	eapply "${FILESDIR}/${P}"-tarball.patch
-
-	# fix hash to be the same on LE/BE platforms
-	eapply "${FILESDIR}/${P}"-be-hash.patch
-
-	# handle mac-3 -> -4 API change
-	eapply "${FILESDIR}/${P}"-mac-4.patch
-
-	eapply_user
-}
-
-src_configure() {
-	# ./configure alike options.
-	local waf_params="--prefix=/usr \
-			--libdir=/usr/$(get_libdir) \
-			--with-target-platform=${CHOST} \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--datadir=/usr/share \
-			--sysconfdir=/etc \
-			--localstatedir=/var/lib"
-
-	local optionals=""
-	local plugins=""
-	if ! use server ; then
-		waf_params+=" --without-xmms2d"
-	else
-		# some fun static mappings:
-		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
-					"phonehome	et"
-					"ENABLED	launcher"
-					"mlib-update	medialib-updater"
-					"ENABLED	nycli"
-					"		perl"
-					"ENABLED	pixmaps"
-					"		python"
-					"		ruby"
-					"DISABLED	tests"
-					"DISABLED	vistest"
-					"cxx		xmmsclient++"
-					"cxx		xmmsclient++-glib"
-					"DISABLED	xmmsclient-cf"
-					"DISABLED	xmmsclient-ecore" # not in tree
-
-					"test		tests"
-				)
-
-		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
-					"		alsa"
-					"		airplay"
-					"		ao"
-					"ffmpeg		apefile"
-					"ffmpeg		avcodec"
-					"		asf"
-					"ENABLED	asx"
-					"		cdda"
-					"DISABLED	coreaudio" # MacOS only?
-					"		curl"
-					"ENABLED	cue"
-					"zeroconf	daap"
-					"ENABLED	diskwrite"
-					"ENABLED	equalizer"
-					"aac		faad"
-					"ENABLED	file"
-					"		flac"
-					"		fluidsynth"
-					"ffmpeg		flv"
-					"ffmpeg		tta"
-					"DISABLED	gme" # not in tree
-					"DISABLED	gvfs" # obsolete #647604
-					"ENABLED	html"
-					"		ices"
-					"ENABLED	icymetaint"
-					"ENABLED	id3v2"
-					"		jack"
-					"ENABLED	karaoke"
-					"ENABLED	m3u"
-					"		mac"
-					"		mms"
-					"		mad"
-					"ENABLED	midsquash"
-					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
-					"mp3		mpg123"
-					"		modplug"
-					"		musepack"
-					"DISABLED	nms" # not in tree
-					"ENABLED	normalize"
-					"ENABLED	null"
-					"ENABLED	nulstripper"
-					"		ofa"
-					"		opus"
-					"		oss"
-					"ENABLED	pls"
-					"pulseaudio	pulse"
-					"ENABLED	replaygain"
-					"xml		rss"
-					"		samba"
-					"DISABLED	sc68" #not in tree
-					"		sid"
-					"		sndfile"
-					"		speex"
-					"DISABLED	sun" # {Open,Net}BSD only
-					"DISABLED	tremor" # not in tree
-					"		vorbis"
-					"		vocoder"
-					"ffmpeg		tta"
-					"ENABLED	wave"
-					"DISABLED	waveout" # windows only
-					"		wavpack"
-					"xml		xspf"
-					"ENABLED	xml"
-				)
-
-		local option
-		for option in "${option_map[@]}"; do
-			optionals+=$(xmms2_flag $option)
-		done
-
-		local plugin
-		for plugin in "${plugin_map[@]}"; do
-			plugins+=$(xmms2_flag $plugin)
-		done
-	fi # ! server
-
-	# pass them explicitely even if empty as we try to avoid magic deps
-	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
-	waf_params+=" --with-plugins=${plugins:1}"
-	waf_params+=" $(use_with valgrind)"
-
-	CC="$(tc-getCC)"         \
-	CPP="$(tc-getCPP)"       \
-	AR="$(tc-getAR)"         \
-	RANLIB="$(tc-getRANLIB)" \
-	CXX="$(tc-getCXX)"       \
-	    ./waf configure ${waf_params} || die "'waf configure' failed"
-}
-
-src_compile() {
-	# waf is very keen to run tests in build phase (bug #424377) but
-	# it does not bother running tests twice, so the hack below works:
-	./waf --verbose build || ./waf --verbose build || die "waf build failed"
-}
-
-src_test() {
-	# rerun tests
-	./waf --alltests || die "waf --alltests failed"
-}
-
-src_install() {
-	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
-	dodoc AUTHORS TODO
-}
-
-pkg_postinst() {
-	elog "This version is built on experimental development code"
-	elog "If you encounter any errors report them at https://bugs.xmms2.org"
-	elog "and visit #xmms2 at irc://irc.freenode.net"
-	if use phonehome ; then
-		einfo ""
-		einfo "The phone-home client xmms2-et was activated"
-		einfo "This client sends anonymous usage-statistics to the xmms2"
-		einfo "developers which may help finding bugs"
-		einfo "Disable the phonehome useflag if you don't like that"
-	fi
-}
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
index 436345d7fae1..b19b7476b0ff 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
@@ -85,6 +85,8 @@ DEPEND="${RDEPEND}
 		valgrind? ( dev-util/valgrind ) )
 "
 
+RESTRICT="!test? ( test )"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
index 01daddf56462..2c519ca93888 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
@@ -85,6 +85,8 @@ DEPEND="${RDEPEND}
 		valgrind? ( dev-util/valgrind ) )
 "
 
+RESTRICT="!test? ( test )"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}/${MY_P}"