gentoo resync : 02.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
commit: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree: c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /media-sound
parent: 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)
64 files changed, 696 insertions, 399 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 02aa1b52fd07..92a125ee1c63 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audicle/Manifest b/media-sound/audicle/Manifest
index 44a88073fcbb..55961f82d4d9 100644
--- a/media-sound/audicle/Manifest
+++ b/media-sound/audicle/Manifest
@@ -3,5 +3,5 @@ AUX audicle-1.0.0.7-const.patch 455 BLAKE2B b030468b23e5a05b2a79c72be9f44e61a31c
 AUX audicle-1.0.0.7-gcc43.patch 2777 BLAKE2B 5b0be13a8a91de81ccc0c3bc54978b43bbeeba187493890ec9192f03259bd9d8b3b2e215a8c781c662cf9bcbb815f71ffdbe98b234eb62bc66c138e9017a7f98 SHA512 e9858e7c7cea35d8f5af5c4c8ca22c80c030eb14bd8798cb617b86bc55067413d3875c9cc30700c2a3aa86a5439dd60708a266acd41195280e744affa89503cf
 AUX audicle-1.0.0.7-hid-smc.patch 3181 BLAKE2B bfdaf969b98c77449a46f79a7f20be976028821f7136413838cb05dcf7fc33d98d4d822c0202e8f631670b802060191e52a8115354b53480c64833b6b7efd215 SHA512 8092d8de0fb6aea240e38c98a45218c002e78af0b1d7b285bca8d9d81ae77a76b15b0db57aaf42c70a65fd52c8ced89c0e31b22213654ba52ac3105f2a764ff5
 DIST audicle-1.0.0.7.tgz 5561088 BLAKE2B 7056880aa6b902e15e7722d9532736b8d513c6e9135b2b5afb839783e3df83f4e1f29f8c73b0f652d920029f6eb12dd7af1a699cb487b9ad0f76229f6ebd6fae SHA512 c96506620e22e1f7846288cb4f34dc7efe59e14d845425673524d0a89712ea7d3dabed546eb921220e021d4e8526937990a4f5764fbf2bb90339b993f6703772
-EBUILD audicle-1.0.0.7-r1.ebuild 2440 BLAKE2B 07f51c0f411cb4312a092ae202ccd01e4b2fa5df9811bff143ddc03860c3954bc9cc096b5688db15948cd82f9e96d10bee7e5cb075fef2569b656311e5169ebf SHA512 519c7b158d1a3ac3c33a58cb782b4b02d49bdbba3a5e010d9f489a48a4928fb7d065e05a9a41c4a6361531b609cbc5d088e5f59d47505fb3662e47bec3e54159
+EBUILD audicle-1.0.0.7-r2.ebuild 2395 BLAKE2B 92c0e6881575eafdf168e26d593a8aff46f53f2ae97d7c615ae58f87c6165bd6cc10ee4962b6062b5f90d20abffc714bf682df5ab8a799ea31c6aba5b618d423 SHA512 eda677f65129704a09fb5e8f7f4a0812f1fcaacdc13310cfbca60a3fd29b54cbc3c8895a18dfdb8ca21b9ebfffca8902c41b43bab3b3cc9da2888af355f6532f
 MISC metadata.xml 386 BLAKE2B 77bb79297d16b8580b574e44a07ec2b8d5ec323528e804aef9e35f7274731e2e46976661b3089fd8d526491984f9564d3dd528564c8559e027b26d2fe3ba3bff SHA512 df4591da51216c3a5b15ef353db9b5666b7e5e4082f3e8214a596a9ab7a344c5e64178c437fe2d15b9f8b5eb1ace88e6ed800595f3b94ebb17c972fe91bed414
diff --git a/media-sound/audicle/audicle-1.0.0.7-r1.ebuild b/media-sound/audicle/audicle-1.0.0.7-r2.ebuild
index b09d488baa5f..7ea60ba2f27f 100644
--- a/media-sound/audicle/audicle-1.0.0.7-r1.ebuild
+++ b/media-sound/audicle/audicle-1.0.0.7-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A Context-sensitive, On-the-fly Audio Programming Environ/mentality"
 HOMEPAGE="http://audicle.cs.princeton.edu/"
@@ -13,24 +14,31 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+alsa jack oss truetype"
 
-RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	media-libs/libsndfile
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+DEPEND="
+	app-eselect/eselect-audicle
 	media-libs/freeglut
+	media-libs/libsndfile
 	virtual/opengl
 	virtual/glu
 	x11-libs/gtk+:2
-	truetype? ( media-libs/ftgl
-		media-fonts/corefonts )
-	app-eselect/eselect-audicle"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	jack? ( virtual/jack )
+	truetype? (
+		media-fonts/corefonts
+		media-libs/ftgl
+	)
+"
+rDEPEND="${DEPEND}"
 
 REQUIRED_USE="|| ( alsa jack oss )"
 
 DOCS=( AUTHORS PROGRAMMER README THANKS TODO VERSIONS )
+
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.0.6-font.patch"
 	"${FILESDIR}/${P}-hid-smc.patch"
@@ -39,7 +47,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
 
 	sed -i \
 		-e 's@../ftgl_lib/FTGL/include@/usr/include/FTGL@' \
@@ -48,8 +56,6 @@ src_prepare() {
 		-e 's/-O3 -c/-c $(CFLAGS)/' \
 		-e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
 		src/makefile.{alsa,jack,oss} || die "sed failed"
-
-	epatch_user
 }
 
 compile_backend() {
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 1d38c5b4909c..e80cf1741f7d 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,4 +1,4 @@
 AUX beets-1.4.8-imagemagick-detection.patch 770 BLAKE2B 120e0af71fe9c63548f49bf20fa94ec20f8b0cfb8395b319d6f8e2a62b5212adb229691c35297615a3b0272b215c87e1ff861e1887d227fc9460501900edae48 SHA512 6c5da1591e0bfc0936dca52c48f74b80b57c18bb0398877d38deb7d448df9466a8544628e0ce6948204a8deae4679c8dd454dab9a2f0778a236eaa60387a1751
 DIST beets-1.4.8.tar.gz 1493539 BLAKE2B 63c44f05bbf139cd43b5f5ada972fd30beeea2303c6b479b1be35ea21fabb0039b3c8eb6e90f8f1b2a61fed36d97ce09a32c6346cbd3b84c7c978e796505f4b4 SHA512 449bed88185a5ecb4781719e092c2428ddc52fb8084033db64a4c0eca8899154192e7cea82517993d60326c7fe39b26429584ba368ffc35800f722d8d6a03217
-EBUILD beets-1.4.8.ebuild 3664 BLAKE2B 5614f65a3489bc6ee055f25592811fb693123af75b5da4c78c2519244003f81438e162bf6d861b6f023d6a9829f63ec937feb8f37848e7e6091d6aba90ba04d9 SHA512 49049389dd652571f82da01da5ce2f676e6bd4340d989669c58db436d819e0fe27e2b1c8a202c9ff40978a4fb4465e64291918283b3f86e1db372e249eb5cebe
+EBUILD beets-1.4.8-r1.ebuild 3664 BLAKE2B 094cc8dfbf32cea571e4789db182a60ad07eeb772a47be47d45843eefe70c20e619f7524e98f533d14e899983b534d7b5c7aeeeed4e8aa00a723ec325d4449de SHA512 62f4c4d9619fc07388427830fc3a8248e7b7477c6a18a451b75e4291dd928adf40db39ddf606b2b1a9feeaa5e4728796d184b2e905aadec09ff0946a7961d8c0
 MISC metadata.xml 2395 BLAKE2B 0df8a5d3fa7b94b5b8e3e45f25e2c4dc0716c438dd51a6061f2276e20bf9779847c34bc571bcdd8948289c75c879cae6ef76fa8432a550855e9f74966fb80374 SHA512 ea2c961e7380a8c05e0e90b34f50323ca932e06ba33d5a214a633e8eba4281577993a870a7d294f286a90c0492256d3142b9e17aa02e2ea129c9c28e24bf90ec
diff --git a/media-sound/beets/beets-1.4.8.ebuild b/media-sound/beets/beets-1.4.8-r1.ebuild
index 432eaabd9850..4cfc7d72806a 100644
--- a/media-sound/beets/beets-1.4.8.ebuild
+++ b/media-sound/beets/beets-1.4.8-r1.ebuild
@@ -3,24 +3,24 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
 MY_PV=${PV/_beta/-beta.}
 MY_P=${PN}-${MY_PV}
 
-DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="MIT"
-IUSE="badfiles chromaprint doc discogs ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
 
 RDEPEND="
-	dev-python/jellyfish[${PYTHON_USEDEP}]
+	>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
 	dev-python/munkres[${PYTHON_USEDEP}]
 	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/media-sound/bitmeter/Manifest b/media-sound/bitmeter/Manifest
index 3c1cdf6a305d..2b5064973554 100644
--- a/media-sound/bitmeter/Manifest
+++ b/media-sound/bitmeter/Manifest
@@ -1,5 +1,5 @@
 AUX bitmeter-1.2-fix-build-system.patch 709 BLAKE2B e3f868aeace527b265fd73e96f9f10235e4abe0b62064a16c61dfb30d53b5048e3c7a0a461473e72895b323b96427a0715bc4716a0783b81222eaaf6b9984151 SHA512 6358c6a930d525c6a6c487556ed8db7d507d1cfbf20381c70106bf888889eee09c3d4b84ac27c757e1c2713e97f2987a051b255052881f77a5249b4dd9ff290d
 AUX bitmeter-1.2-qa-desktop-file.patch 381 BLAKE2B e8d126340b50ff13ea62bfb461a15be1144dcbcccdf936ac6e2e43538e619ea7ed8e31a449a366c56b3f74fca7f5df4e9f0196e0b6c442ef17837f809dbe3b29 SHA512 8de6edd11597d9f9c0a6588b49874de5d69debcf155a3f9ea88dbcb28a75e5d0325a8f904be7c6ff0ec17d6fa0f8789566713c736aba71e928198dd774889c69
 DIST bitmeter-1.2.tar.gz 216592 BLAKE2B 4f093de7d87330329b8ab7f2673c55ba2f90da1053d65b0268fe4ad7d024559c737cf7d6b9038c44f16abe6c34fbe73a0c6cd837b8aadc9a2660630b106a41d5 SHA512 aa034b572d499bb0858d8c0e9a0487bf1c83c8edfa43916e1a0618ad2c3a71272f0ed740c8e62d17d8a504d88c7e0fc4f36b736628e481f036812d07f6e251f8
-EBUILD bitmeter-1.2-r1.ebuild 719 BLAKE2B f18b42a640c3650ba79c9f090ea71d2a5c32bd82d9168a2c71e177d01bfdf145104811ed8d6216c12ff69e34d2676959fffbe8d76c54ce010f365747501911f0 SHA512 fea8335b569550a8f1154ddddb75b496b472df7176059d9f18de23cb404e91e18b8819a9b8a681696f56691db7e1ceb06a30708c0e7d1db809bbda5d7021cb2f
+EBUILD bitmeter-1.2-r2.ebuild 707 BLAKE2B 321922e1be64d273396ac2337138ed968704c0036d19e62d21262f7dc7fe97998f68279b97d8272927849698a9cb48ebed2020d92de178275109d3d0425630d7 SHA512 759321ae249e20e5e57c264e243e04946ef2ed6c98c9a4c41d584fa7ca8960e60ca29c5f369ad4d90a94a00343684de6bdd4e3f1c405680b20452dc6cb2e1292
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/bitmeter/bitmeter-1.2-r1.ebuild b/media-sound/bitmeter/bitmeter-1.2-r2.ebuild
index 35b1faaa6ff9..4ee1222e4afe 100644
--- a/media-sound/bitmeter/bitmeter-1.2-r1.ebuild
+++ b/media-sound/bitmeter/bitmeter-1.2-r2.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
 DESCRIPTION="Diagnosis tool for JACK audio software"
-HOMEPAGE="http://devel.tlrmx.org/audio/"
-SRC_URI="http://devel.tlrmx.org/audio/source/${P}.tar.gz"
+HOMEPAGE="https://devel.tlrmx.org/audio/"
+SRC_URI="https://devel.tlrmx.org/audio/source/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
-RDEPEND="x11-libs/gtk+:2
-	media-sound/jack-audio-connection-kit"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	virtual/jack
+	x11-libs/gtk+:2
+"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2-fix-build-system.patch
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index d618971f1936..8333ad3ef6aa 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -3,5 +3,5 @@ AUX bristol-0.60.11-dontcompress.patch 576 BLAKE2B 78f5629897a3ae3380f5e64ccce6f
 AUX bristol-0.60.11-implicit-dec.patch 320 BLAKE2B 8fef42ab74f5f6777c86774a7f7c8092b20d8c596ab2118fd862bc32e0f3fa55ceee488cc88d4599f22b4b373d67c2af3ea189f3508e30564ffc71acb5e812a1 SHA512 50a59747c75a8843b06fc412c65d724d8f205be1c6d9d5c0aa0d38c57f0f1401634dd301b531f8a28ca43f3804727d9ded82e6fa49abd5372fc8e70f87f5b341
 AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 967 BLAKE2B 9da2f53f06e4db83c5fe280e3253c70a83e052304c9e5adcd6e64956c81ea7bfd9eaf1dd5d639aca581c16bb446140fcef591753b3325aa0f700ed3a8649f1db SHA512 a86aefdcb1a6431bce94dc062b4f3e73332196fc71a154c8d171991cd61b3694958229c5d329245e098976732f03f75516dd7521d887b822bd6441e66a1bd64a
 DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180
-EBUILD bristol-0.60.11-r1.ebuild 1196 BLAKE2B e32f880e80f8b418bc7a96b319a8ce108f7b6d1ad904c61b3732b16cc3fc497f8fd746e865679240bdde50fb084d2a8f858b09ace5af1f2d415f65f801927aff SHA512 3ec5ec5cda247f80c95189fa89f8783b4af16892df646e5784b814cc025808f366a57424c6571128ee7729494207ab2ad8b6745dd10840790ed295f89ca43430
+EBUILD bristol-0.60.11-r1.ebuild 1162 BLAKE2B a91b2583ffa49b6f3d53c6d5948ece07764d9f4c8c6f1be25043d47556b41969b7329eeb5bf6cb63cbfe6298b63cdb3f28f1a161d2893333b241b6c1b2e0124c SHA512 b4f5aab7a0af100da9d95d6c7e621cf6b0e5a51abe5da4abdae323ba3158f79320a2452338d0e51df1b42821f256f79268148f7c693e04dfa35c331819046dbe
 MISC metadata.xml 599 BLAKE2B fa41cf25b04bb687587a736332f3b66a63a52d13c0371b64aaf8c7d12515df8ac9b15c3e70687b6cd8157b493a65992f2e8a1a96db12cd372215b9791b46fc7d SHA512 ca1be472e9a1dce6e55d3313e9b11f0839fbb321c5b662ebf4a9aca0915d10b15cbe3aee3629b285886e84b53f8c7d0c65613e58be32d5d98f04360b368da1ba
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild b/media-sound/bristol/bristol-0.60.11-r1.ebuild
index 0cb211ac2850..01ee6cb806e3 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,15 +17,16 @@ IUSE="alsa oss static-libs"
 # jack: fails to build if disabled
 # pulseaudio: not fully supported
 
+BDEPEND="
+	virtual/pkgconfig
+"
 RDEPEND="
-	>=media-sound/jack-audio-connection-kit-0.109.2
+	virtual/jack
 	x11-libs/libX11
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 "
 # osc? ( >=media-libs/liblo-0.22 )
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 
diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
index 1f5e0d220258..710b462f28bf 100644
--- a/media-sound/brutefir/Manifest
+++ b/media-sound/brutefir/Manifest
@@ -1,4 +1,4 @@
 AUX brutefir-1.0k-ld.patch 4655 BLAKE2B 56ae2cf653311030e5552e50653082b059baa39bf00d1d9a2692e319b459a88b4bef4e0a1aa01aedd2ec9c97f19de0f03b966d10c6faeeccd6ef907d91b12a59 SHA512 606d32f1b76901e3cb6d106259d19c64e3a6f841fd5d0791623ad824c7264ff3ecd7178073fe488c7f1d26b996b9900f9661406f987f2443e9eb8ef9eeb6491a
 DIST brutefir-1.0k.tar.gz 246987 BLAKE2B 3db08c1f51e8febb63b293d1a242342e7d9f4fa4b447b46da37bc3de594bef8a6ee15cd8330ef73673011186dcfe47a5b056ec3c177f3982cd1837a582f050a1 SHA512 5eb81a18935fc3f014613b74c30b2e9a3acfe0ab58b72358f0428b60f0296ab54796b99fa00b12a671935b57589d710dd81b1e0ca675bd2b841c9e932a2c94ef
-EBUILD brutefir-1.0k-r2.ebuild 1103 BLAKE2B fa456a16de2a0014236595bbc49a5b158536a758a184d87d351053e4d898c509515f2440dce18bfc2ef6db50709314e6f527fc9777353afed53d554098ae362b SHA512 b9203230a0686522331f196fdfb3f0fb3daef3ca35ca6fc5f13b30e85906e9bef4254af5228fcaa68db9498e45ae125359844c489d763e964adcefc401e03e24
+EBUILD brutefir-1.0k-r2.ebuild 1080 BLAKE2B b8370021bf1bf6104292c21aa1efb33b0f02952978138a499ebfe0986388c17e57f5a39149d7acd8eabe9701ee1c5ebf47a7da245ae2f48591342108109962f2 SHA512 70060a3750b4209dafa7bcc48b73e14d74295ea44dceb28e00057a22e32cb858f7e62d577df0aab1ed88cb376444618804b8ce3dc8110aabee98203f57c3cb49
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/brutefir/brutefir-1.0k-r2.ebuild b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
index 5c205ce75718..c0dbb7ac747e 100644
--- a/media-sound/brutefir/brutefir-1.0k-r2.ebuild
+++ b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,9 +13,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-RDEPEND="media-libs/alsa-lib
-	media-sound/jack-audio-connection-kit
-	sci-libs/fftw:3.0"
+RDEPEND="
+	media-libs/alsa-lib
+	sci-libs/fftw:3.0
+	virtual/jack"
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-ld.patch )
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index d4142132a45f..fab1fc4b4dd0 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,4 +1,4 @@
 DIST cdparanoia-III-10.2-patches-2.tbz2 6242 BLAKE2B 6eb0f3c3a331421497e406df969de61d42590f4e8ffff13ffc212ec4a03170b1e02e00322c5c4f2042e5cc4be2cffff58ec8b9b57d851d5df8bebc3fb88ac913 SHA512 523a9ef9f3de263236aad6da102b807a6620cde8767e297e54dcd552f59077d959a89187bc82ad71c577fa66c4862d7c651e922b8b8b8369dd63685cbda9cb74
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
-EBUILD cdparanoia-3.10.2-r6.ebuild 1325 BLAKE2B cf1ce4c6aa1df6a613f86d2247b388fee280393079a284f6aa00ea5aa94b0823f8edd924ff2b2c2a40b7ab5e3d389c160c5714c0c9eebc35dccafed37ae467bb SHA512 1229f4b9749fc5e78c85148c4ab72183fc92d04fec13c623b4860c7e9b62733ead9d9378059c9d1cd351f8ae19a277fe77df24055b3e90b9a638edba4ed24809
+EBUILD cdparanoia-3.10.2-r6.ebuild 1321 BLAKE2B 30833fc15e666cd3268bc6c93119e664eb2b70735f86d151411700094675ad5bd9665d74ac446dcd0fe668d4e6249a3b67a0dcfc9d05d9ec3d3e778c2896c1c1 SHA512 669c340b310ad79f0fb659d36bfaf06d27df486cea58bb9aaa2b5a312eea3399a95f07ff7e25a9719f041adf378f49d1fb7f2891b398d416e2e9e9bb3ccce41d
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
index ef62f7fc786e..ccff9a911ad1 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.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=5
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-eselect/eselect-cdparanoia"
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 56ffc0bcc365..f9bf7cd492e4 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,4 +1,4 @@
 DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
-EBUILD clementine-1.3.1_p20190127.ebuild 5041 BLAKE2B 67d44296fce0e1464582645aaec298982b0fa0bc0dd82d1390c56f45c1fedb16b9f7a783ef7d8e3f5ca0a392dbd1f9c5775fdc7cae2574732b3cda3350ae57b5 SHA512 ce614fec90f176fecc761333c959c67df646797448fc12cf0ab6b696942e13c7dc668cfb75e71f77538fa244ef25a689bfaa4687dc8cf631d52014239e26b152
-EBUILD clementine-9999.ebuild 4977 BLAKE2B c542c8d91b7d2305b6a58b7f863159c175919a7960a59be872079ea6393e57d227046dec4c7ecb4a9c7efe9410d5fd1da37ea207d812da84950fd52830a06c5f SHA512 cbba3f82e7dcc42bb76b2d7b92d5de68110041dd8ceb06683757ee7da5efa1b23be0d5106dd14380dbc7798428e79020e4ae5a153673dd8ed92003bfd7876913
+EBUILD clementine-1.3.1_p20190127.ebuild 5043 BLAKE2B 4d6c2113a990744bb310f7d2ef0c20e24554fc64a5df1546a11cad449a689f5aa2515508dd30cf77b9294eb2b880980f24a5e3b22dd8ca6521c752939eafabb2 SHA512 ca57e01f9fbce22460f1d52a01fbc641afbe2a6981f04544e21fd4a35fc8a16c36313b86637e5bd7ce1b0aa87eeb32178acd92266c47f8c50666a0f4f93e1143
+EBUILD clementine-9999.ebuild 4974 BLAKE2B e25668017fc68c1443848e9677e44672109522bf4e1a6ca806dffbb262f063b430eb31af17c36e349b872f32d7a1b05b5989f457dcaced6cc913ac61121c64d7 SHA512 e3e1d1e24f2290281644313c5c29a531b53d80c5f22c09e87e8f3f5119bb56540844020fce471bbd4070bbb55f08229c35c2b0b0e7d736b0b49c6b12cf34a1c7
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
index 24f7f6aca315..64add8ac854a 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
@@ -42,7 +42,7 @@ BDEPEND="
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
-	dev-libs/crypto++[asm]
+	dev-libs/crypto++:=[asm]
 	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/protobuf:=
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index d3752f437463..95744f36b833 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -42,7 +42,7 @@ BDEPEND="
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
-	dev-libs/crypto++[asm]
+	dev-libs/crypto++:=
 	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/protobuf:=
diff --git a/media-sound/erec/Manifest b/media-sound/erec/Manifest
index c266f6683925..346f4aa22066 100644
--- a/media-sound/erec/Manifest
+++ b/media-sound/erec/Manifest
@@ -1,4 +1,5 @@
 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.ebuild 1017 BLAKE2B 34ac4b9ee3588604ac5b80b8f71927103c64c5759d8233152836047cc125917a61179ca18022d5f0e8175b9ee77c0e56fa9b0db41d6fd0416929e6fd6fb658dc SHA512 28cda059398bffccdfb257da8e284d42485cc8cd81d3ea1cd9baf5a2e052d189765511ff8c090fbca415bc1c11b1bb76f63038904dd97c8b5db20ce2a1f5ebe2
+EBUILD erec-2.2.0.1-r1.ebuild 1000 BLAKE2B b0a97af4152309e4a9e106c8a9acbee69a7d107dc32862c6f082903db8137cce5434e5a2e48cb0e8f5d7fb7038ca3a87a1c6e4d82f86f0332766dd320e7976ec SHA512 2ba45949afad716291cb0e613e751f61928c5f5aab4981dc2622bf519a3ac16b290dd416da53030dbdad288379858784b4ed62df01c8d5797a3dd70fbfde991b
+EBUILD erec-2.2.0.1.ebuild 1015 BLAKE2B e6276645909bd996d5a03d3b8a94395a5e45f60848b911870caab8a559a4ed6ebce13d663088e5a5ca821b6f776e2ae1102dc44977eb0adb87ba10f3f9d4e0a5 SHA512 e3ff44ed3d359dd5176743241d7bc7d672da6bfa8044c54634b72e3bdcbc6ae9f3ea26a455ceae5cf8bc167e800013bee802eb07ebedd608c6074b25a4b43f95
 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
new file mode 100644
index 000000000000..527e1ace368b
--- /dev/null
+++ b/media-sound/erec/erec-2.2.0.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Shared audio recording server"
+HOMEPAGE="https://bisqwit.iki.fi/source/erec.html"
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
+DOCS=( README )
+HTML_DOCS=( README.html )
+
+src_prepare() {
+	sed -i \
+		-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" \
+		Makefile || die
+
+	sed -i \
+		 -e "s:CPPFLAGS=:CPPFLAGS=-I\"${S}\"/argh :" \
+		Makefile.sets || die
+
+	echo "" > .depend || die
+	echo "" > argh/.depend || die
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -j1
+}
+
+src_install() {
+	dobin erec
+	einstalldocs
+}
diff --git a/media-sound/erec/erec-2.2.0.1.ebuild b/media-sound/erec/erec-2.2.0.1.ebuild
index a9781b79bc0b..4d9f2c352052 100644
--- a/media-sound/erec/erec-2.2.0.1.ebuild
+++ b/media-sound/erec/erec-2.2.0.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A shared audio recording server"
-HOMEPAGE="http://bisqwit.iki.fi/source/erec.html"
-SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+DESCRIPTION="Shared audio recording server"
+HOMEPAGE="https://bisqwit.iki.fi/source/erec.html"
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
 KEYWORDS="amd64 ~ppc sparc x86"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
diff --git a/media-sound/fmit/Manifest b/media-sound/fmit/Manifest
index bd68e7ed6e86..a6c4a6d303bd 100644
--- a/media-sound/fmit/Manifest
+++ b/media-sound/fmit/Manifest
@@ -1,3 +1,3 @@
 DIST fmit-1.0.15.tar.gz 295365 BLAKE2B 9424c1fac390adc7fb8746ce05b354b31bc9f4ef8dc49bd8ca2c1362d9b57c1c0d8b10e110faae9d48363dd02f80967c767ade0e67096c27bcf5ae1c9d1fa8ca SHA512 44537669391f5043efe35b53d9693f8ab6a151918583d35439c1b29feca4a707225038512c9a2de734ada9e9acb3b4b191b866038edaed9fe8d1fee09c540aac
-EBUILD fmit-1.0.15-r1.ebuild 1568 BLAKE2B 4d0f1604ac942cb82384a887c2f8e2c0213eff0894b899711d56e6311474fa5644852bf86e1a5a1c4a941e374e5d1ef5aaedb6c31331226563c9ae1fd7678ad6 SHA512 d98a45e4207de40ead50af4dc46f533869428312d47cf97cdfbd1edb37c6972984d05f9ff9b609d5e50b433c26e4659b79ef41b6b0652bc859b0a0bbaa6fb9e0
+EBUILD fmit-1.0.15-r2.ebuild 1570 BLAKE2B 34c007975c899da4d94e4f8d4509c66937fed56e4cd3c84638b7e45465152d45b4dd133cc916cfd1f687af58870374eadf13bfc48626aaecb78c9155afde83bf SHA512 8aa800e5e6697e8560ea378b7f3e8fc2d8fa533d50eebefe6b703c96705b6573a1e3b3c800c57fd95b531683da82213fba7aa404825b9fd0230da217f29719bd
 MISC metadata.xml 251 BLAKE2B 41d57d683fe855b6ee6b161b1c9bcc193e33ed5c184df3738f693f0c078978a6d7bfde323243822cd5e0679122e6241158f0e6ecd237fe8f0e7e770c95d7fd19 SHA512 16072c41732d3c5486b4066a8f17cc829688c24772a002ea72c1deae3dcd78f4ee72bd7948782ca970fdb2e5cba66a16db205a384de036186814b2345f2f103c
diff --git a/media-sound/fmit/fmit-1.0.15-r1.ebuild b/media-sound/fmit/fmit-1.0.15-r2.ebuild
index d7e9c9594e38..163fafa5f86d 100644
--- a/media-sound/fmit/fmit-1.0.15-r1.ebuild
+++ b/media-sound/fmit/fmit-1.0.15-r2.ebuild
@@ -1,32 +1,35 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
 DESCRIPTION="Free Music Instrument Tuner"
 HOMEPAGE="https://gillesdegottex.github.io/fmit"
-SRC_URI="https://github.com/gillesdegottex/fmit/archive/v${PV}.tar.gz \
-							-> ${P}.tar.gz"
+SRC_URI="https://github.com/gillesdegottex/fmit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa jack oss portaudio"
 
-RDEPEND=">=sci-libs/fftw-3.3.4:3.0=
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2]
 	dev-qt/qtmultimedia:5
 	dev-qt/qtopengl:5
 	dev-qt/qtsvg:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtwidgets:5
+	>=sci-libs/fftw-3.3.4:3.0=
+	virtual/opengl
 	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	portaudio? ( media-libs/portaudio )"
-
+	jack? ( virtual/jack )
+	portaudio? ( media-libs/portaudio )
+"
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+	dev-qt/linguist-tools:5
+"
 
 src_prepare() {
 	# Fix the path to readme file to prevent errors on start up
diff --git a/media-sound/gtklick/Manifest b/media-sound/gtklick/Manifest
index 7824f6b9a8f0..6e7a8de9e414 100644
--- a/media-sound/gtklick/Manifest
+++ b/media-sound/gtklick/Manifest
@@ -1,4 +1,4 @@
 AUX gtklick 787 BLAKE2B 6442edd7fe2249447950e03b4abfa912a0841d58aa9bd43a16fdaf52bfa735925caff404db477c40f99b27f4085ba1324d97316ea1f0fe02cdf0a5cce68dac1d SHA512 3ba1e5e9507eb6827dd7649e00da69539537934714b8a3833c8fae21abd0d0d7793a0207f4ebf1f65cb6e111cb7e344b97d5cf397cf038364cffe2ee6be39d6a
 DIST gtklick-0.6.4.tar.gz 35901 BLAKE2B 1dd0adcb5c0489633a00ec52230b0a3b7c0017ce5148c5d8a32cf09326243f61e26cf31e3f25c8213af9a77a4a4bc9b74bfd7167808c9037549cb10b20701b99 SHA512 8491650cf324005f32808036f63574b0a59659bc8e5f3efe615b83e42701f1a3bcb95825a2378b3a17b45ddb5b33c87bed9602a0492d117665d85bd35f4a4a9b
-EBUILD gtklick-0.6.4.ebuild 873 BLAKE2B 441645e0deac450ff50fecb3c27ca2cf00978359c6278e63ed4b1964777178500d3efc949df052d1efddfc38ba72a5c26ca9d5ff65f1544e702905e148b1ae7a SHA512 55bd67fac8119fffd8a495da8ba9eef49b13374729d1a27ccd8d68667fc71f410261394d7769f33be58dbb14190d093c45ea53dd052fd6e47ad679aecc7801b8
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+EBUILD gtklick-0.6.4-r1.ebuild 871 BLAKE2B 5928694401c5df24315312095ba83ba7de705a178d1b14f20d03c2457b80738e644fa326d759dd0fe82b3bc3267738d3adc824385bfc98f1e11d76712552bad4 SHA512 ea76fd58f103ddf2c8cb0f5051761e6fc495e9553b2f71b40fab7888b234851dceec114290b842db6c80088ec9beec94b1a4249302f9537a34a1dcdfd7124661
+MISC metadata.xml 443 BLAKE2B 6674b5c036cda85de93e6ad5718105445bfb79209d0d9e84516381349ca4798e14fa4b913b89916b14550d75f0b8b82a4f396d22673659a4c3eb50e9019f9d1b SHA512 2bc8fd482c0035ca55233825c9312c36d8172d9f8a230140d84ea2813cc0f78eadaaac6d62f3647d74aac661e8ad7875544c7bdb5629140bd36fbff1ca9c4344
diff --git a/media-sound/gtklick/gtklick-0.6.4.ebuild b/media-sound/gtklick/gtklick-0.6.4-r1.ebuild
index 0c04f65a3903..cf89a50cad7f 100644
--- a/media-sound/gtklick/gtklick-0.6.4.ebuild
+++ b/media-sound/gtklick/gtklick-0.6.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
@@ -10,7 +10,7 @@ DESCRIPTION="A simple metronome with an easy-to-use GTK interface"
 HOMEPAGE="http://das.nasophon.de/gtklick/"
 SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-sound/gtklick/metadata.xml b/media-sound/gtklick/metadata.xml
index 1b2becffa26c..c0aa4bcd7bf7 100644
--- a/media-sound/gtklick/metadata.xml
+++ b/media-sound/gtklick/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dsacre/gtklick</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/id3tool/Manifest b/media-sound/id3tool/Manifest
index 54d5fec3e225..8fae822bddbf 100644
--- a/media-sound/id3tool/Manifest
+++ b/media-sound/id3tool/Manifest
@@ -1,3 +1,3 @@
 DIST id3tool-1.2a.tar.gz 74723 BLAKE2B b96e16337dd468ddcba9343fd2286fec0149b6919f006cb6db99e862f449050b6f7bacdc3b40ca769affe233881ecba657e93f93d59f9bbf5f18fef150809ec5 SHA512 518d51794f19605bb3733b0d66f55ad3106ba17826bf2791b4629a0697f92bfbe0193d4442c4e3a5eccc8200ad3c0089085167857652884922a34cbe6683b36a
-EBUILD id3tool-1.2a.ebuild 526 BLAKE2B 16bcaf9d56180beb2020b393043a16579d8665231bf590fd291a22e9c04f34dedffda4d522b0adbabdd5e3935dc959213899f743e6515fdbf7d2881b04161c91 SHA512 8146fb9a1c52b37750832ef198cac854d9d42e44126582b125cd434ad76a9fa6e96df2e609f725a59209e9187d9552b7c54facfb2602cba399799449901aaa58
+EBUILD id3tool-1.2a.ebuild 373 BLAKE2B e9309019b73a6e2d940dd184753a335b79854130085db9806bc3deb41da5394d86a586bfada60fad4502ae5c7ddf76cc327d9c26ecfcc4564bb968c24f988831 SHA512 262be800fa58cfb819adc44753ee12b0b03be3500af476b43fb579337c6d05e3bd32b947017d90d7064788da9e65dab281901b30e14dba53c3c413439f9abec5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/id3tool/id3tool-1.2a.ebuild b/media-sound/id3tool/id3tool-1.2a.ebuild
index 6148a3223cad..018bd6961d12 100644
--- a/media-sound/id3tool/id3tool-1.2a.ebuild
+++ b/media-sound/id3tool/id3tool-1.2a.ebuild
@@ -1,20 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-DESCRIPTION="A command line utility for easy manipulation of the ID3 tags present in MPEG Layer 3 audio files"
+DESCRIPTION="Tool for easy manipulation of the ID3 tags present in MP3 audio files"
 HOMEPAGE="http://nekohako.xware.cx/id3tool"
 SRC_URI="http://nekohako.xware.cx/id3tool/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~arm amd64 ~ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc CHANGELOG README
-}
+KEYWORDS="amd64 ~arm ~ppc ppc64 sparc x86 ~x86-fbsd"
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
index 2d1b82c62e15..7a63d8246ba9 100644
--- a/media-sound/klick/Manifest
+++ b/media-sound/klick/Manifest
@@ -1,5 +1,5 @@
 AUX klick-0.12.2-gcc6.patch 1513 BLAKE2B 70eac0137fc8b4ffa25ccb86789efe7fc45cb9d68ac5160e962e0178637a3406221019c07d4a4035aa4baba00c4d883c005f6190f92cd81888277531ed232c41 SHA512 15d5fadd81f5dcb837ac4f91d62b99834fd192a508d5df9647df994b65807fc3de25eaceccad9b39535dc56abb83feb2f48109cf46d95d1ddb68a8212d096ad3
 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1
 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
-EBUILD klick-0.12.2-r1.ebuild 1028 BLAKE2B ccc840f9041de5d1b45b304eb2f712dc60df598c2dc166ba1c0d1cf1abb46695e05b449fbfd6abee1b9cf2157057eabe46f7573dc66e3a880e76f43f2c542295 SHA512 3be24a91e6279d2381d505a16642143b0f340a3269d53e2ea4b03eb85883442bf9094e778eed7cdbf1c2690749aeeb713160c1ecc42b57c8b518c46473583e7f
-MISC metadata.xml 241 BLAKE2B a584bb38ed8f3409284138457ac176a82c7ca3156daeabfb91b7bda72fa8d355c42b66683d16eca6addaa3548caba23e1beee758c7a10cc38686df9bee658e3a SHA512 7b743e56833b3696355128536d637744b5b2f7236f4818c6f8fda0c03a82c1f2ad1c8f491b700eb6ec45454924414c2e2df506184466b2145ba895e12dfa76fb
+EBUILD klick-0.12.2-r2.ebuild 1088 BLAKE2B 941df16e88b13a62eeef5ba0b5af0c6dc96d7a4817e9d3d1413f0e444ad06e6e3f6c0e390c30b6335254975be634d6f9c958b345766d285ca4a258ff3129075c SHA512 583aaaf49426c003ca1657d24eae09a304859f7258df6c2b527374090c2aa55d7331da857b51df320d69dfd39b6ca41516341b65147ef25da15931e5968fd3d8
+MISC metadata.xml 515 BLAKE2B 2a74e5109388a6bf402aeb0a96682b562a53d50aaec99a52163cc3b6744eafdd8be790af99399871af1d87c20afebc80d900304769303301f26b30df2551441b SHA512 fe2a6ca368b2aa748ba1064bbe484849a502a43f7616456c966fd011999ea73aa607c5ffe8cdb1e53e4400c8276fe3e732733f55b0f0143e140cecffaba8522a
diff --git a/media-sound/klick/klick-0.12.2-r1.ebuild b/media-sound/klick/klick-0.12.2-r2.ebuild
index 06734a9fa584..25f94d2fe96a 100644
--- a/media-sound/klick/klick-0.12.2-r1.ebuild
+++ b/media-sound/klick/klick-0.12.2-r2.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit scons-utils toolchain-funcs
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit python-any-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="An advanced command-line based metronome for JACK"
 HOMEPAGE="http://das.nasophon.de/klick"
 SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug osc rubberband"
 
-RDEPEND="dev-libs/boost
-	media-libs/libsamplerate
+RDEPEND="media-libs/libsamplerate
 	media-libs/libsndfile
 	virtual/jack
 	osc? ( media-libs/liblo )
 	rubberband? ( media-libs/rubberband )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-libs/boost"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-sconstruct.patch
diff --git a/media-sound/klick/metadata.xml b/media-sound/klick/metadata.xml
index e83667d5c945..807ed60afdd3 100644
--- a/media-sound/klick/metadata.xml
+++ b/media-sound/klick/metadata.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="rubberband">Enable rubberband support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">dsacre/klick</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 571420ecfaea..58ffea1b66e9 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,5 +1,5 @@
 AUX linuxsampler-2.0.0-lv2-automagic.patch 727 BLAKE2B 23d836320c5bdd8e022599c65d26c3c757828a348e9ce87d158e1bdc9f3fb82ae174cc08a7ee4b4981378c4fd556fb932b2dcd4cf7bdb88c27920fb8a2033f8f SHA512 95f7b2bf01b293c58dc673cd40d6846d50d3a430a2874260fc268de7afe414a4970d4a443801f5d16417c14c6c16732e4bfdc58f7f997b7a3dd0bc1dc7ac8ddd
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 DIST linuxsampler-2.1.0.tar.bz2 1154834 BLAKE2B 1be8a14bb6c13d90f4068cc2e25211dccc8253a114234ba560136d9da9a806d101db49116698fe53353a649c77513d244700d7bb65be04d0eb4d10ef057898d6 SHA512 503db074437b07e3e8dc8d1cb0aa3a510a62d183148157c1a4757681a4319e531bd6a1486a83c0ab9721dde82e27306150f3be87476c9298b2335438670e19a7
-EBUILD linuxsampler-2.1.0.ebuild 1680 BLAKE2B 68947407aee89f1c052dbe90bc1e44508c2a23b8427d5b6fc609c18716d8d71a3c2a439d74a76b50545e3c19e9be633503b57ba8f181d9b073fc29de43212691 SHA512 707d00fe926eb04d2e4ab5781093c065ff5ba70fa3bec2e83ed32591bba3b5c8cc803fb828bca35a99eb2584d2fde962891c5bd453a53b03d0d5eac1a4798c09
+EBUILD linuxsampler-2.1.0.ebuild 1722 BLAKE2B 53ac46fe27117a50943a131183e15cc4889fe65a3e633b59a3f8d32453f8a9bde49b32fcb062f2857a43e2e3c2662f8f9cb4ee2720096dbc8b8996a2a8e431e3 SHA512 e93256be1864c7b19496cef12d0322b058f62ab98594e7a830a2b4865dee747c98c301c81440dee2a1b632c10a3ceea2addb00529d49c416b589bd7f9ebbcd18
 MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild
index b277175098e2..cb7d364ca292 100644
--- a/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,7 +61,7 @@ src_configure() {
 }
 
 src_compile() {
-	default
+	emake -j1 # fails with parallel jobs, bug #666738
 	use doc && emake docs
 }
 
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 52a2556f632f..202ad3c67937 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,3 +1,5 @@
+DIST lollypop-1.0.11.tar.xz 448424 BLAKE2B 80cbd622b46d667ca566e8aac9f523a83cf8b43e61abe06eb0aeaa6fd22a45611ba38fdfd64dfce7b1e1f946bea8b7a2b589152c6b3c762cbdffb041c4c7de08 SHA512 9a885a88af8a4d58b12ef7da82d35bbc3256cabd2a38ac0b35e8a0753b1e10dfa7e69e8e5f6c7f8ba68d2557cfe47c6003ee1f68ecf6c434e5ab81f18c2ae935
 DIST lollypop-1.0.7.tar.xz 436000 BLAKE2B 8b41a3378e39b0cba59323bbd7946226bcce29f80c878833ac920f337c036fcaca9c81caca2e360972295c6446c67d79e201093f86cad0685f7365a332d0e116 SHA512 ce537e60e3f1c678fcbf26d1305a178a3f2299abd4f75bb3c3a2cf717295e14aa73a8f21fb88d0c1fc790a80a572dbce84d01a0fe3229879124f89f8a5fa8305
+EBUILD lollypop-1.0.11.ebuild 1367 BLAKE2B 53a960bd753f365062a5b188ee12854f1a443225c88dfa83fddb1257f47ca4a3b41c3ca656fc249e19728c99d5dcbc599dfe5ceb9df330680e884a107fb9421f SHA512 275448e4e320a520352a7fe2297545dc6b4901c7520e649f89c4c16630b776011fd1932a4c853b79e219f6d26f0feead6c3b3865b7ca5187b4e3dc9977fac1b0
 EBUILD lollypop-1.0.7.ebuild 1367 BLAKE2B 58e95f8666ace9c74cdba8e8ef4508b3ec8aadd40c5f07bbe1deb713f7da0f200827a66b23b28f73abbf130356cfced8e1309996ba793196e35c4d2ac233bf50 SHA512 8ddf6d570858bbdb8381ac75a419b2b6534d5c9165df166356783c7c02fe0ec6fca1cf79087a954680f17825d35ebfeae8e1ccf147ca701559e2415249825f32
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.0.11.ebuild b/media-sound/lollypop/lollypop-1.0.11.ebuild
new file mode 100644
index 000000000000..d8b5658aa634
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.0.11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+HASH="7127b40865afb12d6a07435c4396f34a"
+inherit python-r1 gnome2-utils meson xdg-utils
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/appstream-glib[introspection]
+	dev-libs/glib:2
+	dev-libs/gobject-introspection[cairo]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/gnome-common
+	x11-libs/gtk+:3
+"
+BDEPEND="${DEPEND}
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	dev-util/intltool
+"
+RDEPEND="${DEPEND}
+	app-crypt/libsecret[introspection]
+	dev-libs/totem-pl-parser
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
+	media-libs/gst-plugins-base:1.0[introspection]
+"
+
+RESTRICT="test"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/meterbridge/Manifest b/media-sound/meterbridge/Manifest
index c87a239b5b63..887eaef6c804 100644
--- a/media-sound/meterbridge/Manifest
+++ b/media-sound/meterbridge/Manifest
@@ -3,5 +3,5 @@ AUX meterbridge-0.9.3-cflags.patch 483 BLAKE2B 02233f99771bdf233e374bedc0f965fa0
 AUX meterbridge-0.9.3-gcc41.patch 488 BLAKE2B 379e5d1967a78c53b112a7dbb8ea41d561d5517879a91335468345f56ab90c0bb438dacc69a308fcd03f1df46f1ca617bd47deb0b4329991a4b9dea8cbc5d0a8 SHA512 df259114e25efb486ad980b44449b8c33b3afe87a726a5c40641831810d0de30a56c671bbcc5fdbe2fec05b860a3b2ed1439947240c967f938c6771e91d5907e
 AUX meterbridge-0.9.3-setrgba.patch 547 BLAKE2B 5b2aa5a2701615dfd034c710faa6e75ffba3f5b03517bba4f880b53c17faa248c9e4dae8b2d7a598cd93aa213add78307a5978189c29df688f7ab6f364e37724 SHA512 2bb8e4c26d33a0383f3867459dcc15f5d7500adbbb5cdc230d7fba1d45c9ba4f0ba46731770c5ef25f6adc8121efbef9ecd0ecdac53ed3c3ced840010e3164d4
 DIST meterbridge-0.9.3.tar.gz 610566 BLAKE2B 3a4a2fc95de1184dbbf614b18814d3e1ce52c67f48c70832fcecfb065e489cd18ded17fbb34fe6f477149728731306eb84dec2068f8408d11f197ff0679c87e5 SHA512 19c49a584ab71a4fbe4a0d3f05382ce464c3c5f3e37a6dbd42b4920a18577d66464d8e1277d32c34cf9248a945da05fda17a3ecd35e770fdd8af6e9f691ab52a
-EBUILD meterbridge-0.9.3.ebuild 807 BLAKE2B d7b4d29b312a81c962dd23874b3d32275a216d08a97fc3fbb6f6cab3dd8b1778f0b9ff9e5d16c4ff0dcbed87449c7606899343ee91e5e6d9e581d9162febbfdb SHA512 532fcd9473911c4b8284cd9e69fbefcd7d7d1eb04da0b3e78f7f4df3b585bb66f81c75aaa8cd6763261027018d4824f917c1a5ef1df0322ab1a0d5d9c6c295e2
+EBUILD meterbridge-0.9.3.ebuild 706 BLAKE2B 937d799dc5d7a324b76de3aaa6221b32f4f30605ce8e8ce5f2be2d393d68a36e26783d1f63bd077a282d0c4c6995a3215602aaa88253d6f951e800b004ecb5d3 SHA512 0d2a149a8dc1447d6c0742bb4264f3906be7a1abcdc538d4aa93a981f4757d850f6a091efb50f74944047076a8f18371b13480191e43deafcf20c2417c0c7576
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/meterbridge/meterbridge-0.9.3.ebuild b/media-sound/meterbridge/meterbridge-0.9.3.ebuild
index 83bb62c55f3d..795b52410328 100644
--- a/media-sound/meterbridge/meterbridge-0.9.3.ebuild
+++ b/media-sound/meterbridge/meterbridge-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Software meterbridge for the UNIX based JACK audio system"
 HOMEPAGE="http://plugin.org.uk/meterbridge/"
@@ -14,12 +14,16 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="media-sound/jack-audio-connection-kit
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
 	>=media-libs/libsdl-1.2
 	>=media-libs/sdl-image-1.2.10[png]
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/jack
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gcc41.patch"
@@ -32,8 +36,3 @@ src_prepare() {
 	default
 	eautoreconf
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog
-}
diff --git a/media-sound/mp3asm/Manifest b/media-sound/mp3asm/Manifest
index c73923941bc7..649adbfd8213 100644
--- a/media-sound/mp3asm/Manifest
+++ b/media-sound/mp3asm/Manifest
@@ -1,3 +1,3 @@
 DIST mp3asm-0.1.3-1.tar.bz2 46530 BLAKE2B 031ce687662f107285e373ccb1702743cd340017dd8b49414576454f12338824d1e417625fa1f6228d5f1dff33879b91c88e88ce2c7ee8deb498d01d2d165b57 SHA512 c22fa3a041940fa7826d3f5ea18dd42807ca9c7d87a56c9ae10cd96606e53d17d8e6259be75a77d1101d6cda033e8b48e2dd2303e91fdca338af19ef3522fb83
-EBUILD mp3asm-0.1.3-r2.ebuild 692 BLAKE2B bf3b4e383881338e90ff48aed68e4f606e777eb1f3f13ce0c170eb6ef3edf313359d6e37d2f50f851d2c2a8902dd96815b334f190eb76e02dfea69d89dbe75db SHA512 9f327c586096610cac855515a4630488edf5ad19ffff16bd98ec773521a145230ab2674099f6cf93cf622a7d85ffbe7704aa84521c58e19a53fcc9e1c5b84b25
+EBUILD mp3asm-0.1.3-r2.ebuild 587 BLAKE2B 554c318a3c70b8e2b80b1cc97edf7cc577fdc0f673b0a559226f09de0d9c9ee5eb0ccfc6dd06d78f4734929a6fe8b3447f1ba2ad735533670d75daa4090cf87d SHA512 bcd9130caf24e1b5d1159eddd8bc1da6ed750499ed2a931099845c69c28bbc3f3086994d53da24bb54e66c255058dbbb9cb4f6bcb0950929668696205f025d64
 MISC metadata.xml 329 BLAKE2B e711686a35811a7bb61cd0fabe8d85630e6f1e86e44a3c497604850813e80f1a6658bd392a8018330e9c19458b80e976063ce94b9aae18ef6361198f4ef1bd9b SHA512 abbfd0fe24ced7e49baded7270f11e905e466e0a0c859001bf09f0b3a1e6501e463a2547577c398d1eeb6b47c1bc91ab73c3c89308963f753d8795a8f58490a7
diff --git a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
index b1c4d173eeb6..467241065e7c 100644
--- a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
+++ b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PV="${PV}-1"  # Patchlevel
 
@@ -14,19 +14,15 @@ SRC_URI="mirror://sourceforge/mp3asm/${PN}-${MY_PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
 
 # the author uses weird numbering...
-S="${WORKDIR}/mp3asm-0.1"
+S="${WORKDIR}/${PN}-0.1"
 
 src_compile() {
-	econf || die "econf failed"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	dobin src/mp3asm || die "install failed"
+	dobin src/mp3asm
 	dodoc Changelog README
 }
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index b66720739cab..a16f7005d709 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,9 +6,11 @@ DIST mpd-0.21.5.tar.xz 667624 BLAKE2B d4de4c55306a42caf4f79ee469db2037c0217563d5
 DIST mpd-0.21.6.tar.xz 669272 BLAKE2B ffd50c35e431791503e5d0137abdb93beb42cf48f7638ac0f394d8c4198ce96f915220c92d078ce99cfe7c9866f8e35e58106b801a6d83cdf0a121442f12976a SHA512 20e752a8db2f8ae0b2419b35018557c37a64c6baff25666ba35fce89cfd354e4df5064c25685791f3fcca7ba9e6e6acef0e4653c0c0ffafde2847085dc51b3fa
 DIST mpd-0.21.7.tar.xz 670268 BLAKE2B 1dc6b923e6c6f66ec1f0769b6c4d785761a798659c192184801cee5cd6df361fba0107275650da3e5982ebad5370fb6fe1fe4f7bb9da8986e9c359e4ec2a7815 SHA512 a6e8848c851ca464cfd26284d6479d561f127bc102128e8a41274bc1d62d87a3720843ff1922b5b64b33280217a6036b512f7aa0ce7d7f6b90cbed9fe787c5ca
 DIST mpd-0.21.8.tar.xz 670508 BLAKE2B 04df23007e5cedd00259b1d5f7d301c36b52993ce8352bf784c794150340e4bf2d0a606eb02de3abedcbb9a76f01aca9dc9191d95efd49d0868a32af385821d2 SHA512 034f1cfe431ce163ed808660bee90c2a63926fcc95ab22f55fd566f24c126878fe0fd6521f3008612ea5dca7b448cc5e5d895e0b0156c768bf632674ea982901
+DIST mpd-0.21.9.tar.xz 671092 BLAKE2B 87e1d8afe42b4ca59b1aa47cc0f6260af2d1c161928411cefdcd1f9e6c1013869cffccd729d2cefcc4ddff4fde18bab887407b1b71c6c46457c930c7802f3337 SHA512 e4c5561df881874a16716b32bc1381b6e3bd3690eac07cf3923d1e273937b9594cf387d1e1aa3b02c7f0d19bd30c4575f43863e11d9a69b6a647205009593a9e
 EBUILD mpd-0.21.4-r1.ebuild 8174 BLAKE2B 35bc9bb4ccf75ab510065b1eee80ad626d1359654a3faadfd0ba8e3d09eb3ab3bca37836f2d540704f1914b2a25fe90dbcc80ad1333e6b57970e0f6b2c227f09 SHA512 b347f5939053b35bc95c1600706a364a762e4e81a3a238d31e38a884970df9d1db8892c6b943d8895cd7a115e21310fab646bb0c13a2731f7037e93ac21dddd2
 EBUILD mpd-0.21.5.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
 EBUILD mpd-0.21.6.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
 EBUILD mpd-0.21.7.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
 EBUILD mpd-0.21.8.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
+EBUILD mpd-0.21.9.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.9.ebuild b/media-sound/mpd/mpd-0.21.9.ebuild
new file mode 100644
index 000000000000..969b82d84813
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.9.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dlibwrap=$(usex tcpd enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index d29ce068780c..416f3e400b70 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,3 +1,3 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
-EBUILD mpg123-1.25.10-r1.ebuild 2864 BLAKE2B 9e8878423760d0bf5873fb18e8d5177474cda541c7e2337862882f1326b9029c1a2a6d075c5e7495a0d581ef0a74cdf9f3c8f95800805f74db237b08607f32c4 SHA512 60d871f0f66c50a56cf6c3973be347a9465e97918ad675163edbdd813b4d68592c40161dee73f63bf8544f13ba40b4368967e6eb675f01d48a121534ab883a70
+EBUILD mpg123-1.25.10-r1.ebuild 2860 BLAKE2B 0d25dbccc63c6788dd6c1e0c3a15fc8766d5e5616decfbcaa8f3567a53b98c01c6fcbbf23a4aab85369b14d8eb30498be411cf3cc1a8d577bf2f73dbc08849cd SHA512 20f23de51561b06b5dc1c6ef2923afb7f855caa234033847259223d8076588197f7c9f84be7421bf70d01f2cef3bacfa6b21cdb05e36c59539e06f9d3918bd44
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
index a2f355c63384..2e0212be220f 100644
--- a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.10-r1.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://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mplay/Manifest b/media-sound/mplay/Manifest
index 7f6a1fef9286..dba79568d454 100644
--- a/media-sound/mplay/Manifest
+++ b/media-sound/mplay/Manifest
@@ -1,3 +1,3 @@
 DIST mplay-0.80.tar.gz 565002 BLAKE2B 10931ee32c7a13e4991f50e54e36e900120941fd3cc6a1c8501303833c14b43e7086ff90dda1080b839666a77eb869f078e984b544870bbf4bd1113576ccad7b SHA512 5791e6ae60fcf63c7bd5c3dcac84c2cc11649c0ee009fc20bfb43871023d85622e4ea879ad740656a807354f0fb7329948094cd5866e3110cfd233b08e30a9b2
-EBUILD mplay-0.80.ebuild 950 BLAKE2B 805bb787598a12f9078e7b0aa422400ac2d67eef55618ca23a09899b3e04cda5348ad37783132e9f6d5064fe610468bb4df7932e61bfd546e77af6e86489951c SHA512 00a4556af40a661e5177ca66f4d637753ce4cef96ac5495bb3502f96aa03d4e66f0feb365fac628daea6850abb53980265d6b393af83bcf1c7ad10f2dc577949
+EBUILD mplay-0.80.ebuild 903 BLAKE2B 4c9e7fcdb30cab1ffc61417078ddb3502adf17ad5b6fb9e49475916379d7481a5c930f668a49e6b47dc8fa687b5b4f381da91d100d348daa7949e1edfe1ccd2f SHA512 e359c2a05736555800a9002a2f01a29d11eb95551d834c98cd3d6124e96cba1777d152e4fb239df6dd16f99ae8d916c98f83145c0052c49b9a479cea1864a518
 MISC metadata.xml 328 BLAKE2B 424543230782dd6d38157522c7d35d5e65aaeae902e89db6bf8d953249a73188e4d5c119c9e9508e567bb93673b826dd380f0229cec5e9a56a9be778cb07b4cd SHA512 284a37a8fc22008a3b753d169fca69017bd548eb8f09ca25b55dbaf771d9e0c434bf0698d78d38fd716063b9b264aa66ae74972f757682d59acc9578b5b89a20
diff --git a/media-sound/mplay/mplay-0.80.ebuild b/media-sound/mplay/mplay-0.80.ebuild
index 3028ace5c923..a3cd7a2a79cf 100644
--- a/media-sound/mplay/mplay-0.80.ebuild
+++ b/media-sound/mplay/mplay-0.80.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="A Curses front-end for mplayer"
 HOMEPAGE="http://mplay.sourceforge.net"
@@ -10,7 +10,6 @@ SRC_URI="mirror://sourceforge/mplay/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=dev-perl/MP3-Info-1.11
@@ -21,19 +20,18 @@ RDEPEND="dev-lang/perl
 	dev-perl/Video-Info
 	media-video/mplayer"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i 's:/usr/local:/usr:g' mplay || die "Unable fix the /usr/local path issues."
+src_prepare() {
+	default
+	sed -i 's:/usr/local:/usr:g' mplay || die "Unable fix the /usr/local path issues"
 }
 
 src_install() {
-	dobin mplay || die
-	dodoc README || die
+	dobin mplay
+	einstalldocs
 
-	cd "${S}"/help
+	cd help || die
 	insinto /usr/share/mplay
-	doins help_en help_de mplayconf || die
+	doins help_en help_de mplayconf
 	doman mplay.1
 }
 
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index 3d3b4708624f..a24e66be631f 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-qt-0.14.1.tar.xz 94948 BLAKE2B e0bbbaa2410220c0e34ff77cb84c783ba682587311eaf20eca286a142e122827b6294e9d0409f2ea5b18d80c06d822bbaed49d60d1402a4a97b7f7210ee2cacd SHA512 55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494
 DIST pavucontrol-qt-0.4.0.tar.xz 34916 BLAKE2B f42f560b125e292ae3a8ab76e2020d1a899019e8ed40d6f4d3e90fe1baa0cc044093310fe9ac11c6529f9cc1abc41d475aa2d445de8f19e6f89ed456525aa7d9 SHA512 62e0c909c98acc4605556ba63981e4599d37b592b99ee16301dc0ba154f3066708a31562e158c042b3530c11603cc43de930080770f027bb998cbb6f79f0f3fb
-EBUILD pavucontrol-qt-0.14.1.ebuild 712 BLAKE2B 50c243cba4eaf2e4288c6565ddbf0f16cf49b4829690788ce75ac117126c235d7c2b6c6035ab18065a4451c3093a114754f05fcb0b00a98b8e15c673cd5cbc7c SHA512 c92ab284966a11118b53cf0c62a78089d0812d1634fb74706fb692dfc4f433a3a6cc9a4b3980587867dba8e497b0e27fbda929b9a286431924668a565ee82468
+EBUILD pavucontrol-qt-0.14.1.ebuild 710 BLAKE2B 38a2c63174e1cb5d61fc5deec8a6940ddbfdb4f605d99eaa48d83498464a69968c13539b0df2c12b9abb47160bcc9985a2e163e27a59d9262769deda2b81c46f SHA512 19ef0dc14229d8a65e6b1314ecdbf7df120075b4a3019f5cb708f20b4878b683c12dff0f2d6c7dae58e199bc525a8686303184175ccaab2152eb15032f281dfc
 EBUILD pavucontrol-qt-0.4.0.ebuild 775 BLAKE2B 6e5b47111723959f49917ff2251d3a617025f0565147648c31d7d4bb35f366a1e8b3670760c22d97cb13c0770971ac30d045286e51b0f7b4d38b571c51340235 SHA512 a777547bb37805a559a89e4aaa488949643f770a6f5ea843d183df50ba2d250dbd5fa4a6449916e9c021099c7287d093a99335f43fcf670dc9f2fb3b7b2b2faf
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
index 834f17c16d20..cff744e1b080 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index cfe44f2a8c15..7ae6edf9f7a3 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,10 +1,10 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
-DIST pulseeffects-4.4.7.tar.gz 1082596 BLAKE2B 3265507191f5fca405282d8bdf9cf078023e80d2ca8f3a8bb999f7828f5220ca61b68ce01dc80e2d066a0d759b83229eabd523aff71106bd4024067afd1a8220 SHA512 243bd23d107f22a2a4b5934fb67bc5c059f278f2ec824814791ea24429e8d53844ffd71c9c21c35209261f4a0a4633827362bfd43355437a10944bbfd9a25421
 DIST pulseeffects-4.5.9.tar.gz 1830876 BLAKE2B 3b80e26eb7b3593f0636d4c3a86ddb05c4c08ec446983d8f521828a4a004b42011ca12cbed6fefe3a0df7d1347197abcee89d5786020a61ed28c3277668d8e57 SHA512 aa47b546f13ef29d03c907dfeeba0ecb531ba07bb5bbb7bc49399bceb75583c58c9e188557c1d77c02b8b50e5cac9562b6fc882750c14d755ec0d294e8b60105
-DIST pulseeffects-4.6.0.tar.gz 1831433 BLAKE2B a5eda0e6880f8a3e62ad62b5e1ed3b5b44118d3ac14821f786532f567974fd40e78f0b4c4a7c51851bb48b94694bf473fe0996e7fb361db0c50b00a467b9c949 SHA512 acadff43f35f7ac5f5028e87efb1c8c0d4d8ed97d367b53fd231475243735ac149d8c1aac9c86281ec9a661814a665f67d43f7fc0d7e591b19524b5cb2124f92
+DIST pulseeffects-4.6.1.tar.gz 1878597 BLAKE2B 5db87915f5e008780bc063580cee95202460f9932533d4227eec89ba49d8ba760d2be44e0268d53279868b07da1556ddae648ff6339cc10304a0c429a8d55eb9 SHA512 336ab9c3a2987a8ca0887fd87c836776619e6989c22bb7442c7e6f3d8603537ea2789e012fea11c142dd943d0a670549fcbfff69949cacbda2621e2da95456b3
+DIST pulseeffects-4.6.3.tar.gz 1885423 BLAKE2B 404ab653c187270d879b497b819206815f47f7bbb74762fb6b4ae055169093599fa5350df53292eec4eea46ab380a058db80c693022a854a71bfb4245fc49e10 SHA512 645a19a6f5f1726474a675edc0048eccd37e7236fd863ecbd8c382028344cd3d4a2cbd5c4a8e830e5fb793ddf50c0b24c45f5d93acb7a880ae32c3c940e8d2ea
 EBUILD pulseeffects-3.2.3-r1.ebuild 1506 BLAKE2B 561117695d98390d646cc6d36263aae5f375b1d6ebbdb4baa271a8ff009e788218952b8bb63d5088e1ce647e2e7fb7f38a1ea27ae634d341bd8e7dd3bc332e65 SHA512 ed37577b50ead9ae9d4a007f343ada566df3ed7dbde12a2114bdce793c1ec2a123296f4e4b059619644d6c293b917bbbb26cf2936c55211c89fbaa2abb68df25
-EBUILD pulseeffects-4.4.7.ebuild 1727 BLAKE2B ca64436e30a37e6a6f42bfec26eda83f55fdba724c15c63dc1f76deebaa504d21664cf14eb4ea8be713c8710e4a39a6fdd54dde84f18fd6c7082a646809911a9 SHA512 587856d36ad596a802eb9441571ba0b37290694dc5c466bbaa450e2dbfbb516c70ef107bd0b5a968e03bb15fa0ac6829219787b5819cbf7b7b473efb85e05e79
 EBUILD pulseeffects-4.5.9.ebuild 1799 BLAKE2B e6ba4eb6229e8aaf31eaef655f770989ef0a5794e06c8673f565b3e3e49689ba5c6745c551e6e2bc5cb6aef84bc79e5eaa68b58c7ca5a4a606feed443b2dc2db SHA512 952d00097cf90bd69273ad8f67a4f8caae9ec2d84d0c424972d5c340a0bd1406442fb0e4b9005489da1691f72b98ddc124e2e148b4ecabdeaf7781a56a76948a
-EBUILD pulseeffects-4.6.0.ebuild 1800 BLAKE2B 8dbf5e6ea883155e4a44f4aa259cdd214ecde1866826409b5ce0daa1b7ac8f9c8fd5814ccd96b7891563bb138d9efc15188a35e04ee1e5fa758802158abff058 SHA512 8af20d569a036a53c150c644b854fb837c395629aa059a071ebbab064ae027579d715605b4e73c3588a08856f34cfaa07e9c6ac769d0f981756f15595bf33562
-EBUILD pulseeffects-9999.ebuild 1792 BLAKE2B 4770e4f7f3fbd013166e2b5c694c5463a71ab4209fd8aac620015c654137ffb92b3e53fe338bad07b1fd69b00423eec2e4d9162730f4830352cc404c8051cafe SHA512 1bae5647fa6d7e53d5d97c60236e53af007ad4c2cff13ef385b45c0bd1cacadc154edce2dc677b008624bc7e41ab8f5edb332acd86c63e8ac70dcb78c32605b9
+EBUILD pulseeffects-4.6.1.ebuild 1799 BLAKE2B e6ba4eb6229e8aaf31eaef655f770989ef0a5794e06c8673f565b3e3e49689ba5c6745c551e6e2bc5cb6aef84bc79e5eaa68b58c7ca5a4a606feed443b2dc2db SHA512 952d00097cf90bd69273ad8f67a4f8caae9ec2d84d0c424972d5c340a0bd1406442fb0e4b9005489da1691f72b98ddc124e2e148b4ecabdeaf7781a56a76948a
+EBUILD pulseeffects-4.6.3.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
+EBUILD pulseeffects-9999.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.0.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.1.ebuild
index 451cdef35758..2717baaa643c 100644
--- a/media-sound/pulseeffects/pulseeffects-4.6.0.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/pulseeffects/pulseeffects-4.4.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.3.ebuild
index e9b3c7a727d1..0e6624cf2428 100644
--- a/media-sound/pulseeffects/pulseeffects-4.4.7.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.6.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnome2-utils meson
 
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -30,6 +30,7 @@ RDEPEND="
 	>=dev-libs/libsigc++-2.10:2
 	>=x11-libs/gtk+-3.18:3
 	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.7[lv2]
 	>=media-libs/gstreamer-1.12.0:1.0
 	>=media-libs/gst-plugins-good-1.12.0:1.0
 	>=media-libs/gst-plugins-bad-1.12.0:1.0
@@ -42,17 +43,20 @@ RDEPEND="
 	rubberband? ( media-libs/rubberband )
 	>=media-libs/zita-convolver-3.0.0
 	media-libs/libebur128
-	media-libs/libsamplerate
 	media-sound/pulseaudio
 	sys-apps/dbus"
 # see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
 # and sys-devel/gettext depends reasoning
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	dev-libs/appstream-glib
 	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
 	dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig
 "
 
 pkg_postinst(){
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index e3e2406c171b..0e6624cf2428 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-libs/libsigc++-2.10:2
 	>=x11-libs/gtk+-3.18:3
 	>=media-libs/lilv-0.24.2-r1
-	media-libs/lsp-plugins[lv2]
+	>=media-libs/lsp-plugins-1.1.7[lv2]
 	>=media-libs/gstreamer-1.12.0:1.0
 	>=media-libs/gst-plugins-good-1.12.0:1.0
 	>=media-libs/gst-plugins-bad-1.12.0:1.0
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 10a424b6f362..82d06da2160a 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -6,6 +6,6 @@ DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fd
 EBUILD qmmp-1.2.6.ebuild 4221 BLAKE2B 7c67cfa55ac6cf2fdeabfee469ea7e492b81e8acb560a70a2890dae2704daf6963de5ee00d9a25de04c6b84433c91e3462a23786dbb2d26ece85b4d23d316d12 SHA512 d54e4e481244f1abc5817d45f7487e19e4d88ef6d17a42f72e55df62817d2994c499167004f05d8eb6e1e607573d1145454403251ef31c488f219b868a4f9ffc
 EBUILD qmmp-1.3.0.ebuild 4322 BLAKE2B 45ab0e243e10901cd0456c8459b4f751484da95b797c68b2e648ce4a7963ce77613f352dfe23fb4fe98b22f83338c177035a2a16326d8469e6843840d659e693 SHA512 e54d1867d000359ee22b41761e5b4ae7708639aab24b3a05faf3adfd1e8e095e67ed2c3c74a878a131d11b73a6a97e90c8aafed94db3432970e7da99fb4c61ea
 EBUILD qmmp-1.3.1.ebuild 4270 BLAKE2B 0e4a4bdab7e45fdd23db669d2a8e69703e6ca16ecf96f5c06097156aa3feda3c67bd97bb410aa036123cf1ea8c8129ce54d43ec7ffbd9a044651108434dcc142 SHA512 ef99784cbeeba0d8bfcb19c49884033df7e217d92d5b343d77be0bf222ef11aac6601dcca7fb2b78fef129908df5ffc7af9d71acd05455da89e48135e8f06f34
-EBUILD qmmp-1.3.2.ebuild 4270 BLAKE2B 0e4a4bdab7e45fdd23db669d2a8e69703e6ca16ecf96f5c06097156aa3feda3c67bd97bb410aa036123cf1ea8c8129ce54d43ec7ffbd9a044651108434dcc142 SHA512 ef99784cbeeba0d8bfcb19c49884033df7e217d92d5b343d77be0bf222ef11aac6601dcca7fb2b78fef129908df5ffc7af9d71acd05455da89e48135e8f06f34
+EBUILD qmmp-1.3.2.ebuild 4269 BLAKE2B 293b9ee67741158812b5de962afe246b0f2c30a5aceeeabfb48817c0c571b5eb07283943f4b6c2d7aa7627ffbee6639480eee1b558c899170ec7128d1250915c SHA512 afd972d018e0e4263b54c373de893ac950f876033f0721aec12ef195e733285fe1533962ed27597b24a4562c86420246e9803032f1343d4358182a745695b8ea
 EBUILD qmmp-9999.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.2.ebuild b/media-sound/qmmp/qmmp-1.3.2.ebuild
index 611727b19b0e..ddf529cdf62d 100644
--- a/media-sound/qmmp/qmmp-1.3.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://qmmp.ylsoftware.com"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 else
 	QMMP_DEV_BRANCH="1.2"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index aec58e178f83..8ad4be8343b3 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,4 +1,6 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
 DIST qsynth-0.5.5.tar.gz 269061 BLAKE2B e17bb0ced40764c5bef9ae7c793f7ba1ebfe4edd761f434ad129f338d30384c639f27d697ecfdaa93d7fff52c38bed0a3b95cf51fbdad25e13c14abe795d49dd SHA512 4e90b38d428c6b49a78b648ac9604e683f32623898205abe3a98c4136c5b29ab27c101cf63207dbbfdcba105913de2dcb5cc7669a6433def71d071f39cf68429
+DIST qsynth-0.5.6.tar.gz 269583 BLAKE2B 9b06f7be1aa39addebd0b088eff885bce39c6bc245461b64fe45243306afae8879d4b516bd46c30c2a8074e580e412c38a3c264d647a35ff5c81301703731067 SHA512 752b3ac7e478594ef873b2d1c9fcb1a1dcdd1fb33f34cab5f588f628d1f11f01ecd150c9d51021a41040794b68f0538ad6979751773d5c537f53a1f227b3bf88
 EBUILD qsynth-0.5.5.ebuild 1300 BLAKE2B 82eb320196d3d8646e3a9c8b1ae5fde1ef8dacc586055bd5eb4830b21d38dc26b72de819ccc29ff98509b73e32fb2c4c0d6038f846f3e04d16f4ff9ac5ea0eeb SHA512 0c94edb732c059066ffc3e99ec9250139a6ebdb697868e387c7fdad17e00473f63326048a5f8a9d1072d1026f8e8a9912041d8a2607d5e7e355f5c30a7eb2ed8
+EBUILD qsynth-0.5.6.ebuild 1304 BLAKE2B f1e74ad0d5af54165ac556f9a5d3775d2bf9f8c675d9ef886d99b16c0ab3a73e3075a19d210ee058474ad3f3f2428b8dc7bf4d32e8e031beba5ceee784228616 SHA512 635a03e74fa5eb730bb0ecb007e936db9bd0ad908672dfb68c1964c9bafb88f53d09498db7397351f8ef9d9baeb90b16b96f46a7c6d7193edd8d3fa932153825
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.6.ebuild b/media-sound/qsynth/qsynth-0.5.6.ebuild
new file mode 100644
index 000000000000..e4f0b6bb00dc
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.5.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic qmake-utils
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="http://qsynth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa debug jack pulseaudio"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
+	econf \
+		$(use_enable debug)
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_install () {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${ED}/usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/rip/Manifest b/media-sound/rip/Manifest
index e7429b9581aa..bfc23c906170 100644
--- a/media-sound/rip/Manifest
+++ b/media-sound/rip/Manifest
@@ -1,3 +1,3 @@
 DIST rip-1.07.tar.gz 110261 BLAKE2B 93ef85bf4b50e577180d343f033e6f8765ebe7f17992626b8f7e6ecac13be692edf5bab79fbe0a17b9dd64dbc19886323bc769be6edafcb8e133f58888ea80d8 SHA512 4a89b945cb917d07459f1765bd6e19bb20b84d45e762b01a25374e0a80fced79996440ab85e01fc2fb1bf87175eb9407745294e3099b396d2e4dfc6ee652cc87
-EBUILD rip-1.07.ebuild 786 BLAKE2B 95cc417c957dd7dd9995557c0056a0b10d77f0e2b3d63af8570f831a2973a2d2014afde2b58e9c9fe970e7da7b240bebf2fe71e67f6eba098bd4009698847058 SHA512 36cae29e60968c13a5f4d1bcfebf606b2c3ea8dae2ac43cb55b670af735bf6fac1f8efd24b5625bf88ea9045001d923a1c681022a87810ebdd75238deb6a05f9
+EBUILD rip-1.07.ebuild 587 BLAKE2B b25757f97b0de37394e47107c3008a93417f5384e12e0c2f7b646727b8b02302614926986a5ed645ce7291bfcca50e414f0d172611c984df8bd3fec33873f891 SHA512 0c52db348bc19086c0ff0322cd22de188d4e85e6d02442f15a253dbbbcc8e147e302ef2ff960f65f921cf82a0313b91393f658de92eea0309fd7215cd1053e27
 MISC metadata.xml 326 BLAKE2B 14293ba2c8d9da5e7eef3dff49ec33c4f7c816d2df9b75ecf0f1d5dc6adc8f88028fba7bde542f4b5439890d1c225555a4b3243a2d88433a825851ba2a123003 SHA512 9be190109b6b10f56e73609510a59a349a3f4c2e841eb64fabcbbcb35535047f8806fc33a3ebaffd8ead47b1c1057e93e435b9db79ba4eef9e16e6325846c13e
diff --git a/media-sound/rip/rip-1.07.ebuild b/media-sound/rip/rip-1.07.ebuild
index 960ece4d292b..e1f22280db1f 100644
--- a/media-sound/rip/rip-1.07.ebuild
+++ b/media-sound/rip/rip-1.07.ebuild
@@ -1,20 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-IUSE=""
+EAPI=7
 
 DESCRIPTION="A command-line based audio CD ripper and mp3 encoder"
 SRC_URI="http://rip.sourceforge.net/download/${P}.tar.gz"
 HOMEPAGE="http://rip.sourceforge.net"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
-DEPEND=""
-
 RDEPEND="media-sound/cdparanoia
 	virtual/eject
 	dev-lang/perl
@@ -22,18 +18,7 @@ RDEPEND="media-sound/cdparanoia
 	>=dev-perl/MP3-Info-0.91
 	|| ( media-sound/vorbis-tools media-sound/lame media-libs/flac media-sound/bladeenc )"
 
-src_compile() {
-	#the thing itself is just a perl script
-	#so we need an empty method here
-	echo "nothing to be done"
-
-}
-
 src_install () {
-
-	chmod 755 rip
-	dobin rip || die
-
-	# Install documentation.
-	dodoc FAQ README
+	dobin rip
+	einstalldocs
 }
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index c1a280bad9c8..3d50e98629cd 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -9,5 +9,5 @@ AUX sox-14.4.2-CVE-2017-15642.patch 852 BLAKE2B b6d32a2d7909b601953f0603caa678e6
 AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0c04b89ec75c91440a0ce833327af0ed152a1eba1ef46402f198f6394c1787ae899ee1ffc9748d1ec91544fe8f127cecb6 SHA512 dd4023a6bc98f510c2256537e747a20c9b3b8ec35e0f98d19d188a3973f1774566c5d70f8de6cd9083547ade69670d34d10b848836d0724896993e1e56c85c75
 AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5
 DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
-EBUILD sox-14.4.2-r1.ebuild 2621 BLAKE2B 15db996f6aea42581d1c2d8744c7a06769e08366d4c017ea1683ad50a0b94ddabed7b3d9f47e69dafaf7df662533e3fa1492724dcace92c054f058286f711884 SHA512 b82bd81d5c58f1d56416ea4a0de453831b8a199d99a59fdbbc79934898f2a33b77ed86870ea26091df91df5ae8211c62b410e14ea7f0d30d8a3fdb9dd1f4f87f
+EBUILD sox-14.4.2-r1.ebuild 2617 BLAKE2B 16de3a69ba83189cc3285b2886e2f04081fd875f8d0c85fd28986d0e5bab9afaade01fa39b02adc39f21cc92273dc55e65ec8d71f8000ec0adc96229a76e9ece SHA512 b503cec195701776966eab7ee510faf0f76b48f084bd6a2addfdefcdb8c1eb50370cd7ddcf214524da89d06e8ccd57d1859d84ce2ab2d158ac7b5c71eb6fff46
 MISC metadata.xml 579 BLAKE2B 9a129ee262f9147b903659d806b5cb7db559a3cd70adbe6cbf0faca60ae3f2d3c5898ea713813b124bdb43fac7b7e4fa9a6702892bc99dfa9fe3271403160077 SHA512 3b09529397d2d31693f701c05e4db73db553177ec6471a28612254fe3117d1b3574bdf3381a024c23c2e8c7efa02925d0c464548ed4105c573266c612595de2f
diff --git a/media-sound/sox/sox-14.4.2-r1.ebuild b/media-sound/sox/sox-14.4.2-r1.ebuild
index 71356a701013..0f5768a5812d 100644
--- a/media-sound/sox/sox-14.4.2-r1.ebuild
+++ b/media-sound/sox/sox-14.4.2-r1.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="mirror://sourceforge/sox/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
 
 RDEPEND="
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 670b5afd7a8d..b2c71580a651 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,11 +1,6 @@
 AUX teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch 4523 BLAKE2B e7193fae5efbaeac62e8366f89e8fc19cc32b0eb5269f74ba2108c2bf656f4fcd22d861e21e6512fab6240cef89a6aae7f1c2f77aba01be78af14aef68a8d223 SHA512 fdfe279bb69e7e48a28b64dd430eaeb74a51a3de7c3ea7ee32d0b399e386188f0d3f8f26064ea90f857d362639ad5cc019696cc28cf04691cb97c119cb47627e
-AUX ts3client-bin 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 AUX ts3client-bin-r1 474 BLAKE2B 79b29de7ea3ceabc88d681e96c871612e9ebcb1da291f2500c3e533433a31593cb9d32e82cf9fd305d2d9c04f7d6df62295594397eb447ffb9a6d3396541872f SHA512 27b6ac42ec3ca05868786ee62d0f9ac4900ed2db9dfed0f2fe9cb951669e7abee7e0d2f8d07db76b03c3fc965fb48f46d94b4e64a5e8dbcd6c24d22e724db938
-DIST TeamSpeak3-Client-linux_amd64-3.2.3.run 76247769 BLAKE2B 2fc226455bf839811ad82735c30f493ac9800e6f5f2f3af2d34bcbce3abd7478144feff329c3afa31d994a891990ecae5f51aa3fa001fe828d4ae0bba60fc6e9 SHA512 6f2a0e366589a3495be3ecbe3e866e1d05db3578ed1e2bf19195e6d6818acc1ddb44b46915aa88ff64ac6cc150d3b88b3347147bb0cde93e013aa7960c10dfab
 DIST TeamSpeak3-Client-linux_amd64-3.2.5.run 76619678 BLAKE2B b8d42a4d633124cab395ea69d3ccbebc65f4d9b5a148c6a81a6d9a3afab48dd59fd99ac3f5cc9551c89daabb7cc51a60c5587034a7a5bec5e3b530ecb3d6e220 SHA512 fdfaa863d3523fffdf46ca0cf9c2b0588e8d847e348ade75c8f82818920f493460740a5192d4cc8d1eafe1e7a03af93b09ae6ddecaa0b166552ab5409508a445
-DIST TeamSpeak3-Client-linux_x86-3.2.3.run 75997823 BLAKE2B 03403430d6409ceebcbdfcdb48b54142327a003c300a3bcbd63f9fb6e40c259f50ee9346fe54fbbb3a19143bacb782248f5b61d2a950f893e8227568a2df1839 SHA512 ad6ea2d5f8237585859c5deac11e0f0b6af6018b2a92fe0aab2a04cfdeab0bd57166bf4fec273d48fedd20819203cba2fd58c3a76b59ec3224e867fc10172808
 DIST TeamSpeak3-Client-linux_x86-3.2.5.run 76311914 BLAKE2B 4a8f4a6ce55bde680f2d9d1f28c1cabe2a01fa6c10f3f3f637931dbe2f652c87cd2a7b61f054b50a8faf3bce461e316ca2e9b68418271535a5f6a3cd0b9d3492 SHA512 90b46a840a6e43bbc7d4cfb526117a81cdb92fb8186194ab9f245e8e501608ec4740a198e8d1de5e3f69bea84ab6281384915193d4e6a1e90aff45b4b80d3d9a
-EBUILD teamspeak-client-3.2.3-r1.ebuild 2442 BLAKE2B 7d2564f54e92a7a78056210990b2f98698b29395640de75e8b1b6851a416580c868e7f5e6a7d3899c9e0ed53c546b76445f187dbcca80d330e8954507bb0f5e5 SHA512 7a3a782284fae46e4195a3273852e30744695fecaaf1f8494f86fcfdf651d48f9d79b08e764e10faf9289441d49a0a0cd5ce2f017944d4229db18809b9641876
-EBUILD teamspeak-client-3.2.3.ebuild 2379 BLAKE2B 057d9457649540a24310cbf2e41e00f13a03dbeef8ddf2eacbe0dc5252f83edc70acfa639d85b275c713fb262f382ca111cc8b0f503b092e2274e35e72c2a625 SHA512 6cb276274f2949f09df682d9479e127fb7191da51ed61e42e0fee1f97800b359f8e70390bf6543b4840e4cbcb4523d48e9eed0eaf43b4303d37f9964271f8de9
 EBUILD teamspeak-client-3.2.5.ebuild 2539 BLAKE2B 567bb70a3c72a3bf13a5cb9c721b40f292b2a7c18260e042b7f6a48401fb78aabd12f095b963336cca6baaf2681f9c41caffab961959d689fe13f1b4c1f2cc58 SHA512 65e2c1006054b428a8d230428abaaf9bf99b6df51c3fa13b8941e6aac4619d1f8e988e4bc0bdfc6bc50972a3ec642119fae23c277a0bc149de24f5fcf77b9540
 MISC metadata.xml 756 BLAKE2B 24d27da6d88662420d55ced31434390eeb7cdb354bdd09c7ae9381c1317d69e6aba654098a11efe3a0a9f86f5dafa53302ef6ba09a84463ab4267a4bcb5cc260 SHA512 5fea4c3f3823d53bb3ab6d9c05fc8e468f45c7441276e94eabb05b680f6253a920d92fff8735433121814b1fe80bf5f51c60cd001b42e714cb10bb22a5609cca
diff --git a/media-sound/teamspeak-client/files/ts3client-bin b/media-sound/teamspeak-client/files/ts3client-bin
deleted file mode 100644
index c59e278f390c..000000000000
--- a/media-sound/teamspeak-client/files/ts3client-bin
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Sets BASEDIR for teamspeak3-client
-BASEDIR="/opt/teamspeak3-client"
-
-# Work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
-export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-
-# Launch teamspeak3-client
-cd "${BASEDIR}" && exec "${BASEDIR}/ts3client" $*
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.3-r1.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.3-r1.ebuild
deleted file mode 100644
index eceaeb9cac4f..000000000000
--- a/media-sound/teamspeak-client/teamspeak-client-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop unpacker xdg-utils
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="A client software for quality voice communication via the internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="teamspeak3"
-SLOT="0"
-IUSE="alsa pulseaudio"
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-RDEPEND="
-	app-arch/snappy:0/1
-	=dev-libs/openssl-1.0*:*
-	dev-libs/quazip
-	<dev-qt/qtcore-5.12.0:5
-	<dev-qt/qtgui-5.12.0:5[accessibility,dbus,xcb]
-	<dev-qt/qtnetwork-5.12.0:5
-	<dev-qt/qtsql-5.12.0:5[sqlite]
-	<dev-qt/qtsvg-5.12.0:5
-	<dev-qt/qtwebchannel-5.12.0:5
-	<dev-qt/qtwebengine-5.12.0:5[geolocation,widgets]
-	<dev-qt/qtwidgets-5.12.0:5
-	net-libs/libsrtp:0
-	sys-libs/libcxx[libcxxabi]
-	sys-libs/zlib:0/1
-	virtual/udev
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
-	opt/teamspeak3-client/error_report
-	opt/teamspeak3-client/package_inst
-	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
-	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
-	opt/teamspeak3-client/ts3client
-	opt/teamspeak3-client/update
-"
-
-src_prepare() {
-	default
-
-	if ! use alsa; then
-		rm -f soundbackends/libalsa_linux_*.so || die
-	fi
-	if ! use pulseaudio ; then
-		rm -f soundbackends/libpulseaudio_linux_*.so || die
-	fi
-
-	mv ts3client_linux_* ts3client || die
-}
-
-src_install() {
-	exeinto /opt/teamspeak3-client
-	doexe error_report package_inst ts3client "${FILESDIR}"/ts3client-bin update
-
-	exeinto /opt/teamspeak3-client/soundbackends
-	doexe soundbackends/*.so
-
-	insinto /opt/teamspeak3-client
-	doins -r gfx html resources sound styles translations
-
-	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
-
-	dodir /opt/bin
-	dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client
-
-	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild
deleted file mode 100644
index 816b907b9fee..000000000000
--- a/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit desktop unpacker xdg-utils
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="A client software for quality voice communication via the internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="teamspeak3"
-SLOT="0"
-IUSE="alsa pulseaudio"
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-RDEPEND="
-	app-arch/snappy:0/1
-	<dev-libs/openssl-1.1:0
-	dev-libs/quazip
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[accessibility,dbus,xcb]
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5[geolocation,widgets]
-	dev-qt/qtwidgets:5
-	net-libs/libsrtp:0
-	sys-libs/libcxx[libcxxabi]
-	sys-libs/zlib:0/1
-	virtual/udev
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
-	opt/teamspeak3-client/error_report
-	opt/teamspeak3-client/package_inst
-	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
-	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
-	opt/teamspeak3-client/ts3client
-	opt/teamspeak3-client/update
-"
-
-src_prepare() {
-	default
-
-	if ! use alsa; then
-		rm -f soundbackends/libalsa_linux_*.so || die
-	fi
-	if ! use pulseaudio ; then
-		rm -f soundbackends/libpulseaudio_linux_*.so || die
-	fi
-
-	mv ts3client_linux_* ts3client || die
-}
-
-src_install() {
-	exeinto /opt/teamspeak3-client
-	doexe error_report package_inst ts3client "${FILESDIR}"/ts3client-bin update
-
-	exeinto /opt/teamspeak3-client/soundbackends
-	doexe soundbackends/*.so
-
-	insinto /opt/teamspeak3-client
-	doins -r gfx html resources sound styles translations
-
-	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
-
-	dodir /opt/bin
-	dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client
-
-	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/vb2rip/Manifest b/media-sound/vb2rip/Manifest
index 124d44ae05f4..d6fe64704ed2 100644
--- a/media-sound/vb2rip/Manifest
+++ b/media-sound/vb2rip/Manifest
@@ -1,3 +1,4 @@
+AUX vb2rip-1.4-makefile.patch 421 BLAKE2B 8e19d04d65c0efe9507aabb62b8b662ebf53bed3ac27d6282b222f46d052058951465302c6a1ea14681f56d1e882214d8ab741b9c0ee8143765ab1a237ff6ba0 SHA512 b0ff12f4c9e7e98ca17897bcdf8bc04032a181707df04f85d669ae2415fcc69dbb3d60611aa4cc15104d61dc344bfaa8e1ba6c34f50a46953eee9faf492ed4c0
 DIST vb2rip14.zip 22254 BLAKE2B 4b1571d07c39558d7e95b3b313b1b109952969143f68a47d06a0538628ff8937f62fd88ccdd7641aeaa814ab86602e028acf83b577ddca30e24ae5814438dad2 SHA512 f84c8bb826a319cb0e0bc6118bc270ace18f52cc73b918ca5ef8d8f674bd7922d23d36fe6034a189f18ac4fb9e6a8f0c460dd407ec350fd1185c1088757678ea
-EBUILD vb2rip-1.4.ebuild 763 BLAKE2B 3b003f310e5d475d41de4f9e082c408b1a94fbad12d4afa1af87af37c919338e037548363154642a8fa1c6f2dc4d6e80674b76ecbc07f8f2f05148759acea2a4 SHA512 fd81d828ee0a532e8977617ed2d10713f1ef0f6cc5b2bb97ee33be26b79e12f8f2b5d0fc9a2f120209c6f54986774ce7de0b5c125f449568155f923c9d4069ad
+EBUILD vb2rip-1.4.ebuild 579 BLAKE2B 88b0d60bb9c96ae50e2d82abeb06608448abba3e0187d439d5280ef3eddab138551ada3dc5ccaba44790c77a709e90da8c0a98fea0bb896501004def605bc976 SHA512 9467ab84a17dbf428857ff0403af1d32a671e5e80571f4ce90ad00f16a2528f77ae80af6581c90e674998a90ed70def0c3fad968813efcb90f201a2721c80774
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/vb2rip/files/vb2rip-1.4-makefile.patch b/media-sound/vb2rip/files/vb2rip-1.4-makefile.patch
new file mode 100644
index 000000000000..0b584086f536
--- /dev/null
+++ b/media-sound/vb2rip/files/vb2rip-1.4-makefile.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,17 +1,4 @@
+-CC=gcc
+-CFLAGS=-O9 -fomit-frame-pointer -Wall
+-LD=gcc
+-LFLAGS=-s
+-
+ OBJECTS=main.o decode.o wav.o lsb.o rip.o fmt.o fmt_raw.o fmt_vb2.o fmt_8.o fmt_msa.o fmt_xa2.o
+ 
+-all: vb2rip
+-
+ vb2rip: $(OBJECTS)
+-	$(LD) $(LFLAGS) $(OBJECTS) -o $@
+-
+-%.o: %.c
+-	$(CC) $(CFLAGS) -c $<
+-
+-clean:
+-	del *.o
++	$(CC) $(LDFLAGS) $(OBJECTS) $(LOADLIBES) $(LDLIBS) -o vb2rip
diff --git a/media-sound/vb2rip/vb2rip-1.4.ebuild b/media-sound/vb2rip/vb2rip-1.4.ebuild
index 0ee16ac10e2d..e9bacb5a23df 100644
--- a/media-sound/vb2rip/vb2rip-1.4.ebuild
+++ b/media-sound/vb2rip/vb2rip-1.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit versionator toolchain-funcs
+inherit toolchain-funcs
 
-MY_PV=$(replace_version_separator '')
+MY_PV=${PV//./}
 
 DESCRIPTION="Konami VB2 sound format ripping utility"
 HOMEPAGE="http://www.neillcorlett.com/vb2rip"
@@ -14,20 +14,18 @@ SRC_URI="http://www.neillcorlett.com/vb2rip/${PN}${MY_PV}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}/src
 
-src_compile() {
+PATCHES=( "${FILESDIR}"/${PN}-1.4-makefile.patch )
+
+src_configure() {
 	tc-export CC
-	echo "vb2rip: main.o decode.o wav.o lsb.o rip.o fmt.o fmt_raw.o fmt_vb2.o fmt_8.o fmt_msa.o fmt_xa2.o" > Makefile
-	echo '	$(CC) $(LDFLAGS) $^ -o $@' >> Makefile
-	emake || die
 }
 
 src_install() {
-	dobin vb2rip || die
-	dodoc "${WORKDIR}/games.txt" "${WORKDIR}/vb2rip.txt"
+	dobin vb2rip
+	dodoc "${WORKDIR}"/{games.txt,vb2rip.txt}
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
commit	2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree	c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /media-sound
parent	6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)