gentoo resync : 21.07.2018

30 files changed, 159 insertions, 247 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4b99c84c30c9..1a1ae9e452de 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index ce734eb1c007..d7d5c631f9a8 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,9 +1,9 @@
 AUX bluealsa-conf.d 107 BLAKE2B c67419746ec00b3beb279f21bb4adc86baebe8a14b489c1e3603ac03fc55262315ceed6a4bcf60280830aae07c1e94fb0ec8bce7e12b1f500456bc235f393209 SHA512 3cac8c573ccc3dfe95e66df17e7af99601bb3672f950828eae17ab80ec00a2ead96923559a9c65ddcf666cc0afaabb12a7a9d0b07e771110d972f6676c49dd62
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
-DIST bluez-alsa-1.1.0.tar.gz 73676 BLAKE2B 6db4b1475223f12af66617881e6093a4ae957cdc17482fec13c3dd628a02cdff74f9ff173472231aecf6e58b368fa8ffa335d38a31b1c50c8ea198af091a5d63 SHA512 167fa45994b57b0b44d5827762638d36ef782d7789c229e5c1ca99b59c13636dc53161cd45bec41e61890acd38b44d20778bc2085385582329a1c666530b21f1
 DIST bluez-alsa-1.2.0.tar.gz 63662 BLAKE2B 79549c9848f910e083b88058e6798e10d193a3bfcbc087b41e17aa5f43444f425b5932c6440a5c7416068bd0c562a744f3cbfb3008582f56988e756ee74395a3 SHA512 a6bf0068b3fb88acaa11990db411f1d3be7ad19219e7bdfd091fe81acc2ba5d5992dfb377e4fcc332ac330bb7e5ab5e4f4a9cee3e700e366fd983e81a272a5b4
-EBUILD bluez-alsa-1.1.0-r2.ebuild 990 BLAKE2B 1da853fc91dd289c43cc66dce173b4b13f1d7f9dc9ba1da59b9463a9b5559a65562bcd49960436f7f19b73283150f934f4ec9b092a6fd84f27aba636debef1de SHA512 a4b95242d46eeb23d7f03bcce26149ce851693390efbca96af7cbd6f9b1fd5d1d3b34827e547bcf394cf21923a7290f2f4b46818b79ec4a77c6fc2b623290e8c
+DIST bluez-alsa-1.3.0.tar.gz 86109 BLAKE2B 0a026c590a3e8f655db367e38891142d757eabc8ba647c655451e7b5ff9beabcc71ec33e16522ee7818be7513c9ecc4c5512ce6a2358651b4d8e77cd90f6a25f SHA512 f355873622290bc0193799a77660adf1e3622d3ad77a8e0cbf46d59b3c015009c8b3318c414b855c569d40bbe450a490f53c8d5382350beadfff6e65ab8e58bc
 EBUILD bluez-alsa-1.2.0.ebuild 1316 BLAKE2B 71457c1ab0f83f7a888344dfc59dd1963b006c3be83c50137f62541aaa2b7ae07f6ce5dc41a07742d89df276d40e090f1cab607c3ea830505e20d9d792437121 SHA512 fe23b6623c76bf44dd695ac4b4b2af7b10eb4a5f3fbfc9b8a88643e69c1cbc846948d5f26e6e2a65bae2c2c8581fd7deb6ac156f90273ebadc0b07984d1e1b6c
-EBUILD bluez-alsa-9999.ebuild 1342 BLAKE2B 954d87d02053a16eca4f901cf4b6ae171501e2a6e22463f4521939677a2f21fdfa9070c7c59b6af499d485dced001eb10e15ca8f61b4b7bda9ac3779bb0c4fa3 SHA512 00bbca6a588bcc0611dee1c3e65995702fc951f0cde88e4047ece63a0b80838047dbc712f59ceac3f988fc75f8b7670e79d9da49b94eebd2341ed167306a67e1
+EBUILD bluez-alsa-1.3.0.ebuild 1409 BLAKE2B c0b782b57eb208b6724b34f70987d75592e0047b011ff9981baa5c6ba7aa2cd432ac79cb1c73bcac9cb2f82431bfa14270e608675bfbd5f2bca40ea789046dc8 SHA512 31e1228184456459f1440c98ec3edf2704ea1ae76650b2c7a69273483cfe4277ac39a70c4da31fac860b19c6408869bfd878208964969954a1540ccf1f7bbacc
+EBUILD bluez-alsa-9999.ebuild 1409 BLAKE2B c0b782b57eb208b6724b34f70987d75592e0047b011ff9981baa5c6ba7aa2cd432ac79cb1c73bcac9cb2f82431bfa14270e608675bfbd5f2bca40ea789046dc8 SHA512 31e1228184456459f1440c98ec3edf2704ea1ae76650b2c7a69273483cfe4277ac39a70c4da31fac860b19c6408869bfd878208964969954a1540ccf1f7bbacc
 MISC metadata.xml 429 BLAKE2B 63f3e964e9b2aeed132b919848f9250cc5241c1a5c72b8deb6c4034313e38e92d0b54abdd08553046ef0b7b3862bb23e5eec9ce6845e991f6dd20a61e46ba74d SHA512 3d78a456405cffae4f5995197ca02dfeaf447d3ec417ddb00494cb07defc294329254c227aec5d24ed6c144a97606547b8fca184653e3882ec0c229f19621a8c
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild
deleted file mode 100644
index f89afab59996..000000000000
--- a/media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Bluetooth Audio ALSA Backend"
-HOMEPAGE="https://github.com/Arkq/bluez-alsa"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
-else
-	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.16[dbus]
-	>=media-libs/alsa-lib-1.0
-	>=media-libs/sbc-1.2
-	>=net-wireless/bluez-5"
-DEPEND="${RDEPEND}
-	net-libs/ortp
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
-	newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
-}
-
-pkg_postinst() {
-	elog "Users can use this service when they are members of the \"audio\" group."
-}
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.3.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.3.0.ebuild
new file mode 100644
index 000000000000..6c59d2ee4e2f
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-1.3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Bluetooth Audio ALSA Backend"
+HOMEPAGE="https://github.com/Arkq/bluez-alsa"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
+else
+	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="aac debug hcitop static-libs"
+
+RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
+	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
+	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
+	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	aac? ( >=media-libs/fdk-aac-0.1.1[${MULTILIB_USEDEP}] )
+	hcitop? (
+		dev-libs/libbsd
+		sys-libs/ncurses:0=
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-rfcomm
+		$(use_enable aac)
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable hcitop)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+
+	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
+}
+
+pkg_postinst() {
+	elog "Users can use this service when they are members of the \"audio\" group."
+}
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 186e2b9681cb..6c59d2ee4e2f 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -17,12 +17,12 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop"
+IUSE="aac debug hcitop static-libs"
 
-RDEPEND=">=dev-libs/glib-2.16[dbus,${MULTILIB_USEDEP}]
+RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
-	>=net-wireless/bluez-5[${MULTILIB_USEDEP}]
+	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
 	aac? ( >=media-libs/fdk-aac-0.1.1[${MULTILIB_USEDEP}] )
 	hcitop? (
 		dev-libs/libbsd
@@ -38,8 +38,10 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
+		--enable-rfcomm
 		$(use_enable aac)
 		$(use_enable debug)
+		$(use_enable static-libs static)
 		$(multilib_native_use_enable hcitop)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/media-sound/fluid-soundfont/Manifest b/media-sound/fluid-soundfont/Manifest
index 6c53633ffe67..f6750ca9f276 100644
--- a/media-sound/fluid-soundfont/Manifest
+++ b/media-sound/fluid-soundfont/Manifest
@@ -1,4 +1,4 @@
 DIST fluid-soundfont_3.1.tar.gz 134835922 BLAKE2B e280d64e977b290e7b6512b6781631c7e3dd08aa37a8c934243b4569b3b59810640153b03405d5845c76b7c4701ffe9d528a81d8101d9668af0c95df8c0a180e SHA512 014394752ac50d3162c87903d9dd6b38d199ddfab10e2dea3b2a96d02ddcb876a792cc20bc0e83be5ac15eb0c7e261612eedcd792a3f0ff85a7d032a7dd24f29
 DIST timidity.cfg.bz2 10667 BLAKE2B cdcbf9eed076c6ed210f90f7c592a830e53c6d253eb2b13c3aba00b6040aed946af59981707e3e55a0757fb76b30b5ba0676b9cffdc433c58975b38702cd98b2 SHA512 def3ba456c040a010e7e5d22eed1e1674f8b50853c5771085a16eced47e9a8e429b34564218df6a4a16f697eda69365afe51a0d158b0672a66fdf1b0284c50f5
 EBUILD fluid-soundfont-3.1.ebuild 670 BLAKE2B fd83d341c90a40ae223d9d165328130e7618919b7afe6b4de95ff586047c8db034bc96658b8e00da14665621a591ace35871c870f4ad58a509ab9fff9ed49cf7 SHA512 b15c11a6f51d3890af3d373c9ca445bd5d5224bffe9769329798328b94c3867632c138625115864f6690199b9af2c995778d0d3b8f7dbf239b21d68301b3b648
-MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-sound/fluid-soundfont/metadata.xml b/media-sound/fluid-soundfont/metadata.xml
index 2028cee3c389..6f49eba8f496 100644
--- a/media-sound/fluid-soundfont/metadata.xml
+++ b/media-sound/fluid-soundfont/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index ab0669ea6600..e090499ffefe 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,13 +1,9 @@
 DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231fc16bf6a387497ad6db8e0ba2226ebe05d77135e7ec55911af0d3cd6cb7608da1452083335f9f8f46cbc182 SHA512 e7690cfe375de525f7dde7cc4d64ac9577f702a58bbd2cc1aa318dba58b208a8affe9e8e07078d6a16ba1340b0bd17edce1c8cf750631c8d677a3bd2679bb361
-DIST grip-3.5.2.tar.gz 952153 BLAKE2B e82ccb50636e68ab9862d2004a4dbe59399372b76a835b33350e539a186fed516e7b4961fe930b3beb5168554324a5bebeee5ef03d1cb7731d7f9d7c1fd1feb9 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
-DIST grip-3.6.3.tar.gz 960255 BLAKE2B 9aad33c04e98f60e5f7871e36f2e4bf616a16486482e7363d165ae7d9fc5343a52583e490b9b9757d31b051e6e96165d35931370e2681d727db7abb0854db2d5 SHA512 f94c5dc24a1355a024833992d05a7c05d84367a004607c9d6c7aa6d4bc24dd93b11e0a061689eb521a8abe637472011a1a4c8e968c48ac8447457cffc4d2957d
 DIST grip-3.7.1.tar.gz 961428 BLAKE2B 0c31b549577a1bbde17936e8e243d6fa573c6ac0c6035ea303c983c6ac26a0f7ddef193cea74a4148655f2305db97b3e74476bfe763fcbe77c656e012b4fe07a SHA512 812c6d0715e18da78b8657722697cf7b39b345f2d94c5a3002c6a512ff0482d4e96b58910e0c2fd459ac707a24754c6c491e66eac7692c49ec69bb869079202c
-DIST grip-3.8.0.tar.gz 961876 BLAKE2B 72f2bc01868b25f3722ba32b357c728935fef39f82b1c546c7930dc736c6a6c763b00864f41cd5d334bd5209098e5067b036f2c24731128cb7d75ae26074c6dd SHA512 f7b727e5061711ed213638fc281eb399543a7bf0a89c7ad0ab48cdabdb93a8ce3f898bcee6bd0ddb99a04c1c39985935c173f1d908625045d7bbcef514dc93ba
 DIST grip-3.8.1.tar.gz 960857 BLAKE2B 0d1323961eeb9593fb4644a31369852f8d40582b7ba00af3b2255f443a354cca74f5d60c80b135d09bc514d8302807191e6c8f38bf080d5a6237859ccfc90178 SHA512 9e1ebdf6de523c4b818f2b35f976ea0ceb83f7769e3355a7a5af8ea831c34be21ad0dd2106c3ddb8f61d31fe3f32e745ab806fd6aa125a06beda3d2bf381428e
+DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
 EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
-EBUILD grip-3.5.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
-EBUILD grip-3.6.3.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 EBUILD grip-3.7.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
-EBUILD grip-3.8.0.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 EBUILD grip-3.8.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
+EBUILD grip-3.9.0.ebuild 1207 BLAKE2B 43ee61c3ba2b6b3264b7e90dce3f8337a29f9373f562cfbdfc9b6f8b4a4c880ab2a663fd2ce540ba511ec145a462c1b2c9daabc76012df933c7aa06f9bf7dd44 SHA512 0a16293d757f35e724a42dcf4ed304fb6386f8be53e4a6fa7758f14677eeeea0af427d95ed330b57f0affa8e00fe2997948ee04255d3d7b1951c1bf3cccd2990
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.5.2.ebuild b/media-sound/grip/grip-3.5.2.ebuild
deleted file mode 100644
index 5f7555472651..000000000000
--- a/media-sound/grip/grip-3.5.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=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
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf
-}
diff --git a/media-sound/grip/grip-3.8.0.ebuild b/media-sound/grip/grip-3.8.0.ebuild
deleted file mode 100644
index b664cc4ecb4e..000000000000
--- a/media-sound/grip/grip-3.8.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=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
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf
-}
diff --git a/media-sound/grip/grip-3.6.3.ebuild b/media-sound/grip/grip-3.9.0.ebuild
index b664cc4ecb4e..58adf1f69220 100644
--- a/media-sound/grip/grip-3.6.3.ebuild
+++ b/media-sound/grip/grip-3.9.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs libtool
+EAPI=7
+inherit flag-o-matic toolchain-funcs libtool
 
 DESCRIPTION="GTK+ based Audio CD Player/Ripper"
 HOMEPAGE="https://sourceforge.net/projects/grip/"
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 594b43858003..1d669bae1f88 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -6,5 +6,5 @@ DIST jack-audio-connection-kit-0.124.1.tar.gz 1113456 BLAKE2B 2f845de92e19f164ec
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
 EBUILD jack-audio-connection-kit-0.121.3-r1.ebuild 2301 BLAKE2B 365da2382795f4c6378159e803f67dbbc3e54fa6b5a1723ffd4aaeb2999943783fcd72048f7cf3f5dde0058c69494e43c2f1ead08e2c56dce6b535e8dcd98a34 SHA512 32ad14f0be41c45f096a5dd35c05107c1ff854df1e1e6a2803b4c3cf98f8cd156a0d3aec2d092d6786749e5820edd143463d331dca752c48479d282c2ac65672
 EBUILD jack-audio-connection-kit-0.124.1-r1.ebuild 2104 BLAKE2B 4364186d40279df43927e9ef57ac6ba16de4943444dcbf4e39fc7cb7716232a37d43e28a57765df7ed0ec80106ceebb661f2bf9be7c9dfc241656e6d4061ebd6 SHA512 1b0769d43bc619f0dc41ea307519b7118adfa265af506b3e8a6b11b0bce4fb89ef0d8fe0f69cd1de888097b17c474836b1b95f1e412bf82a99e0592b3ec7fddc
-EBUILD jack-audio-connection-kit-0.125.0.ebuild 2068 BLAKE2B 0aa61f5073c7204000516326d90bba5d7ded266f9ce1003f9f5d506b1255658abbc981db704b057ef0cc87759fc598f2df86068e246c44597f39cccd41a38a2d SHA512 1acb91df14fb47f4b12691b54f430c2e9480f104cb257e05527171c5b1f2384b579f1011bf41416d29c4cda4ac5d735705f979f5e9dcc5acd7ee7f2479401339
+EBUILD jack-audio-connection-kit-0.125.0.ebuild 2067 BLAKE2B 3ea8e40e42611a090de13badcf5bc93177d1ca8ba120e435aaf60f80609f6fecd7a94b52104ede3586855f24d4ff6de106a42c61373b4aaa93a39418cb25baf6 SHA512 9b99ffd4f5c261d3ad665707dc9dfd653be397137d40756057ee175032881591c0b7be1737ffd72d6d9777e2d534e3696c7e8a3dadb6c0dcf280ec04a86637fd
 MISC metadata.xml 514 BLAKE2B 920e43b1a4ee5e4040d05a3dd62f677943ea7166a013e82d06f255d9a0d79d99af927bc5428517232dd7d21392f74b15c40c2d2e781d720abe1c153bc85ccadf SHA512 1fc2dd1efb39c6c002c5ad647a4f5134c841138546f66300db8ce93c979522ee29c4e74cea86e6bba4fe8d5414dfd5a25cb1d98803511450cbd22933ce474c1d
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
index 9364bb28b186..36182a295ed1 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd"
 IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index dac0d1407067..f4f029627fe9 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,4 +6,4 @@ DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf
 DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af
 EBUILD mpd-0.20.10.ebuild 7246 BLAKE2B beb040eb0eca988c33fa5aef07022c3eeeda6afbc50d86ba8ee0f4d96137935ebf5abb3e094130de5cd83dec109527e06c3b95d2178f856a214896615debba48 SHA512 53d08548f75b6be0530c0ff6f0e4210e99020ff79f36515b1abbf4bf7c3db5e64bdf0c3a5396c5c89d07e37f23c28dc81d7e4a75bfeb17970e53d0892e84fe44
 EBUILD mpd-0.20.12-r2.ebuild 7315 BLAKE2B f70d4a926544b8f424226bc3dc1e49af3473682a790a0cb5ea0ed12d1e052d69b31f984b1cf241851c8eea935f06984fa7cfa1dd48c21895849317d2c8c97c15 SHA512 a19375a8cf82b488fe3b1caf48212a33cd8096572b74c14793c63883df944dd39e3ee7ca0dfc67f31c916d892f0359372b88a46bcc95ce3d60c7acf63bd7b5b3
-MISC metadata.xml 2520 BLAKE2B c57a9938881c2924301e84f48820e592988f63a048f23a371f6edc1270cd3a017d1243fcc6ef8503d1a8e0318ce381e4f85ece6127092fdace4a56abc2287556 SHA512 74ed642b0e56483757dcddb3c7f6242952a4438ff88542ac9eed13ac2cbfbd7dc618835ffda7cd300d2cad71a065d52ebbc9dfe315bdb016271b17689ec6f63a
+MISC metadata.xml 2403 BLAKE2B d061cff6d63c179f9dd58b22a6fe6e5eb14c6163440ad9aa3bc9a30adf1ec3bb612030c3d3e739d9c2f92983441683b69cec61285a38254aa5c038df14cdc500 SHA512 97ce4e8fe377823325847e1ab013338d4394863a92d4728dbbf016ca8b4a0b0416e5803380bdcc7f834245565596bcdd2169c5d3e0db1cef8b4a1b9943a2d3a1
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 36bec8baf569..006975e46128 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-  </maintainer>
   <maintainer type="project">
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index 693662f1a495..0654a6f2c2fb 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,5 +1,8 @@
+AUX playerctl-0.6.1-doc-typesfile-path-fix.patch 1127 BLAKE2B d41f347717cbd49fb9ba1792fc33f9777e7a43ddc88a5678dc94666cf4b14a03467b270cd333329c41535f72cd3d075210e8bcca84ff9d6b41791e111eb198fc SHA512 24694c8172e59b2eb76f72e4bb1ce8809ab9ce0b335875750e189ba0047d7282e824f993495feea5680a53afc668cf313a50c1f00ff878512e52260c534248d5
 DIST playerctl-0.5.0.tar.gz 17015 BLAKE2B 5da1d0fd4e442ac5f124bd693ae14222624c5239c9fad72e57d43977467339522344bc8d8c37b0f2bfda51c61861dc33d7e35e4a730ce59a87b691b5657ec729 SHA512 307cad5eeea7efa0c97c885660f49468f442fe907ef2495b56ac512e0551c7248750897b6d00934cbfcfcb35f486a101a238b276ef71d2ef866132ca3cc0932c
 DIST playerctl-0.6.0.tar.gz 22124 BLAKE2B 6bb90586c56e21a00b5e6e1769248b9782a8211b01dacf590857fe4fe199d6d3fa7aa46a36cba9a8e198a1aad0bf17973fc15140db11c484edfb0275971d3d08 SHA512 8023b5704ca2a428510df6228850b616061289764cc3c4190c0c46f79d6a20e499495f2d773bd821357653ba63bca40eac70f7cc3a11251da3c6a4f7781db739
+DIST playerctl-0.6.1.tar.gz 22921 BLAKE2B d2f5874280e1a99b318bc83c40a38ee31d9c68426cb63e1e16e8ded26bac1a894d78a929f46d45d631af70e37476a4151c520eb69c94e80026689a12c682f0ad SHA512 07c302eb06a96bf3b8aa180e68e85ef6f9fdb5933b80fbce8ee5f9a36c1d961eaf5638e319ff0b26475984acc57a447a4aa8e705667f77e4bd393364cdbfb284
 EBUILD playerctl-0.5.0.ebuild 909 BLAKE2B 4b4149e81209610d4de900f59860270d9bee8d97821350f5a9dd921869c6987b0952d93e958f662ded41a08ba58709dfb9af5b4c71e9b5ce209cbbde8c1135b7 SHA512 81bd0b13240357151302d2ba9bc28631e634b25437a19112b3b10e0d1939141c9acb0cf26f62d795bfff8f0d0d70c0a74149aeafa0185a2cae6a67ee8c8db666
 EBUILD playerctl-0.6.0.ebuild 919 BLAKE2B 9023af5a6c9fe937c5096e12720b676c434e45c21238326d957dd50f33d4a44ed20abd2f541386ae471ce6835efdfad1f406fcb220ae6833cc94544aeec2445f SHA512 898d55b119f86d63a9b46dab9b10f53017caa728ba484c7ab814b58f936ae4a25d168b407d86e560099b478b4dfa10fcef01ea5c9c4ecb1d8367cc833cc26e28
+EBUILD playerctl-0.6.1.ebuild 973 BLAKE2B a6f3a4432d1b42984a3426977b05f4e94b303afc755a061f121196e882704cf440c8606b9829099ff91d3e01653ecf75e2beee121b9d0683c6e3c4c0c1b8032c SHA512 0c57ffda7cedd332b10cc566967f35c9a89b0cf732025fe9b4febedb89801332b7a357fb281520dfeee668ae1cea95b1d9c26e9a5cde6fdf0536bdbe9f355d5e
 MISC metadata.xml 487 BLAKE2B 26a06ce93634d362dee7b3a595d5257ef946c27a17c181f758fa3c0acd33aeb45c825643311da3739791f80402e38b8fd618ea43655ec60689978cf2e0f2f30f SHA512 f97cd3597a70b86c784f11ffcc5c7c8fb5c16a124cb871907f8e3f216b7ff26d7e2954a52f52a5640fc8a8f41300a4419c527c57f410350a322ed36b1fa2e77f
diff --git a/media-sound/playerctl/files/playerctl-0.6.1-doc-typesfile-path-fix.patch b/media-sound/playerctl/files/playerctl-0.6.1-doc-typesfile-path-fix.patch
new file mode 100644
index 000000000000..75ba5b61f9f1
--- /dev/null
+++ b/media-sound/playerctl/files/playerctl-0.6.1-doc-typesfile-path-fix.patch
@@ -0,0 +1,28 @@
+From f5fefa32f1ac59d2a9c00221281fe3541845d6d2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Mon, 16 Jul 2018 18:21:21 -0400
+Subject: [PATCH] doc: look for gobject_typesfile in build dir
+
+Looking for playerctl.types file in the source directory is a mistake
+because it's generated during build and placed in build dir. Look for
+the types file in build dir instead.
+---
+ doc/reference/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/reference/meson.build b/doc/reference/meson.build
+index 100d561..b5a16a7 100644
+--- a/doc/reference/meson.build
++++ b/doc/reference/meson.build
+@@ -19,7 +19,7 @@ gnome.gtkdoc(
+     '--name-space=meson.project_name()',
+   ],
+   scan_args: '--deprecated-guards="PLAYERCTL_DISABLE_DEPRECATED"',
+-  gobject_typesfile: meson.project_name() + '.types',
++  gobject_typesfile: join_paths(meson.current_build_dir(), meson.project_name() + '.types'),
+   fixxref_args: [
+     '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+     '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+-- 
+2.17.0
+
diff --git a/media-sound/playerctl/playerctl-0.6.1.ebuild b/media-sound/playerctl/playerctl-0.6.1.ebuild
new file mode 100644
index 000000000000..262d4ae14ff6
--- /dev/null
+++ b/media-sound/playerctl/playerctl-0.6.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson xdg-utils
+
+DESCRIPTION="A CLI utility to control media players over MPRIS"
+HOMEPAGE="https://github.com/acrisci/playerctl"
+SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc introspection"
+
+RDEPEND="
+	dev-libs/glib:2
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+# Override the meson dependency in MESON_DEPEND of meson.eclass
+# The eclass depends on '>=dev-util/meson-0.40.0' as of writing this
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/meson-0.46.0
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.1-doc-typesfile-path-fix.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc gtk-doc)
+		$(meson_use introspection)
+	)
+
+	xdg_environment_reset # 596166
+	meson_src_configure
+}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index f3c3868dd090..acf892169206 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -14,4 +14,4 @@ EBUILD pulseaudio-11.1.ebuild 10850 BLAKE2B 7c4423b125ba27e84d4af9b0ae99d31c5672
 EBUILD pulseaudio-11.99.1-r1.ebuild 10990 BLAKE2B fbf57d791769744ef97fd49390bcb9d30a5a02450650f8b81a3b27575fc1188e7da5797939b01a6c308ba61a4b448377c5a5602ec0e7e585de98ece239b9da6e SHA512 a290149a12739dd09707d18f192f45532e36ab9473a211de4c3da0d37abe142ba710813ceb9019116953e96a451d8f4b7a9636710ea84000b584543073c8846f
 EBUILD pulseaudio-12.0-r1.ebuild 10661 BLAKE2B d411bcf361f9affe99c93f954b122bafc843b327e7e2668b3a01a18b0def83615aeced03d21aadae9fd993535ee44802ae3aed4b8b6a689627c2eaeaf3b575c1 SHA512 fbe96ce05c0b7aff771481d93d7d5567c08c7edfcfbc920e056dbd18cff7c488f86cfe9d5966e8eb71f0919e7af32194bc92f0c0a8997104e23c0385752a794b
 EBUILD pulseaudio-12.0-r2.ebuild 10725 BLAKE2B 1f3c236fd549f603530bafc9bdc6371e20790491636bb80c4d1994ed18d7a52ee3032ea372c9e65edaa49b9ed60159616b9b2f2df540971b8d5f70c28949c21a SHA512 8f53f1f9818040641656efcb0c2a56b0abd7fc8483816b8b2baae9a2bace7ebe71e91e4a6ff7950d0135a90eab1fca19179d7c07a2d3740d5eeec65105559e44
-MISC metadata.xml 3707 BLAKE2B b0bcecdb34c6dc73a944568ce1641a85403ecef5993d097436fe5d89bbaa5fbb01a3c59106774e338046e3af47a7252b02736f90f68bc8c03a37ace7693f7ce7 SHA512 5f9ba1dccb2aa9f46f3bb5a9951147e5cabe5aac82ad442d8ca4b1223bea7e3f51c1e1ef6b55c05e0639612c431c7428597b4c5046af0e719443dcf0f5bc68b0
+MISC metadata.xml 3536 BLAKE2B c0b86b7db7099c5bdbec7f3fade2c058e35684aac8b090d66f579883f37c3f35377de1b2351b49d81119a5a8186874725321e3b0562922edfc306da3286ee118 SHA512 cfe2c11ed40617e80d3d83b8d96a76dcc64921d0facf4d3b6b97f81aaf41fa731862e385140d8167e05d1f6a8a032b48f59d240c8836742cefd69541c9c583de
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index fd92c03f2b56..3ae38b43ad4f 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -5,10 +5,6 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
   <use>
     <flag name="X">
       Build the X11 publish module to export PulseAudio information
@@ -53,7 +49,7 @@
     </flag>
     <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
     <flag name="doc">Build the doxygen-described API documentation.</flag>
-    <flag name="realtime" restrict="&gt;=media-sound/pulseaudio-0.9.21.2-r1">
+    <flag name="realtime">
       Makes PulseAudio use RealtimeKit (<pkg>sys-auth/rtkit</pkg>) to get
       real-time priority while running.
     </flag>
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 29ed3acbe5ec..ed7932095e57 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,10 +1,10 @@
 DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
 DIST pulseeffects-4.1.3.tar.gz 721527 BLAKE2B 616e341375aa71a209e8d5e3043b3013da037609ddbec595eec1f655c9a725e17f1c9359535aa4c6bf441af2e7943bef435340ecccbbd92c5022230697609a40 SHA512 416111e77a09adad9af501d4ef24482969277ac52da5d1df730995ab650e6eca46b96ec6277bada8ee8ed5bb14a09592e566d419ea19f6a87840cecdf1a79bdd
-DIST pulseeffects-4.1.6.tar.gz 750083 BLAKE2B 36d0b61a578b40fc6a14ed56ca66260f1ddaba5bd8c3b2c7f234d081716c2f8437a4b8410a0f4a3db935ab4780a763cd2a0d58d793865f5306e6db13c144afbb SHA512 6bca6d6ef393f4844840e975d86f835c44b36ca339ab3817d051663cd6a14531aabbc5ed98c39e85fbd4440522c9ba48b53e451d955434d508b8aa175caf46d7
+DIST pulseeffects-4.1.9.tar.gz 852833 BLAKE2B f315c56e42ea8e4fad04bd4872f09841d86b874d973aae31d5b34feaa8d036f49f91ffbfe1292f47c7037a4e55c86ea13034998fc14a724d1f9fc440c2fc7724 SHA512 48539f3ec1f827e67a552663f54ce2ec364de9e898b6b485dd195e13719f17124a88ac1e7aef79af0f09f14485bc7b3133739abbcd4cf3a403d4b5d435f219f7
 EBUILD pulseeffects-3.1.6.ebuild 1474 BLAKE2B c37c8cc5b72e9ea384d7e34fe107a9d8a22fbf45309328dd49f99cca01cf85629497399fa388eb94b1a31dceb1dcd5ab5544abf73eddba81edecb1ba749e5a87 SHA512 34755ef7a7b27df191a9044e34f68bef3807a50b5e691adcaba156014244c8f89bed6583fb1684f586e45058eb6ffca0aa1f0af26266884ee32920131b8379de
 EBUILD pulseeffects-3.2.3.ebuild 1492 BLAKE2B 959ccbff4ddd3376895dd833d7a36ba81b8b2d46381a7cc14aa73ab2701d01910fcc340fffe0058099f31e80332670182671c3c737d0b41746af5a386b2e6182 SHA512 281ff12ecc62b6c75db6ffaa290517ab24c8110db4333c54221d87f2283feab60a5ff2e0e02ead2193bafcb7d4a8c6b990e67cd1925e9afa5ee16aa5b49decd2
 EBUILD pulseeffects-4.1.3.ebuild 1417 BLAKE2B 889d988ed05c491f366e78aaa88a8455d431ed47490edba05575ae705fb7dce2d796baea85f1a48d3eef9b2b80fd1476a6a45754a895ab1f6a29af490969bd71 SHA512 73375cff820247f19cda0ab51eba32fab8629721ceb34f73fe1050c5b6a2346eb54f9a05244550e8742958fb5590e5af1b5e1fbdd45be1644de42ce83f4b2343
-EBUILD pulseeffects-4.1.6.ebuild 1515 BLAKE2B a01b7e30bb2dc724e62c8360a8eff01c71ac1ab0d378d481da8bb8499375e690921bebe57c3c8b8d184b7d965ddd73a11990d5ba91c688c23cca12fe66119655 SHA512 2242d7cc3f57c135d6c0f5babdc3a65051009d7dcdb66715d84381d36523adaecc192bdd6b93f2e5edc204611d1d27c336e6bdd4d2fc1c9518374fe7f872ec62
+EBUILD pulseeffects-4.1.9.ebuild 1515 BLAKE2B a01b7e30bb2dc724e62c8360a8eff01c71ac1ab0d378d481da8bb8499375e690921bebe57c3c8b8d184b7d965ddd73a11990d5ba91c688c23cca12fe66119655 SHA512 2242d7cc3f57c135d6c0f5babdc3a65051009d7dcdb66715d84381d36523adaecc192bdd6b93f2e5edc204611d1d27c336e6bdd4d2fc1c9518374fe7f872ec62
 EBUILD pulseeffects-9999.ebuild 1515 BLAKE2B a01b7e30bb2dc724e62c8360a8eff01c71ac1ab0d378d481da8bb8499375e690921bebe57c3c8b8d184b7d965ddd73a11990d5ba91c688c23cca12fe66119655 SHA512 2242d7cc3f57c135d6c0f5babdc3a65051009d7dcdb66715d84381d36523adaecc192bdd6b93f2e5edc204611d1d27c336e6bdd4d2fc1c9518374fe7f872ec62
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.1.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.1.9.ebuild
index fde99f8f82b8..fde99f8f82b8 100644
--- a/media-sound/pulseeffects/pulseeffects-4.1.6.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.1.9.ebuild
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 648355ab8e12..6b463bb45816 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -7,4 +7,4 @@ EBUILD qmmp-1.1.7-r1.ebuild 3858 BLAKE2B 544e062718ea06fb28e0920ef7d4c1ee1fa8ad8
 EBUILD qmmp-1.2.1.ebuild 4174 BLAKE2B f89ba88df7ddcca820028778416ece543951481e82bd6136a45e95349f934e2a3683e2c5dc5248c606c51e44d2eae4c1ef5686e8eec8a93ba1b2fd2ea958a538 SHA512 b33fbca7a5e380f08adcb182caf3772b30e3bdb092e88684e16b8298646b89fae14cb9ebbaf3f1292c2e44689863515d4f87bc944ff5e1f37ff1abd314a8bb49
 EBUILD qmmp-1.2.2.ebuild 4174 BLAKE2B f89ba88df7ddcca820028778416ece543951481e82bd6136a45e95349f934e2a3683e2c5dc5248c606c51e44d2eae4c1ef5686e8eec8a93ba1b2fd2ea958a538 SHA512 b33fbca7a5e380f08adcb182caf3772b30e3bdb092e88684e16b8298646b89fae14cb9ebbaf3f1292c2e44689863515d4f87bc944ff5e1f37ff1abd314a8bb49
 EBUILD qmmp-9999.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
-MISC metadata.xml 1888 BLAKE2B 32fdf16e8d12c830b72d46d887c9573f583c83c69a405ebb32bb9ac6b46f2100fd29b78241e0982df54fac2b2f7f9ee0e53f56d5f06e388f177514a427ad10ad SHA512 8d17a27caa187aca78e9fbbd64a6226a4055232a39f68e8b211ec8d4062343885e2c4efd47a551e157fbb1cb674cefb3be26c645223e68a57e0b75e4b3a40fe0
+MISC metadata.xml 1776 BLAKE2B acbe67572cda04be31f68a07539acc2f1124b789bd1986fcd0e17f7688c37d2248236467b9f04c6de04030c4ce59962e78741fad57d9bd993b1a893fcc58ecbc SHA512 92f5f391cadb3f602d950a52ba0c6e3e8b5ec844ed7d6ffd5bc1ac112fcb46f113ac8524676a1d8c482366703966edbd551a4906aba54af54ca0856e20215425
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index 3a54863df655..d6e2ae6cf128 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-		</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 216d797cf101..7351a681b003 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,5 +1,5 @@
 DIST soundconverter-3.0.0-beta1.tar.xz 196916 BLAKE2B 82832a151e030cbd2be129fe7f4dcd92430aadc71b163c3800cc2108f502020561e2c74291cbb25050ed42bd9d71fdfe310f107af84f612711554cf3e32fd07b SHA512 a27a2c7b4156a6d6c682424c5fa64a4dd82537b1dbfa8176fa39fbfc4d139a21b7dd042de80d088333c0aef0042a76940ab8da5d9708b6aac3399b32b7408f09
 DIST soundconverter-3.0.0.tar.xz 201548 BLAKE2B bdca42d22d2e497b807149dcd5c8f911519b71dc7e836ad359831d0b7cd2241f58f8f9f60fa4580e2f038528e9c249dfa8a811d1681d0c8dead2c53e0f58f7ce SHA512 6f5518711c76e7748447805dbf16ac8622c5041c3f3cac2de6f31968aab4eff43a2fde2da48c47d12093ce1732208923d83d57b6a97ea99fbf882dfef239a62d
-EBUILD soundconverter-3.0.0.ebuild 1801 BLAKE2B 91a1ca75bcbe11ff09266cc3a465a954bd8fd44feef3f956e22c59949ccc11ca8da20f8cf5b42a2f7ce9dae36a6bc6dc10eda1c823aa76f37045f355c253a6ae SHA512 7ccf4fdc7bc1864cd9b29c8d6e019f7c1884bcebcf7e4fd087fe43249e236671df05accbf1ca8e2af7cd71553915e49d179902cc635b9d03aafd747abb245c01
+EBUILD soundconverter-3.0.0.ebuild 1800 BLAKE2B ef9ab547b5c2a8f9cd930e217240394d26e10bc6adc09ded60fe2fc81102186938f264f952d922272043eab7df394fb110afa85823f028a26dd6367eb5af96ef SHA512 38f4c6321cd78a9db113a0a60198e6a98561095f82b9f5d20d11451058fa11af9c4a0131914c07ef0ffa66823428df7e8be192c6a2daf24969e75a96b80ec0da
 EBUILD soundconverter-3.0.0_beta1.ebuild 1723 BLAKE2B f23e65f31ea2707e8bced4de1a19813c5d0b140aa5e38c8d6b0dfa46a2a92a771b3d590e0479e88d2239eb6b95f126068e959fd8f1821a258682db02bb9d3e9c SHA512 703175800399bb19fed41bee82a0e839a10f0c1d36f9da5c7854d8d030788f246ffb449765e20651e42fa050e966e1e45c1ca01cbdd0f4002e6434f8777dbc16
 MISC metadata.xml 422 BLAKE2B c38fb6712043983aeaccb925b572fe26156e10776ff00ff454fd215ddedb0751d3c5f5a973725da4e765907f3c9d0ffe6f4062650a7afa2e092cd9b6930219b2 SHA512 5dc640470aea1b45a59fbc757c1fc57a287a733c7e924cecec2dfda988caf313aa9863e86bc4a538565d9e574207654e62ec2071d03f647d21ef6dff38d15732
diff --git a/media-sound/soundconverter/soundconverter-3.0.0.ebuild b/media-sound/soundconverter/soundconverter-3.0.0.ebuild
index caa319caa263..d9e46c23e72f 100644
--- a/media-sound/soundconverter/soundconverter-3.0.0.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="aac flac libnotify mp3 ogg opus vorbis"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 41d0176c8422..545852782cfb 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -5,6 +5,5 @@ AUX vorbis-tools-1.4.0-docdir.patch 340 BLAKE2B 147fa0212acd6a7df359d3eeb120465c
 AUX vorbis-tools-1.4.0-format-security.patch 367 BLAKE2B ed537460519c4fb7c9743afe660ae1a741d8bb7b2790823936a089c4a8667a41160d6d1b79ec6027f4bf77dbbd8110bc65d2503bcd87c51f4f1e675566ff2dc6 SHA512 319451c4317e2224cb56c791528c8ba4722a142b5c85f63fd606e3a1acadc95904cfab3bee7ad4634fa982f59a92ebeb30d8698d8f697640d6579b6a80eadd93
 AUX vorbis-tools-1.4.0-underlinking.patch 2368 BLAKE2B 8752f76eb1875932d8695d73cbd41c1127c93443436007da94108caac86ad246a8a200ea1429982caeb882c9418dce9e22d104a7122d191338b02740d81cc9fd SHA512 208347b22bc4144f796cc1cbea68dba890e0620db7f3b9005ca20d87069204e0b474f0dfaab0ea248d37e8d9efb685a70f47def41367281464561edfb5192147
 DIST vorbis-tools-1.4.0.tar.gz 1346532 BLAKE2B 37a915c522bc7ec3746d96bef3982f59aa590098425609d8d9a5cd522d15fe7ca5f0cf6cceb8eadf1a14b732f812b56206ec20c04121e20f34b9df0755d8bd18 SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
-EBUILD vorbis-tools-1.4.0-r3.ebuild 1174 BLAKE2B 3369ef56b23523dbb981341bc6e1bc745be8cc405604b9c633a8cc636356075ea2eea4e849718e29428688d877adad0eb8a91e64c4b482a4446fbb9884209f25 SHA512 e0868673ea0b1af427118f502d54bf4b25be9148fcb06e5f47a9fd5415505db2d94f98cff4736ff496119382354a0de8390956c596bdfbd56e172802ad9c2f51
 EBUILD vorbis-tools-1.4.0-r5.ebuild 1209 BLAKE2B 534f416e532934aeb7d3e206a37b858b92ae18042154f1b31e60c67c4dca684b39a2bf8e5bc692d2833cc18e521cc0159bc2b5e978d2c2cd394da27979ed94f2 SHA512 938ea8ca7496a0f2e85b1cedc73f7f9745909bbf919c218468717fe590346469f991397226dff0f58fca6d2b6d885fc7399ec38d4612c3fbfbdf238abf85e536
 MISC metadata.xml 427 BLAKE2B 5a3d7b5384086ba3575fd479f1fb99db4aec140b6438389db4b1857ef41cc963053a57baa3d0a18b90cde721b508bb1985cebd23c20445e93e3362af1eb08aa4 SHA512 fe38791f10b0312286c49042e5c24303418ab755d5300b64b7dc406be5dfda993bbe804eae1124c2484d6a1f2e823895e174a522f8710e4b12129e856674d65c
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild
deleted file mode 100644
index 040a329e40be..000000000000
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="tools for using the Ogg Vorbis sound file format"
-HOMEPAGE="http://www.vorbis.com"
-SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac kate nls +ogg123 speex"
-
-RDEPEND=">=media-libs/libvorbis-1.3.0
-	flac? ( media-libs/flac )
-	kate? ( media-libs/libkate )
-	ogg123? (
-		>=media-libs/libao-1.0.0
-		net-misc/curl
-	)
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS="AUTHORS CHANGES README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	epatch "${FILESDIR}"/${P}-format-security.patch
-	epatch "${FILESDIR}"/${P}-aiff-buffer-overflow.patch
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ogg123) \
-		$(use_with flac) \
-		$(use_with speex) \
-		$(use_with kate)
-}
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index 1275a2091dca..91946e3a554b 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -7,4 +7,4 @@ EBUILD wildmidi-0.2.3.5.ebuild 1108 BLAKE2B f1e1c9d2b7f38959cb423ffafd5ca17c6d97
 EBUILD wildmidi-0.3.6.ebuild 1870 BLAKE2B a024316067bde1b90b6397c9127238198cccda88dd958fe9063257030dd58d00ad1ae5c6a11dc4cec0d4c7134be7df3fd878efe8f043213f84a574f0fd61ae32 SHA512 a15e48e3141a238c4237b7c080234f24b27dbadbc22b26cdb957939a94dd257f0bc21c6f98030881b3d6a477050c2a77b12c57dfe1a1ff6b0be5944be82c2738
 EBUILD wildmidi-0.3.7.ebuild 1843 BLAKE2B e3637544044e1b73f9c597cdc3a759d3c6e206f8523f7703cb465707446543c728b58dae5910c0049a9216e62701a6feae5cc56044fb98d2d53354d43781479d SHA512 d16c4718fdfeaf13ab6893a8617a9cae136ed2e2639b5649f038b65a588ca0f25b6e1ef247a4572e3cc96130a2eb82c4133956adb425c7266c986136b76f8092
 EBUILD wildmidi-0.3.8.ebuild 1870 BLAKE2B 1930d55817f98a070c49732ac393829e9a6fe628bd7e458d67fba4c04be42318186c9be8b6a034a97a4b1e3b93ec66721a4db0da712f2de4b64801c6a9065adb SHA512 85d8692fc01977a7358a11d88ad05bda7ef90bb378d49d17020599eb5e542d36f5d72b68c7b13f6b1d6c6266fa166d894b2813d3328f6027becd2364f3df6a5a
-MISC metadata.xml 458 BLAKE2B 1972901d25dac60409b2de995fadf448b4866dad5b2581b6479a0f649578355dd60f0ee0fda9a2531ef2c4d5e443fb3554917b0204cda66a5a4bf2e1264b17b8 SHA512 f6560b9f1bfb0996f631b9f01ec5d2ef94c5a5cc60026c1c6175ec777b46574e4c7fb7b90a48aa0b63e89a0da3dcbd39a729693783d54f6ea3a8fa9d9b1fe85c
+MISC metadata.xml 375 BLAKE2B a642a1b0da135ba37ab54d3fb876f980c2a24725e121c4f0504d4d3e49c294cdc7ef9a7cc0b69f98cf72c3cb5a001a242c4eb821bf8f66876ca63bcb471775c2 SHA512 195e8dd23afe8b774740dc438e442981fc640c7191fa3319af3a811a51f840c73d025ff5d8c9377377ad246449be40e0dd9d117d9f1f20beb4bf7286fe6aee7d
diff --git a/media-sound/wildmidi/metadata.xml b/media-sound/wildmidi/metadata.xml
index 18425761078b..1943a163e7bd 100644
--- a/media-sound/wildmidi/metadata.xml
+++ b/media-sound/wildmidi/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="player">Install the wildmidi player</flag>
 	</use>