gentoo resync : 02.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
commit: b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree: 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /media-sound
parent: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
52 files changed, 515 insertions, 517 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 3677a3048bbb..7a0dbfd7698e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index c336eb8be78e..968c05b7aeb5 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,6 +1,8 @@
 AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554df5f8f1ac6b545be637c2db6a37096b26c5b80f0b366d4e66f33230431de3b50b1198e2b9fe939e5231321ee1aeb27 SHA512 c06436cab7dbc4eb4bf8595e561402428bd1d45be653fa652841c3378e4b78f246ae5c862addf7bffbcb21d994f11151d464837f20915e91eef31d4f66618213
 DIST abcMIDI-2019.05.08.zip 562151 BLAKE2B 7b7413b329a69c9f8e7cf8eec9ddb2caceb055d2256d01a2e6045008b861b8aac194bb0b2507fb96a21ddcfe228a789be63c1ad322945a7b824ff39908cefcf4 SHA512 3891e10503f319b406b175d18077c353767b1025bae73fed184988427602412ffd5bb8e1ec0513b9ebff4d0debd81535558a8157b150a4e32abad099279d4312
 DIST abcMIDI-2019.06.30.zip 565169 BLAKE2B 1db656cc8f3a1b67802eb5c91a48f45df26c2dd303b58c65b2f6dd2b93a2bad263ff06f68dd56eeb94f72bdcdb00f03a11fe26e288e8ee4ac28a91c6fa513c93 SHA512 a242ab847453a73966266e3787fe51d9e1a7359d0e3aee2e9b294c02eea88b159721298625d3079b584278d84dfe95fec70a55937b02d25a9eb753eb29799b6d
+DIST abcMIDI-2019.07.12.zip 565648 BLAKE2B 446dacce10d6c7aa1eb331f52fc0e82064b66bf394494c03fdade32147e456efc30ec81a82d27d212f8e32047ef1d63ad86b4c783b58c2f19c359cbc7683c0c2 SHA512 5b5948f5bf6e3560a7f3aaf98c79fda5d3b37c9c7738bc0e268adca06a72fdf1542cbd83be762ef140b54c2132be3529510c7661892b6fe8f843f258bf753f41
 EBUILD abcmidi-2019.05.08.ebuild 793 BLAKE2B 64792e08a135c9faca22b5bd3d882670f2e980bf2fc38859ec6b115f21fd501c8f1a25eafa985db4619a3edc32a2c95c78f830b10064b3816c7282528048f097 SHA512 56201e49df5d0be70b6b1b1d62ce9a7203c44a82518b80d8a6ea153a3a79c5598497f7a1a186eaccea6ec1e31f6c237a154c77f5b8a49d0dbfc1cefbb8904924
 EBUILD abcmidi-2019.06.30.ebuild 793 BLAKE2B 64792e08a135c9faca22b5bd3d882670f2e980bf2fc38859ec6b115f21fd501c8f1a25eafa985db4619a3edc32a2c95c78f830b10064b3816c7282528048f097 SHA512 56201e49df5d0be70b6b1b1d62ce9a7203c44a82518b80d8a6ea153a3a79c5598497f7a1a186eaccea6ec1e31f6c237a154c77f5b8a49d0dbfc1cefbb8904924
+EBUILD abcmidi-2019.07.12.ebuild 793 BLAKE2B 64792e08a135c9faca22b5bd3d882670f2e980bf2fc38859ec6b115f21fd501c8f1a25eafa985db4619a3edc32a2c95c78f830b10064b3816c7282528048f097 SHA512 56201e49df5d0be70b6b1b1d62ce9a7203c44a82518b80d8a6ea153a3a79c5598497f7a1a186eaccea6ec1e31f6c237a154c77f5b8a49d0dbfc1cefbb8904924
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2019.07.12.ebuild b/media-sound/abcmidi/abcmidi-2019.07.12.ebuild
new file mode 100644
index 000000000000..ce075821d84d
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2019.07.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+	default
+
+	rm configure Makefile || die
+	sed -i "s:-O2::" configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index d1a5b58c84aa..963b1bb4833d 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -4,5 +4,5 @@ DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75c
 DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 EBUILD alsa-tools-1.1.0.ebuild 3491 BLAKE2B 6c4c591a1025f18d1b8e7e2058fbb227f200ec5c50334ae400a9cff94d5630d05f5298faf91c2c76451b09ef9b90d1e3b1b04aad70871eb79d55a6f66b683f53 SHA512 704b16d093923c138ea05bfbeebd96be74987ea0ea076f40e2260e32765074bbde1bfe08f3b231fc6fb6b7b32a5eb2241c980f9d62294475df8e848e46393284
 EBUILD alsa-tools-1.1.6.ebuild 3551 BLAKE2B f47b5d46525d70fe5f6147be5c1c15a387c13a01248dc23587af8262d73fba73afd546e5dbf9c55a8370d457e5d0c15d75b9c62ea82e9400ad8750fe3a2fbc74 SHA512 adddcc1c52a9facee00e8e9d1db6a197f32f43b3a1ccd3aabda33a46987ba1bbea16cbbd8015fe0875e8661ef305480f0dbf2f633a32aed173d44d57466ecad1
-EBUILD alsa-tools-1.1.7.ebuild 3548 BLAKE2B 35106ec6215558f63133431a436a287a89541e64c26c8ffbd40e2081cc93bc6c44f5f51826276d9eb2c096cd2bdac9ff02f8083b1cd0c066ea1d8e66fbf83422 SHA512 850c2a8d029dbd37e7cf9e3fed04b26ba6c5e471407c46116ddf695d4528487b04bcace57e20e2f1a5e72438f53730b202b81ac5c78a794ca76977175b7d3d68
+EBUILD alsa-tools-1.1.7.ebuild 3553 BLAKE2B ba97574834462eaa72a24e750ee6ae3431ef6e7ecb0368d6a5503dcfa2b061244a8c75a673dbcbe77ef8cd47ce4ee2f6c2b85148e33864665d80867dead6cd4b SHA512 8d359e5818d028d66362681ad6be69eaaaa2fbe4be65d7c78d5a2ab4d16dc32ee24f301e1933534d574ca5db42234c03aa558a82b7511e24483d0f537e8635fb
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
index 876971ee2953..73eb0a6576f2 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ~mips ~ppc ~ppc64 sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/ario/Manifest b/media-sound/ario/Manifest
index 6fc5735abd22..ae9cff76efa0 100644
--- a/media-sound/ario/Manifest
+++ b/media-sound/ario/Manifest
@@ -1,4 +1,6 @@
 AUX ario-1.5.1-single-includes2.patch 16062 BLAKE2B 1cacda4c7fcf04de122d3a0b960605b384239de7fb779b593f9de3dc13d5aa32cbae0018ca60f32ab003cc282f1d3800e08e6d4efd759d77367a0cea19646b90 SHA512 f832498f2445f2f937a1b9636ba6c75fce3a75e706296a315e0c33c3a852140ba829f6972d8cc2ade3fa4a45f21a964eef8134b315fdfe1155cd221e9ee0cbb2
 DIST ario-1.5.1.tar.gz 1135444 BLAKE2B 2d91a7b8ce9c6c6069ec7230e10e7c358a146272474d0dbb298e038a3fb31d524c6ad7a8428af12f580853bbc6ea484ce3ffa6919cd454060d19e9f4cde42200 SHA512 78c3d881d51c3109b73252da0742da2a77bcc24ec21ff2ff02fd3527d62d49a75e412bf092051a9035863d645cba73e6cd2fc674d97629909b931ae9d3ec002b
+DIST ario-1.6.tar.gz 1151747 BLAKE2B 2a9a5d9c9e528f92a198270a4715a225d254a8fd6800004928ef39c4ed792bda2a82eefaa45824d5422598f9fe242b6b621768780655b009043cc3447d8d5643 SHA512 93057da62616e79f6ba6f7204fabac37417fb34c350b53eeea61508f4c65322fabaef7a9fdbe7beb8dcbf92c8f86f0d33caf1ffa0ad76de8050fe72d57408ec0
 EBUILD ario-1.5.1-r1.ebuild 1554 BLAKE2B 124e80d5a4714b1251775ae82ad6b6c19864ddfcd39f29e56644e02a141a1b305a51aecceeeaffd47f668ebc52f9d338d51c26121d6db74576dca5ff9ed8b723 SHA512 6d2a5d70b2974412b2fb9f1d3bc365e8b4eac81fa72da6d192ec2a03969e27a4bc24dd9d2cbadfa6dbf6e2baa4aa8fbb6b543c61abacbc61b627191738e87e31
-MISC metadata.xml 490 BLAKE2B fc146c228205f47ade75b01f2536871a9c67e08badb9fdb9555393d9602db90305a480ac3aff8adcb2ff3cdef56a0274ca844cab49b3accc4a6f6e04a8981764 SHA512 df1656e1674d9aedbf4e6837fd2836e5fc3286e742e014ac6660fd7b5bf30e0709a64899f33e5303d6b4a3754f1cf6e9830ad336a0d36d96c6cdf2ebc91746c6
+EBUILD ario-1.6.ebuild 1205 BLAKE2B 9eebd899e75d6d4086a42e545927249f08877d871256b52ae067c3959d5f621bfc742f7bce689197ce092b388d92cde4f2c75db6aa4adf1de89579b86da9bc39 SHA512 d6326705e40c0a8795f636feb69047608a63784c8a3c0e10ecd036de66078c2f71b1460a58289c15b042f0f79954e1b842e0aed644155d2d0b33d3ca318def37
+MISC metadata.xml 694 BLAKE2B 2e67dc03a24d5593d24d1170d27c406036e82502df12e29b020b0d5932ab09606da3f5f2502c14f453d2415bf4df0d641ee4a634c0ebda2bd45e9e6a0dfef4b9 SHA512 fdf6358cc5ceff526d31e9f1ae43e7b9a5b2d449c4f9bc9011f37675536d99d22edaec439bf5a32dcc66ee24ec4ffcf20206e80afb83235887e500efca18f613
diff --git a/media-sound/ario/ario-1.6.ebuild b/media-sound/ario/ario-1.6.ebuild
new file mode 100644
index 000000000000..a909b0299b6b
--- /dev/null
+++ b/media-sound/ario/ario-1.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="GTK client for MPD inspired by Rhythmbox but much lighter and faster"
+HOMEPAGE="http://ario-player.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}-player/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus debug +idle nls taglib zeroconf"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libxml2:2
+	media-libs/libmpdclient
+	net-misc/curl
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+	taglib? ( media-libs/taglib )
+	zeroconf? ( net-dns/avahi )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS )
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-xmms2
+		--enable-libmpdclient2
+		--enable-search
+		--enable-playlists
+		--disable-deprecations
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable idle mpdidle)
+		$(use_enable nls)
+		$(use_enable taglib)
+		$(use_enable zeroconf avahi)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/ario/metadata.xml b/media-sound/ario/metadata.xml
index 0d5b7ea3ec52..8d7f9eb01e64 100644
--- a/media-sound/ario/metadata.xml
+++ b/media-sound/ario/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>mail@evilscientress.at</email>
+		<name>Jenny Danzmayr</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="idle">Enable experimental support for MPD's idle command to reduce bandwidth and cpu usage, requires MPD 0.14</flag>
 		<flag name="scrobbler">Enable audioscrobbler/last.fm support <pkg>net-libs/libsoup</pkg></flag>
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index 315e9df69f34..913890772670 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1,3 +1,5 @@
 DIST audex-0.95_pre20190112.tar.gz 177973 BLAKE2B 3d0ee2d227c073f4f60fe11745fc2e6f8a9ab63a07991d2fb94257f3c804231b6c7a305afa438a4d44e5733fb5b78be87b7ad516e3adcc8aaeb0e1f09c729e80 SHA512 445b254643802da95ca653c14947e8d304826b24cdc0a222f6b023e6603c3bb8bc940ad44ac09d8d8edd24ab0ed6287ff3def79dad07d6b6a157b2baf230c811
+DIST audex-0.95_pre20190721.tar.gz 179903 BLAKE2B 4260130eba3b1b30e94b0af5535beed6ce73b2a1a46ff91fd808f7d224b363474e02ef6592ac6136361b871cd91a7a4371faad6769f1ab74bd21d1fd2d793876 SHA512 3eec37e3396408c0ce753ed4c315830e542f3ae17fc4000b3c790be22ed74208bc2a956da4248250932e5b7fceac11802d731cf4d65709c207521bcdbaed5957
 EBUILD audex-0.95_pre20190112.ebuild 1145 BLAKE2B e752067cb141345f1c5da5695054607406d2327e99ecee7f6a6ff4048bc18d35967f25fc9c97c1a297086408993d65c8f38f2090bc95a305274e0ce4b6339a90 SHA512 76e8c67c6890e707cc15ae2f90a45fd4e47adda66d816479ce0552861610df1f8fbd46908db0e0121729ca65ab5eb7734536ae97fe21c0effd67bf502db0fc6f
+EBUILD audex-0.95_pre20190721.ebuild 1145 BLAKE2B 4851479de9aa03a36cd51466778a7d70e51a75b1b8d23e4640b4b0e64b5607d98dda2955bfef707d87d0f2d325da09c7d3cae46be2ca548b09a7fb21f1a1ce96 SHA512 d7d6b977e975f4fd155f7d9f12f33b7a034ce2ea6e3fb94022ad2d2054d85b4ac0b24a6fe2529fb14c2ce300cc454adca567ff1cfdc86da82242127d35c8f2c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-sound/audex/audex-0.95_pre20190721.ebuild b/media-sound/audex/audex-0.95_pre20190721.ebuild
new file mode 100644
index 000000000000..877d451e4adc
--- /dev/null
+++ b/media-sound/audex/audex-0.95_pre20190721.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="1389389e7341a749f95b313045f9d0cd809748b4"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Tool for ripping compact discs"
+HOMEPAGE="https://userbase.kde.org/Audex"
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep libkcddb)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-sound/cdparanoia
+"
+RDEPEND="${DEPEND}
+	!media-sound/audex:4
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index b9b2bbfa6762..ae835192abb3 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,6 +1,6 @@
 DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab SHA512 f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
 DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c SHA512 cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
 DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697 SHA512 1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
-EBUILD csound-6.10.0.ebuild 5926 BLAKE2B 21b3a40b66bb0b9f637d8663e7575f0860129c49a20070b8d6f33f5679dc6578d227cef4d9e1fd2932024f2101cc31458dd17ab8518c6a53f390d40cbc3f8013 SHA512 e760c150af0a7c7029ee7c1ed6cc675f2d811e7486797b19ff0f2e0d9e301f11f1ae6c605212c91cea35361c0476454a7102d7c496b04d9a9f256c889404c76c
+EBUILD csound-6.10.0.ebuild 6030 BLAKE2B d75bf31734fb280ec29e92b3cbb99df558a8cb7cabe4d3a3faa3a83d3d0559e337f054711350535ef102d5dd9ccc4f3009dc753f3caf9de4a882a5c706bdcdc8 SHA512 2fce2d37b7584833d84b51c791c8a41a5164bd2bb5f24abb97232a7c1b4ddec7d8f0eb5195241208477285f3b371bf98aa31b95548ebe493bc816200e736db8a
 EBUILD csound-9999.ebuild 5617 BLAKE2B 73254be6aa90bff3722cefaa25fe2b3d6706d554e1cac1e928f2928f951ff0988b0a67c09df02fcbe98f7931cbc64572c7b239aea31b315997c42b8c3c759f17 SHA512 94bcc221fa2f90f27e6497ee087c47e1ef3f44994eb53b4b556731d244558d3b3205e32a67373b22e9b8c7c00742688538240cd84286d994f980ea1fb8d5f9bc
 MISC metadata.xml 1487 BLAKE2B e94fef343f96f5fe68a0fb486b7f8bd9f8af7fb3f585696a4b6d909cc1e87f2da66ab73b24ad1b3c809db472877febb8fbde2c3fc5b2abfab35c3efe9eddf321 SHA512 215f491284f409a299d5c4ef8d9df6f377a4a5e032bce40870fb72c7c6bbcdaa8ea0879a86c3379207e0b69df7f735254936e97ed68ebd2aeecf9498c646037e
diff --git a/media-sound/csound/csound-6.10.0.ebuild b/media-sound/csound/csound-6.10.0.ebuild
index 185ce6f382b4..2c61ca708be8 100644
--- a/media-sound/csound/csound-6.10.0.ebuild
+++ b/media-sound/csound/csound-6.10.0.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 		media-libs/dssi
 		media-libs/ladspa-sdk
 	)
-	fluidsynth? ( media-sound/fluidsynth:= )
+	fluidsynth? ( <media-sound/fluidsynth-2:= )
 	fltk? ( x11-libs/fltk:1[threads?] )
 	image? ( media-libs/libpng:0= )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -111,6 +111,9 @@ pkg_setup() {
 src_prepare() {
 	cmake-utils_src_prepare
 
+	has_version ">=media-sound/fluidsynth-2" &&
+		eapply "${FILESDIR}/${P}-fluidsynth2.patch" # 680062
+
 	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
 		-e '/-O3/d' \
 		-i CMakeLists.txt || die
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 8712dc891ddb..3aca0bb4768c 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,5 +1,3 @@
-DIST dir2ogg-0.11.6.tar.gz 19442 BLAKE2B 4cad096f6e727b90e8b09594b1b189b3dbeae581e5ecd485ac8dc853b3f059cd73529422835d682ac7db96d4225380c48ef101343faecc8f32aa8ce056a6b784 SHA512 c5b82640b21e5c94bf15ae174b1351bab11511fee15c30ba39f8ac64103fd5f6934687eb5c025f68adb3e70701f1b644f61800e2d745e33ecb02005f07b6c6b0
 DIST dir2ogg-0.12.tar.gz 19608 BLAKE2B 39b1210b2458f7774aef64f29b07826a19b274d17a6038fc676557c8b15bed3662f851b87414b9318be154cdadd450001ea45bd8ed6103cffb2ee183511fe617 SHA512 bd76ba168b6e5305e4e5cfd87333200ec72a1d6e7055e966e1544abc842b39743b479b80c63382e10e85eebad92e97ec33e6fe52b0ace2df024ed50468e3946e
-EBUILD dir2ogg-0.11.6.ebuild 872 BLAKE2B 87808d632d07bcb7508af868d3402486314b0fc18b1da430e3548e97d89efbcc8dfd4121aa54686c26a7aadbc1440a35101fdf8a7f3579ae9507890ff848fa7b SHA512 a85412cd58fca620d19da47247d3bba1878bc91a179381b9a252d403aea5cc7d7f3d6e4700aa8c0c71b0a387d27af150b96f2429309f0ce5fef9976bb0d9f5eb
 EBUILD dir2ogg-0.12.ebuild 1167 BLAKE2B 332f8a448d1a8045bfe5a4d4469a2c53bb0256a9798d069071ae32b14f831f5b3acdad7f3e588f256f3be008f6c13bf088ebbd2fe07bc8299effd520d61701e9 SHA512 3a2d66203146187194fca8eef7164c923488c1e11dfdc4f5b02218192c05c2483a00a965873bb88a9ce753e12acf133fcb969d601192fd2421405bdfc63c59d6
 MISC metadata.xml 420 BLAKE2B 96885d28693df18ad564fe6ff658cd66bc39b3d556dcb5079ba531fea3bf603cdd558cd083c82bf76e06c170bf21e880600981dcb114117e55d585664119f1e5 SHA512 3c87da9d9f935209757f3731cb1b80817d28eab005b9ce29cc5113e3ad063e61666d1e00585e709b77f1ba3aca5703f4c9f64100c075062cddf58c2f72edc074
diff --git a/media-sound/dir2ogg/dir2ogg-0.11.6.ebuild b/media-sound/dir2ogg/dir2ogg-0.11.6.ebuild
deleted file mode 100644
index b6a90305c44c..000000000000
--- a/media-sound/dir2ogg/dir2ogg-0.11.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit versionator
-
-MY_PR=$(get_version_component_range 1-2)
-
-DESCRIPTION="Converts mp3, m4a, wma, and wav files to Ogg Vorbis format"
-HOMEPAGE="http://jak-linux.org/projects/dir2ogg/"
-SRC_URI="http://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE="aac cdparanoia mp3 wma"
-
-DEPEND=""
-RDEPEND="dev-lang/python
-	dev-python/pyid3lib
-	media-sound/vorbis-tools
-	>=media-libs/mutagen-1.11
-	aac? ( media-libs/faad2 media-video/mplayer )
-	cdparanoia? ( media-sound/cdparanoia )
-	mp3? ( || ( media-sound/lame
-		media-sound/mpg123
-		media-sound/mpg321
-		media-video/mplayer ) )
-	wma? ( media-video/mplayer )"
-
-src_install() {
-	dobin ${PN} || die "dobin failed."
-	doman ${PN}.1
-	dodoc NEWS README
-}
diff --git a/media-sound/erec/Manifest b/media-sound/erec/Manifest
index 7c1cc6ff69a3..e4d13137acc4 100644
--- a/media-sound/erec/Manifest
+++ b/media-sound/erec/Manifest
@@ -1,4 +1,4 @@
 AUX erec-2.2.0.1-gcc43.patch 340 BLAKE2B d3fc0c0d4bb509e7ce3839b8e83732a12602036502a010d1752139c66da6fcc8993bfcc98d74fb226ee67a0af9d2f73c5da97586a2fa61932c6469310411f5d0 SHA512 12f94249223911709ce46b3c5b1985019232f2d2ea906cfdebc30f6fd9e314e38ec40b734ea235d063f499e651a76fb05bcbfdd3be190b41e03625180b154cb0
 DIST erec-2.2.0.1.tar.bz2 25966 BLAKE2B 22e93e2185fc5eafab93a2558b3dd1261bcd7a96613fcc9b321baba13ca4dfaf024399aa298d36a6df7857ff0dd03c0bb15d3b3c26549b1845dba22061a94f6e SHA512 24832483ebca011294931a40be192fa1f6a0fbf69d2b515529bd6d9cbdb5bbd904f266bd824f816d044ed7ba63bc8cc6886868a0d594a0071e757c3e9ebfef28
-EBUILD erec-2.2.0.1-r1.ebuild 997 BLAKE2B 2841bafd4db18142468530877bd856ae03c3f424d173c2cf59c6742ac34c77c336c00097235da3edd4a49089260be17fa23daabd98ebd3a8c36448867597435a SHA512 7cb541e19f0a58a410a8799fa3087dedb294dcac260325d893f667335837eb8783197f1d02f71fdf48a833bea32622f90b97b610a86d36488cb6b2768b114765
+EBUILD erec-2.2.0.1-r1.ebuild 998 BLAKE2B f260ce3b64e7b15cb49741500340bbc79da4e8bd4e1d79529d8c215be209e496d26e37f756c0220662b34526d8eed366e3532a231b7c3f5c3a019aedc3a2603a SHA512 6a8d6f7f3c8d29adb40c261578090bd14a6ecd8d89ba7edd73918d15103e9d3499e28babe57ae3cf7ef098e652c018afaf0f336fc7643a04d66782b4a846acb0
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/erec/erec-2.2.0.1-r1.ebuild b/media-sound/erec/erec-2.2.0.1-r1.ebuild
index 1159778649aa..764393565e5c 100644
--- a/media-sound/erec/erec-2.2.0.1-r1.ebuild
+++ b/media-sound/erec/erec-2.2.0.1-r1.ebuild
@@ -20,7 +20,7 @@ HTML_DOCS=( README.html )
 
 src_prepare() {
 	sed -i \
-		-e "s:BINDIR=/usr/local/bin:BINDIR=${D}usr/bin:" \
+		-e "s:BINDIR=/usr/local/bin:BINDIR=${D}/usr/bin:" \
 		-e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \
 		-e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \
 		-e "s:\$(CXX):\$(CXX) \$(CXXFLAGS) -I\"${S}\"/argh:g" \
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 483b61727a8a..3eeeab5f5d0b 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,5 @@
 DIST fluidsynth-1.1.11.tar.gz 634566 BLAKE2B ed135533c9e3e807794e0eca8117d430aa299b8772b2b6c85f6233e7e497d69f43381d9c7cf2de5ce8638f5dc616339bd28cecc3cdc23408bf5883a0b14fee79 SHA512 ad7c634426b29e5a05d67addf32d43a9ccb11a1fe3cfc09ad617416b9df3dc99a48191377f5027232521380737dde2d9b59833516d1bffb90f410bab3bbe140c
 DIST fluidsynth-2.0.4.tar.gz 1378042 BLAKE2B 0fc75ea68169c47d64bdf727b8d78e311b36cb04509832f449a52d05e085908bd1ef837dd4c5e23edc25286b8ff3fdf69a9d042520c8eb2a3234fb929bed8de5 SHA512 d58ddc5f4da9bb5954a82749617548ef32edd25f6ca5c6d5c2b06d23090784ec175d2422553a66776f543c6b253f037a6cf1e717a853344ffb899fa53752eec0
-EBUILD fluidsynth-1.1.11.ebuild 2197 BLAKE2B cde965d0f41bdbf48390819e03d8a0021465072a25f81a7942c7148d97678dbd2fc3b1accb3e52e2d19e7945d6ce0bf76a41a07fa817eb27003c006ab9fdbe23 SHA512 d825aab0d67b1e48e83ef4ec9c5c5dd075830f2cace5f5d9271c7e3412595414ae76806d68467ffd0b9699a7a7a71df797ed62ac45afb4cd1956f86c266cbf41
+EBUILD fluidsynth-1.1.11.ebuild 2193 BLAKE2B 4d66cef4db9220271baa5dbf8d1577e80b78fb568490cd52d2ce6bf58b3656a983be6c444a6b798b7563273c54f27a7e4dd937f1e692389fc768edc524a719cb SHA512 4f3925eb3aaf0ecf92f9ffc3435331c3f81588a46632de368d17eee9a4bd37f282772c962956882e46879526e4b79e3b7a38ee9cc0ce9302e32e96e16bf80431
 EBUILD fluidsynth-2.0.4.ebuild 1977 BLAKE2B c99f1ff4f843f464d5539c8886121ff937c95c9f600cb242495525149f466bf4a215643032fefbbe9564f60f351fd7c2d1de60acbbc757ef6005229807555327 SHA512 83ff51c2c8ea1cee7f1e3376e53d2d4007975972ce0c4a831f42ebf44928def1999d8e7e7335cefb9343a99cd566feef49e93dfa2b62bb187497f00461c075ef
 MISC metadata.xml 339 BLAKE2B 4bc7678ba8ccc3e97a79dda9294b31ffc1950212619ace448def22e50852b20e3b716368d9c5b7127aff381aab85d7fa104404fcd409144452855a4b5d41b529 SHA512 abac43fa8ab39fe41adf6c34a4f0e3aa605dbe834555b2eac4abcaadb6556cc08555197aadc43e51733cf8d4e30c7f7be3efb724536d54604069055836a36980
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild b/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
index 54c7ef35b394..038896c834e4 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-1.1.11.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash portaudio pulseaudio readline sndfile"
 
 RDEPEND="
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index d66aaf4b56c3..6f4cea197eb9 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,3 +1,3 @@
 DIST guitarix2-0.38.1.tar.xz 80768608 BLAKE2B fd745955d8b44da72c669e69c36294d4a2131f2b5868e7e254a0b33768852ba9fcf9302f2a7ebd962c8a6dc02a543f70574466c51341a371c9fb988989123e50 SHA512 54d08b4ed20b9df4c69d0c86e4d668c53fffde8919f5570f376cee903926bd01945169d177d0d45976569ea55b28f8dca7884ac6dfe2f063df6583467559c5b7
-EBUILD guitarix-0.38.1-r1.ebuild 1698 BLAKE2B 44e78221b87dc6629f3830dd67f84e9c7b80549e250178c6360e2c9e6833d638080ea1573dee92f0187ffc7128bce2eed0325658b3842bca23f13942eb061047 SHA512 c054c18deadf0b11553337b1761ec42850f5dedebb4efbd3a55eeb9cb809a2e9360050ef91f350af38dd96e8dbf481dd83f16b3979559909403632c276d04ac7
+EBUILD guitarix-0.38.1-r1.ebuild 1714 BLAKE2B d61e321fa0e1083f1a21a278f061f578188e7ac0a9d4486500c210e895cdc563031e1e9cc78a24da7e6aed81adf9fe9f3cf8ffc293fadaf623aba6d70e30c1a5 SHA512 d06d7eb88b3cfe10e1a5de7564a173de61abc3497480880828f028c27342430b596180dc2d5c31051a704d3fde282aa076a9df3f44dd73fcb6a8e9ea44ec8832
 MISC metadata.xml 622 BLAKE2B 390ed1150f373c73c5bbcd5e5193e8465ac348bebae4a5f8484fb214172717d5166c0a17be6afb4e5091c4318cd3a3e30bcc05c70fff78423347298acbc64c61 SHA512 b18db16b6af5381331418267660822972be42997065eed2182c6305ce84bd61fb6d3ee01de195f3f8f01570deed7f97b93ca31916986609a374c1f5962c45dce
diff --git a/media-sound/guitarix/guitarix-0.38.1-r1.ebuild b/media-sound/guitarix/guitarix-0.38.1-r1.ebuild
index ce38767c1e0c..b8e71bf7171b 100644
--- a/media-sound/guitarix/guitarix-0.38.1-r1.ebuild
+++ b/media-sound/guitarix/guitarix-0.38.1-r1.ebuild
@@ -47,6 +47,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 "
 DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	nls? ( dev-util/intltool )
 "
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 8399acda2402..d0a78c2995b6 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,4 +1,4 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
 EBUILD jack-audio-connection-kit-0.125.0.ebuild 2068 BLAKE2B 6e8848a8e5c13564277a30f19892f9f3d5091eca3c6ad6f2e5514a843cbb9fa542715d5266112fcff942dcb55ff8396a6e2ae7b0f4986e18c0b1d83c728524b1 SHA512 48ddb4368b3b954e11a2900352f0d3f4dcf251fa619113c21be65e0bde3e01f649c64ac8f063511435fd4203b6de401e2a9a5c37f0349b99da3ae4e3a00cd486
-MISC metadata.xml 450 BLAKE2B 660a876764f17ce9963bbef4d0092acf7649513ea591c47eaf988ba23f0fea8a1cb2dd1bc3087a4c5175cee4e447725d3b90d22552c0a51ee5c423a88ada30d3 SHA512 13e6a976f07d7d3535ec19b5f7716d21203d08455c2b835f776ff3517749f7f3b3ec97725d6b9cc2375fcd8e51b95a46d1e8f7e17a1acbf2a71c4416c04fd7b0
+MISC metadata.xml 371 BLAKE2B 2fa3a14e38f42ff31b9d3e502fc2762d77ba396dd80af4b4453f4a84ce29e9d6af5da4303c8dea26490b50ff8426a253d64107a605829f8301f9bde45cba4eee SHA512 0b7621340dacce1e798cf7452398200e7d1c6a808ec634d5fb9a6936e4bc6298c0059601074150a26dc92631e5d127c7357f8cf8821afefb121a40219788bb21
diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
index 3eb6b77aaabf..0b8daf306a04 100644
--- a/media-sound/jack-audio-connection-kit/metadata.xml
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
 	<use>
-		<flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
 		<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 4c72036295ea..20e62c27ec2c 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -4,5 +4,5 @@ AUX lash-0.5.4-strcmp.patch 278 BLAKE2B f6381f1c792c39b006e4e25134c07a3fb5f5cc97
 AUX lash-0.5.4-swig_version_comparison.patch 1124 BLAKE2B 12a4f3787c25ca8bd4b87ebe739486dbed52ad3f112c4a9237e4b3c4c76032c2804ea5ae23455b31a2804678af8c85f058f0acc44e1fc40beea400d217520397 SHA512 43e4bf0de6ee9eb5c010a317251ebc903569fe3d1b94f9c5c4c43ba1163088c5fb8df6d861d052184fd93baea61ac5c86f33a618f186cacaa74e27dd12cf0890
 AUX lash-0.5.4-underlinking.patch 457 BLAKE2B 0d21073bafc8ac50aa9b4a117c1268485ad131716b72fc0e2cb73b95ad8c3531c22bc6dacb420a54c68cad2185841911b238556a125395a7bc34b0879bbcb176 SHA512 09519a9b2fb2da9cd716c1460d503bba64265b26025bf987fa7a0eac2edbce5e88a59bccc2d39617c4c3ab62d4dba1e86c400922f5312c1904b1f5746f5a1fb6
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
-EBUILD lash-0.5.4-r3.ebuild 2599 BLAKE2B 33f5253bc5da75fdb9d7627ba2511e3e5dfd5f0f5e8112ba190ea73f6e8672b99513cf36b04a20cda7c2353c13ea356cbe547d234f3b1d6337eeb0be5a5aba66 SHA512 48f86ea78b4a50ae7762b996ac8f0b52e1f2c44a4460a414ffb5cd9099b7713cf6d3460713e59783d41a2db7e5c29f62c97a71345ecb961864cb47f75565139e
+EBUILD lash-0.5.4-r3.ebuild 2595 BLAKE2B e9ad2285ffd1b2df33e5fa56596315efb0b83865a055f0492402e36991dbbd964311c334a999246700661424846f7b94f2c8edb337c2877a289f7153eafb9fc7 SHA512 42fcfe4da0031af7e1800d592fd2b6fd4b48d4cfe8affbf92940b6b6bfed0600d03c357d6eca48485af6c1b3cca8d03433dbb60eab95fe99fa916f7220eb0172
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/lash/lash-0.5.4-r3.ebuild b/media-sound/lash/lash-0.5.4-r3.ebuild
index b3bbce5b501f..3d15cd2a7ed7 100644
--- a/media-sound/lash/lash-0.5.4-r3.ebuild
+++ b/media-sound/lash/lash-0.5.4-r3.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86"
 IUSE="alsa debug gtk python static-libs" # doc
 
 RDEPEND="dev-libs/libxml2
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 1582dfdbdc57..a9ce68ddc5c2 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.0.12.tar.xz 448864 BLAKE2B 65681bc29f8256ad8f9d6dadac7a6d147150a8f779e25c85744a39428176c6887e3a9f90f0af81f432db771806351301712ec2431c3a79bcb230c8c0e6fb055b SHA512 d6ad6fb638ac994c2c0367234c8ab35b79d619b3669c46f27bc1df221e41410f464a0a157faccf0ed1b2b5fbdb9f1ecad10ec7466bdff03231e4724948c8c3a2
-DIST lollypop-1.1.4.2.tar.xz 458120 BLAKE2B 2609e46c2a379bb5f2522291bca3b01e53ffaa8d15636f54eac1f067cd8711adcd38bde27b65f77ecc9ddc8e21ac974debded486d32c64bdc2c52d3d529d2d1d SHA512 8bea35b79ebfa723664558370f946def4d0ec493241f9409d0d00679d38a9d01dfe35438f3f865c08ebbff1d809aba17b92e174261f791c7c778a775dc60945d
+DIST lollypop-1.1.4.7.tar.xz 455536 BLAKE2B 1c8c07fcf4f428f1ff04ff9bbea927b337ac35359e05c7675aeed6f48c0ebe68dc14f1e9bae22a3dafb3122df75f0cbae0bdf6fae0f097add6a1b8669697e624 SHA512 2b0868080ae78a5718f7169bc4c11fe603d030f505644a5aaa342ee50c5a19a567e79094b9abdf8f87e117bb551bcff522e0b0e2bf3cdb9a0cb9319c498b7b16
 EBUILD lollypop-1.0.12.ebuild 1366 BLAKE2B 76d3c0beb3b38f86ce5c68f3f1ffd5fb9bd8becca0ecd60fc45cd288f2b8945f2de0cbb630cc493fb8051ef589b6e7568279fda523448e6804eabdccf0e98023 SHA512 d6a6592473fd8ade16b8a13baa11307fd4ad9eda4889612d535a0b88b566366e8baccf380c7ca97686a46d839df5463756aa14ee5065f4ac75af616c9e5130a1
-EBUILD lollypop-1.1.4.2.ebuild 1367 BLAKE2B 116d9d23a7f3f26f3b6a5e1324103a698c5c69aaccb31f84ff7a6df8fff7395d8ee2e1c9adefc45a770e642c3bfc35b031941fc433d523e8c8adfe9fa6bd72c5 SHA512 563d54270ef3e69ea4a206b3f23381f090cd55860b91964a03274f73369473183adcf5c8114f03cb8674cf1966e2091ece3fda8f37cac29c89d90479c572edb1
+EBUILD lollypop-1.1.4.7.ebuild 1367 BLAKE2B 7e9a894858b3fd35eeb1f4cc67b2a5211f6e46638d1ce213b091ae0ab085dbbccb1d657e907e0e96f676040918dc83f39e145ba4ac1f11c2f135cfec7eb1fc5e SHA512 830eab6931698a1763e828b1c512122607b4b563bc30f1089ae25037048439e65b9bd48e34474fdf0aed10531f72c1a8e994c9da33383c60becbaea9493ad7d0
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.1.4.2.ebuild b/media-sound/lollypop/lollypop-1.1.4.7.ebuild
index 45d87e18b152..498a26092c46 100644
--- a/media-sound/lollypop/lollypop-1.1.4.2.ebuild
+++ b/media-sound/lollypop/lollypop-1.1.4.7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
-HASH="c69b9a5983ae84ea1ba8e2bc61dcbed1"
+HASH="d11925640e7c0337893933b50d144aae"
 inherit python-r1 gnome2-utils meson xdg-utils
 
 DESCRIPTION="Modern music player for GNOME"
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 475c0a9fec55..4449ea2b914f 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -2,5 +2,5 @@ AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392e
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2.ebuild 2148 BLAKE2B 3039de5a7faa6b92c6b9c836a5268896eec61657dc9ce98075f39096df8b3b21494b2bcc1fe7b3178d6870be7505bd8db5aec1b9e08118ded7c315f4dcfec172 SHA512 9680c784f3dcf4a1ceb57c5df5b6c92e27bd3f144ff49d3805fbe8a3afb614b72c40160da15f3a204738a935d6fb84aa16dd329002c59a461e0550c15a80ed5b
-EBUILD moc-2.6_alpha3.ebuild 2304 BLAKE2B 5baf9185736a667d74e7b9dc6157f7768b512fdd1b5a74ce5f1329849a8f8b8c1be0f9dc5463fd04228f8cf0bb730e41c37856a8f204377643c407f58c6912e2 SHA512 22e7457851930461006ea056552b2b80cc574228ebdb43b3a062ee06cd4d003da0c5a2956f886a63d485e00efc6b48e658604774e16ccf22b28224bb4589b0b2
+EBUILD moc-2.6_alpha3.ebuild 2311 BLAKE2B a33ac63830fb03ebeb5fe6938546e9e8ead84bd6ac6861b52fb51e0c53d0d7558ba9535fc6f852cb50f4eaabb411f2cab9d8334419f6cc1dca99490293aebd7e SHA512 b6c43e2a0be7d2eb7357f942070d875962fd4a91057db291e35a8c56df5f9886116484729ded2cf5f7d2b58dfcac266fb37fb17a00d3387232354a040c62c026
 MISC metadata.xml 596 BLAKE2B 4ebc0826f9a0352909b2dfcfcbd7712d0af6b484b5801ee8e0b73be7a5966968af27d5fc4d56893d407e0bbb3809376f8336291901bc36aeb2e43e549e60bc44 SHA512 f2ca529805ed93256100396a8ee414ba1098097eb4a8379144d52fbdf02d98a05c399cb1be861c64eb712bd5160f3286c30e73875dce05ce2e974f7123b40699
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
index 086ee1704824..90a44f09e95d 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
 	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
 
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index 1f9222f45734..061932efac4e 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -1,6 +1,8 @@
 AUX mpc-0.31-nodoc.patch 403 BLAKE2B d829c6f40005531ec7657054549b5fa9acd32d15d41ca8685b4292aac804af52f2f4754b557b69663d4240e6690fe4ab19a15b72459cea321944afacf2a179f3 SHA512 2a028d57fbd76290bc300d0546b52571b6c7c29cf8d2f53cb859b5250c55ae631fe15c8589a1b11c5fef5dacff2ad8535dbfae6c8b2b72dc8a4dc795dfc658b6
 DIST mpc-0.30.tar.xz 41968 BLAKE2B e7d1156f4fe933c360196a1fdaadeb7b51f12b3c6d7bd2f98f80359485acb9d55ea7afb98c82696078b325ab3662bf33b20653d5e0edf0f52c64624c679dd0b6 SHA512 72d6f742de87ca1a9a09c73987786fa7c93b2829242135b210a9a2269e0319ba9e37367dae1043461ea870087faf5c349425025ce6c02aa9dd513ae90cbe8221
 DIST mpc-0.31.tar.xz 43896 BLAKE2B 2b65307983dfd0bc2738b3e4b1379b43b6fec712352f25a6158adefd2065eb3ff8be194e482fc441c74b69feeb8fba277d7061fb80ee6d7d72432f3284f61fb2 SHA512 48df7d85df704ae901ee0a07193daf9738b682b71a24ebd5bf4458aa562acd11b582f83adcfca814faa9a014ef565cb6c23df837b83a569fd6050f9f3802e6fe
+DIST mpc-0.32.tar.xz 44716 BLAKE2B 66fbbfe886b16382d13eb9409746cd40ed9d01ea422c18d609f956fe9b1d1ae9434aa8ae65a60ce0cfc791141e3b9630adabc2fb0bd0b8bdc61b67b2e5b2e3b3 SHA512 1913249da8b29123005a9877ff2e68f9469f8fd48f5411ea0e651255c93fbe14ef6029dadc7d256a99b566085dc19f4c62bdcf55260b27de3d088b8e9c17fcde
 EBUILD mpc-0.30.ebuild 821 BLAKE2B 11cb4a54988476db7b20eb7ea4c79cc0c974146bbb0dfa1a991cb2abbb26b68e19ad2256c44b87ad0baf061a66c97bb8ec249d4fcaf5a286ee2424ab8c2db4e6 SHA512 7cfb2d1d2c06181f5205b34f4c5f8a184c34995eca8107336e2268569a195e807f7910d1f5588523e5bbe6442724e430f7cdcc2f0fecee0fe6dab62104e607cf
 EBUILD mpc-0.31-r1.ebuild 1230 BLAKE2B 8d02b8ea0e981d176afef99720f01c41f6840a2a98c5a670abc88a3239bb0e16c71f33af1082736eeed5b2f524970921c83ae20ff8fec4eb3b4c1bffeefca089 SHA512 10ac37d0f8aae691029961586e8c42ee3ae39386fd823a91d26549efbb9b3ee82284764c5960b84fb22b394d5b16229f079db05e803e53953ef98e063f340653
+EBUILD mpc-0.32.ebuild 1241 BLAKE2B a430ac51b51bf35c99be8ec27e450ab2b5b241dba262a37c91167e40417c912a4f912aa899049f67b096ab3240185f53eb3613a0481d8acf13016540ecc8812b SHA512 a80b698e42d22744d481329024ef534d163d27352752ed266bc009535345ead3d633b97e2f89870e9b32b75bbe494b1303217f513a29a4bbf138905a7a2dbbe9
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-sound/mpc/mpc-0.32.ebuild b/media-sound/mpc/mpc-0.32.ebuild
new file mode 100644
index 000000000000..ef6640ae1878
--- /dev/null
+++ b/media-sound/mpc/mpc-0.32.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 meson
+
+DESCRIPTION="Commandline client for Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc iconv test"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	iconv? ( virtual/libiconv )
+	test? ( dev-libs/check )
+"
+DEPEND="media-libs/libmpdclient"
+RDEPEND="${DEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.31-nodoc.patch" )
+
+src_prepare() {
+	default
+
+	# use correct docdir
+	sed -e "/install_dir:.*contrib/s/meson.project_name()/'${PF}'/" \
+		-i meson.build || die
+
+	# use correct (html) docdir
+	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
+		-i doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Diconv=$(usex iconv enabled disabled)
+		-Dtest=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newbashcomp contrib/mpc-completion.bash mpc
+}
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index b33393276d08..f8751a598a97 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -1,2 +1,2 @@
-EBUILD pulseaudio-modules-bt-9999.ebuild 1516 BLAKE2B 4e98196a927f7943446b113ba4e326779e8230a58f936408653a96637fcea170fb540329b7fcd7e82920001002685407fd383c1681cfa04c91aff60a4d3c74f8 SHA512 375397f0e16a1cae8ecaa3dc566ee8f7aeb8d368f018449c7658787e9dbb6b56cda6cb5b21a48a6b57a33a499e42cc815fab065f5276ab1cf66f93012baa208d
+EBUILD pulseaudio-modules-bt-9999.ebuild 1519 BLAKE2B 1f66b63462a75835a5c757945311af363c93111d3252bbb2bdb8f18ab0e2d69b7557a0a7659f669a379c2d5439b223787e72b166890efb74cb857ab3767f65b7 SHA512 bd6f7ef2571b06bbe076eac62a883e5770df85ccd7e88d97a315d5114e4b29de10994551397f558d64bf22a0c7c3380861d38e012b71519e7344f30549e118b0
 MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
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 916d31a1367b..185f571a0ca8 100644
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	media-libs/fdk-aac
+	media-libs/fdk-aac:0=
 	virtual/ffmpeg
 	media-libs/sbc
 	media-libs/libldac
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index b540541655b7..5cc0b267dd4b 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -5,5 +5,5 @@ DIST rplay_3.3.2-12.diff.gz 25322 BLAKE2B dc66fd94076e7ac3ffe863db98b326ce0272bd
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
 EBUILD rplay-3.3.2-r1.ebuild 972 BLAKE2B 894346d8cdc7ea39a3f7e69e92b3a3645df8848699be6258518b2b1a28e1605e1a9febf8cd7384003dbde0dcdfe799ec8e8cabc3781316e5e09203a7fbf13762 SHA512 d9dc52fe82472426e6d8217003fd0d46bf4dc4af7b57fb67b7356821b39604be10a5429973606b62e0949c60b030df2e5ff99e9c0249e53d27ec962a5f0d5bfd
 EBUILD rplay-3.3.2-r2.ebuild 1125 BLAKE2B 24522fbbbcbb42cda98f1692853708beef98a42fc50f998aeae58bd8234bdff1f75fa34fef2412e71044bbbbb3d4b8275416c110694a5bb1c3ec6b2427d2cc40 SHA512 8b949b1f97bf29b94cc9eac103a1cb365bee26da8f3dd91f2c6ac187cf0254366e36bf062d95fe0cef79dee0f3797faee54342430ecd3719c6e3c22fceb73785
-EBUILD rplay-3.3.2-r3.ebuild 1210 BLAKE2B b86e1c43c951e628442ba6bc9b1c423b4b33fa78d0a212bfdac4d2fdcaf2589f3c86a92826e0f6cfc58c0cac2450b57b6bb2fc3062b8895f9b994d6d0877c964 SHA512 bcf58c67e86d81075e65cb82f77a51a0f49616e2104205e9ac1ad2d1db33ed9436250c760421ab41b567e88ae1f3eb79d1941892b5b4befc353d0d8c08749425
+EBUILD rplay-3.3.2-r3.ebuild 1209 BLAKE2B d3e526574a7db10d1cbedd3eef847ba69f9ee45ab11657ce6f1c89dbf7479625c13019804cdf96bdb4b510edff6c2d2d29d8ce30186477dd22a6a8090ca91380 SHA512 fc852a0ef5090f3fad3aff066f7d2488822af639ba428c65ce27e6e584755130991cbbb1cc2fcd862b52c10dd3b601266bea0f24354ddac16f4fe9a064d5bc86
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
index b5865997d91b..01ae984a688d 100644
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ b/media-sound/rplay/rplay-3.3.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-sound/gsm"
diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
index a0d016c5de67..b16a0b386f25 100644
--- a/media-sound/sexypsf/Manifest
+++ b/media-sound/sexypsf/Manifest
@@ -1,4 +1,3 @@
-AUX sexypsf-0.4.7-misc.patch 7770 BLAKE2B ec617d75c15378dea9546b4a098430d9904258812d6ea3b9ce57727b1dc0d34f46dcb5ab9757fb12d9848f3b0eaf6497cf1aec7b6121735b61303927e68ad7fd SHA512 7568573f143195faaad0aef8224d538c6628653c9bbfa43b1cf18195ac5fc675514200709419030f02a365279cabd81e5239faf3e12d1adcabe4b150549d6c47
 DIST sexypsf-0.4.8.tar.bz2 82954 BLAKE2B ce710cfe20372f81e5c4f18857b46e7eef1837b87469bdf999dd677f617802da0f7cb0ff9ff1a0ee78f6424b179b33cc111ba98619dde4a03b178c63397749a4 SHA512 bb95cdb40cf7172fdf815d6a2083adc4f684973534625d76c4fdb04752888acecfdd5ba329f9e2eed64311f30eb4400c8913ace13e4fa371c89c774905dc35d0
 EBUILD sexypsf-0.4.8.ebuild 503 BLAKE2B af80d45dc051c55562414f5c956a7e34f4246bc49ea5d2e2a1de01a9b11cdb4f5527a0fb9365e8b8d783d91956b902177350e33c1435c29cec18fc987aa0cbfd SHA512 2fe3a6dfec41d33f5148a05e87e811479065e2ad41e92fd5df61a22f204a8cf20bdcb96bbb352dbe7d4b858651cd5cc2e04bbc175cd15304f02a6988236e6741
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
deleted file mode 100644
index bd1c21ce503b..000000000000
--- a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
+++ /dev/null
@@ -1,297 +0,0 @@
---- sexypsf/driver.h
-+++ sexypsf/driver.h
-@@ -23,4 +23,4 @@
- PSFINFO *sexy_getpsfinfo(char *path);
- void sexy_freepsfinfo(PSFINFO *info);
- 
--void sexyd_update(char*,long);
-+void sexyd_update(unsigned char*,long);
---- sexypsf/Linux/LnxMain.c
-+++ sexypsf/Linux/LnxMain.c
-@@ -26,6 +26,7 @@
- #include <time.h>
- 
- #include "driver.h"
-+#include "oss.h"
- #include "Linux.h"
- 
- int main(int argc, char *argv[]) {
---- sexypsf/Linux/Makefile
-+++ sexypsf/Linux/Makefile
-@@ -4,12 +4,10 @@
- 
- all: sexypsf
- 
--CC = gcc 
- RM = rm -f
- STRIP = strip
- 
--OPTIMIZE = -O2 -fomit-frame-pointer -finline-functions -ffast-math
--FLAGS = -g  -D__LINUX__ -DPSS_STYLE=1 
-+FLAGS = -D__LINUX__ -DPSS_STYLE=1 
- #-DTIMEO
- LIBS = -lz
- 
-@@ -20,11 +18,11 @@
- 
- OBJS+= LnxMain.o
- 
--CFLAGS = -Wall -Winline ${OPTIMIZE} -I. -I.. ${FLAGS}
-+CFLAGS += -Wall -Winline -Wno-nonnull -I. -I.. ${FLAGS}
- #CFLAGS+= $(shell pkg-config gtk+-2.0 --cflags)
- 
- sexypsf:	${OBJS}
--		${CC} ${CFLAGS} ${OBJS} -o sexypsf ${LIBS}
-+		${CC} ${LDFLAGS} ${CFLAGS} ${OBJS} -o sexypsf ${LIBS}
- 
- .PHONY: clean sexypsf
- 
---- sexypsf/Linux/oss.c
-+++ sexypsf/Linux/oss.c
-@@ -54,6 +54,9 @@
- 
- #define OSS_MEM_DEF
- #include "oss.h"
-+
-+#include "driver.h"
-+
- static int oss_audio_fd = -1;
- extern int errno;
- 
-@@ -66,8 +69,6 @@
-  int pspeed=44100;
-  int pstereo;
-  int format;
-- int fragsize = 0;
-- int myfrag;
-  int oss_speed, oss_stereo;
- 
-  pstereo=OSS_MODE_STEREO;
---- sexypsf/Linux/oss.h
-+++ sexypsf/Linux/oss.h
-@@ -32,4 +32,6 @@
- 
- #define OSS_SPEED_44100	44100
- 
-+void SetupSound(void);
-+
- #endif // _OSS_SOUND_H
---- sexypsf/Makefile
-+++ sexypsf/Makefile
-@@ -12,18 +12,13 @@
- RM = rm -f
- 
- LIBS = -shared -lz
--OPTIMIZE = -O2 -finline-functions -ffast-math
--FLAGS = -DPSS_STYLE=1 -DSPSFVERSION="\"${VERSION}\""
-+FLAGS = -DPSS_STYLE=1 -DSPSFVERSION="\"${VERSION}\"" -fPIC
- 
- OBJS =	PsxBios.o PsxCounters.o PsxDma.o Spu.o PsxHw.o PsxMem.o Misc.o	\
- 	R3000A.o PsxInterpreter.o PsxHLE.o spu/spu.o
- 
- OBJS+=	xmms/xmms.o
--FLAGS+=	`gtk-config --cflags`
-+FLAGS+=	`xmms-config --cflags`
--
--ifeq (${CPU}, ix86)
--	OPTIMIZE += -fomit-frame-pointer -mcpu=i686 -fno-exceptions
--endif
- 
- ifeq (${CPU}, ppc)
- 	FLAGS+=-DMSB_FIRST
-@@ -33,10 +28,10 @@
- 	FLAGS+=-DMSB_FIRST
- endif
- 
--CFLAGS = -Wall ${OPTIMIZE} -I. ${FLAGS}
-+CFLAGS += -Wall -Wno-nonnull -I. ${FLAGS}
- 
- sexypsf: ${OBJS}
--	${CC} ${CFLAGS} ${OBJS} -o libsexypsf.so ${LIBS}
-+	${CC} ${LDFLAGS} ${OBJS} -o libsexypsf.so ${LIBS}
- 
- install: sexypsf
- 	mv libsexypsf.so ${HOME}/.xmms/Plugins
---- sexypsf/Misc.c
-+++ sexypsf/Misc.c
-@@ -226,7 +226,7 @@
- {
-         FILE *fp;
-         EXE_HEADER tmpHead;
--        char *in,*out=0;
-+        unsigned char *in,*out=0;
- 	u8 head[4];
-         u32 reserved;
-         u32 complen;
---- sexypsf/PsxInterpreter.c
-+++ sexypsf/PsxInterpreter.c
-@@ -417,7 +417,7 @@
- * Load higher 16 bits of the first word in GPR with imm  *
- * Format:  OP rt, immediate                              *
- *********************************************************/
--static void psxLUI() { if (!_Rt_) return; _u32(_rRt_) = psxRegs.code << 16; } // Upper halfword of Rt = Im
-+static void psxLUI() { if (!_Rt_) return; _rRt_ = psxRegs.code << 16; } // Upper halfword of Rt = Im
- 
- /*********************************************************
- * Move from HI/LO to GPR                                 *
-@@ -491,7 +491,7 @@
- 
- static void psxLBU() {
- 	if (_Rt_) {
--		_u32(_rRt_) = psxMemRead8(_oB_);
-+		_rRt_ = psxMemRead8(_oB_);
- 	} else {
- 		psxMemRead8(_oB_); 
- 	}
-@@ -507,7 +507,7 @@
- 
- static void psxLHU() {
- 	if (_Rt_) {
--		_u32(_rRt_) = psxMemRead16(_oB_);
-+		_rRt_ = psxMemRead16(_oB_);
- 	} else {
- 		psxMemRead16(_oB_);
- 	}
-@@ -515,7 +515,7 @@
- 
- static void psxLW() {
- 	if (_Rt_) {
--		_u32(_rRt_) = psxMemRead32(_oB_);
-+		_rRt_ = psxMemRead32(_oB_);
- 	} else {
- 		psxMemRead32(_oB_);
- 	}
-@@ -530,7 +530,7 @@
- 	u32 mem = psxMemRead32(addr & ~3);
- 
- 	if (!_Rt_) return;
--	_u32(_rRt_) =	( _u32(_rRt_) & LWL_MASK[shift]) | 
-+	_rRt_ =	( _u32(_rRt_) & LWL_MASK[shift]) | 
- 					( mem << LWL_SHIFT[shift]);
- 
- 	/*
-@@ -552,7 +552,7 @@
- 	u32 mem = psxMemRead32(addr & ~3);
- 
- 	if (!_Rt_) return;
--	_u32(_rRt_) =	( _u32(_rRt_) & LWR_MASK[shift]) | 
-+	_rRt_ =	( _u32(_rRt_) & LWR_MASK[shift]) | 
- 					( mem >> LWR_SHIFT[shift]);
- 
- 	/*
---- sexypsf/PsxMem.c
-+++ sexypsf/PsxMem.c
-@@ -21,7 +21,7 @@
- 
- #include "PsxCommon.h"
- 
--void LoadPSXMem(u32 address, s32 length, char *data)
-+void LoadPSXMem(u32 address, s32 length, unsigned char *data)
- {
-  //printf("%08x %08x\n",address,length);
-  while(length>0)
-@@ -56,8 +56,8 @@
- 
- 	writeok=1;
- 
--	psxMemLUT = (u32*)malloc(0x10000 * 4);
-+	psxMemLUT = malloc(0x10000 * sizeof *psxMemLUT);
--	memset(psxMemLUT, 0, 0x10000 * 4);
-+	memset(psxMemLUT, 0, 0x10000 * sizeof *psxMemLUT);
- 
- 	psxM = (char*)malloc(0x00200000);
- 	psxP = (char*)malloc(0x00010000);
-@@ -67,16 +67,16 @@
- 		printf("Error allocating memory"); return -1;
- 	}
- 
--	for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16];
-+	for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16];
- 
--	memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
-+	memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
--	memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
-+	memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
- 
--	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = (u32)&psxP[i << 16];
-+	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = &psxP[i << 16];
- 
--	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = (u32)&psxH[i << 16];
-+	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = &psxH[i << 16];
- 
--	for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = (u32)&psxR[i << 16];
-+	for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = &psxR[i << 16];
- 
- 	return 0;
- }
-@@ -215,16 +215,16 @@
- 					case 0x800: case 0x804:
- 						if (writeok == 0) break;
- 						writeok = 0;
--						memset(psxMemLUT + 0x0000, 0, 0x80 * 4);
-+						memset(psxMemLUT + 0x0000, 0, 0x80 * sizeof *psxMemLUT);
--						memset(psxMemLUT + 0x8000, 0, 0x80 * 4);
-+						memset(psxMemLUT + 0x8000, 0, 0x80 * sizeof *psxMemLUT);
--						memset(psxMemLUT + 0xa000, 0, 0x80 * 4);
-+						memset(psxMemLUT + 0xa000, 0, 0x80 * sizeof *psxMemLUT);
- 						break;
- 					case 0x1e988:
- 						if (writeok == 1) break;
- 						writeok = 1;
--						for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16];
-+						for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16];
--						memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
-+						memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
--						memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
-+						memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
- 						break;
- 					default:
- 						break;
---- sexypsf/PsxMem.h
-+++ sexypsf/PsxMem.h
-@@ -41,21 +41,21 @@
- }
- #endif
- 
--s8 *psxM;
-+char *psxM;
- #define psxMu32(mem)	(*(u32*)&psxM[(mem) & 0x1fffff])
- 
--s8 *psxP;
-+char *psxP;
--s8 *psxR;
-+char *psxR;
- #define psxRu32(mem)	(*(u32*)&psxR[(mem) & 0x7ffff])
- 
--s8 *psxH;
-+char *psxH;
- 
- #define psxHu8(mem)	(*(u8*) &psxH[(mem) & 0xffff])
- 
- #define psxHu16(mem)   	(*(u16*)&psxH[(mem) & 0xffff])
- #define psxHu32(mem)   	(*(u32*)&psxH[(mem) & 0xffff])
- 
--u32 *psxMemLUT;
-+char **psxMemLUT;
- 
- #define PSXM(mem)		(psxMemLUT[(mem) >> 16] == 0 ? NULL : (void*)(psxMemLUT[(mem) >> 16] + ((mem) & 0xffff)))
- 
-@@ -76,6 +76,6 @@
- void psxMemWrite16(u32 mem, u16 value);
- void psxMemWrite32(u32 mem, u32 value);
- 
--void LoadPSXMem(u32 address, s32 length, char *data);
-+void LoadPSXMem(u32 address, s32 length, unsigned char *data);
- 
- #endif /* __PSXMEMORY_H__ */
---- sexypsf/xmms/xmms.c
-+++ sexypsf/xmms/xmms.c
-@@ -101,7 +101,7 @@
- }
- 
- static pthread_t dethread;
--void sexyd_update(char *Buffer, long count)
-+void sexyd_update(unsigned char *Buffer, long count)
- {
-  int mask = ~((((16 / 8) * 2)) - 1);
-  if(count)
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index f04619d38990..e3e447005666 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.1.5.153.gf614956d-16_amd64.deb 113728674 BLAKE2B bc7930a1935c0a05dba262abc384a699720be53e3bec83393c962761bee647a247d2ddf475a6812bdb969fc1f59e9d2c283de0da398a9b8f7ddfff8f1232fef1 SHA512 db354f161c35b5f1a2d633282fad8fccf565e0061e7d258012f28422d766630391d47d4dafe22448fb60f850bf4ccbfdf82443cf107e03727c077b2c62e524be
+DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8ebccdc889b723ac6e9f5275dddec97d35142606ece32d1edb1ed288d1c517d41027de22da77421a76f8c00ea90ddc868b74dd46ba07cff60a581b12a SHA512 f004083eee00600a51e50d7dee03846293b5ccd6966786e91055564c7963917b9aaa917de41f299a0f5b7baecea5f466fb37722b8631743ff2ca15f43851f5f4
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
-EBUILD spotify-1.1.5-r1.ebuild 3188 BLAKE2B 79a4713225eec33dac6d1228dbb6d885fefb787f7f314aa8324309c77f6bdd18de3be553f76b71fcb44d1b7f3a344b3e836cce64645413003b74e6ad62b67032 SHA512 c2c5b75c64e4b6c8ed2d4b8ebb75d9239b0c081339226040cae012c72f29beae89d6a25ba8d85db2416540a0104afe12dce30db10cc0332c26c1ccafda97d200
+EBUILD spotify-1.1.10.ebuild 3188 BLAKE2B 6a20f81c52e9f5232ec672da83d53c8b38f5115421a61fb39f11cdc9b30add11462338abacfea61b8c2ef021431ca143198339d7094edc901eda1ac04c140431 SHA512 5760f276e7907ccb4bc96436a92c8435ef33c97a68621addafe5e97204bcb1b67510d65e8de204ed07e225a4b9e528a0ba72217877ca9b0b99fda148c12f191d
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.1.5-r1.ebuild b/media-sound/spotify/spotify-1.1.10.ebuild
index a681fe950c04..77cf183a980e 100644
--- a/media-sound/spotify/spotify-1.1.5-r1.ebuild
+++ b/media-sound/spotify/spotify-1.1.10.ebuild
@@ -7,7 +7,7 @@ inherit desktop pax-utils unpacker xdg
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="153.gf614956d-16"
+BUILD_ID_AMD64="546.ge08ef575-19"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index f3b0886208dd..9c1aaaac0477 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,5 +1,5 @@
 AUX tomahawk-0.9.0_pre20181030-cmakepolicy.patch 926 BLAKE2B 8af469b6186e57db674dc5acaec6032bf43c15d91b5db9a9bf30f617c47b74486149a50774c76eb69bf89157e1ee8eed0d449b9d107e4f8e7e376f9d9d4f9d29 SHA512 7d0c98a6f1708d156ab643439faf3f469fa21a106f618dc1b8b7c569a2f65a9c929670bc1aa679eebf1116e615fd832593116f84e3abe5fff3d91450e1455f21
 AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5
 DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202
-EBUILD tomahawk-0.9.0_pre20181030.ebuild 1771 BLAKE2B 274be96fe2d1072d028245ab133e1f11630d56ee89fa9e4910d708f0ee386f5028a197f0fd88f42c0dc324885a41e49a60a82d16f6750db1faab630b7cc5d13c SHA512 2454cfc8e03f74fce0c752780118b5093bc7f5e160914b26c37814d6bca7b2060d472612f352c4198835270cfb7fa9f486e94a255348110ef9ea57b2bb235be4
+EBUILD tomahawk-0.9.0_pre20181030.ebuild 1782 BLAKE2B 0bf943a9e5eacbb90e01f4986870e1c55fe53aa88e9e94213aaa66f6a512cafe3f5d7118821bfb519eed421c9ebf0c972e03f4e11e72145f5a51ddee137112ed SHA512 7c9ac54104f2f81f356785957c2b92e369b031109469d5800b8288fd297a3787f12a5b3159d966076440e8f8c7a4b6371f66a646fc9b43d00fad8a2c58b48ef1
 MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
index 82c9537fd054..fca16414dfb9 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
@@ -7,7 +7,7 @@ COMMIT=777b31219179b43f56c7b95857d2fbd7f33199aa
 inherit cmake-utils xdg-utils
 
 DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://www.tomahawk-player.org/"
+HOMEPAGE="https://github.com/tomahawk-player/tomahawk"
 SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 BSD"
diff --git a/media-sound/tuxguitar/Manifest b/media-sound/tuxguitar/Manifest
index 9847b5b5ba3f..e274e5c37431 100644
--- a/media-sound/tuxguitar/Manifest
+++ b/media-sound/tuxguitar/Manifest
@@ -1,4 +1,4 @@
 AUX tuxguitar-fixed-ant-files.patch 10154 BLAKE2B 23f18334ce752a657f65a850c4b45eb7685b7937480977973d327c14d10ffc7e66f154d0d465dcb24ab39f7ae76fbf796e3df6571a3ff049fc116eaaee6381d8 SHA512 90b732cddf4684fb99a91e581903e64cd039ef9b9d8ec7bc9629ce8da889a6b2961f8f5dafd6cce21eb0c67e2e5501586580081f28c702de88ddd1d229769013
 DIST tuxguitar-1.3.2-src.tar.gz 82294553 BLAKE2B 74e0e4b0f2d3d63dbf8f16db43a165f77b39ad54e21091520c06228ea789161a6fb65a1a05bde0f1473afe61e2d990f646b5228b9fe19c114da21a5c32aa32b6 SHA512 fb94472df25578d94ad11cd385cfc9347bfefcdd8ebedd2e785f3645d6b2e0d6d87d3fc457af159865b3fae77ad443ac4246b3c6fbe42397f4d15908dd3b7149
-EBUILD tuxguitar-1.3.2.ebuild 3456 BLAKE2B 2115b95150df4ed966e8fbc178242c358de7a02ed8af1ad46ac634ccdb33355ccf2232ac4ea10ebe8d8d4ed54af002bee555c359e4716c553cb2469e0dfcd265 SHA512 12e22f09292b0f53fcf2332765af046871e837475d8302e97d4a8b531c4f244526f71bb09497837bfffc94e397f29089cb09ff9ad0a6ef9c91417778a260739b
+EBUILD tuxguitar-1.3.2.ebuild 3459 BLAKE2B ea0defbcfb81faf0d7566cbcc786078ea808630ebbc54e4db24343e487d0805541ea2ee6776b871e4f15d9439ab936cb6010562931d132696441d607044e93c2 SHA512 ecc329f413c6dde86fcfaef5b0f88f3934510cb72ec4de2f7f8b712be837bbee2394b983b9764c417233f4e291a80171ede7aa1f532dc7f730061710866d3926
 MISC metadata.xml 1287 BLAKE2B aa7c3b560d507756eb72d602038017dd94e3f261a2a0255ee12441ef60b4772015f332109157e28cfd29ef3784cce6061f488f23ee5b8b9e42f430facff44008 SHA512 4249950599126709e668de28b8a8a0ac4dfa8b118b34f738e6eb7b610f6ed0fb2d11a962631bffcb52d552ee950c5045394e0df89dc37b5b9c9ac4648f86e2d8
diff --git a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
index 7c0a2bf1b65c..39bcac4c6361 100644
--- a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
+++ b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
@@ -20,7 +20,7 @@ COMMON_DEPEND="
 	dev-java/swt:3.7[cairo]
 	alsa? ( media-libs/alsa-lib )
 	pdf? ( dev-java/itext:5 )
-	fluidsynth? ( media-sound/fluidsynth:= )
+	fluidsynth? ( <media-sound/fluidsynth-2:= )
 	lilypond? ( media-sound/lilypond )
 "
 RDEPEND="${COMMON_DEPEND}
diff --git a/media-sound/ventrilo-server-bin/Manifest b/media-sound/ventrilo-server-bin/Manifest
deleted file mode 100644
index a1381ccc536f..000000000000
--- a/media-sound/ventrilo-server-bin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 3.0.3-conf.d.ventrilo 84 BLAKE2B 73d9732a8a53bff8600cde7ef5ff940fae859d03e499cf137d236c9f8996425c0a56e9d3cfa1e05275c2023a00ff276917896a0a74a128dc3dcc065bb2cc98f1 SHA512 cd4a8bcf8c18d5cc0871e0ed53749fe84bc65be57e51bd4faa79430dd0baa9d394cdf205fcd4259bd92580edf7fb8eb94545a307f7bd11514b7ad4bce33efb9a
-AUX 3.0.3-init.d.ventrilo 654 BLAKE2B bfb8ad3ab959623c085758e2a4accbaf13ad2bb550fe5611770bec13fbabecd1cb74f305c89934ae685be006b9e483debecac1f6c659ba7b6c62948f73cc51fb SHA512 55c4245de9045b012ff85fe3b025318522c7eb01f96671d5b8c48ad2ea4ba5778d25320ea7b9bec86d64cbfa8d13aaae88b0080d5547c43792ce5427b5ac6917
-DIST ventrilo_srv-3.0.3-Linux-i386.tar.gz 211494 BLAKE2B e75fba4c9f660de84913728aa0ad08af65b07004368640e47810110c0f694634d00421226accd904f23e2141e6be849da31b3604fe441f6ad610db2a1eb58147 SHA512 ac4b38d7ee5cb66b88507e5cfb810d28b98252dfbabdb8d3777ae4b4dfd7a793ae8e0ee0a4d3a03cf7d0d1b1b34162e5f026c7217d296201e48607e44f04e79f
-EBUILD ventrilo-server-bin-3.0.3.ebuild 1099 BLAKE2B 36d00715745dd71ae31cd47036c1116325f8d6d9303dfaec06399ad14c09168186bb124d2fa9435e208fcde989a33df73dff9b643113bf8c5921404447c25818 SHA512 35a66a5322e1326f8481b9ae2f045570ed87876670b158c9333a30c9ddd59412679986ffc30f72dfd2463668c2b5eb31cd635e24646938e916d433633fef4a9f
-MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/ventrilo-server-bin/files/3.0.3-conf.d.ventrilo b/media-sound/ventrilo-server-bin/files/3.0.3-conf.d.ventrilo
deleted file mode 100644
index 673f2bf5a258..000000000000
--- a/media-sound/ventrilo-server-bin/files/3.0.3-conf.d.ventrilo
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set the default nice priority level.  See NICE(1) for more information.
-NICE="-5"
diff --git a/media-sound/ventrilo-server-bin/files/3.0.3-init.d.ventrilo b/media-sound/ventrilo-server-bin/files/3.0.3-init.d.ventrilo
deleted file mode 100644
index 328374467c8e..000000000000
--- a/media-sound/ventrilo-server-bin/files/3.0.3-init.d.ventrilo
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-        # the daemon needs the internet to function
-	# Not sure if net is needed to start but it is required for it to work properly.
-        need net   
-}
-
-start() {
-        # display to the user what you're doing
-        ebegin "Starting Ventrilo VoIP Server"
-	start-stop-daemon --start --chuid ventrilo --nicelevel "${NICE}" \
-		--exec /opt/ventrilo-server/ventrilo_srv -- -f/opt/ventrilo-server/ventrilo_srv -d
-	eend $?
-}
-
-stop() {
-        # display a message to the user
-        ebegin "Stopping Ventrilo VoIP Server"
-        start-stop-daemon --stop --pidfile /opt/ventrilo-server/ventrilo_srv.pid
-        eend $?
-}
-
diff --git a/media-sound/ventrilo-server-bin/metadata.xml b/media-sound/ventrilo-server-bin/metadata.xml
deleted file mode 100644
index ee7258ac28eb..000000000000
--- a/media-sound/ventrilo-server-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-sound/ventrilo-server-bin/ventrilo-server-bin-3.0.3.ebuild b/media-sound/ventrilo-server-bin/ventrilo-server-bin-3.0.3.ebuild
deleted file mode 100644
index 7a7003f7e730..000000000000
--- a/media-sound/ventrilo-server-bin/ventrilo-server-bin-3.0.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-IUSE=""
-DESCRIPTION="The Ventrilo Voice Communication Server"
-HOMEPAGE="http://www.ventrilo.com/"
-SRC_URI="ventrilo_srv-${PV}-Linux-i386.tar.gz"
-
-LICENSE="ventrilo"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-RESTRICT="fetch"
-
-S=${WORKDIR}
-
-RDEPEND="sys-libs/glibc"
-DEPEND=""
-
-QA_PRESTRIPPED="opt/ventrilo-server/ventrilo_srv
-	opt/ventrilo-server/ventrilo_status"
-
-pkg_setup() {
-	enewgroup ventrilo 3784
-	enewuser ventrilo 3784 -1 /dev/null ventrilo
-}
-
-pkg_nofetch() {
-	elog "Please visit http://www.ventrilo.com/download.php"
-	elog "and download the Linux i386 - 32bit ${PV} server."
-	elog "Just save it into your DISTDIR directory!"
-}
-
-src_install() {
-	cd "${S}/ventsrv"
-
-	exeinto /opt/ventrilo-server
-	doexe ventrilo_{srv,status}
-
-	newinitd "${FILESDIR}"/${PV}-init.d.ventrilo ventrilo
-	newconfd "${FILESDIR}"/${PV}-conf.d.ventrilo ventrilo
-
-	insinto /opt/ventrilo-server
-	doins ventrilo_srv.ini
-
-	dohtml ventrilo_srv.htm
-
-	fowners ventrilo:ventrilo /opt/ventrilo-server
-}
diff --git a/media-sound/vimpc/Manifest b/media-sound/vimpc/Manifest
index bf18a681def4..c902fa19d2ea 100644
--- a/media-sound/vimpc/Manifest
+++ b/media-sound/vimpc/Manifest
@@ -1,7 +1,6 @@
-AUX vimpc-0.09.1-tinfo.patch 186 BLAKE2B 83d6bf9df4b6eee4dcc0d114813d49250fe062ae65931092086e1aa4c40f88dc1598f1f761ef34f078ea5ea7216ee8de9b25dc93b00c517b82a8af60f3c9dcf0 SHA512 05581e2cec907ec8b194d7d097498ebdc6d84774e74ebc5dc521d99b55e880f1b130ab919ac7fc6257537e37599f0797fe2fedded35f94517ddf4e58e8ce9556
-DIST vimpc-0.09.1.tar.gz 583073 BLAKE2B e2ab728a202cc7e5b9a1ffbca979274ae3f6b0f43acdacad51fdbbcd2c45f28dd9cf2f4372d085abc28633aec318f92a7632e54732516c51f20392c2d059e04f SHA512 cf40ae43ac21af80e1b5897f1fa83b4d730fb7dfa4c21b80c296a8e6f2c40e643325fd2aa96bd4dda1abca0ccd2d12545cf91ffcdb8017e5b9cd88917ca96222
+AUX vimpc-0.09.2-boost.patch 8262 BLAKE2B 4f35c6bf2a5b2d9072a2cba699fe8175af60f5c18d61fd57fdc497e06dd9260eacb41a29af5db6003f40b0b1e7f28a2fed4abe532b64aabd9f7265eab035bf6e SHA512 f1680f0f63277fdc0b57af24558e3715de656f39fdad00ed218c32542bbbe0a63f891b75802709275d4b0e7bac086ed5ea74cded4c37cbfc5c34586c067abac1
 DIST vimpc-0.09.2.tar.gz 452593 BLAKE2B b6cbeab32318e723d7be114255fba7360fa2608d03bde6b2186d47b1cb8e74b4369d0d2b1d683cf5668232bf4581e9acb79d726308b18ff0d82122aa979f81a1 SHA512 456e2d2c0510273c071b24c2dd8f90b73d40a0b02565c00ea986a78f1231cb26fb053ce5b0d1476647c813b84684e400c21948086299e445ffd651c2af46d4c9
-EBUILD vimpc-0.09.1.ebuild 908 BLAKE2B 7b6b6cb81ab882feeab72dfa94a4e498a5d7d3ee135e3fded6fa7c767b1c8ffa48ef80b2a7672f91011609a66202d28cd88c7c83eff5c1c6a31d5431557521d9 SHA512 fc13626f2ea70f2f2c7bc82d239e4646bd2b076569bc5481e41e3187100454cde82815bd97e9ae2d3ba3baa09d211214125394d78a3ea676abba720b1df556ea
+EBUILD vimpc-0.09.2-r1.ebuild 931 BLAKE2B eeb8e9c338a42a1f247133d95a362570344c9b79936e285e8841ca99bb61f961a283697865c671cc248d4c15c8aef0cf959d0b43b882635b143f93478e71153e SHA512 bce0cd6ebba0787917c000f1109f7dbb9573c84cd8da1806559d10ebe001fefbb87af4e5788d4fbb6127771bb12a7069aaa0ce59dcdf36a850c543fb0855faaf
 EBUILD vimpc-0.09.2.ebuild 878 BLAKE2B d4ccf06603dbf9756365d0eb891ede9cc8cd016e0301aa91c8fc8dfaeb278dfd9f364ff8360977e3ebe1145817b6c15c1fb4d978057fce48e113e2ab8457bbbd SHA512 6141c686b413ad5ac72b24ae8565da33d5a0836434d0df660495b3f5729bf4b1f700b98afb992efa0f6a2f2d443f44a2927ef998b0c002d0e8db06ff110d15e2
 EBUILD vimpc-9999.ebuild 837 BLAKE2B ce8588b8b69918c68d359d5fbc87fca0aee34652c92637dd01e7c753660e718126a10c228886c02f36863aff4a7bcb675107201bb3ff72972261041706f4cf42 SHA512 b3fe1c3768151d09a0a42257c507662da01387dfdb7fcb0d251fc845e0cfc3a085edeaf592c323825cfa0637d4f2e1a40c8ee03b7fe90ca50c9a7657d9165766
 MISC metadata.xml 523 BLAKE2B 110214d23c67c2e0b6255e8472feb6678d3ade52e55232d50067d228fadaddb90f0662db7eb1d036b59d963356b321a9b4ed829cc1860ad7208ac4c5e74f50ea SHA512 88dc39c9a62b9234604d95256ab3c94fa33a98c4df3d3e8583d9692d45ac416995faa2249431ddbf9c8edb31cce77474d2c4572215dec4c3551f02d315d732df
diff --git a/media-sound/vimpc/files/vimpc-0.09.1-tinfo.patch b/media-sound/vimpc/files/vimpc-0.09.1-tinfo.patch
deleted file mode 100644
index 55729b1a7f4a..000000000000
--- a/media-sound/vimpc/files/vimpc-0.09.1-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,6 +97,8 @@
- 
- LIBS="$LIBS $CURSES_LIB"
- 
-+AC_SEARCH_LIBS([keypad],[tinfow tinfo])
-+
- PKG_CHECK_MODULES(pcre, libpcre)
- 
- AC_SUBST(pcre_LIBS)
diff --git a/media-sound/vimpc/files/vimpc-0.09.2-boost.patch b/media-sound/vimpc/files/vimpc-0.09.2-boost.patch
new file mode 100644
index 000000000000..8df2eddd54c7
--- /dev/null
+++ b/media-sound/vimpc/files/vimpc-0.09.2-boost.patch
@@ -0,0 +1,217 @@
+From 300fe8890c8f93e01c445e4df6c3b1414a6115ba Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Fri, 26 Jul 2019 03:26:22 +0300
+Subject: [PATCH] Fix building with boost (#87)
+
+Upstream-Status: Submitted
+[https://github.com/boysetsfrog/vimpc/pull/88]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ configure.ac             |   3 +-
+ m4/m4_ax_boost_chrono.m4 | 118 +++++++++++++++++++++++++++++++++++++++
+ src/clientstate.cpp      |   4 +-
+ src/clientstate.hpp      |   2 +-
+ src/compiler.hpp         |   4 ++
+ 5 files changed, 127 insertions(+), 4 deletions(-)
+ create mode 100644 m4/m4_ax_boost_chrono.m4
+
+diff --git a/configure.ac b/configure.ac
+index c53c555..5e0b618 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,6 +57,7 @@ if test "x$enable_boost" = "xyes"; then
+ AC_DEFINE_UNQUOTED(BOOST_SUPPORT, "1", "Define to 1 if boost support enabled")
+ 
+ AX_BOOST_BASE([], [], [AC_MSG_ERROR(vimpc requires boost library)])
++AX_BOOST_CHRONO([], [], [AC_MSG_ERROR(vimpc requires boost chrono library)])
+ AX_BOOST_SYSTEM([], [], [AC_MSG_ERROR(vimpc requires boost system library)])
+ AX_BOOST_THREAD([], [], [AC_MSG_ERROR(vimpc requires boost thread library)])
+ 
+@@ -73,7 +74,7 @@ AC_CHECK_HEADER(boost/function.hpp,
+                 [AC_MSG_ERROR(boost-dev library is required)])
+ 
+ CPPFLAGS="$CPPFLAGS -DUSE_BOOST_THREAD -DUSE_BOOST_FUNCTIONAL -DUSE_BOOST_FOREACH"
+-LIBS="$LIBS $BOOST_SYSTEM_LIB $BOOST_THREAD_LIB"
++LIBS="$LIBS $BOOST_CHRONO_LIB $BOOST_SYSTEM_LIB $BOOST_THREAD_LIB"
+ 
+ AC_MSG_CHECKING([whether compiler supports lambda functions])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <boost/function.hpp>]], [[int a = 5; boost::function<int(int)> f = [&a](int b) { return a + b; }; f(8);]])],
+diff --git a/m4/m4_ax_boost_chrono.m4 b/m4/m4_ax_boost_chrono.m4
+new file mode 100644
+index 0000000..6ea77b9
+--- /dev/null
++++ b/m4/m4_ax_boost_chrono.m4
+@@ -0,0 +1,118 @@
++# ===========================================================================
++#     https://www.gnu.org/software/autoconf-archive/ax_boost_chrono.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_BOOST_CHRONO
++#
++# DESCRIPTION
++#
++#   Test for Chrono library from the Boost C++ libraries. The macro requires
++#   a preceding call to AX_BOOST_BASE. Further documentation is available at
++#   <http://randspringer.de/boost/index.html>.
++#
++#   This macro calls:
++#
++#     AC_SUBST(BOOST_CHRONO_LIB)
++#
++#   And sets:
++#
++#     HAVE_BOOST_CHRONO
++#
++# LICENSE
++#
++#   Copyright (c) 2012 Xiyue Deng <manphiz@gmail.com>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 4
++
++AC_DEFUN([AX_BOOST_CHRONO],
++[
++	AC_ARG_WITH([boost-chrono],
++	AS_HELP_STRING([--with-boost-chrono@<:@=special-lib@:>@],
++                   [use the Chrono library from boost - it is possible to specify a certain library for the linker
++                        e.g. --with-boost-chrono=boost_chrono-gcc-mt ]),
++        [
++        if test "$withval" = "no"; then
++			want_boost="no"
++        elif test "$withval" = "yes"; then
++            want_boost="yes"
++            ax_boost_user_chrono_lib=""
++        else
++		    want_boost="yes"
++		ax_boost_user_chrono_lib="$withval"
++		fi
++        ],
++        [want_boost="yes"]
++	)
++
++	if test "x$want_boost" = "xyes"; then
++        AC_REQUIRE([AC_PROG_CC])
++        AC_REQUIRE([AC_CANONICAL_BUILD])
++		CPPFLAGS_SAVED="$CPPFLAGS"
++		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
++		export CPPFLAGS
++
++		LDFLAGS_SAVED="$LDFLAGS"
++		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
++		export LDFLAGS
++
++        AC_CACHE_CHECK(whether the Boost::Chrono library is available,
++					   ax_cv_boost_chrono,
++        [AC_LANG_PUSH([C++])
++			 CXXFLAGS_SAVE=$CXXFLAGS
++
++			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/chrono.hpp>]],
++                                   [[boost::chrono::system_clock::time_point* time = new boost::chrono::system_clock::time_point; delete time;]])],
++                   ax_cv_boost_chrono=yes, ax_cv_boost_chrono=no)
++			 CXXFLAGS=$CXXFLAGS_SAVE
++             AC_LANG_POP([C++])
++		])
++		if test "x$ax_cv_boost_chrono" = "xyes"; then
++			AC_SUBST(BOOST_CPPFLAGS)
++
++			AC_DEFINE(HAVE_BOOST_CHRONO,,[define if the Boost::Chrono library is available])
++            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
++
++			LDFLAGS_SAVE=$LDFLAGS
++            if test "x$ax_boost_user_chrono_lib" = "x"; then
++                for libextension in `ls $BOOSTLIBDIR/libboost_chrono*.so* $BOOSTLIBDIR/libboost_chrono*.dylib* $BOOSTLIBDIR/libboost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_chrono.*\)\.so.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.a.*$;\1;'` ; do
++                     ax_lib=${libextension}
++				    AC_CHECK_LIB($ax_lib, exit,
++                                 [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break],
++                                 [link_chrono="no"])
++				done
++                if test "x$link_chrono" != "xyes"; then
++                for libextension in `ls $BOOSTLIBDIR/boost_chrono*.dll* $BOOSTLIBDIR/boost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_chrono.*\)\.dll.*$;\1;' -e 's;^\(boost_chrono.*\)\.a.*$;\1;'` ; do
++                     ax_lib=${libextension}
++				    AC_CHECK_LIB($ax_lib, exit,
++                                 [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break],
++                                 [link_chrono="no"])
++				done
++                fi
++
++            else
++               for ax_lib in $ax_boost_user_chrono_lib boost_chrono-$ax_boost_user_chrono_lib; do
++				      AC_CHECK_LIB($ax_lib, exit,
++                                   [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break],
++                                   [link_chrono="no"])
++                  done
++
++            fi
++            if test "x$ax_lib" = "x"; then
++                AC_MSG_ERROR(Could not find a version of the library!)
++            fi
++			if test "x$link_chrono" = "xno"; then
++				AC_MSG_ERROR(Could not link against $ax_lib !)
++			fi
++		fi
++
++		CPPFLAGS="$CPPFLAGS_SAVED"
++	LDFLAGS="$LDFLAGS_SAVED"
++	fi
++])
+diff --git a/src/clientstate.cpp b/src/clientstate.cpp
+index 357dd6b..d00c981 100644
+--- a/src/clientstate.cpp
++++ b/src/clientstate.cpp
+@@ -223,10 +223,10 @@ ClientState::ClientState(Main::Vimpc * vimpc, Main::Settings & settings, Ui::Scr
+       Main::Vimpc::CreateEvent(Event::StatusUpdate, EData);
+    });
+ 
+-   updateThread_ = std::thread([this]() {
++   updateThread_ = Thread([this]() {
+       while (this->running_)
+       {
+-         std::this_thread::sleep_for(std::chrono::milliseconds(this->waitTime_));
++         ThisThread::sleep_for(Chrono::milliseconds(this->waitTime_));
+ 
+          if (this->newSong_)
+          {
+diff --git a/src/clientstate.hpp b/src/clientstate.hpp
+index 0bcbd5b..1983372 100644
+--- a/src/clientstate.hpp
++++ b/src/clientstate.hpp
+@@ -122,7 +122,7 @@ namespace Mpc
+       std::string             currentSongURI_;
+       std::string             currentState_;
+       std::string             lastTitleStr_;
+-      std::thread             updateThread_; 
++      Thread                  updateThread_;
+    };
+ }
+ 
+diff --git a/src/compiler.hpp b/src/compiler.hpp
+index 8a38c20..09472f8 100644
+--- a/src/compiler.hpp
++++ b/src/compiler.hpp
+@@ -47,6 +47,8 @@ typedef boost::mutex              Mutex;
+ typedef boost::recursive_mutex    RecursiveMutex;
+ typedef boost::condition_variable ConditionVariable;
+ #define Atomic(X) X
++#define Chrono boost::chrono
++#define ThisThread boost::this_thread
+ #define UniqueLock boost::unique_lock
+ 
+ template <typename T>
+@@ -60,6 +62,8 @@ typedef std::mutex                Mutex;
+ typedef std::recursive_mutex      RecursiveMutex;
+ typedef std::condition_variable   ConditionVariable;
+ #define Atomic(X) std::atomic<X>
++#define Chrono std::chrono
++#define ThisThread std::this_thread
+ #define UniqueLock std::unique_lock
+ 
+ template <typename T>
+-- 
+2.22.0
+
diff --git a/media-sound/vimpc/vimpc-0.09.1.ebuild b/media-sound/vimpc/vimpc-0.09.1.ebuild
deleted file mode 100644
index 832b0849f58a..000000000000
--- a/media-sound/vimpc/vimpc-0.09.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="An ncurses based mpd client with vi like key bindings"
-HOMEPAGE="http://vimpc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/Release%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost taglib"
-
-RDEPEND="dev-libs/libpcre
-	media-libs/libmpdclient
-	boost? ( dev-libs/boost )
-	taglib? ( media-libs/taglib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( AUTHORS README.md doc/vimpcrc.example )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable boost) \
-		$(use_enable taglib) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-
-	# vimpc will look for help.txt
-	docompress -x /usr/share/doc/${PF}/help.txt
-}
diff --git a/media-sound/vimpc/vimpc-0.09.2-r1.ebuild b/media-sound/vimpc/vimpc-0.09.2-r1.ebuild
new file mode 100644
index 000000000000..0250e3c5969d
--- /dev/null
+++ b/media-sound/vimpc/vimpc-0.09.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="An ncurses based mpd client with vi-like key bindings"
+HOMEPAGE="https://github.com/boysetsfrog/vimpc"
+SRC_URI="https://github.com/boysetsfrog/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost taglib"
+
+RDEPEND="dev-libs/libpcre
+	media-libs/libmpdclient
+	boost? ( dev-libs/boost:= )
+	taglib? ( media-libs/taglib )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-boost.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable boost) \
+		$(use_enable taglib) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	local DOCS=( AUTHORS README.md doc/vimpcrc.example )
+	default
+
+	# vimpc will look for help.txt
+	docompress -x /usr/share/doc/${PF}/help.txt
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
commit	b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree	0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /media-sound
parent	121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)