gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /media-sound
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
129 files changed, 1860 insertions, 1254 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 10f3ab2f0c54..247c8934722e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 6986f9116b87..fb4ed4034af6 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,5 +1,7 @@
 DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
 DIST asunder-2.9.4.tar.bz2 272740 BLAKE2B 64d0850afb0ea5f30a7522a9709f57cec4ab0d67eca235b75ae4ffac2dcc293438b99827eadd63052e9ea4d98fe97684d4b367255e24692af79a0efd1ed30ea7 SHA512 9410b96f27e7ea46e7a3f290caf17ddee69da9b92770346e10ae8e9403d21a527ba763163cf92e879cefb32f219e7d22d3f9b4dc2d81a3aab2a7676b859cfb71
+DIST asunder-2.9.5.tar.bz2 273141 BLAKE2B 895f067bb867d5e82350cdb334551fcf2f408a0ceeaf02a453262661434b05813e184a325e6b27cdb3d3e47486e1395b539e07c4304eb5ec0940eff48649f96b SHA512 40e27877c8fa17465b13a7fa08df6f94dbcb893bd6d8d46a389ca18bce4f574e04e894f9ca19f52bc22e7d1ec0db67a79f236ae4037be459bc24fe95739771dc
 EBUILD asunder-2.9.3-r1.ebuild 914 BLAKE2B c45c833d0f76953116802aab8c345209843fa28362fd321b7e643b2d726ab8febdef70fb6795a49f1433ffc514e86dff90a09c9775c323c430ab18bfcc5a29ee SHA512 50dd1394d95d7b441fd5a128e66155b312b5d5438ce568e660248bd5e732300154826e0abfcfa073f355eac44eccbfb785b9ca57cd711948816607948ead7de3
 EBUILD asunder-2.9.4.ebuild 916 BLAKE2B d0667f09a4408d0a2506cdac7e28a7a9bf55d60660d2d583ff240e3421da12917a76711c25584b52c9e70eedca1e24f1cd8431c71df60e2820228a20fb260774 SHA512 15602f1ce1ec6be393d591c88743a34c01a15ddff8d40087077906aad551f2ee6f7cd24082b269e2b64acdbee74c4e069125a3e59aaf9742c2ff1d868bcac1a7
+EBUILD asunder-2.9.5.ebuild 916 BLAKE2B d0667f09a4408d0a2506cdac7e28a7a9bf55d60660d2d583ff240e3421da12917a76711c25584b52c9e70eedca1e24f1cd8431c71df60e2820228a20fb260774 SHA512 15602f1ce1ec6be393d591c88743a34c01a15ddff8d40087077906aad551f2ee6f7cd24082b269e2b64acdbee74c4e069125a3e59aaf9742c2ff1d868bcac1a7
 MISC metadata.xml 345 BLAKE2B dc144dfa8d94c1293b6b84f24ecdedc8530c4fa19105e3deca1670ca1a43a261094635bb31abec0d027d1caaa4c72c884e4690f43d7af1b9f5b2dc9685502bf1 SHA512 aa6a8d66e2961a176722a5ab0d2db6a1edb246403ac81f2b282d14d0b4a231449d052c48c59f622c04b7582af0545fb97bb430ca89c33924ce24b354b0e2e47a
diff --git a/media-sound/asunder/asunder-2.9.5.ebuild b/media-sound/asunder/asunder-2.9.5.ebuild
new file mode 100644
index 000000000000..df537f03bf42
--- /dev/null
+++ b/media-sound/asunder/asunder-2.9.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="Graphical Audio CD ripper and encoder with support for many output formats"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="flac mac mp3 musepack opus vorbis wavpack"
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND=">=media-libs/libcddb-0.9.5
+	media-sound/cdparanoia
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	musepack? ( media-sound/musepack-tools )
+	opus? ( media-sound/opus-tools )
+	vorbis? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )"
+
+src_prepare() {
+	default
+	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
+}
diff --git a/media-sound/audiocompress/Manifest b/media-sound/audiocompress/Manifest
index f26126a22785..20a11ce2cb94 100644
--- a/media-sound/audiocompress/Manifest
+++ b/media-sound/audiocompress/Manifest
@@ -1,3 +1,3 @@
 DIST AudioCompress-2.0.tar.gz 15752 BLAKE2B be9ead7800ea080bf1705034660f903c85459934808a3b3a61884713deeaf89084c213a48f731ddc2ed3cf42778d1d9d401048823f0f1c404ee50466a27b4456 SHA512 4ff900510f3f1c1c2f0cc3e5465ddeb3d72306faddfce452c2353c7233f64feff8fe9f5f0726e25a7300b6f016aeda56d61624f6e33af6bfafbbb955726c94bf
-EBUILD audiocompress-2.0.ebuild 684 BLAKE2B 72cb22ac2e6664adc2ede5f7ae90a202076faac522ce83c53652bf4aa1ed2938f212977ab56c78fddc5edb5994e9296f56d3c611a7155d7ef044dc33e4bcf2ac SHA512 7e0ca16f51a72d90ea426e1bc407c59d718931cbf78edc41aea195fadbcf67bf241e503d86c5ef68bbd9677ea90b9e2ec22ee56903ad1ebcb403799e695bdd65
+EBUILD audiocompress-2.0.ebuild 592 BLAKE2B 1dcf577e80188a7c29298ccadd508d1f9c75bf251345cd8928b7b7f84bb28ab485ddb79e2b799277a1a07a96642cb2701bd7228963fffda254e0d5201d3b98f0 SHA512 917e0a9626096e3424dce9dd4bb274f921a9e2e00398145d77ba276f01d0dc703a226cdc719ce2bbd1cc343616f88e33313ea891a92ca1cb4e87aec503223438
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/audiocompress/audiocompress-2.0.ebuild b/media-sound/audiocompress/audiocompress-2.0.ebuild
index 43d20244d5ec..cf03513cb762 100644
--- a/media-sound/audiocompress/audiocompress-2.0.ebuild
+++ b/media-sound/audiocompress/audiocompress-2.0.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 toolchain-funcs
 
@@ -14,10 +14,6 @@ SRC_URI="https://beesbuzz.biz/code/audiocompress/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
@@ -26,10 +22,10 @@ src_compile() {
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" || die "emake failed"
+		CXX="$(tc-getCXX)"
 }
 
 src_install() {
-	dobin AudioCompress || die "dobin failed"
-	dodoc ChangeLog README TODO
+	dobin AudioCompress
+	einstalldocs
 }
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 47d301a14a6c..9c2b40aae7e2 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -2,9 +2,9 @@ AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fc
 AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
 AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
 AUX bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch 988 BLAKE2B e8a038a794a6ec4b8f78943d8371931ed110672b543d4e14d7e6c29baab7f658c6e02a6e7d8a2a9ab2caa73be9255f45b1923cb6ff5ae110bc0c924026c2bfc6 SHA512 32badb733ec3d7f7af07e03ae9f5c224b482fee7910ba9fe9067938d48c6b0d58d3535f1ba10609ecebb7df2b91a6af1048f2d19b4b48435e552800979ed0878
-DIST bluez-alsa-1.3.1.tar.gz 87333 BLAKE2B 0479baa103b9e6e5c26d061df59b0a36a24a74ee04c882a888d63458da96a980bc9f39a6219cd4ad9f8c04b0d58fb337a960584eb7b93455474111a71ddbeb9f SHA512 2b2f7b26b7b8cff70517bf8a24170330038be40f1a5a2fc75d20853b7beca6c9f9e2e6068f6b0f4fa9b6fc61f374ff59961434be8daa3b4d283abfd165be9cbf
 DIST bluez-alsa-1.4.0.tar.gz 102539 BLAKE2B 8e640ba5c0cadfa5478885dc6affef790bd50fe04821602156a598082efc8733f0917a91240af7881f980e89ec0e36801e537feedec3ce357087b040f852eeb0 SHA512 fa4ad21c7b9ac200cdc7628bf0276bbb0beac94066a6c5e69c47a5286f6e13a7dc61caab23acbb14a37c2b97894c425052a09adb8f967038f6fd99557208629f
-EBUILD bluez-alsa-1.3.1.ebuild 1439 BLAKE2B 3e09b00876dfc17692bcce8993a323cd41a932b7ad9552fef77fa01790580c40f895a0b2aa621f147be341df6b8e606bb09ede1190c29031e7903c88319879cc SHA512 e3ac668bf2df4ff4caff94751fb24626ade8ef36a799fe2cf5eb48faa52053ec3e66ba0e30307a770641368fdcee4cb8c0d8cb4e812888997533304afe629e21
+DIST bluez-alsa-2.0.0.tar.gz 116895 BLAKE2B 97dfd3364259e8a633de0259c84efe4dc4a80a9f388620200c44136844af6f3e101bf6d49931e1b5cd466d4b1ff13b2a7b9284d4599db72039ee3c5afa5800ba SHA512 21152be594421cd00056e94065dcf767ca01f7b040117974315f97aab45db020264e33dabddac7fee12834a4ada9073b9ff680c25d8775b47604cb0bec638a7b
 EBUILD bluez-alsa-1.4.0.ebuild 1643 BLAKE2B d7d0390bc854cf11bcc12fe2462b396b2ad42babc8856ea6b67d0d3ca8c19a1df3d7a33c2d6197e86942bc01443e6e1773555847d8aa2dab4fa89a912a520b1e SHA512 fdf75b1e90127d7ad4168848dbd96fccecf08b1c64549e8c759dd25a6e53983f612a803fc73018ac9da0f4637a7a9f8e289dd9d48e3fc175d8a235a81a26eded
+EBUILD bluez-alsa-2.0.0.ebuild 1630 BLAKE2B eb77664e4585045703292e641800d35d632cb5e5ef23cdd4c4fedbc0f45e56a72240ef3af854d2664f87ab93533b0db6f2a8bd4f901188feddf4c882a4b1a4c8 SHA512 cb9ac7860b962ef95d8d29281196957db8f94379ecadcb2ff8094f4aa98189d2fb0f9ebc27ceba823ce1be38ec92d52a114e838e48c8ff887c6d5531bb6030ab
 EBUILD bluez-alsa-9999.ebuild 1630 BLAKE2B eb77664e4585045703292e641800d35d632cb5e5ef23cdd4c4fedbc0f45e56a72240ef3af854d2664f87ab93533b0db6f2a8bd4f901188feddf4c882a4b1a4c8 SHA512 cb9ac7860b962ef95d8d29281196957db8f94379ecadcb2ff8094f4aa98189d2fb0f9ebc27ceba823ce1be38ec92d52a114e838e48c8ff887c6d5531bb6030ab
 MISC metadata.xml 583 BLAKE2B 169737f9ae65bf26204a56b0fbcd1479911895ccfc20433c01a8ea1711ceb75939531f395f7e882149ffde427f43d8410d19392040e5288f5dbca2e4f86fa71f SHA512 b767355e099b5c60ad8d439ba7db224a11638a3fca4a7cd7b3efaa3152a0660ca96176a08d8e352fece334e7a48cebcce555fe12cf9959749491eed360772054
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild b/media-sound/bluez-alsa/bluez-alsa-2.0.0.ebuild
index c883ca5ff3ef..0e5b0d27ae84 100644
--- a/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-2.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools multilib-minimal
+inherit autotools multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -17,10 +17,10 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop static-libs"
+IUSE="aac debug hcitop ldac ofono static-libs test"
 
 RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
-	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
+	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
@@ -28,7 +28,8 @@ RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
-	)"
+	)
+	ldac? ( >=media-libs/libldac-2.0.0 )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -42,8 +43,11 @@ multilib_src_configure() {
 		--enable-rfcomm
 		$(use_enable aac)
 		$(use_enable debug)
+		$(use_enable ofono)
 		$(use_enable static-libs static)
+		$(use_enable test)
 		$(multilib_native_use_enable hcitop)
+		$(multilib_native_use_enable ldac)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
@@ -54,6 +58,7 @@ multilib_src_install_all() {
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
 	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
+	systemd_dounit "${FILESDIR}"/bluealsa.service
 }
 
 pkg_postinst() {
diff --git a/media-sound/bplay/Manifest b/media-sound/bplay/Manifest
index 57cf231da27c..912a669b9fea 100644
--- a/media-sound/bplay/Manifest
+++ b/media-sound/bplay/Manifest
@@ -1,3 +1,3 @@
 DIST bplay-0.991.tar.gz 18920 BLAKE2B b5a749db4d67c82361d2f1c2fd4fb209c959e782071516c739d6711dc069ee8ed925b7310b819eeca6bca381176ee22c8efdf183a5c624a00282a19e75e2e29a SHA512 95f1dbecf97aa9ca96c56220a96873ba3895b61e70b6873665fd054617a9d46b9fb973115efc906116d477db4a665a13c8d50157f6bfb6581d080ec27c853971
-EBUILD bplay-0.991.ebuild 694 BLAKE2B 46732247cf076349a6b91c0e87df0beea613b8dec8530048c5af7769eb7ec5d046ce13b3f68a286ce6649facc488ad9abb27faf1737026332704605469bf43b3 SHA512 8cd18779e548f3d12478c3e0ae964de55558b19c6d069ca696704474014ee6eb81b8cc2f9286f0411c6dc13b9886fef2aa5a166c745171d45d1df0efc452e176
+EBUILD bplay-0.991.ebuild 625 BLAKE2B 9ef05c979bd1a30ca403ccef50a6eb062ce83dad49cbbbb20ec50788745ff40d0e5aec7673b3b6a2ad5033ca0529534baf1bc395d5cc3459372f82096d27e7c7 SHA512 6214f618e87570592c2134f01ae0ac2c0f4615fe98a9c41f3b94c73df98e604e15b634c9688a6825cb76927cbf893c3d4aad401433754d74d96523ba9b75c956
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/bplay/bplay-0.991.ebuild b/media-sound/bplay/bplay-0.991.ebuild
index 2352a1b522c3..0fe9c8a2443a 100644
--- a/media-sound/bplay/bplay-0.991.ebuild
+++ b/media-sound/bplay/bplay-0.991.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 toolchain-funcs
 
@@ -12,17 +12,18 @@ SRC_URI="http://www.amberdata.demon.co.uk/bplay/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa ~ppc sparc x86"
-IUSE=""
 
 src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CFLAGS} -DUSEBUFFLOCK" bplay || die "emake failed"
+	emake \
+		LDFLAGS="${LDFLAGS}" \
+		CFLAGS="${CFLAGS} -DUSEBUFFLOCK" \
+		CC="$(tc-getCC)" bplay
 }
 
 src_install () {
-	newbin bplay bplay-bin || die "dobin failed"
-	dosym bplay-bin /usr/bin/brec || die "dosym failed"
+	newbin bplay bplay-bin
+	dosym bplay-bin /usr/bin/brec
 	doman brec.1
 	newman bplay.1 bplay-bin.1
-	dodoc README
+	einstalldocs
 }
diff --git a/media-sound/cdplay/Manifest b/media-sound/cdplay/Manifest
index 4b0b449971ca..101ef2306ed1 100644
--- a/media-sound/cdplay/Manifest
+++ b/media-sound/cdplay/Manifest
@@ -1,3 +1,3 @@
 DIST cdplay-1.0.tar.gz 12779 BLAKE2B 3a78c125ba2b60bbddbe6a4e1e17ed9d9e36f1c2fdff80df804453e9d81013f5c83310c1e9c04d7c35c271cfe0de555d2d70c0de75454a81f217728d15601cdb SHA512 545f2f6b5fbb8f5c27b4140f805875d7923d7fdc9fb5c77ba7f702c934d9f22540b3d9153424bed3040375965bc30ef065924070eac7d06c31c3be7c185508e6
-EBUILD cdplay-1.0.ebuild 559 BLAKE2B 1f2b9b57ebb7a634174ba50dd9c3e3feffb5e8513d366e403b677c5a04c77e9f4854289edbc6870a6ba2b3f9aa8b9d8742e11aefc6e3b3a362d6a861e597631f SHA512 b447e5aeb4a26ce278ca41874d05533dca433919dbe4374810b4b1dbdc609b94f569008014ab9a3bfb713df264eaa3fd45f9fa90d29b2864520ece903b4f2393
+EBUILD cdplay-1.0.ebuild 527 BLAKE2B a3793cea182542bc38e1b0e6e5e24f27fa353384126b367b7913e9be3b9432d2dbf9c65a5a10bbe7168342b1d90d976b0df47c6e7221faaa15d0081892d4b1c1 SHA512 bd6901b6a13a6f4cff9b0590ea1af178f723e0b49cf60801787b1564c8a778f8f35e148e83603f117f73ed5cbd6285e3846e185562a217b63249b4d00953cd95
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/cdplay/cdplay-1.0.ebuild b/media-sound/cdplay/cdplay-1.0.ebuild
index f0763d2b9c7c..2f69fdc3dd03 100644
--- a/media-sound/cdplay/cdplay-1.0.ebuild
+++ b/media-sound/cdplay/cdplay-1.0.ebuild
@@ -1,27 +1,29 @@
-# 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 toolchain-funcs
 
-DESCRIPTION="a commandline CD Player"
+DESCRIPTION="A commandline CD Player"
 HOMEPAGE="http://www.ta-sa.org/?entry=cdplay"
 SRC_URI="http://www.ta-sa.org/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
 
 DEPEND="!media-sound/cdtool"
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed."
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
 	dobin cdplay
-	dodoc Changes CREDITS README TODO
+	einstalldocs
+	dodoc Changes
 }
diff --git a/media-sound/dcd/Manifest b/media-sound/dcd/Manifest
index 0b41a9862c1b..29b373e46c26 100644
--- a/media-sound/dcd/Manifest
+++ b/media-sound/dcd/Manifest
@@ -1,4 +1,5 @@
-AUX dcd-0.95-makefile.patch 393 BLAKE2B 69448f327918e15f43d6ccf5312ab10c166acb68e90a429692dce9d9e248d3bf50689caada0e060ede71cdf5cf84ec736ac9a73c2c7491515e5f817195714e83 SHA512 fe2114a891ca1ab16a9ec352b381410ec85c974eb9b2d82acae87e757f62bc4e9b0bf107d0ef7e3dc20b54a50f3fe9655b312498ac0ff173d0d36cb98a009c8d
+AUX dcd-0.95-Wimplicit-function-declaration.patch 367 BLAKE2B 20eb9c178131f22c59c456ff1e4c61ef511bface4316e9dbbcec6d91e7677368a9db9fc5114e238d3d70ff30d0f0e3359b84097c1f9809c1731db4446c7a2582 SHA512 b6b97901432756424062aceea37160b74300117cdec2c8b47e6c728d91c9245c9fa52ce56e7db7fa5e4105ecc09df99d035b8bb528b96e2b23dc4e1b22d88296
+AUX dcd-0.95-makefile.patch 281 BLAKE2B fe9d98c496747d6cd257421aba127c4853a9dd7df024bd24db021cc21d0cb38b51cc4546082917f17be766731cd4eeb854ebb8d0680fee0507b12785f722ce29 SHA512 7762a5f076f48ff5aed005528e242149db25d67cc165f233be8918821ae58127165d920be00121b1a3cf9985dce5aa2064c4b9e0884db99bb221f9ebf0a9e873
 DIST dcd-0.95.tar.bz2 33620 BLAKE2B fe5ee6ad882457c4af21740b1667e78e5081841cf31a4c6c5477921ecaa361eb69315b0735200dff9543f2d0c2af5b129f027798f4ac90a795facd8e4a9f632b SHA512 12e9af435ba857e6b3f65881303ff72b349f0645b2649ffb39b17ffa4ab7f16e0f84d385f24cfd32e386185d78abc575cf326a05febfe0acc56b286a64ac6ff2
-EBUILD dcd-0.95.ebuild 668 BLAKE2B 54bc5038e619cfc24d909c446dda1c674ed36549c31bc8678de66dfac7058cd073b1fd7c4293f7d70499bd09615698b26057dc224d1d579af019fb14d33b487f SHA512 401cd33bf67f409902b61fc71a5f597c98715c8095ae398f9afd1f70006c6f2b04685ba99d98bc1faf5716da5b46eb84773887587883c6489fcce19c43c4289c
+EBUILD dcd-0.95.ebuild 624 BLAKE2B ae9edd66089ea3febbc7f8fa4413a77dd44c85018e20950296ec88c41c7326a27ac1fbfdbd7d663726450e424b4decd4e5e83b63c8a9f8d0a23b6f8c6dd60613 SHA512 5d05281ee0a27196961c5efa0a8086db8b11d7228eaf18f47aa92ebfe539689dd1d8fec225037df532f1178513978f1b697f257bda24538438b6de4705e0e373
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/dcd/dcd-0.95.ebuild b/media-sound/dcd/dcd-0.95.ebuild
index 9d4faecdeaa9..0f9f329da3ff 100644
--- a/media-sound/dcd/dcd-0.95.ebuild
+++ b/media-sound/dcd/dcd-0.95.ebuild
@@ -1,9 +1,9 @@
-# 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 toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A simple command-line based CD Player"
 HOMEPAGE="http://www.technopagan.org/dcd"
@@ -12,20 +12,21 @@ SRC_URI="http://www.technopagan.org/dcd/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
-IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
 
 src_compile() {
-	emake CC="$(tc-getCC)" CDROM="/dev/cdrom" EXTRA_CFLAGS="${CFLAGS}" || die "emake failed"
+	emake \
+		CC="$(tc-getCC)" \
+		CDROM="/dev/cdrom" \
+		EXTRA_CFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	dobin dcd || die "dobin failed"
+	dobin dcd
+	einstalldocs
 	doman dcd.1
-	dodoc README BUGS ChangeLog
 }
diff --git a/media-sound/dcd/files/dcd-0.95-Wimplicit-function-declaration.patch b/media-sound/dcd/files/dcd-0.95-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..d3160424fc20
--- /dev/null
+++ b/media-sound/dcd/files/dcd-0.95-Wimplicit-function-declaration.patch
@@ -0,0 +1,20 @@
+--- a/dcd.c
++++ b/dcd.c
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <getopt.h>
++#include <time.h>
+ 
+ #define ZERO 0
+ #define MAX_TRACKS 103
+--- a/screenop.c
++++ b/screenop.c
+@@ -10,6 +10,7 @@
+ #include "cdindex.h"
+ #include <unistd.h>
+ #include <stdio.h>
++#include <string.h>
+ 
+ void disk_directory(void) {
+   u_char ct = cd_current_track();
diff --git a/media-sound/dcd/files/dcd-0.95-makefile.patch b/media-sound/dcd/files/dcd-0.95-makefile.patch
index b59fedb6180c..c5ea478beb1d 100644
--- a/media-sound/dcd/files/dcd-0.95-makefile.patch
+++ b/media-sound/dcd/files/dcd-0.95-makefile.patch
@@ -1,7 +1,5 @@
-Index: dcd-0.95/Makefile
-===================================================================
---- dcd-0.95.orig/Makefile
-+++ dcd-0.95/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -114,7 +114,7 @@ all: ${PROGS}
  	$(CC) -c $(CFLAGS) ${EXTRA_CFLAGS} $< -o $@
   
diff --git a/media-sound/flake/Manifest b/media-sound/flake/Manifest
index 6a3fae54f0e3..bb4f1e0bd9fb 100644
--- a/media-sound/flake/Manifest
+++ b/media-sound/flake/Manifest
@@ -1,3 +1,3 @@
 DIST flake-0.11.tar.bz2 43319 BLAKE2B e24b1f80ce2e1048c46db8957fae51f493a39a245d7c667c0b47713f65d6d78074b2d2c56d0345d0be142bddcd64db8d750c3eceb797bf43661472c8d4ed23b1 SHA512 045cbe7f5af29dfdc5843df3dccfa6faf1ce816566b2f3ac928b98e14f5ee0ec15ee5024a092da4e33beb5d87c31f38c0780970811c5b96ae72683aeac332584
-EBUILD flake-0.11.ebuild 707 BLAKE2B c5c99cdd67e507a6feff89c0cd89524f266ede61ca5cb6b46cb37f70d408df196752ffd317d68df4f6202c1266e467796d16740913fa461e91502d046b8ac812 SHA512 016486f78e93dbbc55b42d2309a7acc3c60955ab05c98bcff6ae3e0cda9a43e3a5e994c839916456bcd4b22f7a2b0c0f9435801929165d9af1e26c1553df13f0
+EBUILD flake-0.11.ebuild 683 BLAKE2B 6a973329f533e8392fbe19d56f616a25b60973616a6ce9e8ba1cdfb06dc43d9b1933dfcb600a5c70de830fb69231bb24c562636950e946d108c237d4e73d0183 SHA512 3665f1c5a2fee5e23dd821e607b4917b3fe4b726998a5a209490976ac7ccf1724a5d53da2f80f4659309d0dfa700f8b21d868c153146b62feb9b8d38e2492ac1
 MISC metadata.xml 332 BLAKE2B c1182dcd7f5de8f8a5687040c8d6a0411a73af3285d538fa8d1ee8732c801d5cb5769fc6c5dd0faafba299d0a8e18212329f2c0382cd49c80e7b6b26d162c8c3 SHA512 a4ccde79f373a6fc28fa699e0ab8dcea6b2a717405dc0da2f2c02ad552e6b0d61b3c19c070e186a1803c84ac7037f39bdfb6e6d5af6eb5aff3f5f6e3b7692e53
diff --git a/media-sound/flake/flake-0.11.ebuild b/media-sound/flake/flake-0.11.ebuild
index 5f1f3377e8d5..24f2e7b6ee1b 100644
--- a/media-sound/flake/flake-0.11.ebuild
+++ b/media-sound/flake/flake-0.11.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 toolchain-funcs
 
@@ -12,22 +12,24 @@ SRC_URI="mirror://sourceforge/flake-enc/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug"
 
-src_compile() {
-	local myconf
-
-	if ! use debug; then
-		myconf="${myconf} --disable-debug"
-	fi
-
-	./configure --cc="$(tc-getCC)" --prefix="${D}"/usr \
-		--disable-opts --disable-strip ${myconf} || die "configure failed."
+src_configure() {
+	# NIH configure script
+	./configure \
+		--cc="$(tc-getCC)" \
+		--prefix="${D}"/usr \
+		--disable-opts \
+		--disable-debug \
+		--disable-strip || die "configure failed"
+}
 
-	emake -j1 || die "emake failed."
+src_compile() {
+	emake -j1
 }
 
 src_install() {
-	emake install || die "emake install failed."
+	dobin flake/flake
+	doheader libflake/flake.h
+	dolib.a libflake/libflake.a
 	dodoc Changelog README
 }
diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest
index 03199e7338cd..8197a50fa4c4 100644
--- a/media-sound/gnomad/Manifest
+++ b/media-sound/gnomad/Manifest
@@ -1,3 +1,3 @@
 DIST gnomad2-2.9.6.tar.gz 318431 BLAKE2B 756345c1b27da5f41d46aaf2862d94a2a94cc91fece77eb5cd8428581773867a85e120e09e83337ddbf8d77a91bd7db09d50584190d9929be45bb3d94393b9eb SHA512 10f025ac38089ebc4a063ac25a262d3e2f6b72336c4566877fae311a873923b55d532d210fd2ec8a29013c06c806ddacc50f042546e4aaa5cf23228d09d854a1
-EBUILD gnomad-2.9.6.ebuild 783 BLAKE2B 141aede3e3610acbbfbbf31e9c2f33a409dc2701db2269bcd635e15f9d1915a4056041d14d784bc146fc2842c7c654aefde1ef3f334b33ab8704f52941330a18 SHA512 eb41ca131055096eaa43117a5e1075ce7a30d74f280dd14ec13cde2ec3c2cee386bea05625a0897a03ab044fc7a54fd358b831cdcd7003ddf8c9ddfe8b192fde
+EBUILD gnomad-2.9.6.ebuild 783 BLAKE2B 6f2c98fa67399953d55d16b7fd2f67a26fe32aa4181ce4882ac9f83eebe43645ab07c0414baa4eedf6364a091caa366c71b74ffdf2ed4d503113e184d4a7d239 SHA512 9be4ce865bf88642b565b1cc2040f13df0a195daa503e3dc3520a6ef6430d558fda9663010b74f9939050f98e94ede1a7b2227acc765ddbb979a1c4286b8672f
 MISC metadata.xml 330 BLAKE2B da9e23c768fba646f72a220e5d3d24a78d8e021660f7310bc657df6fc2ef56a6b4419149b0d2463b9ea51ae5c70795d79c23a54ef4c8fac25b1a0d41212120f4 SHA512 c039363dc7f06ccc5d9652d41923ea06819f199758fa843adad78a11dc00d230b49ebe5141c16f0aa6bf92909021a859e5be187d918eaa0f93fe7f2be7725386
diff --git a/media-sound/gnomad/gnomad-2.9.6.ebuild b/media-sound/gnomad/gnomad-2.9.6.ebuild
index 14e8e6ce2e86..fb2ee99ca369 100644
--- a/media-sound/gnomad/gnomad-2.9.6.ebuild
+++ b/media-sound/gnomad/gnomad-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,12 +15,13 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="nls"
 
-RDEPEND="media-libs/libid3tag
+RDEPEND="
+	dev-libs/libgudev:=
+	media-libs/libid3tag
 	media-libs/libmtp
 	media-libs/libnjb
 	media-libs/taglib
-	>=x11-libs/gtk+-2.24:2
-	virtual/libgudev:="
+	>=x11-libs/gtk+-2.24:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( dev-util/intltool sys-devel/gettext )"
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 1cf2dd67eddc..0f33594d1d0b 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,7 +1,7 @@
-DIST grip-3.10.1.tar.gz 980748 BLAKE2B 75f8bd4a3a22ca0dc9c03f5a7a3d501d054a1443735a684296fefef95c4ab500034724d7f9fabab3ea1bafbb45653f068615b941d6b5845d2e0edac63270ab2d SHA512 627f55e69a06ee21ef3f21900c22903a70cdb7d25f9340d6c9bbf92317e2b0ba0160cda825bc370f9854c96ea81c96684a82bfd000f890d016d5a858095a9eb2
 DIST grip-3.10.2.tar.gz 980804 BLAKE2B d7dd2585d379733a60215705b5d91ffb3ba292bf78b6728c0ce4ccd98eeb79a5c26131b1023e884d51810857c25a18066e89e726d6d08e2b8b125840b0c30016 SHA512 ee17d5842ff4d13b812e5863ce5d0c516d6bf6bffc8131c685056e1f4bb003ebbc9cad99d48d0dc9d3657d0b13d63c2bf09a67db0d37ea47c8ce715c70cfd3fa
 DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
-EBUILD grip-3.10.1.ebuild 1222 BLAKE2B df43a95a06e053381848e36234eba2c8f7436c0db415ae88ca389c59a80aa37ccc15a496ee02d9845565446b4caabe4fbde6f7363c493fd01b5c178da71a30f3 SHA512 539dd6555803d76a6ea9e805ae883956de001001af699405ff9d70d774548e68513006a42131e9242f7249dbb057eb69790e4db48ab051e61a2f3791c414edde
+DIST grip-4.0.0.tar.gz 1004651 BLAKE2B c6f4e5be8a3635be9445b9ad215e0629697ac31f71e92fa68ceffe5396acd6a1fc19597ed6f6f8ced4d350e30484f6cc12ceb6e35fc15ec3e905c5bd2ec81877 SHA512 1e17cc81b2fc9063edacbcbb1cd23ea2c55ac013a3dc57f754e267ef7a3a62f44b4e11561f05ec8534f02ae6543aafecd8882d25bf6b843d01f5cddf05618319
 EBUILD grip-3.10.2.ebuild 1222 BLAKE2B df43a95a06e053381848e36234eba2c8f7436c0db415ae88ca389c59a80aa37ccc15a496ee02d9845565446b4caabe4fbde6f7363c493fd01b5c178da71a30f3 SHA512 539dd6555803d76a6ea9e805ae883956de001001af699405ff9d70d774548e68513006a42131e9242f7249dbb057eb69790e4db48ab051e61a2f3791c414edde
 EBUILD grip-3.9.0.ebuild 1208 BLAKE2B 4b0840d67f852edead6ed6e52e7290df4cbfcef116ea7f6a9473d6eb49f80498d0c9e004e468a97cbf7c5572987049795e312b69eeaca3f8cf3e307888a5aaa7 SHA512 4ca022cb15eda867d1efcfa476d782894094d401a26a98469b27739ca9d5a9778a9bed61f970f8270951915d3fd73bfc76bb29053cd65991fa1f17288ed826fe
+EBUILD grip-4.0.0.ebuild 1223 BLAKE2B 03a279603807bc00bcd7a23688ca3f8fd0a66ac1a062212e7527887a74d12dc709de5029eb04a82a968ecf9ae75c62d03e34e28893d2e240cdc3f86a05bd51ff SHA512 d7c5ed2b6804818c849854e97a11e5089fcf618fc8f3ef6af9e41e62ad2f70d4bf092e43ba819dd42b47559c4837670f873c56a3e3a6a5f8583901a236bea65e
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.10.1.ebuild b/media-sound/grip/grip-4.0.0.ebuild
index 5ebbbe73084f..1c4858f20805 100644
--- a/media-sound/grip/grip-3.10.1.ebuild
+++ b/media-sound/grip/grip-4.0.0.ebuild
@@ -17,6 +17,7 @@ IUSE="vorbis"
 # grip cannot convert ripped files to any format. So use them as
 # a sane default.
 RDEPEND="
+	dev-libs/glib:2
 	gnome-base/libgnome
 	>=gnome-base/libgnomeui-2.2.0
 	>=media-libs/id3lib-3.8.3
@@ -26,7 +27,6 @@ RDEPEND="
 	>=x11-libs/gtk+-2.2:2
 	x11-libs/libX11
 	x11-libs/pango
-	x11-libs/vte:0
 	vorbis? ( media-sound/vorbis-tools )
 "
 # gnome-extra/yelp, see bug 416843
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index a88a30a029c0..cb1e41c33a91 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -2,5 +2,5 @@ AUX gsm-1.0.12-64bit.patch 591 BLAKE2B f72688a27c9e52bd3e0b40018f2e035da4284c40e
 AUX gsm-1.0.12-memcpy.patch 301 BLAKE2B 887d9dd0c9220284f1ef69bad73e5e311994fb020bc06742cd931fead416937ae25d0e3364432be5c4cc408c57fad80bb524fddf7db75bf53e70158da4a8f089 SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200
 AUX gsm-1.0.13-shared.patch 3723 BLAKE2B 4bd926e470d7c120560fe2378dd87496e47760efe293db5e9b1b61cf5075cb737425ca1e7c6b7a92068c95416603b3a5c46741e04f30a477c8d39b0b0c33e63f SHA512 0872ddb6c93ab6f7082f4a999a39439ceaa8337bf72c0a690ebbf1561a605d2664ceec14eba81a36ab244c3cfe3f3edafe3ee76869a68aeffe6fcc3f12026957
 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
-EBUILD gsm-1.0.13-r1.ebuild 1507 BLAKE2B b8163ad6fe1ac0be34ff2ff87b786f6e40a8a7af0adfe1c0b86d4d41af06ca970c76ab8dab68ec8b1d68593f3b7817c21e99b7631b1c21ff4b5ac7793d539266 SHA512 3445f086177b9f624af8346ab71eef36ebd49928b120ca9ff6914b45c9db6ed60f916b654e87f3984709e217714019c6eb886d48587d75c31387c8071d946696
+EBUILD gsm-1.0.13-r1.ebuild 1551 BLAKE2B 3e9f4a7845d5a6d4a27e6a6ff760972d5a57da05657ad1a275a3219cdb11b443eb2f58c91fca2ce226dd6421308bad4c98294d23ebb316e4fd0647c0619d84da SHA512 2666baee74b43ea893c0e398a978f13d1dd5cab5a4778eb0f1c86b7adca6cd7db0428581cbc0771be6a5c3ed60a55c8119702299ddc3a67982dee05f3241a670
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 60550df0a103..47621630dd40 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Lossy speech compression library and tool"
 HOMEPAGE="https://packages.qa.debian.org/libg/libgsm.html"
@@ -11,24 +12,31 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="gsm"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-pl' )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shared.patch
+	"${FILESDIR}"/${PN}-1.0.12-memcpy.patch
+	"${FILESDIR}"/${PN}-1.0.12-64bit.patch
+)
 
 DOCS=( ChangeLog MACHINES MANIFEST README )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-shared.patch \
-		"${FILESDIR}"/${PN}-1.0.12-memcpy.patch \
-		"${FILESDIR}"/${PN}-1.0.12-64bit.patch
+	default
+	sed -e 's/\$(GSM_INSTALL_LIB)\/libgsm.a	//g' -i Makefile || die
+
 	multilib_copy_sources
 }
 
-multilib_src_compile() {
+src_configure() {
 	# From upstream Makefile. Define this if your host multiplies
 	# floats faster than integers, e.g. on a SPARCstation.
 	use sparc && append-flags -DUSE_FLOAT_MUL -DFAST
+}
 
+multilib_src_compile() {
 	emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
 		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)"
 }
@@ -44,7 +52,7 @@ multilib_src_install() {
 		TOAST_INSTALL_MAN="${ED}"/usr/share/man/man1 \
 		install
 
-	dolib lib/libgsm.so*
+	dolib.so lib/libgsm.so*
 
 	dosym ../gsm/gsm.h /usr/include/libgsm/gsm.h
 }
diff --git a/media-sound/icecream/Manifest b/media-sound/icecream/Manifest
index 27b391a56b37..fcde5a2f66c9 100644
--- a/media-sound/icecream/Manifest
+++ b/media-sound/icecream/Manifest
@@ -1,3 +1,3 @@
 DIST icecream-1.3.tar.gz 17976 BLAKE2B 090bc59a180cdd8f5a2f2d8d5ab9313529042b080a5805a17063a148651f29a3687b6069b85854de5baca55a1cb7df983e50ea9fd5aff0d7781ffc2f9d2e9145 SHA512 d239cc616d57839c8f68ad22c6ce0bc5f5ab614da104e03ab9a0b76caa74ef72f3af202cf780e5b893c4111f3f1efd813311b4cdd4f6f7f0722c2b648add5624
-EBUILD icecream-1.3.ebuild 469 BLAKE2B a8b37030cc2e1815e02759c193d0d69b875b27cc504939056dea465795be5406e141890ff5ac8121c782a0404ff63725e2f11c0e817ccc34c2dd54f45e72e96d SHA512 c8653a6e6fb9885b5736a3afdccea68483af660f21acc2a46b7fd25d17f61f6b1859b63ea069e15fd9d9cdb326ae4afa2d9789b008062664e85bbc54ded4a437
+EBUILD icecream-1.3.ebuild 426 BLAKE2B f334b2989f3ae275e0522af90add3e06b112488a013e5f1a52ce4a6943c3f01dbdf222c1b5798e3f26f712c434dfd31f3dc4f246ba25f54a85d14ce057520510 SHA512 267f66be2280a7b3e7b19d5683192796b0be63d87308e3e92116df919134d0c5c073bf781fa357b9074358b432aede26e0e1497e7c3fdf60edb46ccf9b9ebc4d
 MISC metadata.xml 331 BLAKE2B 8a1429f4f1323fa41587da9ad45b4ca7bc96a4dec536b08b891eae247358c3f4334ea0c90387d9cf8e1dc2767999933e8281759b01890a75f0bea048bf22853b SHA512 37881b7efe81d61d47e2b397d99ced6b746c34b3834c1dc193280b8312ea7d52f45e5bc1e6f9f395a3bd05b436e90f8a3cc6944a8d571d7a37694304ba3d83cf
diff --git a/media-sound/icecream/icecream-1.3.ebuild b/media-sound/icecream/icecream-1.3.ebuild
index b27d2353bb93..535a6f44327f 100644
--- a/media-sound/icecream/icecream-1.3.ebuild
+++ b/media-sound/icecream/icecream-1.3.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
 
 DESCRIPTION="Extracts and records individual MP3 tracks from shoutcast streams"
 HOMEPAGE="http://icecream.sourceforge.net"
@@ -10,13 +10,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 RDEPEND="dev-lang/perl"
-DEPEND=""
 
 src_install() {
-	dobin ${PN} || die "dobin failed"
+	dobin ${PN}
 	doman ${PN}.1
 	dodoc Changelog
 }
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index d433862bf7fa..21d1462efdc9 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,4 +1,7 @@
 DIST jack2-1.9.12.tar.gz 6487135 BLAKE2B 9140b3892d2321576a7329fbef2f23e340be4b9be967ec173edbbc7a43952c9a3712ead05dbe57f958b88c1e29c8a912a937c0bd34e0122ecc600ac9d48f147d SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
+DIST jack2-1.9.13.tar.gz 6485870 BLAKE2B 7acc0a1389af133dafa7368b4285c2a06607d84015601f2d8afbd63a9a08f40210f8206f2febbd0e5cc651513a59419e1d948a56163d2074c4b77da5edd84a52 SHA512 dd83a6535cf92a3c45b5ed31edda5f1cb4a6c1db2ac683d4ea709e226bc30d55b366ce80ee543dfaa600f871079f3754e9314124093e230dc7deeceb828de8aa
 EBUILD jack2-1.9.12-r1.ebuild 2248 BLAKE2B df3c7d95bdd19ebac930330209a968ea175fa410e88f792c6a2c2d514a4958c1d761916dee23c183f43c148d440381bcb3368aab43cbc158876065d9cec9af79 SHA512 fd3261aa55103089325e372af16d53a73035dde0b06ec048f04b0c4fe9ff376e05ac5184ec6de9db7f76270a3f32f13ebbc34ab12b719efcc190b7994a6633d4
-EBUILD jack2-9999.ebuild 2262 BLAKE2B 89548e80dab03db5f233396413b4fb7a6ecffdaeba8675890ea444482e6fd9633e2db1ef5f17ee7bc1b11f2f81d55f6c305f64d2f10dc8be0c1861c525b72516 SHA512 da88f72c8b05d6296026573be4f936cc5040b929a9e49588a5b3143a0161c45d8b0ec3f7c90ee15cb47d885d6fee42b32215a725b6f12f13d1f63ad4ecea14c1
-MISC metadata.xml 506 BLAKE2B ba66e2cbd670da4a3eb56f611f624ae64214475c131d53a54436c1dc1cb8f47585a31af583c44aa03bcd497b662d9bb91ae434b0d246bd4fd18519efb6ecbc35 SHA512 61c4dbd8d78c20d61fb52468ced23f4c77b0432bb066e32395b0f26b5bbf3d17231045451cbb3b390a978c9598d313d08df13389262c424bad78bcdf7cab528e
+EBUILD jack2-1.9.13-r1.ebuild 2333 BLAKE2B a0af3c55f071e3decef515a2958fd5e3eab280d61108570c74550a3007db584a6373122d2cf1312ad0c565ac42192345d912d53a45c0c8132ad627c6252fe6a4 SHA512 ae6bf28f27478d0c122e5840c619b02172b3b30012069960a83362652121d2b8ffbb0774676b115166b8284fef80e757663c96a22cf5a3ba32b7b64ae0286fdb
+EBUILD jack2-1.9.13.ebuild 2264 BLAKE2B 159e3a74eb6f3cebfdac5eb9597efc14b434c410e2b9d2191ca198b98d6edf8a8b4801831769382012cfd5226bcd53674d8576389f7be24ff54d1be847e3f5f7 SHA512 585e808d0a967e9cdd2f544f42b8c808dd6cc61f14ddf13806d63a948e992fc49aca1cb965d900c2b41646c9b57f3db71980bd63892be1650d000f3177429f43
+EBUILD jack2-9999.ebuild 2351 BLAKE2B a226227c67bd6b7630b8dbab44b33a50a5732dbe4181f64d630fd03bc613d78429cab6d07ea91b34e5adecb4f693e341c0b3d88c92a52b1e8f65954a1959d4c3 SHA512 ba3e3abe0a631e4d275d9f13b9bbe32bdd35925914c91c0f16d6426609ac1aa0c901bed47c483870ebfde97b81a74e4704f3fcf06f2c76e2b7f9affc93211ada
+MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.13-r1.ebuild b/media-sound/jack2/jack2-1.9.13-r1.ebuild
new file mode 100644
index 000000000000..0f479c637fbb
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.13-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://jackaudio.org/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+else
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+CDEPEND="${PYTHON_DEPS}
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:* )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( ChangeLog.rst README.rst README_NETJACK2 )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=no
+		--db=$(usex metadata yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=$(usex ieee1394 yes no)
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/jack2/jack2-1.9.13.ebuild b/media-sound/jack2/jack2-1.9.13.ebuild
new file mode 100644
index 000000000000..54bed398c30a
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.13.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://jackaudio.org/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+else
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+CDEPEND="${PYTHON_DEPS}
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( ChangeLog.rst README.rst README_NETJACK2 )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=no
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=$(usex ieee1394 yes no)
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index e93c8733c184..9293ca615b0d 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( classic dbus )"
@@ -38,6 +38,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		sys-apps/dbus[${MULTILIB_USEDEP}]
 	)
 	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:* )
 	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -61,6 +62,7 @@ multilib_src_configure() {
 		$(usex classic --classic "")
 		--alsa=$(usex alsa yes no)
 		--celt=no
+		--db=$(usex metadata yes no)
 		--doxygen=$(multilib_native_usex doc yes no)
 		--firewire=$(usex ieee1394 yes no)
 		--iio=no
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
index 7956a5fa4618..61e6667c2b4e 100644
--- a/media-sound/jack2/metadata.xml
+++ b/media-sound/jack2/metadata.xml
@@ -10,6 +10,7 @@
 	</upstream>
 	<use>
 		<flag name="classic">Enable building of jackd</flag>
+		<flag name="metadata">Enable metadata API</flag>
 		<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 98c54327ca0c..b78070427106 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,11 +1,14 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
 AUX lilypond-2.17.2-tex-docs.patch 608 BLAKE2B 7cf73d59a6ebadbc34952c199ba1085e6fcebafebe613b041dc8d16fae051380e051d72a2617bcc96fe382de55bfcf4e06d14c4cdd9cc1ac6a9c44a60f49ef68 SHA512 fe22e649e12ba1aacf05dab14b1820d636d58dce252832331577935db2c0e565b3ec6073c6bec11a05a4c1254ddd1495252e6b3e41623e290363eb124e7fa6c1
 AUX lilypond-2.18.2-fontforge.patch 924 BLAKE2B 5f128e65357033c2b2ae33d5f00cccd7237b59354342d33f958170e5f22d904a47aeb18dcb12b7f7c8846d3689ed7d39459b4995c99834603dc22f3b2c893fda SHA512 f4a45a1ed601c114df24e9e20aa083cd30d5b77955e19cac309508af2f59c808a629bc82bc181e5325d0534d29d3fe4de53029d2db317ed447e306e11150ef7f
+AUX lilypond-2.19.80-fontforge-version.patch 503 BLAKE2B ff0565562e2156aa833d0de1fda31cce3901999c6fc1f5ec05fcc1dad5a60b4df4823eb9e5e809e4bfd863eef7088627e8dbab38fc1b2fe10152d9c26965c934 SHA512 0098b5f7fae77bd39f08397b460efc43bed8ea90feb2afd5349cb3459209720111bba657ca04be9781d5ad2731476887b6a9414690842d455e22f3c9ed6faeed
 AUX lilypond-2.19.80-remove-ly-protect.patch 1534 BLAKE2B fbb07b254ac8c41ac3db4c00203efd46fa48b0d3157d0ac57f60587bacae6d0cee6d1694f7a1a74b4fc1d31b338f31dd55daf294872cf8cd85d090683853cbcb SHA512 ec74abc959b569ef43eae0709ea62f012d41700dcebcb9cb4ece551b0095e593e6ac579520a3be3bef648e04ee69b3549f9152158c705ebb615ecb66f0f4d0fd
 AUX lilypond-9999-programming_error.patch 479 BLAKE2B f5375c71b2a82340dcda7ca24b8f1a5f106642c9edff2dd35ccb5793e88cd5bc512bbc47ce9636d2536cef18b76bbf5e38325c635377405a277ac405d741c6ed SHA512 4ef02c68b919792199142e83607409f6e3037367e090540a257d611ce7ebe1620c586bbeaaef2d5a953e71074ecbf92cef9710bd4bda9ebfee0ab93ca6f59c9d
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6
+DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604
 EBUILD lilypond-2.18.2-r3.ebuild 3211 BLAKE2B 3e87556e56d9fdf00535b816a952fe5a133ad46f71668a0d02102c09c9f73b799c5d370d6ed788434901da5217524ee7675a3a10338831f5d2df44ef95525b9f SHA512 3f8ad4d240e1df1ed32c1b2fcfb2755dc4aa9f1c018693df543074cf776034bf4b4b89c7129952004ea72ef7f053dadfb9d9bf696be9e6ebd04951b6f366677b
-EBUILD lilypond-2.19.80-r1.ebuild 3298 BLAKE2B 52ff415a50fa1509dad2305bd5b419d9a49d28bd0c542f8225100387f613576304bc728e6e6308821f07ba9bc4d6eb367a3b04b95837e45fee1d7189ea9f8dd4 SHA512 17ab9bc1ed6d5a71d7415395d7e0ddda5962247323318bba88a9ecab6e1e170ca941fa018d024e5d9867317c6bfb663615de4d0830bd895a699f7cd33df990a3
-EBUILD lilypond-9999.ebuild 3466 BLAKE2B d68e1e1962510d9653b2bbee3647eb88c9bdb4a9f1824ad41ff30f07ad927f3b93f0f8ddbf7eb92f42530e4a40a778c9b2ea4c648e0c4443f82705983a41a987 SHA512 5e8a7e0fea9896c76e3187d7417dea2c38f05ebd0b5cb06aba66770608a0c2c315412c1e24f22dcbdc182371c617e911785ccfbf1ac731e67e9b8914d9f00f6a
+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
diff --git a/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch
new file mode 100644
index 000000000000..4e2c2ce77c12
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch
@@ -0,0 +1,16 @@
+The version test fails for two reasons:
+* fontforge --version does not print anything that resembles what the configure
+  script expects a version to look like
+* fontforge fails to print a version if it cannot connect to an X display
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,7 +236,7 @@
+ 
+ STEPMAKE_PYTHON_DEVEL(REQUIRED, 2.4, 3.0)
+ 
+-STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222)
++STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED,)
+ 
+ STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED)
+ 
diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
index 1a358dd52c2c..3e23b2dfe640 100644
--- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
@@ -55,7 +55,10 @@ DEPEND="${RDEPEND}
 # Correct output data for tests isn't bundled with releases
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${P}-remove-ly-protect.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-ly-protect.patch
+	"${FILESDIR}"/${P}-fontforge-version.patch
+)
 
 DOCS=( DEDICATION HACKING README.txt ROADMAP )
 
diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild
new file mode 100644
index 000000000000..b86d49030a18
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.83.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1 xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+	MAIN_VER=$(ver_cut 1-2)
+	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+IUSE="debug emacs guile2 profile vim-syntax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	guile2? ( >=dev-scheme/guile-2:12 )
+	!guile2? (
+		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
+		<dev-scheme/guile-2.0:12
+	)
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge[png]
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.19.80-remove-ly-protect.patch
+	"${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
+)
+
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	# respect AR
+	sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eautoreconf
+
+	xdg_environment_reset #586592
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	local myeconfargs=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable guile2)
+		$(use_enable profile profiling)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 93bb8d785b9b..4d591c81e099 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.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=6
@@ -22,7 +22,10 @@ SLOT="0"
 LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
 IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-PATCHES=(${FILESDIR}/$P-programming_error.patch)
+PATCHES=(
+	"${FILESDIR}"/$P-programming_error.patch
+	"${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
+)
 
 RDEPEND=">=app-text/ghostscript-gpl-8.15
 	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
diff --git a/media-sound/litestream/Manifest b/media-sound/litestream/Manifest
index 3501cae2ce59..d51ef279a9d2 100644
--- a/media-sound/litestream/Manifest
+++ b/media-sound/litestream/Manifest
@@ -1,3 +1,4 @@
+AUX litestream-1.3_rc3-fix-build-system.patch 1585 BLAKE2B 06dddd1f0e7815f539242de4842ca5e1cd2082a4ffd0943d81af38ba25e95de59de6319ebbb58f2cbac058dadd2b4369feff45517a9bf1995eece9982b9075b7 SHA512 7836b0af8305fba2ff201b9cb17da713b9a4d9963f7c7eb739fd9738b58f51da571f2b26029f977ce6336ecf1c0838576d5a6368d80c18d786a562352ac2e6dd
 DIST litestream-1.3RC3.tar.gz 25018 BLAKE2B cf5b6b57dc1a466c21745372111f2d63be2029016308ec0d30d1c54ae30389df08ac6ac429b60b112adb85449da253567cd0228afa71fa0c56352035238bd5a4 SHA512 65cf43e852a35fc299d6b0e387ca67e6fc53694e8e63cd7f901544457887785780728ef064aed5f6b5bfbba09867f8a62e5d94a44d920ca44e0dbba663732c12
-EBUILD litestream-1.3_rc3.ebuild 953 BLAKE2B 4ec4ccb712280d171fb1941eb830b93707ad7b1d51ab7575956a58496542d0b3711aac3bf1f40f1b3f0c8538b36ab99c222f0d8fb17f1c0023f94706ae627277 SHA512 937a6ffa9091547597e86293eb0bf50c269b4818fbcd5434760ea6866d81482db354d4c4acd5124a1ca8ef8add07ba228fae6590045bdcfded05a63d96f99877
+EBUILD litestream-1.3_rc3.ebuild 723 BLAKE2B d6ae0b7052381367a88ed244af169dd2f815863deae775bcd565181dc6be192f546000963a6cd1a9f5a03a6dbfe99cf3a5b0af5ee20a64008a41c27a7ada6c23 SHA512 8a2f46ac29b46273497fae7af81af5309ee73cc1a3fe7adf3a1c0fa44ad1cdc7c65050bdd3cfad781893f168c0b7d8952f8b725882cf149db1cbb9befacbefdc
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/litestream/files/litestream-1.3_rc3-fix-build-system.patch b/media-sound/litestream/files/litestream-1.3_rc3-fix-build-system.patch
new file mode 100644
index 000000000000..0ef4eaa8a664
--- /dev/null
+++ b/media-sound/litestream/files/litestream-1.3_rc3-fix-build-system.patch
@@ -0,0 +1,43 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,32 +1,27 @@
+ # $Id: Makefile,v 1.8 2005/09/06 21:26:02 roundeye Exp $
+ 
+ INCLUDES = -Iinclude
+-AR=	ar
+-RANLIB=	sh ranlib.sh
+ 
+-CFLAGS = $(INCLUDES) -Wall -g -DVERSION="\"Litestream 1.2\""
++CFLAGS += -Wall
+ 
+-LDFLAGS = # -lnsl -lsocket
++CPPFLAGS += $(INCLUDES) -DVERSION="\"Litestream 1.2\"" -DNO_VARARGS
+ 
+ all: litestream literestream source client server 
+ 
+ .depend: $(WILDCARD *.c)
+-	$(CC) -MM $(CFLAGS) -DDEPEND *.c > .depend
++	$(CC) -MM $(CFLAGS) $(CPPFLAGS) -DDEPEND *.c > .depend
+ 
+-client: stream_cli.o stream_sched.o hexdump.o client.o stream_log.o
+-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
++client: stream_cli.o stream_sched.o hexdump.o stream_log.o
+ 
+-server: stream_serv.o stream_sched.o hexdump.o server.o stream_log.o
+-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
++server: stream_serv.o stream_sched.o hexdump.o stream_log.o
+ 
+ literestream: stream_serv.o stream_sched.o restream.o hexdump.o icy.o yp.o stream_cli.o http.o textutils.o stream_log.o
+-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ litestream: stream_serv.o stream_sched.o stream.o hexdump.o icy.o yp.o stream_cli.o http.o textutils.o stream_log.o
+-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^
+ 
+-source: stream_sched.o stream_cli.o http.o stream_log.o source.o mp3.o playlist.o textutils.o
+-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
++source: stream_sched.o stream_cli.o http.o stream_log.o mp3.o playlist.o textutils.o
+ 
+ clean:
+ 	rm -f *.o source server client litestream literestream .depend *.core
diff --git a/media-sound/litestream/litestream-1.3_rc3.ebuild b/media-sound/litestream/litestream-1.3_rc3.ebuild
index 21c193593598..e0d4d98fac8d 100644
--- a/media-sound/litestream/litestream-1.3_rc3.ebuild
+++ b/media-sound/litestream/litestream-1.3_rc3.ebuild
@@ -1,40 +1,31 @@
-# 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 flag-o-matic toolchain-funcs
-
-MY_P=${P/_rc/RC}
+inherit toolchain-funcs
 
 DESCRIPTION="Litstream is a lightweight and robust shoutcast-compatible streaming mp3 server"
 HOMEPAGE="http://www.litestream.org/"
-SRC_URI="http://litestream.org/litestream/${MY_P}.tar.gz"
+SRC_URI="http://litestream.org/litestream/${P/_rc/RC}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:CFLAGS = :CFLAGS = ${OPTFLAGS} :; s:-g::' \
-		Makefile || die "sed failed"
-}
+S="${WORKDIR}/${P/_rc/RC}"
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
-src_compile() {
-	append-flags "-DNO_VARARGS"
-	emake CC=$(tc-getCC) OPTFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin litestream literestream || die "dobin failed"
+	dobin litestream literestream
 	newbin source litestream-source
 	newbin server litestream-server
 	newbin client litestream-client
 
-	dodoc ABOUT ACKNOWLEDGEMENTS BUGS CHANGELOG CONTACT FILES MAKEITGO README
+	einstalldocs
+	dodoc ABOUT ACKNOWLEDGEMENTS CONTACT FILES MAKEITGO
 }
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 69b5e93567a1..b246cf689266 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,6 +1,6 @@
 DIST lmms-1.2.0.tar.xz 14541000 BLAKE2B f53206c2a78104d250fd7eda06ea1c646ad40c2db66baa9ed333213900e33bcab5312c95d5864636930be1b798ac1a79754035e3aec3a3772976aefb80dd8191 SHA512 7d3476fbcbda49d75efee4161f6478656e38a517b6a3b24740ea354e223fba51210f45ff74b46fd1ac73fc6e65409226088b12e29558c91eb818da58734ab6cf
-DIST lmms-1.2.0_rc8.tar.xz 14318692 BLAKE2B 972404ab6ce517c748aad21528d5891af5d12c47d38a18f802fb3a5dfc5d6f3ee91cce14a6ff267341c06c9607328b018e1b612f7f0f550372a35038749a7bb3 SHA512 b8fb9c505d9f5e7854767bcd223c8578d4977e59d7bf64993fe0b57e00d1de87f8e77366c3195d8ea429eb3dd44c641e3dbecf27e64609e892a4453ab17d7343
+DIST lmms-1.2.1.tar.xz 14543092 BLAKE2B 23cdc201b32295634c5f50f258e5f63fb995cc4bbf7283c8230b35bc0c6ab26e36097860f574747747966e267c36b43d67b6e9e836a026351c48635c66a00aeb SHA512 7054d1592fdea60d76423a0260e941c217f50d2db9c4fcc35df20c8b58067c431ed9b264ef05e9f3f2cba84ca66870d1bf23da92b294a00ac6d567e3d3e771d6
 EBUILD lmms-1.2.0.ebuild 2319 BLAKE2B 660549b54242179f82ec39495f9600883252642a6b00acc75e4a1bcb8520c65364daaeaf583fa63014cf6d2ef5b9d8189e667d48eeb6d0082a7e0619b3cc64a3 SHA512 c599583adbaffcdca3bb5387a40a785047a44ad9267b71108a1c38f03ef051d934069e3e40726c371b0869affd42520e3eae857031e0ad1555b677b5c1da5246
-EBUILD lmms-1.2.0_rc8.ebuild 2404 BLAKE2B 4327d8dcf22d9a6d170843235fde5f96bb6d0630332459da4a3b3ed636ce984d42e8c46cdfd210571443ab9adf1c9c1694da8d1cb4f5654791133f3df5605371 SHA512 cd71131d24ff78b0cbb8bf039dde1e24d206e91787782bf6e2e23d9f8028188ea0fd675eff630a9372f3199b88445048de4db42242f06343e19a6a33bd7d71a2
+EBUILD lmms-1.2.1.ebuild 2319 BLAKE2B 660549b54242179f82ec39495f9600883252642a6b00acc75e4a1bcb8520c65364daaeaf583fa63014cf6d2ef5b9d8189e667d48eeb6d0082a7e0619b3cc64a3 SHA512 c599583adbaffcdca3bb5387a40a785047a44ad9267b71108a1c38f03ef051d934069e3e40726c371b0869affd42520e3eae857031e0ad1555b677b5c1da5246
 EBUILD lmms-9999.ebuild 2312 BLAKE2B 4ff386189219b087a28849b5eaa9821705b9e58497206a0e1d29ed4d2a67893b222562ad36e85c6e62569c1689efe7d10c0bd01cf3a6cf118ed9526e90b871ae SHA512 e2880190ea5731e948b72b4a1f2d06f6992486f7e0d3b7a521d2723b070e611143d686b37fe43f110b52cdf40a16f9a08fb6938915b80cd27b256ad7869894db
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/lmms-1.2.0_rc8.ebuild b/media-sound/lmms/lmms-1.2.1.ebuild
index 60e4c62c671e..d5f82bfff2a3 100644
--- a/media-sound/lmms/lmms-1.2.0_rc8.ebuild
+++ b/media-sound/lmms/lmms-1.2.1.ebuild
@@ -13,11 +13,9 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
 	inherit git-r3
 else
-	# Upstream again fsckd-up their release process
-	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_*}.rc7.1.tar.xz -> ${P}.tar.xz"
+	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz -> ${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
-	#S="${WORKDIR}/${P/_/-}"
-	S="${WORKDIR}/${P/_*}~rc7.1"
+	S="${WORKDIR}/${P/_/-}"
 fi
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index b2fa38297f8a..711526859cc6 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,7 @@
 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
-EBUILD lollypop-1.1.4.16.ebuild 1403 BLAKE2B 171ee6723d1d5694d5d7b6d445051265d31be6bac513aa4b3203ac3b2b4679522f7e98022028daf6a7054b8f77ec282bbe49a4564af46dd58924c5fc79ab4153 SHA512 14132e0aa8b9cf37fbeb68cfc06ebc16d26854b2aa37510d54a79d4b9427aaf35a2ad7835921a4fbeefaf5d0164d42847e50e22da4846b674445456496f7ba80
+EBUILD lollypop-1.1.4.16.ebuild 1402 BLAKE2B 5481a031876dea76a7591479fc79cf6af819ac55c0cbb8a1fab2ffa6dcee1efa24f72fb6b3e51e6f6184de2f2a31aeb92b93323e8a0cb51396b540708f75a985 SHA512 31f72c147a4c921475bff48dab39bc4adeed3df559775138ed378d0cba64b965af88c8d985cc7b35b0bb9e101d2c06ca5a54d03bb3291db101551911e8772f03
+EBUILD lollypop-1.2.2.ebuild 1403 BLAKE2B cfb669dd82e52369359cce87623aaa2e7f974d465c19e344df0949a8d6292da78903e0390d7ae56cc80d5ea1aa09d05c336fe517dd55f1741746a9d1942659c3 SHA512 c776277f350eb0e4f076b0b244dc03b0ffae468ee57b237c1cd59a18109a7c15eaf510ec1721e921620c1098efb106dbc1eae103457e683c231cef2a0fe01dab
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.1.4.16.ebuild b/media-sound/lollypop/lollypop-1.1.4.16.ebuild
index c83209d2db1d..e4ca988679fa 100644
--- a/media-sound/lollypop/lollypop-1.1.4.16.ebuild
+++ b/media-sound/lollypop/lollypop-1.1.4.16.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-sound/lollypop/lollypop-1.2.2.ebuild b/media-sound/lollypop/lollypop-1.2.2.ebuild
new file mode 100644
index 000000000000..138068d27cd6
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.2.2.ebuild
@@ -0,0 +1,61 @@
+# 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="aa4fbd92bf338296c28e54710271ccab"
+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/mp3c/Manifest b/media-sound/mp3c/Manifest
index 1bf310828f5a..264c9fde3049 100644
--- a/media-sound/mp3c/Manifest
+++ b/media-sound/mp3c/Manifest
@@ -1,4 +1,4 @@
 AUX mp3c-buffer.patch 340 BLAKE2B 775e62f27d178ddf9af7e9b529ae83e4aeccdb8766fe387997f7968b1f56f8d427c0c26258a2119f1988d7fc737166f77a0b8c5d62609e08b20f25b7604d5236 SHA512 2f109b9307c9ddd8012f7f7e4ac967889e6aba4886f59aca1d785c0c24fbf3231174bb3dce41aa0f362115b98c0c9921f7d87676f467cf75267026bb23cf03c8
 DIST mp3c-0.31.tar.bz2 351015 BLAKE2B 0330471c56abd2659885ba2d9c35df1f7cb3b46772ff142c3246939ab45cfc96ee6051c535bb7ba04bec91072b4a0c50c7e534962f1420f6f68f528f92f8fcab SHA512 6c30573c2df86a019c0832b0f0dc83587af5f866ad29b84ac4f57cc61de03708363644d0b3ccc144fce12cb6209357eb1d5dad4e90d70a420f083f0ea4c36c7f
-EBUILD mp3c-0.31-r1.ebuild 820 BLAKE2B 78ab9962eb76e91df279e441c9029b5744aae97f6ac78c8874b5a99bf5487a6a96fb93ad20e47567c8a7096dd7ef759df56d6c443f98c6e924dbe4dbb40685a3 SHA512 9c62b262dd5cbee0a9944454a2676a1cca19de0311a48763df479c06aa80105cfc44bf945b21fb0e706a3d53eb7ea9a5019a85ae5188108e2329db7aad8aba23
+EBUILD mp3c-0.31-r1.ebuild 803 BLAKE2B fff61bb6980b4d95a985b3d03d6c674969167fa7b4f5750c122fde6a126d396f51e8c4f05e58ae07ea934aa4bba363d6970a04970a829124f4eb9e2aedfe1cc1 SHA512 ff419422ec36d547c94fd0ead2ddf39ef5e71509f10f624b8e64575489363b4ca68dde626d9fd3e57ac06420ebae9a6ccb7dc0cb12c857bc9cd534c195cbb60d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3c/mp3c-0.31-r1.ebuild b/media-sound/mp3c/mp3c-0.31-r1.ebuild
index 556816841642..c81de5093efc 100644
--- a/media-sound/mp3c/mp3c-0.31-r1.ebuild
+++ b/media-sound/mp3c/mp3c-0.31-r1.ebuild
@@ -1,37 +1,38 @@
-# 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
-
-IUSE="mp3 vorbis"
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="console based mp3 ripper, with cddb support"
 HOMEPAGE="http://wspse.de/WSPse/Linux-MP3c.php3"
 SRC_URI="ftp://ftp.wspse.de/pub/linux/wspse/${P}.tar.bz2"
 
-RDEPEND="mp3? ( media-sound/lame
-	>=media-sound/mp3info-0.8.4-r1 )
-	virtual/cdrtools
-	vorbis? ( media-sound/vorbis-tools )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
+IUSE="mp3 vorbis"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-buffer.patch"
-}
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="
+	${DEPEND}
+	virtual/cdrtools
+	mp3? (
+		media-sound/lame
+		media-sound/mp3info
+	)
+	vorbis? ( media-sound/vorbis-tools )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-buffer.patch )
 
-src_compile() {
-	econf $(use_enable vorbis oggdefaults) || die "econf failed !"
-	emake || die "emake failed!"
+src_configure() {
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
+	econf $(use_enable vorbis oggdefaults)
 }
 
-src_install () {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS *README BUGS CDDB_HOWTO ChangeLog FAQ NEWS OTHERS TODO
+src_install() {
+	default
+	dodoc BATCH.README CDDB_HOWTO OTHERS
 }
diff --git a/media-sound/mp3report/Manifest b/media-sound/mp3report/Manifest
index 0bfbda9c5ac4..9f6634d144af 100644
--- a/media-sound/mp3report/Manifest
+++ b/media-sound/mp3report/Manifest
@@ -1,3 +1,3 @@
 DIST mp3report-1.0.2.tar.gz 37396 BLAKE2B 5869b234122a7f24925e24f3366aecf4b31ed602d0400e46099636e7e7cdeeaffe24b1639e64d9cec235de4e83a92f57d74643e8c765c936117ba68c3233b5ad SHA512 ef103adef263cf48fd67c8bc888fc81d43d298b29c9e4abea06d500a74fd78aa30cff63b943c8706ab97196c8cae42df5f71412e9da5c51d029413fdc172106d
-EBUILD mp3report-1.0.2.ebuild 690 BLAKE2B de91f783384ab71e5df0e273b186dce5163bef73f48d6ea4251f24eab9f1365c92f899add264c8e2f371502add3df3657eeabed83cc93e85b40729e97b1e1411 SHA512 469b3959e06aa63956517585772f7c606af01d4516810d6cc59cf4ec185cfc5ebe919c568f60eee835de635288a572a17ba51be65153d9c79d5e15a465c6c914
+EBUILD mp3report-1.0.2.ebuild 655 BLAKE2B 576d6465008a2195c9911a3742112ba854a6a66f0edc328941d3ae4406a96c9b37eaf57876893affa0a28582aacd46bfb9ee79d086ea07e3a277a590a3d44800 SHA512 19fd77ebafead235beb5cd144bb64d3778e60e275bcd9f8f02c542ece1a566e9f61446f50bcfb573d487b272243d328b07f1f9e0301ece6596113671151a4d38
 MISC metadata.xml 332 BLAKE2B 722451901d08a471ee7260d187dfaef93d9c0c8bb3102d350b96bd211596c6f2a96a53ca2e8010fc90f547a6f66b963941c8b7287a1625962b3b02559e7e25f8 SHA512 efc0b1ead5d2d8613013fdc09c0f32f3e78e248ea04630757b2b6d7f642c803276f07dd33fc5bd84fbdead29f3e9ffc4214a6581ea00a3b44d4071d38a3e8975
diff --git a/media-sound/mp3report/mp3report-1.0.2.ebuild b/media-sound/mp3report/mp3report-1.0.2.ebuild
index 798f21705442..9d7c418407b0 100644
--- a/media-sound/mp3report/mp3report-1.0.2.ebuild
+++ b/media-sound/mp3report/mp3report-1.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
 
 DESCRIPTION="Perl script to create an HTML report of MP3 files in a directory"
 HOMEPAGE="http://mp3report.sourceforge.net/"
@@ -10,20 +10,21 @@ SRC_URI="mirror://sourceforge/${PN}/${PF}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.8.6
+RDEPEND="
+	dev-lang/perl
 	dev-perl/MP3-Info"
 
 src_install() {
-	dodir /usr/share/mp3report
+	newbin mp3report.pl mp3report
+
 	insinto /usr/share/mp3report
 	doins extended-template.html default-template.html
+
 	dodoc documentation.* ChangeLog README TODO
-	newbin mp3report.pl mp3report
 	doman *.1
 }
 
 pkg_postinst() {
-	elog "You can find templates in /usr/share/mp3report"
+	elog "You can find templates in ${EROOT}/usr/share/mp3report"
 }
diff --git a/media-sound/mp3wrap/Manifest b/media-sound/mp3wrap/Manifest
index df5388722645..eee98096f5a9 100644
--- a/media-sound/mp3wrap/Manifest
+++ b/media-sound/mp3wrap/Manifest
@@ -1,3 +1,4 @@
+AUX mp3wrap-0.5-Wimplicit-function-declaration.patch 171 BLAKE2B 76309d73b37655dfb91d40a7b37c9940904d981b3a3c081bda31b4f3e68dde928689cadcb769b6f5f03498473147b53922138ba288e2237e814a8010e288cd1f SHA512 30ad56d51d8008930a30e5aadaf29421fafa4da1ac419974b3956692521b179454dafde8466c42b2d498d985a43da054e7f51c0ef27863031f03f37a2ee129e7
 DIST mp3wrap-0.5-src.tar.gz 113008 BLAKE2B fea61d613b48ab492237ddf813a53ee434341262a69e5e36ef7052bc00088361550c363cc979ae012cdacd45bbdc86f9d54f2aaed60166586a1a283d8a5aa7a8 SHA512 2dc7a72a12b9245956000443a51cd5341e1d48795b629f6277f9dd26ac9b3ab2511a119478a10daa9516cb2526073956af42f83410aff1e4eae0c972fdd8b0f1
-EBUILD mp3wrap-0.5.ebuild 533 BLAKE2B 4f08ba8d1809a58ce4b2621d4383f450612be4939861027a45d5ec0113b198d7cc24148a8dd6bea37fbb4b095ec4fd4f4b9a69c9168e9edb92095fec1e9a7368 SHA512 5e7f79b77968f90d94d470870e1be107e649ab01fd552567fe50dacd9b4e0bb3247585337b3c6775386ffe56ef3cf301b310165c65a48bccbb55d7040ec4a101
+EBUILD mp3wrap-0.5.ebuild 527 BLAKE2B 7ee5508d1dab4fb13a70c858ecc331e393b9bb90c048f033db89e605a6279a08d9a7c96abaa4cdb3af207273e6cbf0be7a04387afc1060316fb7e1604b765ba6 SHA512 a11855b89ec444d440c7552bffb0b08f493691d120b4ad5819de7b81bff72d90d1b6280d2d359db566d035b14f4de14818803a9090160e0f174df03af8fe70a8
 MISC metadata.xml 330 BLAKE2B 0d648b7e51c8d864376841c48300290386b808041546c4d76d9270bfc3c443440c9695278274e9d5e68866e4d544efb78fe748510a541aafe207ef2c56cea581 SHA512 d84e915ded7ed432ab25c7b62afd23832913a55fea4079d818916bc79d49404d59ec4172c97789259b0dc7333f7631855578c9fdc57ac92815a77dbe7b0ccc8f
diff --git a/media-sound/mp3wrap/files/mp3wrap-0.5-Wimplicit-function-declaration.patch b/media-sound/mp3wrap/files/mp3wrap-0.5-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..2398122f049a
--- /dev/null
+++ b/media-sound/mp3wrap/files/mp3wrap-0.5-Wimplicit-function-declaration.patch
@@ -0,0 +1,10 @@
+--- a/wrap.c
++++ b/wrap.c
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <strings.h>
++#include <string.h>
+ 
+ #include "wrap.h"
+ #include "mp3wrap.h"
diff --git a/media-sound/mp3wrap/mp3wrap-0.5.ebuild b/media-sound/mp3wrap/mp3wrap-0.5.ebuild
index eed1cd4354b3..c0f1e36d268f 100644
--- a/media-sound/mp3wrap/mp3wrap-0.5.ebuild
+++ b/media-sound/mp3wrap/mp3wrap-0.5.ebuild
@@ -1,23 +1,22 @@
-# 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
 
-DESCRIPTION="Command-line utility that wraps quickly two or more mp3 files in one single large playable mp3"
+DESCRIPTION="Command-line utility that wraps multiple mp3 files into one large playable mp3"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 HOMEPAGE="http://mp3wrap.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND=""
+PATCHES=( "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch )
 
 src_install() {
-	dobin mp3wrap || die "dobin failed"
+	dobin mp3wrap
+
 	doman mp3wrap.1
-	dodoc AUTHORS ChangeLog README
-	dohtml doc/*.html
+	local HTML_DOCS=( doc/*.html )
+	einstalldocs
 }
diff --git a/media-sound/mpck/Manifest b/media-sound/mpck/Manifest
index 7da5bdc9b6fe..23369b6f4f0c 100644
--- a/media-sound/mpck/Manifest
+++ b/media-sound/mpck/Manifest
@@ -1,3 +1,3 @@
 DIST checkmate-0.15.tar.gz 198526 BLAKE2B 21ff0e0eef95fc8d9d25ce9e182a48efab4527124ec340510556b16476c52794940852382a72ce402638857c3149c55f2dc5190f4ab4d3a1485c86c9994d98cd SHA512 a1d8de736528cd7e0d0c07fd48eddde907aa17cc49841815454d43d64258443dbf0e903696bb11231c35240e0ba8fbde67921edbc5045ea21698ea4fa2f5a6e6
-EBUILD mpck-0.15.ebuild 482 BLAKE2B 88d8ec7f3917a1903c0afed554ddee7d33ae833c6da0b9e97eb5908cea08a4023deeb2d425711b7361decbd1c6f4ebed0deacdee5d2dcab60359d7641df2d21f SHA512 50db3cc4dccf384f63d1a60ecc6b367fe2866341550aed94945824b869fa019c1599d454cc1dbf00309e4a6ea814b2f7db46b4f62d5d81e3f4a967d6d4eae42d
+EBUILD mpck-0.15.ebuild 407 BLAKE2B 99fe46afd279ce5e77d187f45416d6f33db3a6a53851baaddfb462ef8b8aecf3927012ba49cd500e0a0836d54d412e831a65a9a24c1950d3f42887f45f283ea9 SHA512 df3698741eca0ee092602404eeb25ae6865dcddaad4afed3d4be95b07974c4a042e61ed6e1fade0f4d9e4e3e452ab0bd58f8bb9ae1298583f4e6e9324f1a028c
 MISC metadata.xml 355 BLAKE2B 0b4bd7ae8bcc459e4ad681ca7063761fe84a6218ea53cca6c601a2da002c5d90cebb34f1d322cab5c2b3d1810d7a6f192ed8bf5fd0f448c1ed5f2ec07c43155f SHA512 67f7562f4f2882838136fa69cfc0927da31bc1f75b0e3226ffc8ae1ae0bb6997160b7de36294bf757b566a79e8937e1aafd74fd59e5978a4ef847fb1e4e876be
diff --git a/media-sound/mpck/mpck-0.15.ebuild b/media-sound/mpck/mpck-0.15.ebuild
index b2a8a3f7fa32..1df48af46667 100644
--- a/media-sound/mpck/mpck-0.15.ebuild
+++ b/media-sound/mpck/mpck-0.15.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
 
 MY_P=checkmate-${PV}
 
@@ -12,11 +12,7 @@ SRC_URI="http://checkmate.linuxonly.nl/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ABOUT_FIXING AUTHORS ChangeLog HISTORY README
-}
+DOCS=( ABOUT_FIXING AUTHORS ChangeLog HISTORY NEWS README TODO )
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index dddab00fb4e1..a427acf11465 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,6 +3,8 @@ AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
 DIST mpd-0.21.14.tar.xz 673036 BLAKE2B 73eed90c0d48e26d747e26b0cd000d3e0a12dfebb015f865fe9d3ddbe5f7fa564b1655b7e0639951e9aeb2554185063b11d6bc818813ca6366688ea05705ba4a SHA512 d5ce06741444d545c7334f4c4ab32dbfacaa264df5a1ac61b73d951e0a6f952c8ea1e4df1b5bfc827e7faa35a6b8026e78cbf3a057ee35adf448fa7204389cd9
 DIST mpd-0.21.15.tar.xz 673056 BLAKE2B e399c0439e790ac62525b33c5d2d26b47d36687edc877169934dd5379646d1d38ed7fec75532498a4c0f6e51e355e872847873045ae2446d037cce8781be3067 SHA512 c67ebdb7609b36b4b8504ce0751ca2dcc38a2fba03a5b8419185e8be64bce7e19560347a600773b65f55ba0a3cedeff051117071db8e7fe0a90c9771de8bd37e
+DIST mpd-0.21.16.tar.xz 673732 BLAKE2B ed43ae9d5d40fcac0d035c24161c4db3a1b6df2b05f6a006a47beb7f7ba8ec198cbd20e34c9fcaf4e9832dbf13c57a77a9e5864d7f16de2bdd1c414d41ce391c SHA512 bb7587acd03d675ae3127ab4e196d549170551ac643e5134baa2bccaf8d7c9bba6c9a9edec9bcb61a2ec3a6ce26f4d77190323ef0329033d0cd8c1f8964be05c
 EBUILD mpd-0.21.14.ebuild 8191 BLAKE2B 9851cb110f9059babe6e5095f87a79a769871f755c78439b01fbde57a0c8fde354a1318e0d2da9b0ec1df3c4964ed3b23eede05cd17d1727380ffeba282911c0 SHA512 2ac00aa81d9d3ae49f65ec77d73d798d7d3170823039ab50e2c5735c7e454b8fcc9647cb5e37afc8a900ce3a456aca2536b0e861a2f9587f78c430696b8aa0cc
 EBUILD mpd-0.21.15.ebuild 8194 BLAKE2B 312fddb816b472d5851c34249d10f78bb03f0b22d622f1c6719acf46de05767b6b36671ccfab8e93c8402004ecf439f6d3ad5cd0b9ed00298f9d765fba9956cc SHA512 b2c2fe8011db9aae9721e9314d5888fb5a7d3b10503f0f8a53b2f44d4af10a7ca4cfa4ae8d7fa05600094f0600fc2de204ceb2540ba7935e16315d9f716480c8
+EBUILD mpd-0.21.16.ebuild 8194 BLAKE2B 312fddb816b472d5851c34249d10f78bb03f0b22d622f1c6719acf46de05767b6b36671ccfab8e93c8402004ecf439f6d3ad5cd0b9ed00298f9d765fba9956cc SHA512 b2c2fe8011db9aae9721e9314d5888fb5a7d3b10503f0f8a53b2f44d4af10a7ca4cfa4ae8d7fa05600094f0600fc2de204ceb2540ba7935e16315d9f716480c8
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.16.ebuild b/media-sound/mpd/mpd-0.21.16.ebuild
new file mode 100644
index 000000000000..a5cdc87afb48
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.16.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user xdg-utils
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/multimux/Manifest b/media-sound/multimux/Manifest
index c6c5ec9df8ee..c1974f62da58 100644
--- a/media-sound/multimux/Manifest
+++ b/media-sound/multimux/Manifest
@@ -1,4 +1,4 @@
-AUX multimux-0.2.4-makefiles.patch 379 BLAKE2B 7ad2da492d661f402e7c5976bb3b87144a8547baec8d2c5d1f8d27a56ae1c266386ba449715811fa7bf3607ed2d85b0e2a4736ef7ae2f328503fc7ad908f68af SHA512 fbb7b685f580700afe4659a60cc0499cf4eb578c91ac7ffc6154d3761e4ada4905ec29f51220cbc1e425fe474c4b55e4bf0952412f256eb9a4802faa4e8f6f72
+AUX multimux-0.2.4-makefiles.patch 474 BLAKE2B e6956747e37499784a9ae96b1c2979bf34e33a0a02f1d7946b8ef2fd787cc151d0270e4d96d6849e72747e3c9f904516092e08b3b144d2e737df8c4288f2df76 SHA512 8ebd4eafcd4c4b1d130952b1f1ef384cf9f045930fa82870be34cbd151aa62f11e72fac24180ea46ced210d2761cbfea2f27eae08737a17a9594af95b1cc0801
 DIST multimux-0.2.5.2.tgz 16855 BLAKE2B f82e27c058d3d3ab948a3e26c923e9dbf40b0eeeaf4e44dc0abfc5385393cff83ea657a3f301b9ba669f3b74996e22cfd59c4f6948b462523cf03d72c71e7f70 SHA512 6f27a154de2f5265457b390a5ef315fa32fbe4764460cef6ec861eb71df25c9d314ee59f2fbc1e15b44839ad0c7b642fa4213f0e7142cff3a715567964364c0a
-EBUILD multimux-0.2.5.2.ebuild 726 BLAKE2B b289129eaed765bfc01cc2d56b4cabb4201efc9587c45f57fdcac9b99d8ff73d28f83e58d61ef5e76f9d1f5928e037b11d6190148d1979266b488938675d91e6 SHA512 9cfe776d7ef4931d620ca34575af1bb642e5fca37718d08d4ef4765c9d35210e49b9a5e0385a99a9cc3a01c52d652b2a674577a8da7e9dc2528a0c9dd65e5c4a
+EBUILD multimux-0.2.5.2.ebuild 552 BLAKE2B 6743c5b5bdbc4064a36c95113c6ee4a95861d48175995d7ceec857425f6325af4808036be25d017f43dae9061493fd352231534763e90a89f7996d8e8abaf615 SHA512 496d3c7c1e83383ee221e1df8f7b8191c585777d2421a5dc44c905f33a946c1ceb8aff6223452c8ec2ca95870af064796d591c5c74cdee67c4669715e0a67d72
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/multimux/files/multimux-0.2.4-makefiles.patch b/media-sound/multimux/files/multimux-0.2.4-makefiles.patch
index 61ab8b8b395c..108d14eee2b1 100644
--- a/media-sound/multimux/files/multimux-0.2.4-makefiles.patch
+++ b/media-sound/multimux/files/multimux-0.2.4-makefiles.patch
@@ -1,13 +1,27 @@
-Index: multimux-0.2.4/Makefile
-===================================================================
---- multimux-0.2.4.orig/Makefile
-+++ multimux-0.2.4/Makefile
-@@ -17,7 +17,7 @@ multimux.o
- all:
- 	$(CC) $(CFLAGS) -c $(SRC1)
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,3 @@
+-CC = gcc
+-#CC  = g++
+-
+-
+-#CFLAGS = -O2 -Wall -D_FILE_OFFSET_BITS=64
+-CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ LIBRARY =
  
+ SRC1  = \
+@@ -12,13 +6,7 @@
+ OBJECT1 = \
+ multimux.o
+ 
+-all:
+-	$(CC) $(CFLAGS) -c $(SRC1)
+-
 -	$(CC) -o multimux   $(OBJECT1) $(LIBRARY)
-+	$(CC) $(LDFLAGS) -o multimux   $(OBJECT1) $(LIBRARY)
+-
+-# DEPENDENCIES
+-multimux.o : multimux.c multimux.h multimux_proto.h wave_header.h
++all: multimux
  
- # DEPENDENCIES
- multimux.o : multimux.c multimux.h
+ install: 
+ 	cp multimux   /usr/local/bin/
diff --git a/media-sound/multimux/multimux-0.2.5.2.ebuild b/media-sound/multimux/multimux-0.2.5.2.ebuild
index 8bc954c85281..da2b0b17ecfb 100644
--- a/media-sound/multimux/multimux-0.2.5.2.ebuild
+++ b/media-sound/multimux/multimux-0.2.5.2.ebuild
@@ -1,11 +1,9 @@
-# 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 toolchain-funcs flag-o-matic
-
-IUSE=""
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="combines up to 8 audio mono wave ch. into one big multi ch. wave file"
 HOMEPAGE="http://panteltje.com/panteltje/dvd/"
@@ -15,18 +13,14 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.2.4-makefiles.patch"
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.2.4-makefiles.patch )
 
-src_compile() {
-	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE	-D_LARGEFILE64_SOURCE
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+src_configure() {
+	append-lfs-flags
+	tc-export CC
 }
 
 src_install() {
 	dobin multimux
-	dodoc CHANGES README
+	einstalldocs
 }
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index b5644b7d922c..c0f3030ed1d6 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,7 +1,10 @@
 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_General-0.1.6.tar.bz2 35109226 BLAKE2B 62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d SHA512 81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
 DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
+DIST musescore-3.3.tar.gz 64453809 BLAKE2B 278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef SHA512 b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea
 EBUILD musescore-3.0.1-r1.ebuild 2433 BLAKE2B b41f19798c7702f5b31c29f2feee04e4c2973846e40ab08d3c1b5db7449448b9a14dc90aa16f5af3374b1d359227721f853a3e5d80468087bebe502b7f5398c0 SHA512 db33d86a72952ec81318fde0775ac70ea612928ff14b5b422b770299d09c2e05ff7a79e1c2784e15ba1739e2f3990595177b43cbe1a5b0d34b07fc78e099ffd2
-EBUILD musescore-9999.ebuild 2592 BLAKE2B 79b11923eccd097e55d417755551c127eb7250b0d828f6dcf4144ea0125412094e1d016057d248e3de7d53b0f46f4b5731cf60c28b8f325d275fb6990c2a6ade SHA512 7d46cbb33797f26dc67879531d0504fd49f78ead44acf2f2352fff37146735771beefb65123c0b71ed3c6bb5d392c47be32365cfeabd04092cd4be58d06c734c
+EBUILD musescore-3.3.ebuild 2637 BLAKE2B f85431f1cf5e86df9ce62e2e5766fb470420fa226544f95541a270a81477c786d0dcb5186800803badb1a88a3beddd9d5495b56d6c95a7b596a82d12fe7f0979 SHA512 38158e7f2935383823947a61cf00c81e52c498e099b727afb0524e07d4538a45f7aed38b1d0e8935615036202a2d03de31ad8a16181ad2c103eb395f637728f0
+EBUILD musescore-9999.ebuild 2629 BLAKE2B dec041350e036cfe620cde6203f56df3c36fbf0912327efbc59d5d72e0a2e364fbe23426e4ba8017876d1c07ad8e9bd87f17612798f61773f782d603516e55c0 SHA512 d0fd199a02cffe02cb440d2710b96af5e4642ed6745860b9c2fc477d82137c55add1b8b2fef5db8cacadfef55ef58fb63f1f8d97d5fbb8880a52c7a470d9b8f9
 MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
diff --git a/media-sound/musescore/musescore-3.3.ebuild b/media-sound/musescore/musescore-3.3.ebuild
new file mode 100644
index 000000000000..436f8021bc15
--- /dev/null
+++ b/media-sound/musescore/musescore-3.3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake-utils xdg-utils check-reqs
+
+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.6.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	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] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-man-pages.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
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 54404ac316e9..15619c44fed6 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-CMAKE_MIN_VERSION="3.11"
-inherit git-r3 cmake-utils xdg-utils gnome2-utils
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit git-r3 cmake-utils xdg-utils check-reqs
 
 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"
+SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.6.tar.bz2"
 EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
 
 LICENSE="GPL-2"
@@ -19,7 +20,11 @@ KEYWORDS=""
 IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
 	dev-qt/designer:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -44,10 +49,7 @@ RDEPEND="
 	vorbis? ( media-libs/libvorbis )
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
@@ -93,11 +95,11 @@ src_compile() {
 pkg_postinst() {
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 8e67610cb1d8..8312dd8c77c8 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,6 +1,6 @@
 DIST ncmpcpp-0.7.7.tar.bz2 443801 BLAKE2B b0bf1f6264f94fc1d0dce5b7ec8d85607427e5bf8955914fddffd8dec94850e6dd20dd83a966a25353d6ec23a61e92751d83fddec8202d9a843e0ed9e3b32077 SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
-EBUILD ncmpcpp-0.7.7.ebuild 1501 BLAKE2B b4fac49d9ebca61da51109aa52b06a14f5005064d4427bb94403d534ad03ff65574ff7cbf0d0708dadc7942c51ddc93bc0260e1741ba5b75a026a2e5c726e674 SHA512 dc3691ec4e4d92f063fcccf219e3566ebc85d8b2b0bdf8134720701172108bce462ba9278b9405c556c8631df846747e5f5a2ccdfaab1b6efad58ec92e9474e1
-EBUILD ncmpcpp-0.8.2-r1.ebuild 1401 BLAKE2B 78592b16a7daf591099dd3a3c0e395c330e6e29ba12ae16cd51101d9b5cdc85c375d1867db68f57456dd726a1e9d043f5a820bcc7394b5d14262f9172991e084 SHA512 4f1564e261ea385669401b9d318d3de00db35f9abc8185a96049994ccba3e5cdabb017afc5474b9dcfdea41f703d6c868152647eb3d71188eb2f28a03110fcdf
-EBUILD ncmpcpp-9999.ebuild 1396 BLAKE2B ff321fc947d5dec8a6b72bfdaa886c1d9749a2d4818d04a1fd5ba8dfd03e52c6e36e001c4d69c78330f89fa38a27969d2c06a98086dd08c46d7a86157aac3bd5 SHA512 23235b975f1d1dc1e375d6c6f3bedc8625430f1ff55d88efa0cfa48acd2e2bfc1b1a386d0df68948f3f2661dbf25fe2cbc9e5191afdcafb7b21949ac40e52c31
+EBUILD ncmpcpp-0.7.7.ebuild 1467 BLAKE2B 07f776a3c433b8ede9e741e74a9ee6a50e0a01865da5a2eaa5eb2193fb4eb5f19b694849739fcaf7593d931e967baeabc2e0ca908bb6e00beae1fcdd89cd36da SHA512 6e6f00aae80ccd97f4ec32b37e5f72ec5e782d0155edc9f6a85b752d26e09c749bfa31cc4b4f86a993caad09b866fdb891e987fded319d58e7c5ad0f0428bd47
+EBUILD ncmpcpp-0.8.2-r1.ebuild 1396 BLAKE2B fa0f50a4d870ccc0c7d02f899fdb1fecdfc60bd04af8a59f6640690c8a20b5ed6b729cab9e1d5ff711a36897b5e54c7aa2da0c474ed8791f9a26cfa156aed6a0 SHA512 9a59f7900c619b557421c54b832d123b70a4d08a3ba25c73e8e548ad6c981f971fbb23942b61bf66bb1e69194b1c08b717bbd07e97bf65d97ef5da6624e01531
+EBUILD ncmpcpp-9999.ebuild 1391 BLAKE2B bb70ae4ce0ffa9d9234b76f57ce1a5ef638c2fef6b1efca502c8dc92191748ce52f98b80043362861fd51475d8c6b14344e37d8b70a25f2053ee93f607b5ecf7 SHA512 c073659170e5cf5c554c7f3ed8fb9b101d4275af1ec6eb3eb38e295ee2e1e8023aef5a6d5c9f79d8734d994765933b5413ee47d2a53403d8c65077c746f0ce8a
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
index 85d189cdcd0a..fac787897fba 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,20 +10,18 @@ SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="clock curl outputs taglib unicode visualizer"
+IUSE="clock curl outputs taglib visualizer"
 
 RDEPEND="
 	!dev-libs/boost:0/1.57.0
 	>=media-libs/libmpdclient-2.1
+	dev-libs/boost:=[icu]
 	dev-libs/boost:=[nls,threads]
-	sys-libs/ncurses:=[unicode?]
+	dev-libs/icu:=
+	sys-libs/ncurses:=[unicode]
 	sys-libs/readline:*
 	curl? ( net-misc/curl )
 	taglib? ( media-libs/taglib )
-	unicode? (
-		dev-libs/boost:=[icu]
-		dev-libs/icu:=
-	)
 	visualizer? ( sci-libs/fftw:3.0= )
 "
 DEPEND="
@@ -42,12 +40,12 @@ src_configure() {
 	econf \
 		$(use_enable clock) \
 		$(use_enable outputs) \
-		$(use_enable unicode) \
 		$(use_enable visualizer) \
 		$(use_with curl) \
 		$(use_with taglib) \
 		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
+		--docdir=/usr/share/doc/${PF} \
+		--enable-unicode
 }
 
 src_install() {
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
index 007f6387ce67..dbdf6c5d16ca 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
@@ -10,16 +10,16 @@ SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="clock icu outputs taglib visualizer"
+IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
 	!dev-libs/boost:0/1.57.0
 	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu?,nls,threads]
+	dev-libs/boost:=[icu,nls,threads]
+	dev-libs/icu:=
 	net-misc/curl
-	sys-libs/ncurses:=
+	sys-libs/ncurses:=[unicode]
 	sys-libs/readline:*
-	icu? ( dev-libs/icu:= )
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 7b75299afc52..5074e7460063 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -11,16 +11,16 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="clock icu outputs taglib visualizer"
+IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
 	!dev-libs/boost:0/1.57.0
 	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu?,nls,threads]
+	dev-libs/boost:=[icu,nls,threads]
+	dev-libs/icu:=
 	net-misc/curl
-	sys-libs/ncurses:=
+	sys-libs/ncurses:=[unicode]
 	sys-libs/readline:*
-	icu? ( dev-libs/icu:= )
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
diff --git a/media-sound/picoxine/Manifest b/media-sound/picoxine/Manifest
index cfc6964a5e8d..2fc46062cd01 100644
--- a/media-sound/picoxine/Manifest
+++ b/media-sound/picoxine/Manifest
@@ -1,3 +1,3 @@
 DIST 39596-picoxine-0.0.7.tar.bz2 13677 BLAKE2B fc76726213f7f931988dbad6f7e3975171ddb852db0c3d58b74f400b27aae8d2231769f8db554394c373d8156cfe0593097b4216c189364f54af572ddf58d347 SHA512 c028e5f0c8dc8d692637ee091322d608c89509a7d9ab842ce15e14b28a940f03c356e8fdb8c90eb26ac9a7eed9c7c0e20c15eb0de06cf88e4e495cb99eabbbd9
-EBUILD picoxine-0.0.7.ebuild 794 BLAKE2B 0f27ba66a46c4c4c35cd9d66b253c092466202d41b803e697302b096a654ef8d44e8cd8055ff66d45230e1aeb04834e04852b8f74a7e48c5e3cf139f57f4b06a SHA512 b9c11578b61f320da39f96afd77a10f10d3d6ea985cc96243aa858f5420eaa68ed943f0acc09ef7e7478214161ad2105bb64f0e6a369061ddf040cf37626564e
+EBUILD picoxine-0.0.7.ebuild 768 BLAKE2B 3519092f039c5a05fa12c21a9ee5cdc80d7d9b8b9f7d2f1b8b69bbcae0fd9aefda288f7f9dd0bc9f86c309ad8525f1b580f863d6b849697a7710fc3c4a6a75e1 SHA512 4d23674e2bd7e936bc422c966e1e8b67733da89de49552edf14aeb7134d38b2c666a6f0b93a1a6198371f10a76907aea5439869b84a22efedb94e0073765333a
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/picoxine/picoxine-0.0.7.ebuild b/media-sound/picoxine/picoxine-0.0.7.ebuild
index 32ccc01af5d9..e2fc8dac1989 100644
--- a/media-sound/picoxine/picoxine-0.0.7.ebuild
+++ b/media-sound/picoxine/picoxine-0.0.7.ebuild
@@ -1,9 +1,9 @@
-# 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 toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Very small xine frontend for playing audio events"
 HOMEPAGE="http://www.kde-apps.org/content/show.php?content=39596"
@@ -12,32 +12,27 @@ SRC_URI="http://www.kde-apps.org/content/files/39596-${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-RDEPEND="media-libs/xine-lib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="media-libs/xine-lib:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -f "${S}/${PN}"
+src_prepare() {
+	default
+	rm -f ${PN} INSTALL || die
 }
 
-doecho() {
-	echo "$@"
-	"$@"
+src_configure() {
+	tc-export CC
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags libxine)
+	export LDLIBS="$($(tc-getPKG_CONFIG) --libs libxine) -lm"
 }
 
 src_compile() {
-	doecho $(tc-getCC) -o ${PN} \
-		${CFLAGS} $(pkg-config --cflags libxine) ${LDFLAGS} \
-		${PN}.c -lm $(pkg-config --libs libxine) \
-		|| die "build failed"
+	emake ${PN}
 }
 
 src_install() {
 	dobin ${PN}
-	dodoc AUTHORS INSTALL
+	einstalldocs
 }
diff --git a/media-sound/poc/Manifest b/media-sound/poc/Manifest
index 04be1c604293..e7d5fda02a12 100644
--- a/media-sound/poc/Manifest
+++ b/media-sound/poc/Manifest
@@ -1,5 +1,6 @@
-AUX poc-0.4.1-fec-pkt-prototype.patch 214 BLAKE2B d97d4a1a105c475635a662f5ce17cef249dacd00a23dde77870a80bfa326b98f6f5fdefa75f58c65d04727880750505dd656fca278aa5c658fe99be1a9420a12 SHA512 d98b35b746f5bc92c017e2c3f3bf3f19b2ed28970a955dd0ca6010f338889cacf0c3e527f2eb8a57bbdfc67499fd2eb24b93662dbb2b24c43ed790e79e249e99
-AUX poc-0.4.1-file-perms.patch 269 BLAKE2B f09586fd78447263d21c4685144931c59029c0db94967bf0670754601b1c16ceb247327846379aa384eb82d847d1a6608749bb1b5dd9b65cbda70e114ff54b0c SHA512 a86671efabc9438876132f92a9d59ec2a125010796f645c63b67ec29d26040bfd158852580881576564961e2efd0ee86eaf8b29577ad5bbd94d974ed1e4d811b
+AUX poc-0.4.1-fec-pkt-prototype.patch 218 BLAKE2B 48a3f1938094bf997187dc9451d8d13d09be12f290154e75d116ca82e0dc2ec311e243357fc02d7889e2af514abeb88f005183f85338050d18b2f5c7b6df5791 SHA512 bae56e17cbc735a805b58e63f579254e42487f84b761675e40cb055f82272dfdff6a1fe9b8907ac9562334962f28713d2a8185e3c73b77e9f5519e4837abf8ec
+AUX poc-0.4.1-file-perms.patch 273 BLAKE2B ba02074fafae5ee2ace5dd8e60d059da4725d6260115e739505a67f19fce0fcf126e4e1d4e434fbf2b6209ebda1fbb6b0af5a56d0546bfd9b4d81b04ff0f3846 SHA512 ebb4e43e57265c4b40d7e50e0bcb4f2defbcadf9eaa354393320ed90c2ee2120c0859c2533068331b31231353c32b6b0e021e9352a77e904e4224fc2ff74a299
+AUX poc-0.4.1-fix-build-system.patch 1014 BLAKE2B cdcb45bf5a461ad1c64751b8370571e7901f3cd65d1bce2d365c59528b8a6e00c02cedd665ac780fcc11c3b363a425db40f1e611c2c86e6d2b4dd7645a31db39 SHA512 a831eb4ab7c344299bf7ef432a4114bfcbc54f650b36a63de2677da8cb90c986e3e616fda658c13377afaf66ed389ae2d83971943a22a43571807835ecd0a2fd
 DIST poc-0.4.1.tar.gz 114875 BLAKE2B 50731ca679bd24e799ecef193d40dc6ef38954fb96c418b426d9fcd30f776ac1e8239c6e3a756f0e333ae6ef2a623561c19fe216442241d6d06373e757e3e0ca SHA512 84cbe5421006a9b81310925c22d4b25888c036c83ee1c59ee63415fb5656b9c04d5c417817d026f8ad85240f401b3d5cdeb2c4f480b13bf7a295d147ef2246b7
-EBUILD poc-0.4.1.ebuild 841 BLAKE2B 90f26eb17967f437661bde67e30282510c24030b528e5f8c9a89b4125e44fcfb1affe3754a1fb1e98c250c2527fb0d39f362155ba3a0dd3eef0b465a309f94fe SHA512 980aedab8dbbbe7740804978df2c063f6d7cb99d940e016c674d5c120cca819f6a391ee174a6085c5a2cb75f17e5d11f2692565c71e976584b75d802b343d8ef
+EBUILD poc-0.4.1.ebuild 573 BLAKE2B cbd74d82389ea46f22eb451fde99db132bb2aa6f1f748c8ef106239a812dd6634ed1e96e0719c73f67f4d0d769dff7abc7c20e99871b4b50fe36c8ae89762c34 SHA512 795f25f35fe6cfb0ea5217c420a0f96012254260689abb277cca2f556503fb42b1fba9ffbd9a5ac256091dc4c5c7155f1b5128645c75d56f6ea29352fbf065cd
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/poc/files/poc-0.4.1-fec-pkt-prototype.patch b/media-sound/poc/files/poc-0.4.1-fec-pkt-prototype.patch
index f0957a1ca292..757a85faddb6 100644
--- a/media-sound/poc/files/poc-0.4.1-fec-pkt-prototype.patch
+++ b/media-sound/poc/files/poc-0.4.1-fec-pkt-prototype.patch
@@ -1,7 +1,7 @@
 sync prototypes between the header and source
 
---- fec-pkt.c
-+++ fec-pkt.c
+--- a/fec-pkt.c
++++ b/fec-pkt.c
 @@ -68,3 +68,3 @@
  **/
 -int fec_pkt_read(fec_pkt_t *pkt, int fd) {
diff --git a/media-sound/poc/files/poc-0.4.1-file-perms.patch b/media-sound/poc/files/poc-0.4.1-file-perms.patch
index ee23d90ab82b..71360341f0cf 100644
--- a/media-sound/poc/files/poc-0.4.1-file-perms.patch
+++ b/media-sound/poc/files/poc-0.4.1-file-perms.patch
@@ -1,7 +1,7 @@
 Creating mp3 files with u+x attributes is just silly
 
---- file.c
-+++ file.c
+--- a/file.c
++++ b/file.c
 @@ -136,3 +136,3 @@
      file->fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC,
 -                    S_IRWXU | S_IRGRP | S_IROTH);
diff --git a/media-sound/poc/files/poc-0.4.1-fix-build-system.patch b/media-sound/poc/files/poc-0.4.1-fix-build-system.patch
new file mode 100644
index 000000000000..01a58084633c
--- /dev/null
+++ b/media-sound/poc/files/poc-0.4.1-fix-build-system.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ #
+ # 2005 bl0rg.net
+ 
+-CFLAGS += -Wall -O2
++CFLAGS += -Wall
+ 
+ # Uncomment these flags to add id3 support to mp3cue and mp3cut
+ #CFLAGS += -DWITH_ID3TAG
+@@ -352,8 +352,9 @@
+ 
+ USER  ?= root
+ GROUP ?= root
+-PREFIX:= /usr/local
++PREFIX:= /usr
+ install: install-man
++	install -d -g root -o root $(DESTDIR)/$(PREFIX)/bin
+ 	install -g root -o root -m 0755 mp3cue    $(DESTDIR)/$(PREFIX)/bin
+ 	install -g root -o root -m 0755 mp3cut    $(DESTDIR)/$(PREFIX)/bin
+ 	install -g root -o root -m 0755 mp3length $(DESTDIR)/$(PREFIX)/bin
+@@ -367,6 +368,7 @@
+ 	install -g root -o root -m 0755 pogg-http $(DESTDIR)/$(PREFIX)/bin
+ 
+ install-man:
++	install -d -g root -o root $(DESTDIR)/$(PREFIX)/share/man/man1
+ 	install -g root -o root -m 0644 man/man1/mp3cue.1    $(DESTDIR)/$(PREFIX)/share/man/man1
+ 	install -g root -o root -m 0644 man/man1/mp3cut.1    $(DESTDIR)/$(PREFIX)/share/man/man1
+ 	install -g root -o root -m 0644 man/man1/mp3length.1 $(DESTDIR)/$(PREFIX)/share/man/man1
diff --git a/media-sound/poc/poc-0.4.1.ebuild b/media-sound/poc/poc-0.4.1.ebuild
index f91c5fc7dd44..a187a005a8fe 100644
--- a/media-sound/poc/poc-0.4.1.ebuild
+++ b/media-sound/poc/poc-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# 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 toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="mp3 and ogg streamer (include mp3cue and mp3cut)"
 HOMEPAGE="http://www.bl0rg.net/software/poc"
@@ -12,29 +12,17 @@ SRC_URI="http://www.bl0rg.net/software/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="sys-devel/flex
-	sys-devel/bison"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/^CFLAGS/s:-O2::' \
-		-e '/^PREFIX/s:/local::' \
-		Makefile
-	epatch "${FILESDIR}"/${P}-fec-pkt-prototype.patch
-	epatch "${FILESDIR}"/${P}-file-perms.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed."
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fec-pkt-prototype.patch
+	"${FILESDIR}"/${P}-file-perms.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
 
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc README TODO
+src_configure() {
+	tc-export CC
 }
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index 9367816d89d0..ea5d759825a4 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -1,7 +1,7 @@
 DIST pragha-1.3.4.tar.bz2 691256 BLAKE2B af1455633a4f9d3c40f6b97051692fa301cfb763d0ca5f03c3ae932513556ff7a6fed5c68cdd3f7e86dbca305598cb9495221e1b2c841f7e1cb56905fa742130 SHA512 65aadf68f427f03ea7ca07d2002806eb94019c8091a80320da7d8ff4c2f0cd912e9c346956188b42d2b7a68c56c79ee5af8e8327c69ad69f4a1fa5b9e3b3ca58
 DIST pragha-1.3.99.1.tar.bz2 804701 BLAKE2B ae68c01706d593defc4ee357e1bdd1e832fb6d6720f723149c752c98f16502e1254553b404f53b40a4e126b647e6de478e7929b7715c0f9815d23b2e62e5475b SHA512 1c92bf7b2d1d1d6b3f8616b1980b60c6c688844d0bf9f80bc86185035a05971f3b8f5aa73d230b01fa5d14e54db38b356df41781e4a5da73b0adae82829c8c31
 DIST pragha-1.3.99.tar.bz2 781892 BLAKE2B 9d73dd2859db0c7ab7ac66fdafe873bd78b019408682828ddd05aa18a1591576df667e326037a7ca28eaed227fcbce943209fad16c9f55bb38c0c2c808275104 SHA512 df032fe16932ad464417306d8d01373b8e415f5f810a06b1baff647a395b10bdee5c912f36a3f6e3ea6a0e04d399257e202112c1838444d23dfc17b5fd34e12b
-EBUILD pragha-1.3.4.ebuild 2310 BLAKE2B 381391dbdcc5ced2d515ec0e9adbce25152d9b578cdeb92290dee352293ba306432c3c96ac26187b6116cc1b1186e1dbb0c32c6be93e30997fdcd9c7f966f884 SHA512 f61ec80c622a9f22a2afb6f03fb1e22e03a16ca20ee738b638b544a0541e5bf27af04772b1596e87197047c69417746982ebf3e03c0d0443e7c3a83a0ef799eb
-EBUILD pragha-1.3.99.1.ebuild 2555 BLAKE2B 660f720cfaf7242633de11a16dcb1ae750cd5e35d42c0f19d35141cfedc5ad9678e7e392ea7f20c760c845d690a218748c3b4d1bc2b96dfc2eb6ed709086350b SHA512 be4b63181f933b56bd48587796508856b57675d10885460109f7bcc432c0f50f28f2e990bcad0c95603c5cc28e1e4da0713acc2941bc311d55243d4fcc4b1b15
-EBUILD pragha-1.3.99.ebuild 2591 BLAKE2B 3ea0da51e0ffe4fee16e69d92e39143666817c9031c037be0fca13de5d457819fa348b0d7258651f67e888d265d9396f4db8ead768bfcd8c4c04f58a06ed50e2 SHA512 d83414ca8e3d34357d9b123dbb4ab19d663ea529f6898437404108d9394b061dde8d1bb0a3219f9a8e3bebe0ff8cfd7973fb80ced341d7955363f8f3d63ff06d
+EBUILD pragha-1.3.4.ebuild 2311 BLAKE2B 8fdb4c4d4675a77e540b4dbec42e8eb9ea25363d1433251f8ed0725dd9f2a0ad38c1c493bbf270e8834f55efcf2283794c44ab1a7ccb23d68989f9bc1bf9d5b7 SHA512 a5d800c276c0da3eb781ff92472c1aa7dd08477b64ecbc849d1348240c59987973cc6127be07c447550557575e514709c022cf296862e010df278eb8193971fe
+EBUILD pragha-1.3.99.1.ebuild 2556 BLAKE2B 43d9cbcc86a67aeb76f76b438d841ded5e193135e069b19deb04bf1859cbb73011dfa9ec254abf87beeebd474d6d2cb92c7a8040bb519ca9f2066e7bb8da9a20 SHA512 73f5178af2c82094ac599bb8096caa56d0f14ad5c506aab806dade8820d2b466c96b7e0e5af771365e7110b100a0c5a73ce6dfba98f7f0d5a1b0dda6ec06bc37
+EBUILD pragha-1.3.99.ebuild 2589 BLAKE2B 34c988b47cff4a563c41c18215286de0c213e9d2e78fb704bf4b4fcb47079d7fd103d81a5a8a22ff98f27ac755020d84ec2b7af4577641b3919aa44727bd8efd SHA512 e2eef37dd9e0009116419a26903a0fa09eb1682ffdb0480e7634a5fc3d228c3bae620d583f45e18011027149046f0fe32b61e854194b335c97c4ef4ab89371f3
 MISC metadata.xml 1215 BLAKE2B d7a5bf01af7aa7047342f674cc33ee8ad9ea20dd9b0a496f1954830057bc51932530755429d54faa599da6b2817907100057153436a47a731892a8d8f91aece3 SHA512 9700873ef8ee962e9ba0057d8489b22e73ebaf55a6bda1cd58f062167f15f1b8d08e0c9061e45b4fd71040932e394a9006c00a95a944bf45ef7b65d48f922f34
diff --git a/media-sound/pragha/pragha-1.3.4.ebuild b/media-sound/pragha/pragha-1.3.4.ebuild
index 24f7053da9d2..723eee3c53bf 100644
--- a/media-sound/pragha/pragha-1.3.4.ebuild
+++ b/media-sound/pragha/pragha-1.3.4.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
 	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
 	rygel? ( >=net-misc/rygel-0.20:= )
 	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( virtual/libgudev:= )"
+	udev? ( dev-libs/libgudev:= )"
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0"
 DEPEND="${COMMON_DEPEND}
diff --git a/media-sound/pragha/pragha-1.3.99.1.ebuild b/media-sound/pragha/pragha-1.3.99.1.ebuild
index c60f3ad27eab..c05a03a33111 100644
--- a/media-sound/pragha/pragha-1.3.99.1.ebuild
+++ b/media-sound/pragha/pragha-1.3.99.1.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
 	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
 	rygel? ( >=net-misc/rygel-0.26 )
 	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( virtual/libgudev:= )"
+	udev? ( dev-libs/libgudev:= )"
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0"
 DEPEND="${COMMON_DEPEND}
diff --git a/media-sound/pragha/pragha-1.3.99.ebuild b/media-sound/pragha/pragha-1.3.99.ebuild
index 54229d1b0085..10930450160f 100644
--- a/media-sound/pragha/pragha-1.3.99.ebuild
+++ b/media-sound/pragha/pragha-1.3.99.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=6
@@ -35,7 +35,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
 	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
 	rygel? ( >=net-misc/rygel-0.26:= )
 	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( virtual/libgudev:= )"
+	udev? ( dev-libs/libgudev:= )"
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0"
 DEPEND="${COMMON_DEPEND}
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index f8751a598a97..6750540dbe65 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -1,2 +1,5 @@
-EBUILD pulseaudio-modules-bt-9999.ebuild 1519 BLAKE2B 1f66b63462a75835a5c757945311af363c93111d3252bbb2bdb8f18ab0e2d69b7557a0a7659f669a379c2d5439b223787e72b166890efb74cb857ab3767f65b7 SHA512 bd6f7ef2571b06bbe076eac62a883e5770df85ccd7e88d97a315d5114e4b29de10994551397f558d64bf22a0c7c3380861d38e012b71519e7344f30549e118b0
-MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
+DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
+DIST pulseaudio-modules-bt-1.3.tar.gz 85802 BLAKE2B ea7e5141d07c1d3b19372cbae2aa9a5b6049509a12bb2470f47f231f85cc66ef4a74e70bdc91d3554d57e9c26b64129f87b2a3a55e16fbf0c6fe1b5ce7721074 SHA512 094c4205c1c71326efd42053a1bc9f131633c9e28fde177f1c08a290395864b76b8f60f79ffec2fbb8445186aa5c85aafabc47908fd302beb5b278ebcac98558
+EBUILD pulseaudio-modules-bt-1.3.ebuild 1816 BLAKE2B 14b1edfce44e867bc555dc26dac64273965c55eb2cc5c43a1b3aa924dc8e88fe7e2cb079a0151cdd142d1d27348ef8c1d38ba4206a26f40df27b49b92a0f8400 SHA512 b5e08c87657adfcc954dbe6d29a2306f0225684fedcf6be0012acfc082bf28a19da534539b7c4cf830ec705d09731619f4aaf604c73bc63e32ca3070bdfecb6e
+EBUILD pulseaudio-modules-bt-9999.ebuild 1685 BLAKE2B bdce8163372a4ffc867aedb776a6bdc5a2735d3942a8a5adb5f285b763ff334f9be0b25d45df23b69523cb5c5acfb72bc9da590a52828dc518f0f8a96bd2659f SHA512 064f16de80bdd9d5d2bd1e8a74767e5e75f0a11fe1b123b7df5eb1129cdc05d81eb69d2e49e0cb9d56ede6647dd1e644a07e358c6551d3343d6817a92db74bd4
+MISC metadata.xml 287 BLAKE2B 97a6dbf2f2d8ec4f843481ad45df44044774a9d886fcea246694b5568fee990b15bf8c13a04f7bef5f348ec0b1a705f71fa1eb77973df0bcb90a8432b99b8057 SHA512 37dce9f554f78faee8b0ff3a1c10ec05b8fc38a91e1530e8842684e05efc2cc7eb185dc2c91af38399487e4eaece927d9d3e36f6306cd4dfd4520497e84a7b45
diff --git a/media-sound/pulseaudio-modules-bt/metadata.xml b/media-sound/pulseaudio-modules-bt/metadata.xml
index 38b28ff6e621..c6a40a7b9cb4 100644
--- a/media-sound/pulseaudio-modules-bt/metadata.xml
+++ b/media-sound/pulseaudio-modules-bt/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-<email>zx2c4@gentoo.org</email>
+	<email>zx2c4@gentoo.org</email>
+</maintainer>
+<maintainer type="person">
+	<email>pacho@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3.ebuild
new file mode 100644
index 000000000000..72132d0bcd33
--- /dev/null
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils readme.gentoo-r1
+
+DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth (alongside SBC and native+ofono headset)"
+HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
+
+PULSE_VER="13.0"
+SRC_URI="
+	https://github.com/EHfive/pulseaudio-modules-bt/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PULSE_VER}.tar.xz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	media-libs/fdk-aac:0=
+	virtual/ffmpeg
+	media-libs/sbc
+	media-libs/libldac
+	>=net-wireless/bluez-5
+	>=sys-apps/dbus-1.0.0
+	>=net-misc/ofono-1.13
+	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth]
+"
+# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+DISABLE_AUTOFORMATTING="no"
+DOC_CONTENTS="
+After getting media-sound/pulseaudio merged without its bluetooth
+support (to not collide with this) you may have removed the loading
+of bluetooth modules in default.pa config file, leading to failure
+to use your bluetooth device (see
+https://github.com/EHfive/pulseaudio-modules-bt/issues/33).
+Please ensure you have this lines present in your /etc/pulse/default.pa
+file:
+
+.ifexists module-bluetooth-policy.so
+load-module module-bluetooth-policy
+.endif
+
+.ifexists module-bluetooth-discover.so
+load-module module-bluetooth-discover
+.endif
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# pulseaudio headers needed to build
+	rmdir pa/ || die
+	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
index 185f571a0ca8..4dbb99143961 100644
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
@@ -10,7 +10,11 @@ HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/EHfive/${PN}"
 
-LICENSE="LGPL-2.1"
+# Ensure it is synced with major pulseaudio version
+# https://github.com/EHfive/pulseaudio-modules-bt/issues/83
+EGIT_OVERRIDE_COMMIT_PULSEAUDIO_PULSEAUDIO="v13.0"
+
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
@@ -23,7 +27,7 @@ DEPEND="
 	>=net-wireless/bluez-5
 	>=sys-apps/dbus-1.0.0
 	>=net-misc/ofono-1.13
-	media-sound/pulseaudio[-bluetooth]
+	>=media-sound/pulseaudio-13[-bluetooth]
 "
 # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
 
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 10d2f2f15783..b3fd86f37490 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,7 +9,6 @@ AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f90
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 EBUILD pulseaudio-12.2-r1.ebuild 11524 BLAKE2B e5bc795b25e2168669f7cbfdc8c0978e0cbe4505303e7fcaf6880be67863e7c0adef2f1191eb0f87526bac69bfebe75890e0d57931b3738b62214c74b64f461d SHA512 c5d49ef2a1cca32102f7115892a5047af11a09edeef0653610c5d1e1ddf385fe781496929d3d2f150f9aa210ac4e6ea7fd5927b639f5416827f82b39583e20a0
-EBUILD pulseaudio-12.2-r2.ebuild 11705 BLAKE2B 5ac1b15972f9273eaef6aa9a32bd71b7cbab9825a8557ed53197fedd0e726cbe40668e52e0092cfed397348b2ca4ae2980de6daec91924089a8a9548775732c8 SHA512 0aaa32ed145fc37a1b8d1de1fa00dd597fe8a093e80d5d0392a29e842abd0ac0cc447ccaa2fa51f86072465bb95ec8c55717db732cd1400faf319b5232a39fb6
-EBUILD pulseaudio-12.2.ebuild 11099 BLAKE2B d33df38bacc886aaef22ae97f4be401dbbb057573454285801258f413368c5b4efc287061bc8bf4a8bc5008d473912304604d66399d5f6edb2a4a6573689b30e SHA512 c040da91b5156d9da07a8bb5ef19fba4429def61204b7784d55329c5504de04eefcc3fde06bd614bd18820b9753ad924ca42dfb2ab50ff66a26144bf25fba469
+EBUILD pulseaudio-12.2-r2.ebuild 11704 BLAKE2B f8f305be0bcd2cd11509573e0b26f17437383932ff3f811a609b618cb6b3eaed2ff5917d2ffbc5ff10277b893543636dd3d4b85872066ea5a6eab06a146adba9 SHA512 ac82b022d9b5b0d0a6ef2f62fc712b7718c3e534e11e22505f2527cc52b7fb2c56ae8668ef92ddcd51f93b67a5a1b031f1964c78680b2a5835a9e904d7f30eaa
 EBUILD pulseaudio-13.0.ebuild 11546 BLAKE2B e8b0ff927a906f63ac0d721814430c160036ce21385dd6fcbe678e581b550712d66b5a569b3e4816dcd94b56c9f49e3c181d013046c0039ecef02da04cf32d2d SHA512 250d2aeb6c5a05eaf489e975e7588f9baf45a103d392207b5bd1a39b62986fc659694e3331afa63745a75e295c89e36ab44646e7a7c6489fc3fdb49035550363
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
index a661e7070d97..990985e38c2e 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-sound/pulseaudio/pulseaudio-12.2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2.ebuild
deleted file mode 100644
index 35e17253e500..000000000000
--- a/media-sound/pulseaudio/pulseaudio-12.2.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer gconf +gdbm
-+glib gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
-+orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X zeroconf"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	realtime? ( dbus )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-CDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	media-libs/speexdsp
-	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
-
-RDEPEND="${CDEPEND}
-	realtime? ( sys-auth/rtkit )
-	gconf? ( >=gnome-base/gconf-3.2.6 )
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.10 )
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool
-	>=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt5 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-
-	enewgroup audio 18 # Just make sure it exists
-
-	if use system-wide; then
-		enewgroup pulse-access
-		enewgroup pulse
-		enewuser pulse -1 -1 /var/run/pulse pulse,audio
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
-	sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-adrian-aec
-		--disable-bluez4
-		--disable-esound
-		--disable-gconf
-		--disable-solaris
-		--enable-largefile
-		--localstatedir="${EPREFIX}"/var
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable alsa)
-		$(multilib_native_use_enable bluetooth bluez5)
-		$(multilib_native_use_enable glib gsettings)
-		$(multilib_native_use_enable gtk gtk3)
-		$(multilib_native_use_enable jack)
-		$(multilib_native_use_enable libsamplerate samplerate)
-		$(multilib_native_use_enable lirc)
-		$(multilib_native_use_enable orc)
-		$(multilib_native_use_enable oss oss-output)
-		$(multilib_native_use_enable ssl openssl)
-		# tests involve random modules, so just do them for the native
-		$(multilib_native_use_enable test default-build-tests)
-		$(multilib_native_use_enable udev)
-		$(multilib_native_use_enable webrtc-aec)
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_use_with equalizer fftw)
-		$(multilib_native_use_with sox soxr)
-		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
-		$(use_enable glib glib2)
-		$(use_enable asyncns)
-		$(use_enable neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable dbus)
-		$(use_enable X x11)
-		$(use_enable systemd systemd-daemon)
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_with caps)
-	)
-
-	if use bluetooth; then
-		myconf+=(
-			$(multilib_native_use_enable native-headset bluez5-native-headset)
-			$(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	else
-		# Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
-		if use elibc_glibc ; then
-			myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		if use doc ; then
-			docinto html
-			dodoc -r doxygen/html/
-		fi
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-
-		# We need /var/run/pulse, bug #442852
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-	else
-		# Prevent warnings when system-wide is not used, bug #447694
-		if use dbus ; then
-			rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf ; then
-		sed -e '/module-zeroconf-publish/s:^#::' \
-			-i "${ED%/}/etc/pulse/default.pa" || die
-	fi
-
-	dodoc NEWS README todo
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-	fi
-
-	if use equalizer && ! use qt5; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use equalizer && use qt5; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index c71adc298e5b..c6df532a2478 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,4 @@
-DIST pulseeffects-4.6.7.tar.gz 1880914 BLAKE2B 919f9885c8b991782251257ba13512c5c25ae6590fd3f709b9f142f74f80f9fd15bbdc0cd57a7a7d84cc4c94c795f69db57a13b161cbbebdd2458803e36e8ccc SHA512 138ea6081e3b1751f0cd15d6ae1eb0dbc4156493b37f7c8b48878a6600ec19c8846145b7bef3bccb93b6775bd4f0b9ee998c603152c6526540eaaebcdcaa5d2e
 DIST pulseeffects-4.6.8.tar.gz 1882449 BLAKE2B 57a93eeb32304628efb51473912a70485e054ef50e9e9aec9731ba761dd7809ce0a8c3838fc74a04c6a29537bf182a74c6e6715c722ce76670c8be71dc4a5608 SHA512 672204ad90534ad45228b3473902eb8489c8306c7850f2b2a6f983aa89955529fb5381d6a7d703de94dcd658ffd5b560cce17291a0b23654b225ebd301659e74
-EBUILD pulseeffects-4.6.7.ebuild 1803 BLAKE2B 62eb4d5b56e930df0ceda31bdeebf26ae89f80108f1754c6718342468481768dd5dcf8a5b0006a77ced1a92c3d8504142b65dc558b26defb4295caf20699e9c4 SHA512 052459a1211ea7a74265723b6d4352d0c79346195aab43136b74f3be7a3cd29a4cb8b53874b9106419d7cc3dc3e194dc36c7f7b67aa53450872eaf614f305a33
-EBUILD pulseeffects-4.6.8.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
+EBUILD pulseeffects-4.6.8.ebuild 1803 BLAKE2B 62eb4d5b56e930df0ceda31bdeebf26ae89f80108f1754c6718342468481768dd5dcf8a5b0006a77ced1a92c3d8504142b65dc558b26defb4295caf20699e9c4 SHA512 052459a1211ea7a74265723b6d4352d0c79346195aab43136b74f3be7a3cd29a4cb8b53874b9106419d7cc3dc3e194dc36c7f7b67aa53450872eaf614f305a33
 EBUILD pulseeffects-9999.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.7.ebuild
deleted file mode 100644
index 9ff4d83fe6d1..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.6.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.7[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.8.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.8.ebuild
index 0e6624cf2428..9ff4d83fe6d1 100644
--- a/media-sound/pulseeffects/pulseeffects-4.6.8.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.6.8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 1052a56f0cfa..c422b716cb08 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,3 +1,6 @@
 DIST qjackctl-0.4.5.tar.gz 832932 BLAKE2B 9e47ce1bb0439e62b8922b2a39650410b96ffa6f13489042fdd8909152d31b2a8f5b1a7ee73cd8a85b10aec776175a9c6a3782b0ab592c5196e7352b106b53ee SHA512 251b7275fd6cb13c91420b7c11d5d2a1d9b7c5b11b78a4b5ba41955b4bbaa3c4f4721123f3375c2ce4a243ee9defc69c982cc93796e17e01e096e1228c4fe5fd
-EBUILD qjackctl-0.4.5.ebuild 950 BLAKE2B 23a01bac1f1e0a41ee9066529614ecf1b54d0754b91ab19004852a4c0399c79312086ae5b21890a9f685b141e5ff7aa450d67370fc4c94193777c276097c328c SHA512 09a0ecfb94b74741e3b88361394033ad14b069b549eda269d8dc045d84d5ec0173a4b48feade3b31b595c0fbb4278b7ad2d2b33f07d0b5cc3b1c551ebd0708c1
+DIST qjackctl-0.6.0.tar.gz 933416 BLAKE2B 116a6a71ab0c0974ff5109c5ae34c47fb4706e3e051d7bfc9daec74f952304606f5a790e03d3b97bc2c68968ac6a09ad885c4dd4c774b2454c9a7af8ec6c997f SHA512 f1cd281f67a764f12301c6b58644aed2419d2c82696a24bd9980aa7ea42a266ff5e4aa6247b0b6ac78cb01afc34219c7de8c0657cfdf0fa9858a52d1f84b8fea
+EBUILD qjackctl-0.4.5.ebuild 947 BLAKE2B b6b5a59d3c7b1da0a5d19384815ea6c46ba0bf83d52fe053bb2ecaaa7cec71f68a2772415b98a15d18cacf521f15b6240f7bc28a0c08b2c5b7bbc28a2aac36f1 SHA512 573bef057913955d4596edaddc1db55b2239bac6eb79de52f6926a9c63a611372f9932bce01ee7a5bf90299041f5fc000d72fb2f2b80e86037222f45a43b3e5a
+EBUILD qjackctl-0.6.0.ebuild 1174 BLAKE2B dca45c45f48c87e7af6262a2b2800c20cdc3e24bc8f9c5ab605f5bea97ee7186866b4ec35c4f6bc8ff59756161cea1de654cb7fb2d0428d95c80af9876f9600b SHA512 a26d27bf71190900dd32aaf8e0c17fbb35a5080b0cc3118e157d514464128cba41a264175da9671ae7695a562b442f7c21db74da177a6a906fb91411d3fa0776
+EBUILD qjackctl-9999.ebuild 1226 BLAKE2B 4c340d964561fa9c34635d02220a7139882283ab5cd9a8b4ce0e0f799aea6c0116d2f2d3482f1febb234f7044c63a0dddd8b63da064238f4013f0e81c0f9f0b4 SHA512 f9f277ec117e06a8c1ef8f2210e6943c62141367c1328eb68d25af401749c180d84b4e54b4a8cb027d985415f93698bf6c7e6ad0d422d00107fdbcefdffc90da
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/qjackctl-0.4.5.ebuild b/media-sound/qjackctl/qjackctl-0.4.5.ebuild
index 05a40eed7807..18a1fac09117 100644
--- a/media-sound/qjackctl/qjackctl-0.4.5.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit flag-o-matic qmake-utils
 
 DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="http://qjackctl.sourceforge.net/"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
 SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/qjackctl/qjackctl-0.6.0.ebuild b/media-sound/qjackctl/qjackctl-0.6.0.ebuild
new file mode 100644
index 000000000000..264583c2f70f
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.6.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils xdg-utils
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="alsa dbus debug portaudio"
+
+RDEPEND="
+	app-arch/gzip
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_enable alsa alsa-seq) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable portaudio) \
+		--enable-jack-version
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+}
+
+src_install() {
+	default
+
+	gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz"
+	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/qjackctl/qjackctl-9999.ebuild b/media-sound/qjackctl/qjackctl-9999.ebuild
new file mode 100644
index 000000000000..87c768da8ec4
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils autotools git-r3 xdg-utils
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+EGIT_REPO_URI="https://git.code.sf.net/p/qjackctl/code"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="alsa dbus debug portaudio"
+
+RDEPEND="
+	app-arch/gzip
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+src_prepare() {
+	eautoreconf
+
+	default
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_enable alsa alsa-seq) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable portaudio) \
+		--enable-jack-version
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+}
+
+src_install() {
+	default
+
+	gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz"
+	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index adce643480d9..a3f9f4245895 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,6 +1,7 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-DIST qsynth-0.5.5.tar.gz 269061 BLAKE2B e17bb0ced40764c5bef9ae7c793f7ba1ebfe4edd761f434ad129f338d30384c639f27d697ecfdaa93d7fff52c38bed0a3b95cf51fbdad25e13c14abe795d49dd SHA512 4e90b38d428c6b49a78b648ac9604e683f32623898205abe3a98c4136c5b29ab27c101cf63207dbbfdcba105913de2dcb5cc7669a6433def71d071f39cf68429
 DIST qsynth-0.5.6.tar.gz 269583 BLAKE2B 9b06f7be1aa39addebd0b088eff885bce39c6bc245461b64fe45243306afae8879d4b516bd46c30c2a8074e580e412c38a3c264d647a35ff5c81301703731067 SHA512 752b3ac7e478594ef873b2d1c9fcb1a1dcdd1fb33f34cab5f588f628d1f11f01ecd150c9d51021a41040794b68f0538ad6979751773d5c537f53a1f227b3bf88
-EBUILD qsynth-0.5.5.ebuild 1300 BLAKE2B 82eb320196d3d8646e3a9c8b1ae5fde1ef8dacc586055bd5eb4830b21d38dc26b72de819ccc29ff98509b73e32fb2c4c0d6038f846f3e04d16f4ff9ac5ea0eeb SHA512 0c94edb732c059066ffc3e99ec9250139a6ebdb697868e387c7fdad17e00473f63326048a5f8a9d1072d1026f8e8a9912041d8a2607d5e7e355f5c30a7eb2ed8
-EBUILD qsynth-0.5.6.ebuild 1301 BLAKE2B 433b215e3b3e3f2a8823a597611e98d78bb4f29a00982c48d78eb43ba88ea59054d3b931dec07443fe6985edb2d08db6115a71be43a1a45dfa024ce04064b94d SHA512 ba161548ecd67395bcf9ef33444c1be86eb7c0de64502875d4bff49995147b696559fd54576bccb70a6a272a5af901cfc22f69296e5479cc36bd446eeca80388
+DIST qsynth-0.6.0.tar.gz 316308 BLAKE2B d414c73d5baf3be1563c45390735de964c79774a4d7cc37ff4bc609a7fa4d291a5b0cba7f3b8ed52649c50325a3ba2fba7baad3943122cc76a98aa6cfdf2cb0f SHA512 34e15d283f403ec6633fef911285dc2d4d4b2c5a0cd3614bd38feefbf68cff5fd8e296f47d1bcd527658b8a9dab212106aa63ca71ea60cf49f8126adb7d28591
+EBUILD qsynth-0.5.6.ebuild 1301 BLAKE2B 23515c33c27d2768151b0cec68f74e3675734a97e3ae8b019e1e0aef9ae2e5cce2803cdc66235b31b29008eea3efd3d5933f64528ee2405aa8c76e863f24acd9 SHA512 3a062d818ba1c41a0731b97edd3f6c77e3706ee458155455677a73304e50ea9fdf9391156405459613b9fa635265cdcb8832047f765bcfea02ca7e1a9846c0d5
+EBUILD qsynth-0.6.0.ebuild 1398 BLAKE2B 4b092fd3449076f2a0367748ccba30bd248f19920c523f19fad6500b54c32ace09c7d7cd1ec80d0a8fb702c96a67d139e1b61abde3d4aacd6565d187b6636edc SHA512 c98170ff62b167524bbe0f7d2c8919205b2333f18eab12d160de3b21052089d1205bbfdf41da9d3ff8579dc6444ffb2a68f5019605ab437a52adc2270ddf773b
+EBUILD qsynth-9999.ebuild 1445 BLAKE2B 300936cbdee4140ada6df996741f2eb73850de8784e9f2eab596b16cdcae614d5cad3f448cdb32d405ebb7504b5db4ce1f4ee592c57940dbc553bfadb4c1051b SHA512 58da89e2efd524f4b522a136cba6ec536bc04ff0cd2fbdc30fcba0a4bc8757887b2749bd22432740d1f1bcd87da32032449aa698d578402cf557f9c3e4e55a2c
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.6.ebuild b/media-sound/qsynth/qsynth-0.5.6.ebuild
index 2a0bd80ee1c0..d6e9dd919db4 100644
--- a/media-sound/qsynth/qsynth-0.5.6.ebuild
+++ b/media-sound/qsynth/qsynth-0.5.6.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit desktop flag-o-matic qmake-utils
 
 DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
+HOMEPAGE="https://qsynth.sourceforge.io/"
 SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/qsynth/qsynth-0.5.5.ebuild b/media-sound/qsynth/qsynth-0.6.0.ebuild
index 68c2993624bb..466ded54ecf1 100644
--- a/media-sound/qsynth/qsynth-0.5.5.ebuild
+++ b/media-sound/qsynth/qsynth-0.6.0.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic qmake-utils
+inherit desktop flag-o-matic qmake-utils xdg-utils
 
 DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
+HOMEPAGE="https://qsynth.sourceforge.io/"
 SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug jack pulseaudio"
-KEYWORDS="amd64 ppc x86"
+IUSE="+alsa debug jack pulseaudio"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -60,3 +60,11 @@ src_install () {
 
 	make_desktop_entry "${cmd}" Qsynth qsynth
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild
new file mode 100644
index 000000000000..327a19853a99
--- /dev/null
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic qmake-utils xdg-utils git-r3 autotools
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="https://qsynth.sourceforge.io/"
+EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa debug jack pulseaudio"
+KEYWORDS=""
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
+
+src_prepare() {
+	eautoreconf
+
+	default
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
+	econf \
+		$(use_enable debug)
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_install () {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${ED}/usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/rawrec/Manifest b/media-sound/rawrec/Manifest
index e0c9f91f3eca..233a90cce66d 100644
--- a/media-sound/rawrec/Manifest
+++ b/media-sound/rawrec/Manifest
@@ -1,4 +1,5 @@
+AUX rawrec-0.9.991-fix-build-system.patch 900 BLAKE2B 3572e6c249c777514aed2f35c5a0814aa148ea352361b72c50c4da377bd274ed8241c361fa9124735d881cf6b3ba5dcf6151b0a1484d33469d7dc57a61c57d98 SHA512 f2223ec30e07b43d8ae6790f3e4c7f363824646b5fd7c6fb4e72f8637cfc60306a3b322efae656566752b933da00d19790d6bfeb5c84442ebdfc2960358ecef2
 AUX rawrec-libs.patch 817 BLAKE2B 8da060f6631560d3f994af4471aa08f7f4a0d01664281adac71350088e81e724f021d2ffcd768b889f9472dd819d4e95ef284ded121fe0661854a511b96fb4ef SHA512 86707ebc6533c137c3a569394cbfd17626dd855e2caeebe2a469091ad5d88f50932e4b4717d4e9cf88e44678c4bc51f74bfccd04c13d98f6e3471300fdaf4dd8
 DIST rawrec-0.9.991.tar.gz 62134 BLAKE2B 2ff1bc864f0da3d2416f3b5dfc8f331396544d396a47f94dcbd7b2880453a007db1254610262799239a6096fd7465018129fd23c59fe5b30cef9069a55de0eec SHA512 3f0c6080b246231089cf01dbb5be0e9e6749cd9d339a9d3ea865681e836767c69909bb9f70ef7d87b39298603438169e9531e957e364dfcbe64aef074f862d90
-EBUILD rawrec-0.9.991.ebuild 759 BLAKE2B 347fb68df445645d280c1c2b0fb8e4baa04f5f9b479d42134ce27bbec58ac18a4f6c86497c06df84a9f5b24b1abd3f70bfaee0efa13c1ca521359a344abb03f9 SHA512 3f1577b9fe2c049486cfc961eeac486c16253f03f12060168ab37ec7085d32aa207862ee81f5230abff925282091d917b85324b54ebe4885ee85eed0c9a5bb94
+EBUILD rawrec-0.9.991.ebuild 721 BLAKE2B 562957c3a068cb2f21923b25c8d753ad8e97720dfc315030df3b4d1762beec97185931208abcd77ab8663a9f4154ff4e0266b3d5d1d775ee0943f29f3b4acc34 SHA512 f417dcda3da41f865a4118c9aa1735212ef01a8dcfc4d97bb188e54c07f78a083faa605d37649cbe17a8394d4ccbed00fca0870b65d5dee3bb22537830418c01
 MISC metadata.xml 329 BLAKE2B cb48532535b24c1aa027739ba20960f703f4b16f4c9bd0dfbee5c3db57fe00b11290ca72f2290b7edd4fa0e806acd82363dd92c7a6fc09ad97bba6784d90ca24 SHA512 03288474cb2d673f67059727711ae15215ea738740e473082470065728892794d13cf2c7426b48d93a85adbcf805d81f1b3eeb2f89dec08fe459a4202f6f87cb
diff --git a/media-sound/rawrec/files/rawrec-0.9.991-fix-build-system.patch b/media-sound/rawrec/files/rawrec-0.9.991-fix-build-system.patch
new file mode 100644
index 000000000000..bef125094f13
--- /dev/null
+++ b/media-sound/rawrec/files/rawrec-0.9.991-fix-build-system.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -6,19 +6,15 @@
+ HEADERS = $(wildcard *.h)
+ OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
+ 
+-CC = gcc
+ WARNFLAGS = -Wall -W -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
+-DEBUGFLAGS = -O0 -g
+-OPTFLAGS = -O2
+ 
+ # Uncomment this to try to use untested priority ceiling/inheritance
+ # code (if system supports it).
+ #FANCY_THREAD_DEFINES = -DUSE_FANCY_PRIORITY_CODE
+ 
+ # FIXME: USEBUFFLOCK appears to be historic, and should probably go some day.
+-CFLAGS = $(WARNFLAGS) $(OPTFLAGS) $(DEBUGFLAGS) -DUSEBUFFLOCK \
+-         $(FANCY_THREAD_DEFINES) -D_REENTRANT -D_GNU_SOURCE \
+-         -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CFLAGS += $(WARNFLAGS)
++CPPFLAGS += -DUSEBUFFLOCK -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ LIBS = -lm -lpthread
+ 
+ # The GNU way is just too painful.  I'm not writing three tiers of
diff --git a/media-sound/rawrec/rawrec-0.9.991.ebuild b/media-sound/rawrec/rawrec-0.9.991.ebuild
index 24377e072281..3372ddccaf5f 100644
--- a/media-sound/rawrec/rawrec-0.9.991.ebuild
+++ b/media-sound/rawrec/rawrec-0.9.991.ebuild
@@ -1,9 +1,9 @@
-# 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 flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="CLI program to play and record audiofiles"
 HOMEPAGE="http://rawrec.sourceforge.net"
@@ -12,23 +12,24 @@ SRC_URI="mirror://sourceforge/rawrec/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
 
-S="${S}"/src
+S="${WORKDIR}/${P}/src"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-libs.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-libs.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed."
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	emake EXE_DIR="${D}/usr/bin" \
-		MAN_DIR="${D}/usr/share/man/man1" install || die "emake install failed."
+	dobin rawrec
+	dosym rawrec /usr/bin/rawplay
+
+	doman ../docs/user/rawrec.1
+	dosym rawrec.1 /usr/share/man/man1/rawplay.1
 
 	einfo "Removing SUID from binary.."
 	fperms 755 /usr/bin/rawrec
diff --git a/media-sound/rcenter/Manifest b/media-sound/rcenter/Manifest
index c9d0fa7eefc3..9fed8b83622c 100644
--- a/media-sound/rcenter/Manifest
+++ b/media-sound/rcenter/Manifest
@@ -1,4 +1,5 @@
-AUX rcenter-0.6.2-makefile.patch 555 BLAKE2B ca1459bdb835b73aa947f2549424d6ef2626f497d2699acd6c527d7d787268624e6ffdaa47b9e0f2b05cac0fa053ffa034884a5a662e9860eb083d8f00ced317 SHA512 385c22722ac44ae17420135f68e72ece74a4c3ee1e2eddd578b441c1a32efa6d9ccfc2b80f154475c5a434b49e029189fc1c21682c0a5530e81bb129fdfd041c
+AUX rcenter-0.6.2-Wimplicit-function-declaration.patch 267 BLAKE2B 52460e47e6fd3e74fa36af96cb89eba8f9f4a246367e42f975d4b364098f8142fef0cb100da1782bb0ed9707599695a4c852e9bfa8bce01bd4e59d295dda5509 SHA512 95ba345dcd1716723f74a802e858f0352501fa5c12ee40fb4f1aa1d270d50e4dd465e00d6df243345bf79742469a4b3f0e85e250121090d5c050a45e4741dfa9
+AUX rcenter-0.6.2-makefile.patch 549 BLAKE2B dde87bd6143d878be35574119d2605c1a4b9731c961ff390b76eab71f079679fc8a643409ecd7755a12ebba27b6fa885cabad810a4f2c43d0a8788a154120eec SHA512 7f06434da1605cf903b14a4de830b1f8ab819379a0022f8f95aeb7a7dfe7823ad9e44baebd15a06732720f13016cc9413aa6ac7662878902e9261f82bfdb7582
 DIST rcenter-0.6.2.tgz 15053 BLAKE2B 1a2cf30a42332bfd7dc3141d7cdb9454dffbf4270571f2f6bae581c033eee36e867d980a0ddf49e72bf77f27aa2f45a6ee3c5f15aaee06003031a50d4dc8c979 SHA512 0db7780c3c9f991ff79a9513fcb1640b18050336241d52b99fc63c8632a5d0a1d9a96e1e265c41c0ff2f0c11be9ddf17dd6d4d9b1ee8ce92cdcd2afd716e788b
-EBUILD rcenter-0.6.2.ebuild 1133 BLAKE2B 1e5b4759cbe11ac4dd1224e85bbdfe6ab1e4f67676b4e745e9ff29ff29f7d928a47cb6658adcba54950a042e16f35d70d7385156ebc50c9a65b295d630936417 SHA512 a35272450c80ab7f9c49bf96bdcadfa9d6ec89f1caf1fecbd575cd9f9444578bcdbc2eb56645c0ab0c0e82fbe6c79f598cf98db6b529cf39428e2844b63d80d6
+EBUILD rcenter-0.6.2.ebuild 1079 BLAKE2B 59fb3f5417e6dd214d489d666112572575750634caa679355b2c268266f3ff4806b4dd91c7f280bffe09f449858a15f17a8ec202731c04412069732e131c328c SHA512 56bda1cc2990f069f87912d3dd5a78af11bf1f75eecb47fa9288e5560e8844abbc0ba6a77ce0880ef589bc1807df5ee6326c796b0dbc72795ea102fed08baef6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/rcenter/files/rcenter-0.6.2-Wimplicit-function-declaration.patch b/media-sound/rcenter/files/rcenter-0.6.2-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..00de497890f0
--- /dev/null
+++ b/media-sound/rcenter/files/rcenter-0.6.2-Wimplicit-function-declaration.patch
@@ -0,0 +1,11 @@
+--- a/main.c
++++ b/main.c
+@@ -28,6 +28,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
+ 
+ // use the first one of these that exists
+ static char *default_device[] = {"/dev/midi00", "/dev/midi", NULL};
diff --git a/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch b/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch
index 2c5fbd761a83..aa579b0d9253 100644
--- a/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch
+++ b/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch
@@ -1,8 +1,13 @@
-Index: rcenter-0.6.2/Makefile
-===================================================================
---- rcenter-0.6.2.orig/Makefile
-+++ rcenter-0.6.2/Makefile
-@@ -19,9 +19,9 @@ button.o : button.c
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,4 @@
+ ALLFILES = *.c *.h Makefile LICENSE HISTORY README config
+-CC = gcc
+-CFLAGS = -O2
+ BINARIES = rcenter
+ PREFIX= /usr/local
+ 
+@@ -19,9 +17,9 @@
  main.o : main.c
  
  rcenter : main.o lowlevel.o handler.o button.o
diff --git a/media-sound/rcenter/rcenter-0.6.2.ebuild b/media-sound/rcenter/rcenter-0.6.2.ebuild
index d071eadc0d76..295c65fb14a2 100644
--- a/media-sound/rcenter/rcenter-0.6.2.ebuild
+++ b/media-sound/rcenter/rcenter-0.6.2.ebuild
@@ -1,11 +1,9 @@
-# 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 toolchain-funcs
-
-IUSE=""
+inherit toolchain-funcs
 
 DESCRIPTION="Rcenter - A program to control the EMU10K Remote Control"
 HOMEPAGE="http://rooster.stanford.edu/~ben/projects/rcenter.php"
@@ -16,21 +14,22 @@ SLOT="0"
 #-sparc: emu10k1 doesn't get recognized on sparc hardware
 KEYWORDS="amd64 -sparc x86"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	chmod 755 rcenter
 	dobin rcenter
-	dodir /usr/share/rcenter
-	cp -R config "${D}"/usr/share/rcenter/
+	fperms 755 /usr/bin/rcenter
+
+	insinto /usr/share/rcenter
+	doins -r config
+
 	dodoc HISTORY README
 }
 
@@ -38,7 +37,7 @@ pkg_postinst() {
 	elog "Rcenter Installed  - However You need to setup the scripts"
 	elog "for making remote control commands actually work"
 	elog
-	elog "The Skel scripts can be copied from /usr/share/rcenter/config to <user>/.rcenter"
+	elog "The Skel scripts can be copied from ${EROOT}/usr/share/rcenter/config to <user>/.rcenter"
 	elog "Where <user> is a person who will use rcenter"
 	elog "Remeber to use emu-config -i to turn on the remote"
 }
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 38bf404e445f..ad5dff2f45d6 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST rhythmbox-3.4.3.tar.xz 6410600 BLAKE2B 0df8ac37ac0815468414c5b8118da6d07276e0c15f08812a46af7f377c29418416e1a24d7398aec10772887ae98922f6fb9fa9eaecc6ae15115cd7ca1c4b67a4 SHA512 a3585c026037674345909e2050a4ccb22a75084f830f351b926f7fbfc84d200c8246b8da4bd72804e595929ab06d3c7b53d362675dde193746f40b0f38b7c493
-EBUILD rhythmbox-3.4.3.ebuild 3371 BLAKE2B 5e01913300ef35132df218f4cabf37b38f9a5a796953f4276e6aa500d816da728eed790a9ef2934bc4410200d8729d33a72bea4bcca68fa19a450e33dff25212 SHA512 e1846abf3d30e99d1140906c328f9162ae1ce859e9d24302a8b8c5c3c984ad9cb1bb67ac17dd93a3a9fea5809ccfedbcb330a3741d7a618c1c7f96b4a266dfa8
+EBUILD rhythmbox-3.4.3.ebuild 3372 BLAKE2B f2219fbda44529bb7507b9ccff4e270640c15f79b696b9a4bf6210d972a07f4788a449080f9e5351a0697c9d6f272f6ff060325b1a72d129d3d600d84912f66d SHA512 cda5541861b9be91b6113fa6e34ffdac5cb1b2bf946a214b1654d528a4c0b3a49c01e52c59c671ebf7dc09605a334b568584de1a5750dc448df38d328a316f06
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
index 89c3a913df8c..5e1ce69f5026 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
 	)
 	udev? (
-		virtual/libgudev:=
+		dev-libs/libgudev:=
 		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
 		mtp? ( >=media-libs/libmtp-0.3 ) )
 "
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 0c240dfbcefd..dea6683bf00c 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,3 +1,5 @@
 DIST rosegarden-17.12.1.tar.bz2 6692715 BLAKE2B 698ecfb58754ee292e589e0fb3618e2076a6e59dde1f06d15ed3bad43313cc79ed03307364350f5cd2323350173119ccc71b42c839d8498d360461a19801a96a SHA512 8bd4a464bbf2825d6c2fb8d36123e68d94de7f4e997c6ed8efc5670e87799781eb8251995890979c9d107d4fc58c636fe73e699c859c8e95aa567c4289958495
+DIST rosegarden-19.06.tar.bz2 6667374 BLAKE2B c204a99dd46a0dcbfda6afc361ec31b7f211d2b95a8d171ff3fb06e37b3dbabc2b36fdbc04a3dfc821a9e331681d2a1e2395e91a86fe9d9fecd3af173f5b675b SHA512 13eddd4ec88662f3275d83bf40471ca0a34d43b3c9c9f07cf46b891c74f087ec7fe0d4b8ffe8204f2f3a30829352f4d952bb035a5bd09a7b6bdeb41ff5d1e8d8
 EBUILD rosegarden-17.12.1.ebuild 996 BLAKE2B 955ae5c825df0b675211d7fae021280f7ea8896bd3dde778fb847d02cae59291e8ed6f382d87e1bf39f125564626e5b72aa68fbe477bbd7e5bd745f1a0627a39 SHA512 52527e0803bc198cc7f6167091aad55317e6dfcda6d2322e90932b4ef8d66713455bc57117c6fd83212955243fe52c98aeb5faf7993c2c87bbddb5b76e962952
+EBUILD rosegarden-19.06.ebuild 998 BLAKE2B 49ee99784594c188f2a896f186ff9d8cbceea7b459737ffe2bdb88a9d387ac7f282c1ec312b3d81f78e9dea21f90a0e8771affc439009d5c8e474985aa9b31c8 SHA512 cf4cad1a1146c4dca6c1190e8d05e1f4704e04fba3f9b998ab2d8159c20e52c211626873a161ef601043fcac543065e01bb2fd7c562c61f67f426e39e1812a30
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/rosegarden-19.06.ebuild b/media-sound/rosegarden/rosegarden-19.06.ebuild
new file mode 100644
index 000000000000..a62b21c7fa70
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-19.06.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="https://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/ladspa-sdk:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	media-libs/libsamplerate:=
+	media-libs/libsndfile:=
+	sci-libs/fftw:3.0
+	sys-libs/zlib:=
+	virtual/jack
+	x11-libs/libSM:=
+	lirc? ( app-misc/lirc:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-sound/saydate/Manifest b/media-sound/saydate/Manifest
index 663dab12fd2a..004b109e294a 100644
--- a/media-sound/saydate/Manifest
+++ b/media-sound/saydate/Manifest
@@ -1,3 +1,3 @@
 DIST saydate-0.3.0.tar.gz 137732 BLAKE2B 4de22e65b2cc9255ce961168ebec693e367720d95cc1c25d62d565b1612b26dee0209963474541e3217fff878f903a735b59e673c589ebe78e85b40b8fd67a5a SHA512 b53bc6037f4f757deefba54855036b25287c721f424a53858d038362b1b0c42d27bf7e72739768362c3b02cc9cca13945fb33dc6f3df9c1e76dba23b1cedbd71
-EBUILD saydate-0.3.0.ebuild 924 BLAKE2B c40739ffd6282cb2bc9f122df98c0ef7f1a24a7462e9edee28a2358e80fcd32d50662be69e553923157f115fb4d8faf9071ec61f901901904e7a7fd16723ebe1 SHA512 5f31382fe97ac0b6247b1f9a739caa12b8230793ead3828ca8b5ccc10aabd254fc044478bde50c26cd7110d0390ffa4580401674d8753b5abe173025170de44d
+EBUILD saydate-0.3.0.ebuild 809 BLAKE2B 80b9344b21afcc91df4af0ffb3dc9a923c7719978b4084962152547fe3d13ab153fa10a56b806820718e1b1ed27b4a6bac92ab63f546e57adeeccb59ee5a0a68 SHA512 c0e4b1c3f8abcf6bdf829f0c29a84ea00d360b9f46cc7954a247d4c418a9ab2a0b0f0d1d4dcad14f63145d1966f198d590e8f230aa898fd3c25fcacf8b2d740c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/saydate/saydate-0.3.0.ebuild b/media-sound/saydate/saydate-0.3.0.ebuild
index 7b6489dbdcd8..95205e4dd16b 100644
--- a/media-sound/saydate/saydate-0.3.0.ebuild
+++ b/media-sound/saydate/saydate-0.3.0.ebuild
@@ -1,35 +1,39 @@
-# 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
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="A Linux shell program that talks the date and system uptime"
 HOMEPAGE="http://unihedron.com/projects/saydate/saydate.php"
 SRC_URI="http://unihedron.com/projects/saydate/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 
-DEPEND="=sys-apps/sed-4*"
-IUSE=""
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	default
 
-# Don't leave this empty or it tries to install directly
-# on livefs
-src_compile() { :; }
+	sed -i 's:/dev/audio:/dev/dsp:' saydate au2raw DESIGN || die
+
+	# don't install pre-compressed files
+	gunzip man/{saydate,au2raw}.1.gz || die
+}
+
+src_compile() {
+	# Don't leave this empty or it tries
+	# to install directly on livefs
+	:
+}
 
-src_install () {
-	insinto /usr/share/man/man1
-	doins "${S}"/man/saydate.1.gz "${S}"/man/au2raw.1.gz
+src_install() {
+	dobin saydate au2raw
 
-	dodir /usr/share/saydate
 	insinto /usr/share/saydate
-	doins "${S}"/data/*.raw
+	doins data/*.raw
 
-	sed -i "s:/dev/audio:/dev/dsp:" "${S}"/saydate
-	sed -i "s:/dev/audio:/dev/dsp:" "${S}"/au2raw
-	sed -i "s:/dev/audio:/dev/dsp:" "${S}"/DESIGN
+	doman man/{saydate,au2raw}.1
 	dodoc README TODO HISTORY DESIGN
-	dobin saydate au2raw || die "dobin failed"
 }
diff --git a/media-sound/setmixer/Manifest b/media-sound/setmixer/Manifest
index d80e24d9636d..d37b3d309769 100644
--- a/media-sound/setmixer/Manifest
+++ b/media-sound/setmixer/Manifest
@@ -1,5 +1,5 @@
 AUX setmixer.rc 449 BLAKE2B 1be8ae6ff027694a7307d31522c643d40e0053946ef3c41f3e2b4892e4e1ebfefdf8a38f0f39aa2b419106ff030b57a8974928416dcfcec72d48f3eda5cb9e1d SHA512 a0a3e26798e04b4b209b290a3ebae531f1a2effb3610b370b2b2329c42498c3ac9497c7be8d32fb64abc99452c3877a98662c0469352400812077cb0721d8345
 DIST setmixer_27DEC94ds1-1.diff.gz 3843 BLAKE2B 5ec339ea58140bec6c35270c1b88aa22ac16b0e080edf9dedee65e791b985b1b127afdd7ff559351bf8042ddcbeb08313ae8450fedccf3fc87655109982d2e3b SHA512 ec58b6b2da3723659352eb9930d6b1afcfa9087056511eddf4502e3a2a962763152b1df25a9bc44b0587a7284701b80c4583af4f00105bc3998f68b25842b0a7
 DIST setmixer_27DEC94ds1.orig.tar.gz 2884 BLAKE2B fc70dc83565ce08f96aed78d1b127ab17ca0e9023e87b4fa69e76a1d638d0a07661b573c85f23fc995116caf155a2a4da1b8eb224d2bee69b6d484c203c2aa53 SHA512 65a88ba577b62d0e7f98897b711f319aad886918695ea0b5c5f7897c45d109d7d26d9b9c64fb6a53bd419ba7346c631f6c0252ef305797bfca0ab2407eefec15
-EBUILD setmixer-19941227_p1.ebuild 888 BLAKE2B f0224a7958ee88dbaab1dd34003f5911840f1078221c495afc6d5f1386f84ed564361536add9f5aaa656ccadb42da255b0e5049ec857306bb9c951ed897da607 SHA512 8905b34963230fcff1af8394a3c5fbc9a69167913c8da6b8e3bc90fb6aef8a3e546f01a4e1833cbec1cf9aad2439105955bd5d778302cfbd01d3020acc4b8c30
+EBUILD setmixer-19941227_p1.ebuild 834 BLAKE2B e05616a2908ad59090de77a1f54bea6866513487784c58d619fab75075287246526e68c24af5c08da7f500d9d0e2b4c88b02189dc0699cd66e0c754044b6427e SHA512 cc4b030ba3bf68b2acd0f62038c15f1f94b0d2bf56d1072acb8a3b5d97715e786f34aeed8ec3504154164b958e64d16b7424870fd9270c5606be9b2de2c2badb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/setmixer/setmixer-19941227_p1.ebuild b/media-sound/setmixer/setmixer-19941227_p1.ebuild
index 1ae45173a460..5a6817684f7a 100644
--- a/media-sound/setmixer/setmixer-19941227_p1.ebuild
+++ b/media-sound/setmixer/setmixer-19941227_p1.ebuild
@@ -1,40 +1,42 @@
-# 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 toolchain-funcs
+inherit toolchain-funcs
 
 MY_PV="27DEC94ds1"
 DEB_REV="1"
 
 DESCRIPTION="A commandline mixer"
-HOMEPAGE="http://packages.debian.org/unstable/sound/setmixer"
-SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${MY_PV}.orig.tar.gz
+HOMEPAGE="https://packages.debian.org/unstable/sound/setmixer"
+SRC_URI="
+	mirror://debian/pool/main/s/${PN}/${PN}_${MY_PV}.orig.tar.gz
 	mirror://debian/pool/main/s/${PN}/${PN}_${MY_PV}-${DEB_REV}.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
 
-S=${WORKDIR}/${PN}-${MY_PV}.orig
+S="${WORKDIR}/${PN}-${MY_PV}.orig"
 
-src_unpack() {
-	unpack ${A}
-	epatch "${DISTDIR}"/${PN}_${MY_PV}-${DEB_REV}.diff.gz
-}
+PATCHES=( "${WORKDIR}"/${PN}_${MY_PV}-${DEB_REV}.diff )
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" setmixer || die "emake failed."
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" setmixer
 }
 
 src_install() {
 	dobin setmixer
+
 	dodoc README setmixer.lsm
 	doman setmixer.1
+
 	insinto /etc
 	doins debian/setmixer.conf
+
 	newinitd "${FILESDIR}"/setmixer.rc setmixer
 }
diff --git a/media-sound/shorten/Manifest b/media-sound/shorten/Manifest
index 3be1a1be5a32..b403d58337f2 100644
--- a/media-sound/shorten/Manifest
+++ b/media-sound/shorten/Manifest
@@ -1,4 +1,4 @@
 AUX shorten-tests.patch 548 BLAKE2B c8478471433a2840513994af71313c228d2cf89717406a03d5d3f65caaf73433c73dfb92b1f7db20025c5a3b1ca80027912f24b80cfca1434b47b00c715fd2c3 SHA512 0572b2bc84473cfc30c72c989035500942ed37eae3d9e3c770e9908606270fe0c52e03b8ac3ad42e2999798b9915a734400ebe1820ab1c7311d714dd66d370e2
 DIST shorten-3.6.1.tar.gz 597581 BLAKE2B 0a8bebc1219cb504df4b24b663048f1649f5279c0b20af7dfa30b8d9ad64a711f3dc5646d296b39f26b3eed6a5fb52271fdcd49d960fb5837ea003d1808d4b39 SHA512 825f2c02fcc5f715eb20b2b4356a5334be9c3d55b9c7238e0a2a734b99b88d8fb23308647644506282fd03df4a8e51e2aafbc1b1a89982d45d042a05a01951b3
-EBUILD shorten-3.6.1.ebuild 566 BLAKE2B 2323f749abe202309952725b53c52f2004c88f70f956013fea904079e131721ecab5a56e5e3e684a042e49adce4cb51712c068362fdfb8ae70f739251c819f92 SHA512 6349239ca2ed899f6378ccfcc4176a1f0b4bcff8b0a1eb2a88e4e7d9d7aa3d307f42cccdf804a0916b6624e27a3913dacf6ae62f5d22b2279846de06d1637637
+EBUILD shorten-3.6.1.ebuild 417 BLAKE2B 61b3ef1994869252c39e214916bbaea380acbf98073555a71eb6a2559642d091ec7c78539e667e494401cee60e1942c7a65425ed8dd5400df8526c7c0008b9c4 SHA512 b394f34561f275f5837767e7d223e24b7c7f4de67d0d0b3307acbc2fe49da451ac47d88f4dd4879703b1d319ad3ca454927bcabaf330a1bd94a5dfbd8af8a79f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/shorten/shorten-3.6.1.ebuild b/media-sound/shorten/shorten-3.6.1.ebuild
index 633278326a9a..c0a5213789ae 100644
--- a/media-sound/shorten/shorten-3.6.1.ebuild
+++ b/media-sound/shorten/shorten-3.6.1.ebuild
@@ -1,9 +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
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="fast, low complexity waveform coder (i.e. audio compressor)"
 HOMEPAGE="http://shnutils.freeshell.org/shorten/"
@@ -13,13 +11,4 @@ LICENSE="shorten"
 SLOT="0"
 KEYWORDS="alpha amd64 ~ppc sparc x86"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-tests.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
+PATCHES=( "${FILESDIR}"/${PN}-tests.patch )
diff --git a/media-sound/timidity-eawpatches/Manifest b/media-sound/timidity-eawpatches/Manifest
index 5d4ba8c57061..847f4c4da743 100644
--- a/media-sound/timidity-eawpatches/Manifest
+++ b/media-sound/timidity-eawpatches/Manifest
@@ -1,3 +1,4 @@
+AUX timidity-eawpatches-12-fix-dir.patch 251 BLAKE2B 40efdb10eaadd4d4430fdcc5f0f2b9cacb5976b4068537f012227919c853d3264fddfbea0d362d1d7e32de593b3d40a49105a1ba08f0b627ca3637afea13749e SHA512 fe5ef5ab981a9430bcecd5a7c00094daccc45f0e9e580830cde3a9e9f8c75bb15519f99771c89768efca74aca41ea582bf4a99edc7597ad0526368c8de5ec514
 DIST eawpats12_full.tar.gz 32047230 BLAKE2B e2711c59e95b29f77d07dc7465e1eee717007759328ce03c85ae4897d6507ad6801ca7040b1b08d26fcefae5afaba1d6415b6fe152920b58a77947682a9bfb08 SHA512 fb5532c85653e624ed310cd5607d1e24231bcaa9bf966548e9383daf463b9221b21945d2786db0bc44dbabc5342b224a4cbb6c9329f1eee1ee8137d56b3cf71a
-EBUILD timidity-eawpatches-12-r5.ebuild 1327 BLAKE2B 652d0b6d0701e78e7bb7dcbab6a6199e348885aa51d1e513d0c2bd3ad907bdf865fa48d577fabfe18591268edc420a94ea1b878f770b7376993298cb17bcb09b SHA512 35ccd833af645011df43c3bc0175efec5ffb0b861d5d6206a45008233f06d47e736f4a81e76506490b1d1b2880c48bf16980fa16890bdb7b2839e5578f5c08c1
+EBUILD timidity-eawpatches-12-r5.ebuild 1103 BLAKE2B 617dfc072441e0e65907942218641b219a8d09bd498f0f2c347d90be5edc48a15052310d9bc274d64afe06bcc3116a03115d3260fa4366262ba25db1002697fa SHA512 0dda5d940bf5a7f582925791900654e1a9662c53b9fe32bc20ff87c5dee0e9b543b7dcf339b6a8c97e307eebc96f8e99117de0b4efe4109421a2c19c6ebc176a
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/timidity-eawpatches/files/timidity-eawpatches-12-fix-dir.patch b/media-sound/timidity-eawpatches/files/timidity-eawpatches-12-fix-dir.patch
new file mode 100644
index 000000000000..a41b0eac3d0e
--- /dev/null
+++ b/media-sound/timidity-eawpatches/files/timidity-eawpatches-12-fix-dir.patch
@@ -0,0 +1,9 @@
+--- a/linuxconfig/timidity.cfg
++++ b/linuxconfig/timidity.cfg
+@@ -1,5 +1,5 @@
+ #on my debian: /usr/local/share/timidity/timidity.cfg
+-dir /home/user/eawpats/
++dir /usr/share/timidity/eawpatches
+ source gravis.cfg
+ source gsdrums.cfg
+ source gssfx.cfg
diff --git a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
index 942dcdb38ee7..3c9b2827791e 100644
--- a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
+++ b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
@@ -1,9 +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
-
-S=${WORKDIR}/eawpats
+EAPI=7
 
 DESCRIPTION="Eric Welsh's GUS patches for TiMidity"
 HOMEPAGE="http://www.stardate.bc.ca/eawpatches/html/default.htm"
@@ -12,41 +10,32 @@ SRC_URI="http://5hdumat.samizdat.net/music/eawpats${PV}_full.tar.gz"
 LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
-IUSE=""
+RESTRICT="binchecks strip"
 
 # These can be used for libmodplug too, so don't depend on timidity++
 DEPEND="app-eselect/eselect-timidity"
 RDEPEND=""
 
-RESTRICT="binchecks strip"
+S="${WORKDIR}/eawpats"
 
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:dir /home/user/eawpats/:dir /usr/share/timidity/eawpatches:" "${S}/linuxconfig/timidity.cfg"
-}
+PATCHES=( "${FILESDIR}"/${P}-fix-dir.patch )
 
 src_install() {
-	local instdir=/usr/share/timidity
+	# Install documentation, including subdirs
+	local f
+	while IFS="" read -d $'\0' -r f; do
+		dodoc "${f}"
+		rm "${f}" || die
+	done < <(find . -type f -name '*.txt' -print0)
 
 	# Set our installation directory
-	insinto ${instdir}/eawpatches
+	insinto /usr/share/timidity/eawpatches
 
 	# Install base timidity configuration for timidity-update
 	doins linuxconfig/timidity.cfg
-	rm -rf linuxconfig/ winconfig/
-
-	# Install base eawpatches
-	doins *.cfg *.pat
-	rm *.cfg *.pat
+	rm -rf linuxconfig/ winconfig/ patref24.hlp ultrasnd.ini || die
 
-	# Install patches from subdirectories
-	for d in `find . -type f -name \*.pat | sed 's,/[^/]*$,,' | sort -u`; do
-		insinto ${instdir}/eawpatches/${d}
-		doins ${d}/*.pat
-	done
-
-	# Install documentation, including subdirs
-	dodoc $(find . -name \*.txt)
+	doins -r .
 }
 
 pkg_postinst() {
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index 3924f593b8df..92791b74dbd8 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,4 +1,6 @@
 AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535a9f0a55e47a01315aa0c0121c1473aa6ff9f53b7bcf4b70a849a0b19bfe3125213f558c17ecb1d4fd1349376 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413
 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
+DIST twolame-0.4.0.tar.gz 890908 BLAKE2B f61a49aed06dcd2a60744dd758b480670f14f0eece0586b62a0b21fe2d9ff8280f8f7324b7daf88e85675c6200a1c68815ddd6bafa308b503a52df4552031bb1 SHA512 cc594bc8d2322922280f915a3c0aa52540cca0350d6498bc96f3f60fd6e53f951e775ea015a44bdb29ec883b46b31a0e5483f6a5c188b02e30008289273c7d03
 EBUILD twolame-0.3.13-r2.ebuild 1235 BLAKE2B c8e1905e12ad4838cf303a174e384f493e58c0537c53e9110cec7ed9496bd11e65734f73db16991af260708350886389108b524f2292090a4990ed716fb94887 SHA512 9bf472d563e846c485b3d2e0c9a8f270d65ffcb18845c8849b668d67e508ac8fe971fe770e87c9a512f806f57405bfd2b52d6fe44291d5d685cd72b765ed354b
+EBUILD twolame-0.4.0.ebuild 1336 BLAKE2B 3899df2d91fcaae03cc9356e142cfd15203f5c7d99fb1bf44e3316081bfc8a9529a9ff57d73bab086ca3ffb72b09776a0ca2fb9032d06a2521b6bd6cf47773ce SHA512 337ad4449bfaf14f9efafb8a9b836b1c6131eb122b3cb828cc9f23515a9205f68afc0710cf035cd7e010abf464a2fd3596f832b8537ce88e4c17697a44e3a083
 MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8
diff --git a/media-sound/twolame/twolame-0.4.0.ebuild b/media-sound/twolame/twolame-0.4.0.ebuild
new file mode 100644
index 000000000000..965e12fe4341
--- /dev/null
+++ b/media-sound/twolame/twolame-0.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="An optimised MPEG Audio Layer 2 (MP2) encoder"
+HOMEPAGE="http://www.twolame.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+sndfile static-libs test"
+
+RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e '/CFLAGS/s:-O3::' configure || die
+	# remove -Werror, bug 493940
+	sed -i -e '/WARNING_CFLAGS/s:-Werror::' configure || die
+
+	if [[ ${CHOST} == *solaris* ]]; then
+		# libsndfile doesn't like -std=c99 on Solaris
+		sed -i -e '/CFLAGS/s:-std=c99::' configure || die
+		# configure isn't really bourne shell (comment 0) or dash (comment 6)
+		# compatible, bug #388885
+		export CONFIG_SHELL="${BASH}"
+	fi
+
+	default
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable sndfile)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 55233b291981..9f4ed505744d 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -2,11 +2,7 @@ AUX umurmur.conf 1637 BLAKE2B ba9519dc2a09512c3b8398009c1ee41a8d49f1a18de5800dd5
 AUX umurmurd.confd 64 BLAKE2B d98d616da50acabd055333c36699ab0dd060193fc4507528370b1b77d5c3335f61e0c0ab6cc28bb8530aa9876345bb9ff01bdb1db56f0d0e44b09ef7d6a12eff SHA512 4af070ab4d8f4a9a2d5b59b8be95cfb49c22faae809843d9c8ede954bdf39f1224bb31cc53e5cf0f771a2033dfe904890345a6031055c9e79fdd315447e54840
 AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec7215c3f263de0582baf70a0b822a1712c2423d753dda9e2602ff404d11f2f0d02df02116cdfb3729d SHA512 d60c700bf0bb54c904faff658e09dc37a6cd79edb69e4aa54f46872f474c8f673a91ebe022a47dc0d6b4f624a86f70be99f661a1e80a672b04dff6af3328b28d
 AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682efc1001cf130bef21f6f925f4b535d0d02209617c92b4d4a3dad4a7b459c8dbbcf6f97b050bab933de0 SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913
-DIST umurmur-0.2.16a.tar.gz 91187 BLAKE2B ba306dfa4c6fa958735ab02bd262729d582acdd5f33e642066712c2188549b8675f1b9305642af198c608108e5277820d6aac2c09470cce0d5e9e3f272b11c2f SHA512 432a85e93cb7d53c505caf8b97c1bb7c173c8f625127510de61cc0a1e3abaea9abcf96ab1c0a8c5039ba82af5d29710e4973f70c1438bfd44ba00fa0c3f64c9e
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
-EBUILD umurmur-0.2.16a-r1.ebuild 2136 BLAKE2B e8ccba8b874014b89991f731abd0c2f1b724c126aeedd6563c4b118efcc630004d3cdd46a122678499f680d4e065f410bf5656e442d8c7ca560b64e05e96f406 SHA512 d65241e668ebb560a8f4ca482374c2d4a3738ee7eb700ae7273bb2c350b5b508678c19b174848f4b59adf3f077a108cca0aaf472fe87947473aac0a7d81251f3
-EBUILD umurmur-0.2.17-r1.ebuild 2163 BLAKE2B 95d724db07bd1f6b6a405a921d21569bcda8f4baa781ef2a6e1c21e167adbc61d9f8dd975caf2f228577f30b7fff4f0a713af3a630313f7b5a5d0a27a7625d88 SHA512 265168d48225f8df2263cdaf37bc665c7f624071a63fe33b9570cc3f5e1ca9121e61923e6e0f07f45f8c2750e6090882752327e1e031b527ceee722a759c5837
-EBUILD umurmur-0.2.17-r2.ebuild 2660 BLAKE2B 60c76bfafedaa36fa4e0d1b5e1119e2601ab2bbabd871e099ed176e154d658497c5ecdb8f8195d9ef664e13240a2b692a44e6fe2d0b4b563a74b8f18e76388af SHA512 772ff1543f1cd79605475a23ce867eebcf4a227df2a3cf96e6fee6421b8290518e8a28bafaa631222704675b296cdad006be9fd8fec928e8c157c3f8c8bb0b18
-EBUILD umurmur-0.2.17-r3.ebuild 2625 BLAKE2B dc8ca273bc5b9d88686ef51ef9803d2c0e94e82d3c81e96fb4926077d0f7a8db79cf6f6f80e817cded610111b75e573c7d42dee532c8dcccf98a661cd63b42e6 SHA512 451bd9ed9f3f034992880ad81fb347a49b0d4750b0dbed044a9e54c112740024f16f6de0e0ca105df0dc130ac022b95bc0aa0fda7482dce0bb6d3e1a360bc176
+EBUILD umurmur-0.2.17-r3.ebuild 2623 BLAKE2B 4163646ffda96651ed9c88ae6e0bb8599f95d77abd9f4567d86fb63bd8cd19943dfd3ddf72a526368395a967c9a15931a7acfd5f925b9c35d5c7a9577acf0bb7 SHA512 667ab4fb2db0db3c92728b91354f78b1cbe80374db702b150a9cda3de732750b079917575b1a9c2c1e878bddd1d637b581d2cd42cf619e4bc4975e4cd8d644f8
 EBUILD umurmur-9999.ebuild 2625 BLAKE2B dc8ca273bc5b9d88686ef51ef9803d2c0e94e82d3c81e96fb4926077d0f7a8db79cf6f6f80e817cded610111b75e573c7d42dee532c8dcccf98a661cd63b42e6 SHA512 451bd9ed9f3f034992880ad81fb347a49b0d4750b0dbed044a9e54c112740024f16f6de0e0ca105df0dc130ac022b95bc0aa0fda7482dce0bb6d3e1a360bc176
 MISC metadata.xml 1091 BLAKE2B fc7db1a6e1f3d32e9e579a8ba870b1d0322042cc2e9b723d0dcc120a4a714cb9d3a9e2e5da51e73c7d45e41976ae13b6566aaf0da856e0ef692d997f2ddf17bb SHA512 3e45f70e658253e9eb2fda16e3c054c0a670083142cb699247f47aac208ae67249fa66588a07730588e0ce64677a90e77dcd7015eb9d5478aef8b70933855831
diff --git a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
deleted file mode 100644
index 137b63342690..000000000000
--- a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd eutils readme.gentoo-r1 user
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://github.com/umurmur/umurmur"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gnutls libressl shm"
-
-# ssl-provider precendence: gnutls, libressl
-# and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
-	dev-libs/libconfig
-	gnutls? ( >=net-libs/gnutls-3.0.0 )
-	libressl? ( !gnutls? ( dev-libs/libressl ) )
-	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )"
-
-RDEPEND="${DEPEND}"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
-	may	want to review it. See also\n
-	https://github.com/umurmur/umurmur/wiki/Configuration "
-
-pkg_pretend() {
-	local ssl_provider=(  )
-	use gnutls && ssl_provider+=( gnutls )
-	use libressl && ssl_provider+=( libressl )
-
-	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
-		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
-		ewarn "defaulting to ${ssl_provider[0]}."
-	fi
-}
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur "" "" "" murmur
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	econf \
-		--with-ssl=$(usev gnutls || echo openssl) \
-		$(use_enable shm shmapi)
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-	systemd_dounit "${FILESDIR}"/umurmurd.service
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/umurmur/umurmur-0.2.17-r1.ebuild b/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
deleted file mode 100644
index 4ca66ad93d0b..000000000000
--- a/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd eutils readme.gentoo-r1 user
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://github.com/umurmur/umurmur"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls libressl shm"
-
-# ssl-provider precendence: gnutls, libressl
-# and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
-	dev-libs/libconfig
-	gnutls? ( >=net-libs/gnutls-3.0.0 )
-	libressl? ( !gnutls? ( dev-libs/libressl ) )
-	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )"
-
-RDEPEND="${DEPEND}"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
-	may	want to review it. See also\n
-	https://github.com/umurmur/umurmur/wiki/Configuration "
-
-S="${WORKDIR}/${P/_}"
-
-pkg_pretend() {
-	local ssl_provider=(  )
-	use gnutls && ssl_provider+=( gnutls )
-	use libressl && ssl_provider+=( libressl )
-
-	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
-		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
-		ewarn "defaulting to ${ssl_provider[0]}."
-	fi
-}
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur "" "" "" murmur
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	econf \
-		--with-ssl=$(usev gnutls || echo openssl) \
-		$(use_enable shm shmapi)
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-	systemd_dounit "${FILESDIR}"/umurmurd.service
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/umurmur/umurmur-0.2.17-r2.ebuild b/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
deleted file mode 100644
index 54434dd96ad0..000000000000
--- a/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd readme.gentoo-r1 user
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://github.com/umurmur/umurmur"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-LICENSE="BSD"
-SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
-
-# ssl-provider precendence: gnutls, mbedtls, libressl
-# and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
-	dev-libs/libconfig
-	gnutls? (
-		dev-libs/nettle:=
-		>=net-libs/gnutls-3.0.0
-	)
-	!gnutls? (
-		mbedtls? ( net-libs/mbedtls )
-		!mbedtls? (
-			libressl? ( dev-libs/libressl:0= )
-			!libressl? ( dev-libs/openssl:0= )
-		)
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
-	may	want to review it. See also\n
-	https://github.com/umurmur/umurmur/wiki/Configuration "
-
-S="${WORKDIR}/${P/_}"
-
-get_ssl_impl() {
-	local ssl_provider=()
-
-	use gnutls && ssl_provider+=( gnutls )
-	use mbedtls && ssl_provider+=( mbedtls )
-	use libressl && ssl_provider+=( libressl )
-
-	if ! use gnutls && ! use mbedtls && ! use libressl ; then
-		ssl_provider+=( openssl )
-	fi
-	echo ${ssl_provider[@]}
-}
-
-pkg_pretend() {
-	local ssl_provider=( $(get_ssl_impl) )
-
-	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
-		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
-		ewarn "defaulting to ${ssl_provider[0]}."
-	fi
-}
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur "" "" "" murmur
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
-
-	local myeconfargs=(
-		--with-ssl="${ssl_provider[@]}"
-		$(use_enable shm shmapi)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-	systemd_dounit "${FILESDIR}"/umurmurd.service
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
index d01e6411f0f8..368646a5296a 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 LICENSE="BSD"
 SLOT="0"
diff --git a/media-sound/vlorb/Manifest b/media-sound/vlorb/Manifest
index 4d75f03cf969..08bb4e5d9c96 100644
--- a/media-sound/vlorb/Manifest
+++ b/media-sound/vlorb/Manifest
@@ -1,3 +1,3 @@
 DIST vlorb-1.2.tar.gz 23935 BLAKE2B 5746cc9d3bbf0df032fc171ec048cedba636cf001ce58be9438d754468cd21e33616bc2ec6f370686ee8ea7ee006ca70e09581f493b359ad829753909b31b5e3 SHA512 b0f7a2fd757c98a4cc70b3a74612553986a42edc38df69e3b52df787fc32770cf98e1931c2f524cdcaf32da403193bba2ca2b4e178a1a757ebc9660067c10b05
-EBUILD vlorb-1.2.ebuild 556 BLAKE2B 68803cf1c71a21b9b87cbd09d74695a753b53d2182e68cbe45c31d3a855330dd43f48ffb6d0d68cd31654dadccbbda6e62bedaef9a8098f59ffddb0ab65bb9d0 SHA512 195e01b71a104e3c8dff901eff1913dbb476501734fb60f63e62410cf16f818b2133dbed60f88db428259df01fd972392fc42e223529c19cd6574db6b3fa2f4d
+EBUILD vlorb-1.2.ebuild 539 BLAKE2B 9ee2a396657aaede6cb5164bf46db5019e6bb891a88b3a96b959112542cf7e4a19a1bdfa6ce36366d5993f3d0ef74c23a46ea080bc28cf95f4a54bbdcf64e74f SHA512 48ee6ce7b56d93bd547256181b77d50490c317d31eef7afcc3a889314b3a6282b9239f4dc2542495b442c369f3633171714163c6941a3883984fd152cf311986
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/vlorb/vlorb-1.2.ebuild b/media-sound/vlorb/vlorb-1.2.ebuild
index 6480dc21acc2..07b2dfeedb06 100644
--- a/media-sound/vlorb/vlorb-1.2.ebuild
+++ b/media-sound/vlorb/vlorb-1.2.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-DESCRIPTION="a high quality Audio CD to audio file encoder"
+DESCRIPTION="A high quality Audio CD to audio file encoder"
 HOMEPAGE="http://jk.yazzy.org/projects/vlorb/"
 SRC_URI="http://jk.yazzy.org/projects/vlorb/releases/${P}.tar.gz"
 
@@ -12,14 +12,17 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="ogg"
 
-DEPEND=">=media-sound/cdparanoia-3.9.8
-	>=dev-perl/CDDB-1.12
-	ogg? ( >=media-sound/vorbis-tools-1.0.1 )"
+RDEPEND="
+	dev-lang/perl
+	dev-perl/CDDB
+	media-sound/cdparanoia
+	ogg? ( media-sound/vorbis-tools )"
 
 src_compile() { :; }
 
 src_install() {
-	dodoc ChangeLog README
 	dobin vlorb
+
+	einstalldocs
 	doman vlorb.1
 }
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 8c4369d6a7dd..0fd691b0b26f 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -6,5 +6,5 @@ AUX wavpack-5.1.0-CVE-2018-7254.patch 3004 BLAKE2B 2c744a5675a8b8c3f6b8e956ff3b6
 AUX wavpack-5.1.0-armv7.patch 805 BLAKE2B dc69a643e3dde75cce1d5a23176cb09fecc513a98835242437659b0724de8ba2cb97a59fb1cb3dc050454ff95bc2669e6b19f10fd03fadaf06e4c859c063277c SHA512 b152f8081b712c24ae8db641f4755798ab4c7412a298054449883255fa76571ffbd0c580848a274ce1c44401f69102a0b2c66137ae36d9323e9e5330ee20856e
 AUX wavpack-5.1.0-memleaks.patch 800 BLAKE2B 601e81daad4208d109bd980cbe63ce0c638577d53fe01fa133469090faed7f641d00efd44f906732905599615513b0dddf918dc9ce13f927b3e889a1dbd0d13d SHA512 ac5f8473314939c1b07019617f8881e4675bab2d4a0f61dd95c5389ec9915a8573f3291a5c29547e8e5a300483600d36f3c53f9ee7380c5f0691860cef6a3594
 DIST wavpack-5.1.0.tar.bz2 824331 BLAKE2B 736dcb3cc0bee4ebcf76b8a7df178aa1b797ec6858358bf289a3e151f62d2ce8f430d163d46a84c0b5a7501c732ac639955c867e53fd9217ca7f213b601a8697 SHA512 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54
-EBUILD wavpack-5.1.0-r1.ebuild 966 BLAKE2B 49fbef7600b0b2073e8c9f5ec342d8b0e59ac3023dd95c6e0d66234f64cc7253bb6f6c406d4fcf88225d3337059eb72148eccc32947e2805e7fa1ab4b8918838 SHA512 762006a3806870180d763687920235a96851d662577c29c39ce337fc1b225ad5d3f897208f4965f37eb175c6da9c41f2f62a718ca75ac2a6f12c771f9a748c50
+EBUILD wavpack-5.1.0-r1.ebuild 968 BLAKE2B d811b19aa3d03c3fb460acf71ff29a51afe26acf87e4448ed07d874405a49d4d04277be2691219c27ed4f7e47da136cdc3efb500f15edead5283cab1eb6daccf SHA512 060e3f32c6c175e56bcd1ffb1d366f507dbf0612e3184ed8706a39ceb01711384833ccbcd0dc810235b3b86b6d055167c679e547020e3ab52d9aa070e7748d2f
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
index 041956f9efb6..39f0c3cbe6f1 100644
--- a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
@@ -12,7 +12,6 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1"
 DEPEND="${RDEPEND}"
@@ -32,6 +31,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE=${S} econf \
+		--disable-static \
 		$(multilib_native_enable apps)
 }
 
diff --git a/media-sound/wmsound-data/Manifest b/media-sound/wmsound-data/Manifest
index c7d3c6272e43..37bb1405f341 100644
--- a/media-sound/wmsound-data/Manifest
+++ b/media-sound/wmsound-data/Manifest
@@ -2,5 +2,5 @@ AUX WMSound 548 BLAKE2B 8c392187608a409d7a336c8983b7cf08b7bf6c5e0657feb11bd48fb4
 AUX wmsound-soundset 312 BLAKE2B 7f3c22a4f7d99e3aacae3d1135e1b90ae065dc300d323b4a1815a8d92c78aa071f2163207a6ef10d852c71172e8476205853a85554b0e1c24aff82258b8d53fe SHA512 c8822f4ab1621159b07f2f412dcabb128bebb85fd01eea1b6dd329605f4202c6d65d300f48adec6706854bee9655901851d8c92ad487620d0c20cd0232900a70
 DIST wmsdefault.tar.gz 711376 BLAKE2B 23814e9514dad9e987ca456c42ff5524d8dc120af195a908deb03d5184b409e38b508560dcce51418a7dc47ef28deeb3e91c1910c8d3ac0498517008fd44fb9e SHA512 7fce83906f675ab8426fc4c2440a39dc9b658c93e99c515c4cec02c89df99097545931591358a33adb3dfc7c73b28cd9698d8e071b7b019511aa5edc5d51f62b
 DIST worms2sounds.tar.gz 356608 BLAKE2B add52d7e3bb459012b17397ed397deb34aca361fd9e1164b9fa19acd6a9b256511769913b51d9871b95fbec617f446d62c6b85dda9ecd13145eb601721e1d259 SHA512 7fe60511e7f457ea398d6d5456bac90d6303ede645c73a527551e44008e09b8f1f343f5622a49b365bcd93674b9f2ee6a91f9774dadf770cd71daec69400e5da
-EBUILD wmsound-data-1.0.0.ebuild 942 BLAKE2B b2508b3098bbe8761c9df00b5e29e86225449a007a9cdc6d8f87855a5168425d367eaeba5bd44760521ed988c61629f1fb8c86a96452d59bbae33ad1b690d685 SHA512 5d810a6522ebe8107f8de037d7385b7499fc9db8290bc8a7a816caf15426a8b60996380ad4be15a0218a350df423feb298d8258a5a8ae655677cfcba10f8f6e5
+EBUILD wmsound-data-1.0.0.ebuild 898 BLAKE2B bcfe37f4d3f5cafd25656b88d1ef837af92ff85fbc0cb6109c91459aee2d29b76410d5b26cf9119259ce1dabbd5ff74867057b61b17b0a2376ae7526ea71a234 SHA512 ebf10bea4e669551ec21905c1bb8cd7e375d6011d124771c7d8d7066d2ec476c107172f4a4e939092b94d077ff5b06c2a9dbb5da38b60844930d0a0a92d68ead
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild b/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild
index a3caefa71ad5..0cec6efcb2b3 100644
--- a/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild
+++ b/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-IUSE=""
+EAPI=7
 
 DESCRIPTION="A bunch of sounds for WindowMaker Sound Server"
-SRC_URI="http://largo.windowmaker.org/files/worms2sounds.tar.gz
-		http://largo.windowmaker.org/files/wmsdefault.tar.gz"
 HOMEPAGE="http://largo.windowmaker.org/"
+SRC_URI="
+	http://largo.windowmaker.org/files/worms2sounds.tar.gz
+	http://largo.windowmaker.org/files/wmsdefault.tar.gz"
 
-DEPEND=">=x11-wm/windowmaker-0.80.2-r2"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 
-S1=${WORKDIR}/Sounds
-S2=${WORKDIR}/SoundSets
+RDEPEND=">=x11-wm/windowmaker-0.80.2-r2"
+
+S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share/WindowMaker/Defaults
@@ -32,11 +30,9 @@ src_install() {
 	insinto /usr/share/WindowMaker/SoundSets/Default
 	doins "${FILESDIR}"/wmsound-soundset
 
-	cd "${S1}"
 	insinto /usr/share/WindowMaker/Sounds
-	doins *.wav
+	doins Sounds/*.wav
 
-	cd "${S2}"
 	insinto /usr/share/WindowMaker/SoundSets
-	doins Worms2
+	doins SoundSets/Worms2
 }
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index 3f620c938939..84d5646f6421 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -1,7 +1,3 @@
-DIST xfmpc-0.2.3.tar.bz2 414680 BLAKE2B 167af8e53d7ddf2a629d585e8ca9f15507e54ee92ceae0f48d3462fc1667b07570d2489cc5058c0521aae2f0b1493a1101655ae702e48b3c4d0c6be493a4ec57 SHA512 3f592fdd559817051f7720bafc07fc66b39f682cc20286c12d54c4bd607e85bb0a722c567264a29224971b4ac14db51b0b44b233a16cccd9d17579a50549a3be
-DIST xfmpc-0.2.90.tar.bz2 449973 BLAKE2B 89b1e0136fdc161857fdf50a47b5dec388f9e999df26a1e3399e2997a95945224a4a500431495c831e131a9831c281606e27f46d5c998cef41bdaeadbc389563 SHA512 3e88eb6b1c1270111981bed51653f4f019bcd72253719ea0751bea48ac13dcf1a3f22fd12d4399b20986348a9c2e41be9b1bd82830c09149ed70fd9facdb2d55
 DIST xfmpc-0.3.0.tar.bz2 443234 BLAKE2B ee0f491baadfb6be9148de8060758f788f773bdbc0354d6061889e979fb16eeb7a44357b61e698908c972714616b4268ed443d1d6323cbf0f457cdfd6cdf0fc1 SHA512 6e876aca2c2a6764fe97f061c97dc0fa9ce72b7ab6a2597b5f54bdce39789cc73bd038a0ef69b87d826c225efb9c3a2d19aa9ed7872ce7ee9ac5d7bd275444a3
-EBUILD xfmpc-0.2.3-r1.ebuild 774 BLAKE2B ecfffb22006c3452b3d0cf54bcdb9d993fb274b3adee1b72164beddfd4eb3a786863fd8278c02afb8052e89fc748ae90699ebada619436d0fccafbf3d9c004db SHA512 5b1272722cac67bc3b6c5492a64f63d85e22014dda9f45eaf8e523df5e56ddcef562a57db71093721674f82db0665933522b66922fca16d64cd9757d69f7cca8
-EBUILD xfmpc-0.2.90.ebuild 759 BLAKE2B e9f3b13df3ed0e2a45580051576db384e43016751f2aa15a33194685a1f41c7fbaef20cccc19ec716e59c50b64ff94d47e22d61396c6b8aa05e79ad259292d64 SHA512 7105976a5d8a3f779948b5363bdd4a2261522a4b041fd8d4ea48bd1fd0ee2c643755abd59feb4ba4ba3fe7de4f7c3048032f6d7be804d050b6a5b170eb521eed
 EBUILD xfmpc-0.3.0.ebuild 768 BLAKE2B 94c1ca9a19414e7b1d5cd217a4aa67b41525717227e76a267fc9c864c1635f96b1c94d877da81e21c505c6e515b9a32e02b7ae0bb74e681aae419cfaa5c70073 SHA512 5038a745344bed18aecfbf515dc7278935bc65ab0a81012f3df44dc1803a062a877dd8ab584369c7a7c979ed3f278a92b4328309d25af88654b4ca4ff1b0ea95
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild b/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild
deleted file mode 100644
index 6d1b25a9d567..000000000000
--- a/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit xdg-utils
-
-DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfmpc"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/0.2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2=
-	>=media-libs/libmpd-0.15:=
-	>=x11-libs/gtk+-2.16:2=
-	>=xfce-base/libxfce4ui-4.8:=
-	>=xfce-base/libxfce4util-4.8:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS=( AUTHORS ChangeLog IDEAS NEWS README THANKS )
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/xfmpc/xfmpc-0.2.90.ebuild b/media-sound/xfmpc/xfmpc-0.2.90.ebuild
deleted file mode 100644
index 9a6ac70cb9df..000000000000
--- a/media-sound/xfmpc/xfmpc-0.2.90.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfmpc"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/0.2/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2=
-	>=media-libs/libmpd-0.15:=
-	>=x11-libs/gtk+-3.22:3=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog IDEAS NEWS README THANKS )
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /media-sound
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)