gentoo resync : 10.11.2017

17 files changed, 352 insertions, 70 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 5240345796f2..0110ff013dc1 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,17 +1,19 @@
 AUX audacious-3.7.1-c++11-throw-in-dtors.patch 1214 SHA256 0133fa37f5f8e5588fe3fc268c202d7d453d6bf3686c683895cfb7d89532e4b3 SHA512 dcba1e73f17919634d4c6770029bdba2774c752d8296c29f5c78f69bc454f421bf55a6e5b059ab68ffb462995023f63d6eb855a3242f4e806a0a348571adc417 WHIRLPOOL 3128479beb07d6c86186a973294973d9d64f25fddfbe386e3354a95db08357c9f13680b8e21733b22cafd138b25ffff1eaf53d9f1626e5671e1a4cc96d73c0e9
-DIST audacious-3.4.1.tar.bz2 474755 SHA256 57ed4d8378b1e753e266a82424c3ae595b6c0e88fc3e32957720cd6cc14ac971 SHA512 2a9e203544861a0b902b720823202ef1038927932826847dc9b9a9c321dbecc19e2187afbdeb62a22ee8e6348c7df609ad671c8c63da2abc003a37556df20ac3 WHIRLPOOL 4b8facfb9fb3187286a59f5ddbba4ec784a3fd42e2fcadf322ee27cd8d1ae08ee3d5e23cb5c56875d3d3a879c1dd7ba21407cf19ef400693b8ab7a0adc176087
 DIST audacious-3.6.2-gtk3.tar.bz2 539937 SHA256 ed951e588a9f3cb6766301cc387138a3fe2abc81c243eba478e4261390cb51ed SHA512 6667f71de1951265d7c8bfbd83079d67942c2c97323ffc7214394ef3f81b1f58e0432117417281833611964e88c629ef855bd90562da46be1c5d350a51c0d997 WHIRLPOOL 4e218ca1c236b3e02b20e5ed5bb9d91fd95d8132273de8451963c84e2aabb869298cf4c58704ab07036ed7c1e5a6b1ea7855f733812aaed7685b13ce7a4ecd9d
 DIST audacious-3.6.2.tar.bz2 539843 SHA256 b2fdb9f3cafd65b2afc50efea6f17a7a329547f1d394f525870e42cb0483cb04 SHA512 b2fbf0b0628031ae5c883108cb1963232b50381b44882bf01faa7e11cd645e10a1d686d9ed078305a2cda66d238feaf7bdffd45c512830d20cef6770df327dde WHIRLPOOL f7b069b7e1f9538032d1bc290c7d476f16b075cf44a5d5d2b6f582a9e95ca3aa3e0a87d21ca00d4fc57a19983a9e74f3ded5e883acbd990df2064ac75e3da69a
 DIST audacious-3.7.1-gtk3.tar.bz2 571720 SHA256 30d63066916d0de32891c74b6b39e3c9e81fc2449274eba3d0a9b8c9f70d02eb SHA512 0ead2827c74b31e10c555fd1254deb3d11e5aebf8c15d455cf5d6ab258012b293324700693b2b9da48b2b4c25418c7149a1901e1dfe3f210ddf730c25a43a358 WHIRLPOOL 2ceaa0194378b12ad8905c86fcf15e696f6deefa6da793d24e4e6282f0619f0fc9f7d7b8a7db0c231ba3a4e17052b4e8cdbad32c2b5a886f9aedec520c29cc25
 DIST audacious-3.7.1.tar.bz2 571450 SHA256 c8366870aea21d5f4a5a282dee45fba99390e4e3d5164cd119e343f79e9ecbbf SHA512 4c74fcfa6e575375501828905f01ed1e769d88fa346a99162c6800da5bc6aa33ec5598c5de1201c4e24cadb31b8c36768ea390aa4884de6bdbf42b0bea5a31a8 WHIRLPOOL 19fb9e0bd4b606e09ef21a66b8684fbc5ccac4e97c0f26abe96b42851fc3a2c629d89b39ec3f9a5ec82a779a2d6a5ae56ab36ab0993a2e0c1ff48861e6c28518
 DIST audacious-3.8.2-gtk3.tar.bz2 591423 SHA256 4ec6bd82d812c5cdcb1c32f4b0912b219edc8f1ce2603b07f714e0c4f2ed08bc SHA512 fc2c69748c8f044aa8eae1848771b45088d85fbb67baf5dcd3ab2ff52e0848ba626e138d1a37756df98249f32cb3d6c54de29355b218602c6a47ff15c8ba0b96 WHIRLPOOL 7d9e2c295e89ec40ef91613f4a4c1f808446f156bbbc6e6be89511fa94a4b9cce5bef209187d1396edd008dd4474c127ad97a493cf9bf3deffd6064f07cdec8e
 DIST audacious-3.8.2.tar.bz2 591209 SHA256 bdf1471cce9becf9599c742c03bdf67a2b26d9101f7d865f900a74d57addbe93 SHA512 13914d837ab5f283c45297424033486d9a5158f78f17f5538ecce780125fa76585e9e45852d15f6ecf3ed974e7a2f6289ceaaeffa97b2ea79b2bef449d8c786b WHIRLPOOL 9027baf4fe10e69fd41417d46db2d9105701a6a8c8b80f5bfa3f0aa9615b07a0103b159585b601c01b3483f93872ed890ed81f921b512d295648bffc820267f0
+DIST audacious-3.9-gtk3.tar.bz2 600249 SHA256 f546c3cf95066a0390d41b27309f2c0a58e2f2f96a85cf12245250b1c1738735 SHA512 6ff98d027c13b30ea9600a9aba914ec993c69826199b8dc303cb60cebdf2af06a7e3dd4af1d34a86343be5485848a57c8a29e48d2a45a33945585550de4e5f9c WHIRLPOOL 3a649bca61a670afcd4498a8cc42b42eb17eeb8fec938b44cfbd62889a0eb5c7b24ba95149672719505fd2220455e5208bcc6379b27ff22e35d13ca9e901fe9f
+DIST audacious-3.9.tar.bz2 599488 SHA256 2d8044673ac786d71b08004f190bbca368258bf60e6602ffc0d9622835ccb05e SHA512 d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa WHIRLPOOL a3e3d4f6b9fb0b3e2e90ea249101ae9cc0263d8dda0e49696e44ee00492218d9e19770669abcbcc4b8adfc4e53c263de1e8c9b5d5cdcc9a43d90e9b70d76e282
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05 WHIRLPOOL b7a4409629a860021477f34f8886c40c005ea2ec34373d80e6a696323866e54f361e38c76b1ac536775ae5912308f11416e613dec791f21473f01a2fad35bcfd
-EBUILD audacious-3.4.1.ebuild 1412 SHA256 b2e8fd64af6616d3d1c665b8aacd3ac700ecb7c4844acfd7dfac253ffbeb0cac SHA512 3216422c0426c0a63d9412899b4e8a721d3df5cf8233c3139b3687f7f686397bcd3653207e2b7163b0460ed54c4c53916946223f5f9bef2a191e1eb614710946 WHIRLPOOL 45f35ff6deb6a5c2c10ba952faf02bae9f6ef52d6a3ad874a4c605ff1157625bb6501357d4493612bedf571f6c1f166915045b0c531638fd05f1755699125cd4
 EBUILD audacious-3.6.2.ebuild 1737 SHA256 fb89f75637193dd0197aba3bccebe8e397b55e3d6b0851770a1f5d536015bd99 SHA512 621cfc40a2509302ec34de313427de8f0f5d792ac240396b5c3b508d1cfe287b0930bb834dceb6199622ef07f773294342ce095016e26e1806c987c318a37d80 WHIRLPOOL 2d6aadca2e5c99ca382f829c2a36e7c4abc11e8a64001e9fb6185ca3b71f07fb05da58b5785a8c52679d7c16192514751227c825dc7229bd47d6f60ea3398631
 EBUILD audacious-3.7.1-r1.ebuild 1981 SHA256 188814670ea2f656c5842c903f2921dce95d57d81b5e515af598e63756010e86 SHA512 f727ab57ec08543af48a383ebe2964a4a7aa7cad41ee20ca59452d0c73c61e233e82720bd64fb0eac06cde0d1b410cf89b1dc4b92fe403081aaf406688854682 WHIRLPOOL a8078114e225edfc50b0b1d6f0ccb25184834ace4a99f7af9a383a0416af96e94608a7aff33bd902af51e56540eaf35d8e150e29c4771b914558a5b8644b1667
 EBUILD audacious-3.7.1.ebuild 1902 SHA256 9decbb5f74d1ed979faad677f9333db7a81b6b657fbd4673575434904310a5ae SHA512 0e6f4d694c7ec951920ffa87bcfd5fc7bea7bac98c075891ca337a9d382cf280badaabbab38b7889b7a52ac6b1ae45df0d9ecac50459da5c3976eb5b08cf7f83 WHIRLPOOL 1052ddd9639a3b5f5c3b2ce2db38134c3d13c9e4b7879bbf848a03067a9c2cac09fd85bb349185bb92abe75bcb8911b084f61fb652d10fc1264f6647f04ced85
 EBUILD audacious-3.8.2.ebuild 1835 SHA256 0f5313f90f93e6d6990ce5f7824837e47b1bb08262ee89c2ff2a41c7713d991c SHA512 ca51ae6472f8b0bfce6cf355feee68f783a48f4ffc4e097c694b007bae87ff3a1c27432fc27a5a19149d1f09321a5834ce930e43130f2d11e03d920c4a6f15bf WHIRLPOOL 44d7f62d8157dcff03cc0fbbfe7f031044f251fd7f7d6ab3f0200098ba0eacc789fa548fc72472932ed7e6f8e0125dffa4f62b8847634a6bcc0d60c4fe1907ea
+EBUILD audacious-3.9.ebuild 1935 SHA256 646482e92890ebef9b60f590718a94c23c51577ac88acc6419ff91e556b03bcf SHA512 6b009f932c1bc34d9cd8720820d51836ab397bc4d23b82e186a982aa6a84cfc62389f763b77ee17cd994567dbb50a416c0a8d046210cf9472ab165800a0a55fd WHIRLPOOL 03dcfb67d3f77b8ce4c27cc97d705420a38152be9f1048e8b466aefd991f2d1cb711b722e8e27a2a837e0aadd03136823cab450d731d3c74d49f94704d09ef63
+EBUILD audacious-9999.ebuild 1935 SHA256 646482e92890ebef9b60f590718a94c23c51577ac88acc6419ff91e556b03bcf SHA512 6b009f932c1bc34d9cd8720820d51836ab397bc4d23b82e186a982aa6a84cfc62389f763b77ee17cd994567dbb50a416c0a8d046210cf9472ab165800a0a55fd WHIRLPOOL 03dcfb67d3f77b8ce4c27cc97d705420a38152be9f1048e8b466aefd991f2d1cb711b722e8e27a2a837e0aadd03136823cab450d731d3c74d49f94704d09ef63
 MISC ChangeLog 4820 SHA256 5e50343e1b021f674bdbee0fa169ee49750c8bd840f65ec36702c5eb930bab1f SHA512 52c8774df9ab2e45fc26a02722870253f017849208b31cac1b7af69a4db82076db64676f3699bc1bfe4b6452a321c47906cdad9afdfbbac76d4fa3953b314f2a WHIRLPOOL 964b256ddf881c6cc1147c10c73ff85f5b4e702dd23c02cecf0fd92aaa1ab354987fd240cfac6398045a3700ae0df00c1822f190abac2823c731b1c0d3336406
 MISC ChangeLog-2015 51371 SHA256 974d56f687f6397ceede515c6da7959194b330ef7a453cc72291e6b1b4f299fc SHA512 f384f858eeef58567bfa6248e16c03a65a2d681a21f239354765c964455a77ec4777f707a62b148f5fbec8eada09c8938bd2b289e2cf88a893c42c5f03143dc2 WHIRLPOOL 6a80047e08fc60b1f21f57d1eb0b57bae75736ef14f13fcef91f893f616a9b54c3e9886b97af7cfbfe1f53501fe799694945b3d2306b1033cc9f0fa577ad4fa6
 MISC metadata.xml 572 SHA256 0492486fc71fb35796bba00dda24ab02b92aa8681cd6d70b2fbd58e559287251 SHA512 f54961e5da4f17200ee622ddfe439fa826dd7a195f1548fc7a7c038a6dc0683ece5e4147b082172d3ea6ff9b2e1f1bc67c62aa4c68057913216e3eaef29d0d25 WHIRLPOOL 463570a30a9c537e719195f7905852cc8585049f3c9e6f0b881c129c0d7af9e63ca1005a0fa74dd04158cc9abf8a93d5e3b2f9b92cc3d2d6689263d7d5662a4f
diff --git a/media-sound/audacious/audacious-3.4.1.ebuild b/media-sound/audacious/audacious-3.4.1.ebuild
deleted file mode 100644
index 919d0e6cb270..000000000000
--- a/media-sound/audacious/audacious-3.4.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="chardet nls"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
-	dev-libs/libxml2
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
-	x11-libs/gtk+:3"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	chardet? ( >=app-i18n/libguess-1.1 )
-	nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-3.4.1"
-
-src_configure() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	econf \
-		--enable-dbus \
-		$(use_enable chardet) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	dodoc AUTHORS
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.9.ebuild b/media-sound/audacious/audacious-3.9.ebuild
new file mode 100644
index 000000000000..a8910bd0fe3e
--- /dev/null
+++ b/media-sound/audacious/audacious-3.9.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
+else
+	SRC_URI="
+		!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+		gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="gtk gtk3 nls qt5"
+REQUIRED_USE="^^ ( gtk gtk3 qt5 )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	virtual/freedesktop-icon-theme
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+src_unpack() {
+	default
+	if use gtk3; then
+		mv "${MY_P}"{-gtk3,} || die
+	fi
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--disable-valgrind \
+		--enable-dbus \
+		$(use_enable $(usex gtk gtk gtk3) gtk) \
+		$(use_enable nls) \
+		$(use_enable qt5 qt)
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins -r "${WORKDIR}"/gentoo_ice/.
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
new file mode 100644
index 000000000000..a8910bd0fe3e
--- /dev/null
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
+else
+	SRC_URI="
+		!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+		gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="gtk gtk3 nls qt5"
+REQUIRED_USE="^^ ( gtk gtk3 qt5 )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	virtual/freedesktop-icon-theme
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+src_unpack() {
+	default
+	if use gtk3; then
+		mv "${MY_P}"{-gtk3,} || die
+	fi
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--disable-valgrind \
+		--enable-dbus \
+		$(use_enable $(usex gtk gtk gtk3) gtk) \
+		$(use_enable nls) \
+		$(use_enable qt5 qt)
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins -r "${WORKDIR}"/gentoo_ice/.
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index f4c167af7ec6..fc87b271d964 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,8 @@
 DIST audacity-help-2.1.3.zip 20682229 SHA256 35a8f989ac8dfd24fa73716498feeffb82f838972280623309a557a3fa632a88 SHA512 4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec WHIRLPOOL 413390d10f977da3ebd339ed7925a8e81efede5b322d0e5c96c21ab86f8dd3c800d9a5eaeb5a69a6655e7c76ba7010b0ccb4da14864d77891d3028da54d3de04
 DIST audacity-minsrc-2.1.3.tar.xz 8073388 SHA256 c8fe1d52a58cef05390118a7f458f89252a3aa70155b78e8e25c92c4eeaabf31 SHA512 96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef WHIRLPOOL 730c962b6ff0861d9f96a58fb7d1c97af73cbf0072d3b8560c0250b4a37568741762d2891d8fb5097e6456a014e1ebe1dce4a41e039af5feb48d7bc454b67483
+DIST audacity-minsrc-2.2.0.tar.xz 10191924 SHA256 87635ed19ebcc80d6e4bb88d578c67277c63a02bd22d09d5489080ad216f606b SHA512 2b0cfbedce279faff4d26b8a8fc68730596891394a6cc7d9bce9d48f2e180d6ecdebfb87cdd381f1f92111a9d143d2ebd3906517206d888a2d922dc176a0f7ec WHIRLPOOL b171864dc0419a17d08693d9c97086021283601dc48c2487fc0a89264dd2ee30bfbf22264052564ef82f063ce9f3ae42a9df94486ac3f8041d50b96537473f29
 EBUILD audacity-2.1.3-r1.ebuild 2716 SHA256 80af9aee40b6dace965c6cc7afa447534dfc16b94616eec40faae8071239b133 SHA512 1d92991b6295ac279c898c94fa30c9928b596918a0425ca30f7acbf77e417dbf0ab8e819df14e93c69293f6fd63b80845c2943c4cb2635204d5596a552ff86c5 WHIRLPOOL 33da065903c766fb6032562638cd485e376c63e0e3115f8573484ee0a5a7fe29a58d0b3ac6db371d3ce38348ae35e04edf0072a6b68f09b97be8335d53350a01
+EBUILD audacity-2.2.0.ebuild 2913 SHA256 dd34fa58539dcc946f0d8874a95b9da0288e95fb74b0fdff53e10867313f3f9f SHA512 514799cfa03a1ad2d0e19404a6696e70444e6b824034b4261a352df54bc91f3744743c904ae813701a083a3d2a725922be7be0033749cabe52d8c33883c67119 WHIRLPOOL c2f4542fdd4d4784a5d49db98b663690f5f312d687fb46257fd2e24c3d31f0343bded85cbf9b2f8d9a2e4caaef29c17ac1bdc071123a95142c3160086c557323
 MISC ChangeLog 5384 SHA256 ad0abc3d8d4aa596434004a717126b958abe96f379c7caabea2ed46f2a26de94 SHA512 053613349248958c99e619f6392b7b8e086bb7d1be08050e6f5e76255f610a85ef841afdea20158e2a1c0cac44c9ad864437bbda49c999f501f3a368c32ae573 WHIRLPOOL e0e32d2a1a1ea51d43e1512a03242a84f57dc381877cea637afe0c41c0e2adf2f236a44bfeb718bb056b60f0090462b67d1f243f33022166789b84b8b11baf0b
 MISC ChangeLog-2015 30913 SHA256 b1ac51c14249d021192d80c7cbd201ac9a6021e91a14b46042940cdb0da10b82 SHA512 194078bc41acd27bfeeee0a07b02aea368db98d7e32306dadbbeda3f90e4f0fee03dc8907ff33110ba4b64cb7a839bfd34be22bab2437d0f4d48cb2591f06ba8 WHIRLPOOL fa7e61b7d7482efe917353f99b5fba05d5ca624a663e13d64b44f04ee180ed93db96d9f335f189ee365dbf2b4132f768e3e2b260446156522a38c27cc7e5aecb
 MISC metadata.xml 1175 SHA256 d42a3128754301d8e594c592b8db289f3c8358fe7d56bc71dd468a1fa8169176 SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae WHIRLPOOL 9b504e7e277d1a60aed4cc667d1e6f173614b188c759a22a02ded3f5b793e13ade2247934582032d98351d303763a88a0edb63b618301a0d71871473090ec9dc
diff --git a/media-sound/audacity/audacity-2.2.0.ebuild b/media-sound/audacity/audacity-2.2.0.ebuild
new file mode 100644
index 000000000000..9bfd7eae4ac3
--- /dev/null
+++ b/media-sound/audacity/audacity-2.2.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils wxwidgets xdg-utils
+
+MY_P="${PN}-minsrc-${PV}"
+DOC_PV="2.1.3"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
+	doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-help-${DOC_PV}.zip )"
+	# wget doesn't seem to work on FossHub links, so we mirror
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+	+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+	dev-libs/expat
+	>=media-libs/libsndfile-1.0.0
+	=media-libs/portaudio-19*
+	media-libs/soxr
+	x11-libs/wxGTK:3.0[X]
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? ( libav? ( media-video/libav:= )
+		!libav? ( >=media-video/ffmpeg-1.2:= ) )
+	flac? ( >=media-libs/flac-1.3.1[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( >=media-sound/lame-3.70 )
+	lv2? ( media-libs/lv2 )
+	mad? ( >=media-libs/libmad-0.14.2b )
+	midi? ( media-libs/portmidi )
+	sbsms? ( media-libs/libsbsms )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	twolame? ( media-sound/twolame )
+	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local WX_GTK_VER="3.0"
+	need-wxwidgets unicode
+
+	# * always use system libraries if possible
+	# * options listed in the order that configure --help lists them
+	local myeconfargs=(
+		--disable-dynamic-loading
+		--enable-nyquist
+		--enable-unicode
+		--with-expat=system
+		--with-libsndfile=system
+		--with-libsoxr=system
+		--with-portaudio
+		--with-widgetextra=local
+		--with-wx-version=${WX_GTK_VER}
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable ladspa)
+		$(use_enable nls)
+		$(use_enable vst)
+		#$(use_with alsa)
+		$(use_with ffmpeg)
+		$(use_with flac libflac)
+		$(use_with id3tag libid3tag)
+		#$(use_with jack)
+		$(use_with lame)
+		$(use_with lv2)
+		$(use_with mad libmad)
+		$(use_with midi)
+		$(use_with sbsms)
+		$(use_with soundtouch)
+		$(use_with twolame libtwolame)
+		$(use_with vamp libvamp)
+		$(use_with vorbis libvorbis)
+		$(use_with portmixer)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove bad doc install
+	rm -r "${D%/}"/usr/share/doc || die
+
+	# Install our docs
+	dodoc README.txt
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${WORKDIR}"/{m,man,manual}
+		dodoc "${WORKDIR}"/{favicon.ico,index.html,quick_help.html}
+	fi
+}
+
+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/kid3/Manifest b/media-sound/kid3/Manifest
index 5ddbfe59c6dd..345c0bb17785 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,9 +1,9 @@
 AUX kid3-3.3.2-libdir.patch 1506 SHA256 e3fab2ca350c40dcd11ce89a790da3675a254ddc62ababbc1965f4d4dc73a577 SHA512 b987463eb82b499af757ba2865bfe57f9f9d405eb005822d08521f89700bfcfbb1bd46f9caa8c436b6d73d0b12284db08299d5425299f5803612e7b75b6c12ec WHIRLPOOL 24d0c8954e68212bac4392957399a79296f0579715a046f76690e30fcbc26fb3642afcf053b5d0a07a8984835b02e5211f20b6f8167465b5639ad317392ea71e
 AUX kid3-3.4.4-deps.patch 1485 SHA256 3d39bf660c3a2bcdbeb4f81c864617c733388af86df347409bafbe49a84285f2 SHA512 af386071836e542e178cda38297091817943a3f754e4d14b3cca2ec628bd7c13980932e77b1f9e3c578b095d88ea2b24e89e58b6f726c6f656989fc08bc8a808 WHIRLPOOL 0892773c97bb47ec6cbb35f21daeed6fd51dc81097c4a9acd2aedbcd316cd48d25a5fd6f66721a50aaaee8c039b2bd0093b565d2474030b0ebdcb45902a94347
-DIST kid3-3.4.5.tar.gz 1376570 SHA256 0d703b0b8c2538eba1f8f540a87e13a4bf61f715ef9cd1253f18417ebb096404 SHA512 36ffb45dd6689f252021cb9cda667f28810fb1d7da77179ef6abc80031b7a0dfaa445776c8e3586000d774bc608395fff0854d867c9e1e52676409f78a515ae3 WHIRLPOOL eeb0d29b9a30685ca6bdb4064216efbea48cb35de8056c7cf60956801129455e2145842e9cd52d8a4e99a099752d70e31e09307454ac25ce2c8d4d1bbc122199
 DIST kid3-3.5.0.tar.gz 1414288 SHA256 0f1a3a003de180e58ef53c3db6f5caf07f5415cfd22ec2c57cbd9791d5a54fd6 SHA512 a70aef4c775ec8a2d760856fdda38394384d71fbfb5847ba4da2d6396a1167c740a57a5609ef99a06ca99c090de974e91a87b13344f2e123b33842c51860cf34 WHIRLPOOL ae9a2c73d5127a5d44bb32b1fac99ecc096f850004228995ff67d4528a975a463386d1906f2146d1c6683011ae57513f83623bb770acc9441a51c8733fb76c68
-EBUILD kid3-3.4.5.ebuild 2012 SHA256 5920b9445ee9d6f400e15935a044affcad60566badf38be10f54b4c89c382c39 SHA512 fd1dbbff570248c636426324150d9792caff8cbe29a2f098604ce09f810cc6c6c1b3d7fedc695f6a5a450680002333cebf37aeb814b81cdae438c24137dcb971 WHIRLPOOL 12f33ac02a17749e1bb9ee9b5437aae09b1654703b2aac6043f298c694619e4e78b9929f19d4f3b654d3e0e377c007cc7ee65124d339ed0a992cbae656622298
+DIST kid3-3.5.1.tar.gz 1414829 SHA256 88c20826deb13f81bcdfa7033a4b9ff9ca8957112b2fa2ccc0a9a1076df73926 SHA512 7f1fbd6d1d576d23f9b57baaaa35101fb2e9ea23dec5b5506e25ec5a94dc8516d25b69b4dddb4a9b4835b2502d0a07087c245380483571a68e5972f98ca8ca58 WHIRLPOOL ca18db7b2f5e9850956f9df5db6ae958c8558f80ab40e137c0304ced2ce1b3520b7aede0a593ffe50f54d56e5bcb60d6a570db620b3929cb1f0e22f3f17fa479
 EBUILD kid3-3.5.0.ebuild 2012 SHA256 3a943ea8dc44c88008ae8ebf114061ad82f2c4ad0a68c536e01ffa0f3eaad38b SHA512 c2a9f141724d8073240a76a1c9e9a7c3352bb91f62c05298de81ecc085772dcccd9b0a90fff3c7ac39992dc7ba481c60f3f633e56e5e18cbcc573b275f7a3df6 WHIRLPOOL 2f6b2740e9c0870c2dc36d7b8e51dca436124d6192afb6f83190fef2e91754d3a139514321405fbb07674b68a565289cce960c4ba9d891d4bbd1e9d6eb8c4d13
+EBUILD kid3-3.5.1.ebuild 2014 SHA256 0a082bd5677e0309c8e827fda27c7e2fc036c8858a9768216bf84e71f4832307 SHA512 39077f8810c78da6d71ff2ccff9b6ac5d3ae31835844c25a49ac6500604a16c3ff60511fa0ddaebab938f805611ff0ada2b4a5649e093be2160757f543194cf7 WHIRLPOOL 36ae61f6ae61ab6a7f39fa72142df79d95492be834c2bde314394b545768ed571a97eede06fd55d7008429508da293d26f9a2fb36887e2b439c2b6dc14b70a80
 MISC ChangeLog 7232 SHA256 a3c22ac7d7c38f1040e1ccb3f7aefde8033c530b8b6b2a36763062ddf87a9be4 SHA512 0aa84c70113e4681820c672dc03b3e2edd1c87618090366d146082603648b811ebabb0ca138c6568bc8ed26abe2e0279e71f2e9acd38c939269765ada95b7c68 WHIRLPOOL 9d86f330e1d443181fba85ba11d49cfd68e98ba6303316ddd0771dfe19365def9d13d1f1f7cf1527dc65a814d80f963c30f117f15c7039fec952dd5a686d7205
 MISC ChangeLog-2015 12280 SHA256 50bbd374682b1dbc356308a5a2882611fa32c2b0800d76030847121653fe1730 SHA512 7a8b2a9109e8ab7150217282331ffa7cee1aed4f6b7dd968d8151aa8dedf1fbff5ac5b4d6c369936104d3126369ecad410a6258c12be2f45af7abb3d6dfe4b27 WHIRLPOOL 6be2657cc843bf49bfa7ddaca41d0078844de89abffef2e6ac71de679a9a1c2bc9f3213d6ba465bce384ac663d6f475fec9d86841411ad9bfdbe2896bb48c8ab
 MISC metadata.xml 672 SHA256 6a1640a28cd926507a19d1b9119e7d6c7d51bfc5f5507c297500cb479d24bee6 SHA512 b76d1d9b77eab5a42ebb2bae4a039a0a9abc5227e37fbe3066ca04aacfaebfdbcd99b3901eba79bb8ee46a64fa58a3aaf6370eeb3706d1773e137b02de1202ed WHIRLPOOL 3ea8ab8df8c39b1c18cd216f2077d387ca7b1f4c25f9173aab1dbb87a3b5264889008843e290e08075749019e65d3afe7d25a8fc9483c1abfcc5c3db1d5cfea8
diff --git a/media-sound/kid3/kid3-3.4.5.ebuild b/media-sound/kid3/kid3-3.5.1.ebuild
index 5766131f8ebc..98825f9596ae 100644
--- a/media-sound/kid3/kid3-3.4.5.ebuild
+++ b/media-sound/kid3/kid3-3.5.1.ebuild
@@ -7,12 +7,12 @@ KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
 inherit kde5
 
 DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="http://kid3.sourceforge.net/"
+HOMEPAGE="https://kid3.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index ab91281c32d0..298834866285 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -5,7 +5,7 @@ AUX lame-3.99.5-tinfo.patch 768 SHA256 75e5f5be5a18bf5f436ab9622113502a889b90b6b
 DIST lame-3.100.tar.gz 1524133 SHA256 ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b WHIRLPOOL 6e940e2995dec8d1f6b73b87fc5441f9d85bdccfb3faf670ca06f9001ce752e9efbad17dc8fb5641e0e14e4e27aa2ff33f4c2c9df2fafd5e522ca0894e4c8efb
 DIST lame-3.99.5-automake-2.12.patch.gz 536 SHA256 49833b952d846405fdcc8d87de55f60dda5fb2268e1b36861c53dfd39dbd275d SHA512 9d6211e257d573ced5c29c43ba5d5cc98a231b213d6e0cfc352b14776c06c9e656ed1873d5caae466afb27dfe753eeac0842c7221a8538ccecea8f4ba0f8bfe2 WHIRLPOOL 506e505cbf8659c3f67084565fc581e4dee3ba2016db3d835e3e63d9eca0d4383443e7596229f51b349c1f8c53ef42a581761d27778de4c1e5b698c85418b401
 DIST lame-3.99.5.tar.gz 1445348 SHA256 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff SHA512 ce62d7eb9fc8c53c343374ded30f11153a296910f0be7e649197bca7412c6660aad1aa6143d56b750f866229eb492cf7bb4f682535c383fb4aa57d7077d8b4d8 WHIRLPOOL c238107bfb824c67c639875547e24b64ceeeb22125800af753ca42de129138f480574a6cfe132bc2c9cffeb39e54b6d57059be69cb41bdc164cdbf29bd95afe9
-EBUILD lame-3.100.ebuild 2227 SHA256 16e951eb454f969affe1e2aebbfae22c1fa5c89d0989dbf855bac57b1cc49d02 SHA512 a2f1ad06602e918c3667f252f728f3e4c77dbc256544f4e7c4453210d2f58dce8862a80e9c46d85e39f1d3a7d94b92ec3a755b58fea683921b961b7be01e521f WHIRLPOOL 8640cff1488f735b7e85ce155c13ae086090caece5c4f6b836d60d5a82037cb491137cf44364aef11e4a6de2c59e26b50eb19a27df665157dfa05a339f4011da
+EBUILD lame-3.100.ebuild 2226 SHA256 503ff526cc853dc37ff53f4652d5d6af85edd0533992ec80f1eb54a6135815fd SHA512 87e29813edab52d7f4d2afbf517d3052fd5478d9e8464ebbf9f01a887a1f817d6daed6d03f03ff672ec754c7e31ef2459b2d2ad65a564e14ccb903dc61218b65 WHIRLPOOL 83ea65a89287c0d433e32beb2b6c4b5ab719516ff1330b5b6a64740f7bb6428e0be477da1fe9694db487b4293b0629e54f8579f57d0b32c18fa2a52b71df55f8
 EBUILD lame-3.99.5-r1.ebuild 2389 SHA256 d374131c6b53fe22e2e3c47d1c5d2146f6e38bca0e1c3a4cc8f24cab7243f6f5 SHA512 4ec01c7f70acef14e3363f9c764d5b538d44662ae23dfc936850831874d9e97c3a3a16051aa99af0086576fa85d5f1d7dc94862c0a20aeae61d3e4358be89e4d WHIRLPOOL ed6d4b8885f5ab69a0f2cfb4108e9411ee0ccae8f4f54510dab82780e7a18805507bf1f0bfec773d40019d0414883e2de6924b3113f4d2fc9458cefb3aaf0edd
 MISC ChangeLog 3967 SHA256 cba2a8250a14dfce2a88981f3d162228874e5d8dc150396f8b87d4fca7faa99a SHA512 3075cc97e089a57fe4cb8149cfe11602cf2bddafc628f26702502b71104bdc8669ca43f637053bf51bdd2343b605bda8e6567e8504a1a63d063d6004f16d95ce WHIRLPOOL 9ba9c5dcadd19974fab507ed2c906b065e97a8dd0529b37cdeab839b5906edd85e33fad0394e272791c29a280902d74a6ef510dc5ae2dda7b47e3f5d251297a5
 MISC ChangeLog-2015 23341 SHA256 d275b2762420a52827eaafcd4fea3c4c3ec52f32d0c06ec62aba48d408cf6817 SHA512 084b9e0d4ffc5eedcffe35239d1632232755f2f6604d9e6b12763f380eb06aa8886a5787143d3570f5846845a2cd91654ae2e20dfbd24faa11ca8738aaf9d931 WHIRLPOOL 951a28e8a998711e9c340f129b32ad75122bca2090d25e894d7c92cab90cca2b610baabb5ce708a755c7e6e15782c9e68bdb83df8ddeba5820c6e8729e4b75f1
diff --git a/media-sound/lame/lame-3.100.ebuild b/media-sound/lame/lame-3.100.ebuild
index 5bfd8b0a825e..f640c1a8ad3c 100644
--- a/media-sound/lame/lame-3.100.ebuild
+++ b/media-sound/lame/lame-3.100.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/ptabtools/Manifest b/media-sound/ptabtools/Manifest
index 8e275d9def5f..f7e8f4a675b5 100644
--- a/media-sound/ptabtools/Manifest
+++ b/media-sound/ptabtools/Manifest
@@ -1,6 +1,6 @@
 AUX ptabtools-0.5.0-makefile.patch 778 SHA256 1bfd0e89bee304fbb41f0f26348260dc91809c35ea7441154f11f1ad75ead0ed SHA512 d68a8791e3ec053ed557db0dce4de6bf07e91017e416a11cb131a5786ef66957cf2ea955a77fd8d009ab6d5b20ed6b044abe805994f4342a00fe84a3392f0dab WHIRLPOOL 09487f8a1fe86e912a731d9fd63915b340a7ab8d1d6a9a181fef5d1ada4b9c247445f7f5f8ca37f0de288975c3fa8022d6b441e6fb9064d64266468210db3547
 DIST ptabtools-0.5.0.tar.gz 116083 SHA256 2204d5969eaf17c538d839ee5cabdf68f4c458d0ef1e314689e3f6523633db98 SHA512 c0028daec1587b190692b8aa8d9002063022ff7516d99e9fae3fd01f25d27ce4230cb2b15ecf4652fd4b902de27bd8ae4b63af248e950ac8e7c1f277da37cc93 WHIRLPOOL efc06cf5b93422063ef1d223a66d784bd9bb64b3c7ada003129e5db03435ba3c25f05286a11f8f7f83b1967cd77dfe738ab4bb1e1649859309fde5d16db46b2c
-EBUILD ptabtools-0.5.0.ebuild 702 SHA256 743680632b35b8de7d29364eb3f39d6dc014e5691922ba959b11775a05864c3d SHA512 b1625ff6397d1b828e4b7ff2d174e21876d43a86730467a27873e290f06c2a32c059b6669aace6fcafb7bd89c8084404fa959601646e651d12ec8d32d2f9c86e WHIRLPOOL 8d06c24fb437005848df7020609c75b5ccc71c89b4b3665514272842b73aaba416fbdf76ef47eddcf93318ddfa86d13d6fc970e9b6b04781a78bccd7572d16f9
+EBUILD ptabtools-0.5.0.ebuild 704 SHA256 01b34ea6eeddbb0d8d8c2500436a1aed86cf54e8f4e807618ec24b6bcf671e46 SHA512 be8658375af305a57456a766809d30e732d7ba8c635a367dfc3bfd3da6701e7b2140094474186fa6bad5e35e650ee97db22739661d34e501b88346f30fc5df62 WHIRLPOOL 72d2b86aa99e3201a149d5f69a49a27f269a91e209c5353ff89c59c89de344593f5ab91ebd7fcfb9164956c52661f3d5a6a658197ea4b818306970ef5de710b8
 MISC ChangeLog 2655 SHA256 3f8909bd0c6868f4d8ef47ae39d2456ca37c1a3ea5d5622e62b9a1e67e583673 SHA512 7db8e7540ffa24c31dafc8edae09955dd65991a387fdda0f89a244212d9ea33d6697236b1dcbfb3f3dee2ba8a54ca61268225821facb05a39aaf4bf95dbf1a50 WHIRLPOOL 19430c4a7c04a29de1a451f7466b543fb0bf54a9d9c3f446790415b2272d71607c34d10748dd584dbd7729ca909e4e6d7df492da573661b83b726006c8794002
 MISC ChangeLog-2015 3305 SHA256 3ec346c45c090ca74d0396f8327f5cd54e136d240901c5978f9aa323bb6036ec SHA512 f5f54d13c74946ef683ffc171d5a6af69d990a5007c57fe80b680c48fdd1d873d4b6bca51022aea2fd51b047a89e7638b794a63d2aafb5f7320d942ac3eec510 WHIRLPOOL 69e5b82e8e58cb6a412e687fb518c9ae1630680f03f2e267aac03daf65af4502ad081a0f0d1709bf29b6d03f5e86f43267a56e0e25c484bf5cb0f6212a742841
 MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/ptabtools/ptabtools-0.5.0.ebuild b/media-sound/ptabtools/ptabtools-0.5.0.ebuild
index ce38e48576a8..350f55fb39e8 100644
--- a/media-sound/ptabtools/ptabtools-0.5.0.ebuild
+++ b/media-sound/ptabtools/ptabtools-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,8 +6,8 @@ EAPI=4
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Utilities for PowerTab Guitar files (.ptb)"
-HOMEPAGE="http://www.samba.org/~jelmer/ptabtools/"
-SRC_URI="http://www.samba.org/~jelmer/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.samba.org/~jelmer/ptabtools/"
+SRC_URI="https://www.samba.org/~jelmer/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index d0d794233f05..2282e37d6c96 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,7 +9,7 @@ DIST pulseaudio-11.1.tar.xz 1648924 SHA256 f2521c525a77166189e3cb9169f75c2ee2b82
 EBUILD pulseaudio-10.0.ebuild 10963 SHA256 727bd75bcbcd49f37f4188d43419347b6ff28770e58679534c30f57a38e4bc5d SHA512 0f4eeac1aa1d2446db522259bd669c67ad06f717964b6272f3ad733a01feecdc00bfd4fd886636a284522a7e766a090fcaba60251a8e65486ec518677425825f WHIRLPOOL 30a1344a7de4248ca68c7bc6786c1f89d6172817a7c20d916b0aea2f896c810e4caa4b07029eb584aadc7e2db603fac1bfdcf5a257c57e6348331f9b4484fcb9
 EBUILD pulseaudio-10.99.1.ebuild 10972 SHA256 35ac28a1ab6838e5720c3325e523055cd3ba736c1fe5846de0688f25c4f36eb2 SHA512 9140a7bacc08ed57975a5016d7ccca54c585a3c58cc0605f29ace3b2a9c4f7e5af817cd9be75034fa6b8769ae9b314cb2b56d53675308d8fef95edda5079e764 WHIRLPOOL 0ffee03dedbb1807cccce95ee9afaf28e619e3da3946fbbad99b25c3a5ed730b09bcf731250cc777df7342b11f77e1a6811c845b621aeaa7c0709a54fbdb6ec1
 EBUILD pulseaudio-11.0.ebuild 10960 SHA256 8c32ceb6a44f122d6b119dedc3e83a6365d57d5b19c89149f582511f8bfe4e8a SHA512 5857ec66ea36197411d0e42b2234683686f3a6982a5b5168b23f69dec72e4827155d664b6e4164f578758290362d885d7370f068a32c0c37d77d7806895cdb67 WHIRLPOOL 95e1c6dfeb6bf571fb45b8d1f7baed02c2ae8629e94d75887e87e88fcb5aad325f8f31a8aea277bc7c22d67fd9494e80cb50a487b4c2e5cac8681c484bcee4b1
-EBUILD pulseaudio-11.1.ebuild 10960 SHA256 8c32ceb6a44f122d6b119dedc3e83a6365d57d5b19c89149f582511f8bfe4e8a SHA512 5857ec66ea36197411d0e42b2234683686f3a6982a5b5168b23f69dec72e4827155d664b6e4164f578758290362d885d7370f068a32c0c37d77d7806895cdb67 WHIRLPOOL 95e1c6dfeb6bf571fb45b8d1f7baed02c2ae8629e94d75887e87e88fcb5aad325f8f31a8aea277bc7c22d67fd9494e80cb50a487b4c2e5cac8681c484bcee4b1
+EBUILD pulseaudio-11.1.ebuild 10958 SHA256 6fbecfac0de4af50b523115216695c72c048da187c1ecb869b22bee0b5dab2ee SHA512 71ecd71851a7839f703637cc8a71c06e6303ede99ff425e35ef3682ad8adf65341f325e7b4fc0ac4ff11743d02bf603593cc9d3f6caf9e700923e7a25a3ffcfa WHIRLPOOL afb4530909c80cc4abcec1d3b91a1ff275d8df39dc84cc16b1b9464547ce79e8b84ed3fcec9dc09a7148650f22c647b7a5324b0c53641f64436992ec0860be0b
 MISC ChangeLog 11540 SHA256 721b6fd79ffce2f0d2cd26022f7bbcad88b1fdebd1139bbdfd1e5b07ef4b7ab2 SHA512 63d72899dab2227aa9159deb9a106da315f3bf6ebf63fb79e7214edbf351bc13c063e1abedf4d616c5746e33132ba8445c2c6fb6d5903107cf148c2562865ece WHIRLPOOL 109e3cd94d1b0df5ceeecc2df51a3594edd86722b92c66f5fc012c931291f5ee7d161a676ec6f5b6855989939ee13835cfa32e7e4e888778c1ca6e4c25ff1244
 MISC ChangeLog-2015 73034 SHA256 daebab187cd3a8bcffd1013ca2bd5f1ba94a30be9131949e23ff7fabf8953b2b SHA512 db0cda662b8f52d41b0502ef68001170c6eea3e18141e61984f96e2b7bb528126f752e4c7c4a622fcac04dd763a44c2816a5adc2ecb52d2b55230ed80e3454c9 WHIRLPOOL 5a9ef76f9272053d13dbb4f5c5646b10278a2a58e6e4ade4d9a301b4aeac99f1e6ebae6476d7e5ae57ca6760270c34c092479c6ef327247caf5d1c945b64b024
 MISC metadata.xml 3415 SHA256 3bfd27ff5ae2987f910aeaf1964f5b5a0fa9299e93b4bfe305a8472e7b42a5a3 SHA512 1c7e7a12eeafc6abd5d9bd315e4b512a7b479ae933ee3865b9fc37d994f123beea8208dfe742334d12dd4b20c7eb8077bb37fcd1a862dcf1f5874a0fa8777896 WHIRLPOOL 69bc332ea2cf65ebab7f1a9fbdd331a8eeb01c94dba024ded2450456ca5e607042fe1cb542c858de338f71c81e3bcc44e2086de858bcbedc01a474781e1e10a0
diff --git a/media-sound/pulseaudio/pulseaudio-11.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
index 9ca990d07101..e8a75b63a805 100644
--- a/media-sound/pulseaudio/pulseaudio-11.1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 8f16a6372c16..8db86aeb4fb4 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -17,11 +17,12 @@ AUX xmms2-0.8-rtvg.patch 1539 SHA256 a5486f791ee431171c3bf3a813165279f3218b2f2c6
 AUX xmms2-0.8-samba-4.patch 1125 SHA256 e453c2d3ecea7d95da393fce2d246a3372351cf25a60c0f1dedd61eb0ebf9d38 SHA512 f6a3ef39188b077217becc7317253e7ab652d6bd603bf26239a8398d8de6d34c62415f42baed78720fce9048f2499de90f0cca07d7219f281df8a441b16a7e01 WHIRLPOOL c3d2219eb5aa4979d5319776a14afb2a700d0a6d1e1249005dab057bbfa1e31776daba54812367b5657e8f18631a8ab9d5516c26810ca2c06aa7929f00ebb4e9
 AUX xmms2-0.8DrO_o-waflib-fix-perl.patch 1693 SHA256 92677d5cd31efa55cad5a0c9918b50be274f7de65065c3f491482ee95fb77b92 SHA512 0f7f86cebd0ff75ed53366776f8c93abb54adf5942f53d7424183a4bd6913b73493882d4d3caadba6a959ddf22da0a22fa53d0fc18ce5b8508eb5670482e8c92 WHIRLPOOL a7259c7071f70082f23044743302f96aa403e428fe93f4854f63ac900c7da948ebf1cc1332d8adbfd72a3862e888cb5d6b56481e8ec1e4e299e19c50c14bf34b
 AUX xmms2-0.8_p20161122-be-hash.patch 1075 SHA256 0a5a5bdef85c3169c0b0761b6b3e4b3ae1e27dcf506210501598cfee32c4a7c0 SHA512 051e22907315bb6bda201497e1c2ef84d919fc7d39aefac187b3616c5f6c41e768cdd79cfe197fbadfdda3863f9e9c96b5f72fa07d5e1655451328cde8ba5781 WHIRLPOOL a7e82bd247c7630dabcb95425a2db7b18feeafe90b5e613fce6baa7495bef09699b7dff18e74c902963bb06696f6561f6fe65525c1a1f59f2e3699a3d8bd0080
+AUX xmms2-0.8_p20161122-mac-4.patch 1632 SHA256 09d184a861bafa3acfa8f39854f0779bba50d374da72e77c3900a3ea738dee86 SHA512 d2fe5f9a0c59205c787386e7b219c3fa9a334c30787b9a343214cc1c4dbf9f5d47f5dad9b2efd7deac1e96a227c827cc66198215a89b0e788c9d856cff51b16b WHIRLPOOL 1820c09f7f0ddfa89cafcf7a0d80c9a297c0b62ab6a45549658deb8de9dcd996984c774221732428a896236fdc50f243d40b4d4f66c6088eb8c5e581ec61a544
 AUX xmms2-0.8_p20161122-tarball.patch 2764 SHA256 3de2d3c0cc8cf0a0ca28c4d51082c55fc7fe19839a54b8f2787335ff2f9bd7ba SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac WHIRLPOOL 48567b17881749e0ebb933dd445c663b89ebb005d8e8c5c55ad97edfa3ebb249d69cd8812588a5a62e4272064375447940be04fca6259b9428b543a53954f9a3
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 SHA256 58bd62f1e3ca83d4d82ad6854ee769b97238fc1c89967262c0e9e9e20e35092e SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb WHIRLPOOL 438d33793b808dd151b27ac51af9998b819ffc03cbc0ce789d693192f8aa5cab3c48402ef83f2b8fe1442dd9130248f561b1fe466168c0569c2e017ee1a0ede3
 DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a SHA512 478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8 WHIRLPOOL 741dd85b8c065eea799675588a8d4c389c47fa3dcf129a9fd799bb5da0ffcb1eeffa45cfaca40af7c505908818b5e7960c1a54e947f53358edeb43841f2eaa5c
 EBUILD xmms2-0.8-r4.ebuild 7874 SHA256 471384c64f1a54c2dc421a44c6673f9d18b4b0841ed2459639aa18ba08efa2ad SHA512 529fb2aa5655d0acc7b8c76c50e51e336771eec912dd5b5c3c469c6f32942eab15c1ca6aa9716c06b5103a2e852729b295d1b3f862d4e8e1c3c24918fa7550ae WHIRLPOOL 378209b1ae3bbdbc31c891ee47a92c87bee5fc714854bdec209e9ed3afb66b5d29a2f0063f72c8d5b53c26817c3beeae214e01f461b40a2a1321cec33e0f11a2
-EBUILD xmms2-0.8_p20161122-r1.ebuild 7492 SHA256 ac947dea9d870ed6a876a37bcb222cea492eda3a0adc3f4a08417df77a9313c1 SHA512 a05b1284416709210ed396a95ee66e53687e3ed957c21827d7e9274efa3ba79e4522ede456ce07eb447d366898bfb66f5c056c7d6d110e3593a14535b7e096a1 WHIRLPOOL 147afe919b4e09803f7479caec286f74caa0d6596ec4787bb50da63fd1db20770eea462677b0a6963f90c1e80aed44e8a032451749d9caae77d74e601d577bf8
+EBUILD xmms2-0.8_p20161122-r1.ebuild 7565 SHA256 2420546531c17d2b293ce4b74510e020b5f2fe7e680753e76da51c3606aea334 SHA512 cd1d39d50f001baf36c7dcbd9b18296fedee8abcf8041f85c630d04d53a287d4a52d1d7d6608f559f8387ffc737551df09e9caf26fa2849bbd1b1e285126e0a9 WHIRLPOOL 812b51e54ccab3cc0385eba3193660347900fac0db84293ef29fbe3902d1c40deab4fc7e93ff486dc598094cced0b76a59673e85b4f0ee2d4c2e68f8618cd858
 EBUILD xmms2-0.8_p20161122.ebuild 7395 SHA256 3606e852697e31ca64d8888441ccad3f270ec4bff3fe0eb80453c8015d62a7ca SHA512 3b1afecead61985d6ff70bf85252fbfba891c07d14cf2557cd992b42a04b69c79d44a48d2a55768d77c2cee85079e5dac132c71d94859f775ce28d593a8acf98 WHIRLPOOL f82ff2cfe21680175049af774a636020d7befc28f70dcfb9305507fcfbc435e8bb44f96b1e6ad869265a68b32f002e2052db7fbfde94d8861f64ac0fd1a0d032
 MISC ChangeLog 6165 SHA256 38f2d2683f2a7fc4c39fa78ee02ebae2589538d80cc195efc5183a157772bf3c SHA512 1c47e67574b722dbc4363c9a5bcf7292bd062b72abb53eb3e20dc7de5e2e4ed6715ddf5110c4aa9f04f66d0364a1cb66f7affee15f6940671a4db24ff713b92d WHIRLPOOL cf953aa3bfd0f1d054773c09ef961d084d8d5466612079a63811b258b31ca59d68dbdb50cd69d4a419309a5bf1d771789f4fd3eb5986ca2368e20320916d3270
 MISC ChangeLog-2015 7596 SHA256 a519587f0ed0529ca29d316c0e958984ccc5c02887219ca49de1d5a69c34e49d SHA512 22539404663febb287ecc813a8655256c2696864e7cd99409a957aa5c665b3a348a3744666621dfa8ce775eda08077b36a0f721f754c42957bb97305625d86a4 WHIRLPOOL a08bedf3739615df0c51931df17507be30792afe66f9353460db786648dbb91504449b30bd4c12a9adc95fbadc42f3bee9f1d85645aafdb511ba9e5b238290d8
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
new file mode 100644
index 000000000000..df3e4d2af852
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
@@ -0,0 +1,50 @@
+From e87745721deaf46d7054ac40cc55838561c9f552 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= <cJ@zougloub.eu>
+Date: Tue, 24 Oct 2017 18:43:26 -0400
+Subject: [PATCH] plugins: mac: support newer mac API version
+
+---
+ src/plugins/mac/mac.cpp          | 6 +++++-
+ src/plugins/mac/source_adapter.h | 8 +++++++-
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/mac/mac.cpp b/src/plugins/mac/mac.cpp
+index cec43e52..d8d3d1b9 100644
+--- a/src/plugins/mac/mac.cpp
++++ b/src/plugins/mac/mac.cpp
+@@ -210,8 +210,12 @@ xmms_mac_get_media_info (xmms_xform_t *xform)
+ 				gchar *name;
+ 
+ 				field_name = pTagField->GetFieldName ();
+-				name = (gchar *)GetUTF8FromUTF16 (field_name);
+ 
++#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
++				name = (gchar *)CAPECharacterHelper::GetUTF8FromUTF16 (field_name);
++#else
++				name = (gchar *)GetUTF8FromUTF16 (field_name);
++#endif
+ 				memset (field_value, 0, 255);
+ 				int size = 255;
+ 				p_ape_tag->GetFieldString (field_name, (char *)field_value, &size, TRUE);
+diff --git a/src/plugins/mac/source_adapter.h b/src/plugins/mac/source_adapter.h
+index 94f75359..70617514 100644
+--- a/src/plugins/mac/source_adapter.h
++++ b/src/plugins/mac/source_adapter.h
+@@ -38,7 +38,13 @@ public:
+ 	~CSourceAdapter () {};
+ 
+ 	// open / close
+-	int Open (const wchar_t * pName) { return ERROR_SUCCESS; }
++#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
++	int Open (const wchar_t * pName, BOOL bOpenReadOnly = FALSE)
++#else
++	int Open (const wchar_t * pName)
++#endif
++	{ return ERROR_SUCCESS; }
++
+ 	int Close () { return ERROR_SUCCESS; }
+ 
+ 	// read / write
+-- 
+2.15.0
+
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild
index 8e1a03998bf6..f65e222e0daf 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild
@@ -135,6 +135,9 @@ src_prepare() {
 	# fix hash to be the same on LE/BE platforms
 	eapply "${FILESDIR}/${P}"-be-hash.patch
 
+	# handle mac-3 -> -4 API change
+	eapply "${FILESDIR}/${P}"-mac-4.patch
+
 	eapply_user
 }