gentoo resync : 17.02.2018

13 files changed, 515 insertions, 26 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index cc1995aa898c..d43859444196 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 0529b53c3f02..d43d6951fb29 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,6 +1,8 @@
 AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db134710f5aaf62c4e8105ab1b8ab0e69a0953b6177fb91dd89fcdcf5493dfc1e634f51658eea9f050689aa1e219dbd8db189 SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
+DIST clementine-1.3.1_p20180203.tar.gz 8483246 BLAKE2B d338a93d4111be2b4d118df40bfca5fb1107cff68e62a82c387dcf83da8f34b2eeb5649fa16cf2f94cdbfc455ab01982b81091344e82d1c4eef5d7bc23008cf6 SHA512 72589c525c5c2452f09fd023df03bc7cfe45278a13d42d76678108ea2c02bf078529cf0169882cd3774ecdf65bbd6443fc1c93336148570c9a1b2a7757af61f4
 EBUILD clementine-1.3.1_p20171113.ebuild 4949 BLAKE2B c191c95fe3eeed9a429120b212e449b6bec7de077f0da771612fb5a3d04c3b3d64f34c92ba48fb13037f930a243695fe0768ce0df03b877f7f4479dd8bcc6d48 SHA512 5a6038ab815b894e46c1f5d84c73754a3265e105b7aca76e4cb828749d3fad64fd2ea5ea153dd26ebb602bcdd6510a185c6547df5d5e4950372a1e8ce7cc6020
-EBUILD clementine-9999.ebuild 5178 BLAKE2B 8dc7dd9b86b6860c5eab23ec4da3f4c29e19df4a6cdceae5c1fef1070fd2641d639c1575c6cffa35478b0f3a51439be693eb00f716ae430c8166955801a9c534 SHA512 d90eba077e830647838ee437a167f4c2148dfccbbffb5afd756a10d92689300b363b39dd8766fbf047c7ba8c71e5e9857dcc003459d2a32629a9007b153cf58b
+EBUILD clementine-1.3.1_p20180203.ebuild 5181 BLAKE2B 9b72a071d0bf32b6c6fb84a270e8cb4185d8c90737c4edf98226ed3432b513001dc4d123d190a988e952e84d3420bc5d0c885b7e05a0ba03113886367705cc7a SHA512 ed300896e0020255bb1003d10cc9748c6fd724c083ced82ca389d32fafae470e6b0f30aad075c19cea83d01da30239b401c8ff2e1addd06884703b7b195fd722
+EBUILD clementine-9999.ebuild 5151 BLAKE2B 3fd15cc126cf7e9e4021195d3dce0d7e2b5bd80d9cc2914c9b65c1eee766dab52792dc10f38402ba36d6ad3283a315c89d786294068839fa08227a44c3284eb7 SHA512 a5283a018f0fa14f7df6cdffcd2c767d411b6f0292938e91ca6f7f84b22a80aefbe4dcdc8006ea4785fa1103b59f4b976136d48b2c97428a721cd815d7e3fc1e
 MISC metadata.xml 1270 BLAKE2B 42b3ad43defebc30898db95bac41edde89d345e4776fa81f84581f8f35df8fa962024f0d08e84bfceba1080966988308434c7aac90d244ead02cc3a1fe01c58e SHA512 9d69291b66803e4dbe1ca50309891fcd9ee5ad5264bb7827a88a550367d770482744f3b5689f60a584b3fda7614cd27743085492dc72727275b470b225b96cf4
diff --git a/media-sound/clementine/clementine-1.3.1_p20180203.ebuild b/media-sound/clementine/clementine-1.3.1_p20180203.ebuild
new file mode 100644
index 000000000000..8a8acf0c01cb
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20180203.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+MY_P="${P/_}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_BRANCH="qt5"
+	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+	GIT_ECLASS="git-r3"
+else
+	COMMIT=b04367937a3160e15543a07631e36213db7b6048
+	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} vcs-snapshot
+unset GIT_ECLASS
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/crypto++
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt5]
+	media-libs/taglib[mp4(+)]
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1[qt5] )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	projectm? (
+		media-libs/glew:=
+		>=media-libs/libprojectm-1.2.0
+	)
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	|| (
+		>=dev-cpp/gtest-1.8.0
+		dev-cpp/gmock
+	)
+	dev-libs/boost:=
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	pulseaudio? ( media-sound/pulseaudio )
+	seafile? ( dev-cpp/sparsehash )
+	skydrive? ( dev-cpp/sparsehash )
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
+"
+
+DOCS=( Changelog README.md )
+
+PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	cmake-utils_src_prepare
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+
+	if ! use test; then
+		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+		cmake_comment_add_subdirectory tests
+	fi
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="crypto++"
+		-DCRYPTOPP_FOUND=ON
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DENABLE_DEVICEKIT=OFF
+		-DENABLE_GIO=ON
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DUSE_BUILTIN_TAGLIB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBLASTFM="$(usex lastfm)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_VISUALISATIONS="$(usex projectm)"
+		-DENABLE_SEAFILE="$(usex seafile)"
+		-DENABLE_SKYDRIVE="$(usex skydrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx emake test
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index c80ccee1bf4a..caae648812d0 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -3,23 +3,26 @@
 
 EAPI=6
 
-EGIT_BRANCH="qt5"
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
 PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
 
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils
-[[ ${PV} == *9999* ]] && inherit git-r3
+MY_P="${P/_}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_BRANCH="qt5"
+	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+	GIT_ECLASS="git-r3"
+else
+	SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P^}"
+fi
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
+unset GIT_ECLASS
 
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86"
 IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
 
 REQUIRED_USE="
@@ -99,10 +102,6 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS=( Changelog README.md )
 
-MY_P="${P/_}"
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/${MY_P^}"
-
 PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
 
 src_prepare() {
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 11484b929ef6..4d90051e657d 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -2,6 +2,7 @@ AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd7
 AUX lilypond-2.17.2-tex-docs.patch 608 BLAKE2B 7cf73d59a6ebadbc34952c199ba1085e6fcebafebe613b041dc8d16fae051380e051d72a2617bcc96fe382de55bfcf4e06d14c4cdd9cc1ac6a9c44a60f49ef68 SHA512 fe22e649e12ba1aacf05dab14b1820d636d58dce252832331577935db2c0e565b3ec6073c6bec11a05a4c1254ddd1495252e6b3e41623e290363eb124e7fa6c1
 AUX lilypond-2.18.2-fontforge.patch 924 BLAKE2B 5f128e65357033c2b2ae33d5f00cccd7237b59354342d33f958170e5f22d904a47aeb18dcb12b7f7c8846d3689ed7d39459b4995c99834603dc22f3b2c893fda SHA512 f4a45a1ed601c114df24e9e20aa083cd30d5b77955e19cac309508af2f59c808a629bc82bc181e5325d0534d29d3fe4de53029d2db317ed447e306e11150ef7f
 AUX lilypond-2.19.80-remove-ly-protect.patch 1534 BLAKE2B fbb07b254ac8c41ac3db4c00203efd46fa48b0d3157d0ac57f60587bacae6d0cee6d1694f7a1a74b4fc1d31b338f31dd55daf294872cf8cd85d090683853cbcb SHA512 ec74abc959b569ef43eae0709ea62f012d41700dcebcb9cb4ece551b0095e593e6ac579520a3be3bef648e04ee69b3549f9152158c705ebb615ecb66f0f4d0fd
+AUX lilypond-9999-programming_error.patch 479 BLAKE2B f5375c71b2a82340dcda7ca24b8f1a5f106642c9edff2dd35ccb5793e88cd5bc512bbc47ce9636d2536cef18b76bbf5e38325c635377405a277ac405d741c6ed SHA512 4ef02c68b919792199142e83607409f6e3037367e090540a257d611ce7ebe1620c586bbeaaef2d5a953e71074ecbf92cef9710bd4bda9ebfee0ab93ca6f59c9d
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.54.tar.gz 17068093 BLAKE2B ebc3100a55affd9b89fa93abf32c7c74cf1fc3f3b026c77d7893d7cd622079a236f5690692a98bf258bea4f3cfd764307c730a1896da0b853eddda6498414d00 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b
 DIST lilypond-2.19.64.tar.gz 17174255 BLAKE2B 840b91ff39648e7ad741d1139a2040ee33aa922934a7bf891649ea99cf4aa95b0e82a98421e154cae3fb617ac8b38dc412e072206e3437e770801fe91ab914a3 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9
@@ -11,5 +12,5 @@ EBUILD lilypond-2.19.54.ebuild 3405 BLAKE2B 11cda4b12db9ffd74848b34dd67631b99c3e
 EBUILD lilypond-2.19.64.ebuild 3412 BLAKE2B 9123385f5ee2db9cc62a1d3c2d624c656d85704d240ee0fcf7d84bed6eb3b3f8d146287a9485006e737912d21e932ed83c72bf55886c025f80886bf4fda47f5e SHA512 572971acf6aeef2c1b61caf0588fa66e1d63d9a5b4a3b1c43af3e515817f50816be698f9e6c910cd16bf854d4a19a1a8c06711c7b515fbaa2fddb45ed25935a6
 EBUILD lilypond-2.19.80-r1.ebuild 3309 BLAKE2B 25c1bd50f48201552a27feddb85f27c11bf85c0706273c9489ce568bf5fcc5c5d23b69dc7b258db1890eb66da203443e2d5df562c189c33564a0784bcf132edc SHA512 f22a2d7f16cbe85580c19e62ec7fc64fe2314e05bceb63b8af617ef4e6c76bcf18fd1c44474ba4fb0601cd9e687df3e5095400613f6397f0943c7a5a6598eb32
 EBUILD lilypond-2.19.80.ebuild 3412 BLAKE2B 1dfd0e40c1bf89ce8203d4423110e3c2b307ef9a0ef40989ac86dccd34322120de6335f989a14d429a25ece14f57ae6c3acd0dccae5e887f2044000a6f37c60d SHA512 b10abfa1293fd20f275949690509c1076d007161b92551887da975e22667f92fd364228c9b85090d234709ade9410cce428f5f7b6a61b900aebc9d4283d4ba14
-EBUILD lilypond-9999.ebuild 3424 BLAKE2B 0b665ab80334b220921ee30b04b45156b7e871c349b34fae85f87e268760a7a6d6d5c403a440b437328ffe34f1a56daf783425f3361e9e74d9cb22c75afc837d SHA512 3fe435e2ea515617d03e11074b8c35176d30a78d344525cfec1fc4cae84d69086081de180c9e51cbfbf41cbc723f028a1e7acd92e8bde1e794ad7b9dbbf72fdc
+EBUILD lilypond-9999.ebuild 3473 BLAKE2B 26df57f7367039a721e8c9d9d513c5e35b0298c9bec13f23cfbb5f50a681164e5e13697868e00c00396349d5a4b91adeb446c2c216a6b04f4423ebc0edbb1c6c SHA512 dfad11b831dd3d3245925c0e869ff8542cb080d7da3ac1146fba8633ddccb9d4bc055c730e3ba9e114d340ef9ee0f6dff8508b569f7c8334ae2baba71632b5f2
 MISC metadata.xml 861 BLAKE2B c7214caf915ce8f32dad9cd6f08c72bb42490de9f679f073bb6e68c6f14e209f6b3013554fc786d3fb765d271bbb39d54ecdc4df2967700507ab0c9f782d4621 SHA512 d20e7dc27a7836585c7ca28cb78c073c3767a1749d16bca3989bb552d4920e949b3caf36f2227862655e61be0914602aa3af41f17a0f61246b3f305228c9b70c
diff --git a/media-sound/lilypond/files/lilypond-9999-programming_error.patch b/media-sound/lilypond/files/lilypond-9999-programming_error.patch
new file mode 100644
index 000000000000..f2b85164a6e5
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-9999-programming_error.patch
@@ -0,0 +1,13 @@
+diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
+index d25e6c9ef8..2fd2e4a4fa 100644
+--- a/lily/general-scheme.cc
++++ b/lily/general-scheme.cc
+@@ -275,7 +275,7 @@ LY_DEFINE (ly_protects, "ly:protects",
+ #if SCM_MAJOR_VERSION < 2 || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION < 1
+   return scm_protects;
+ #else
+-  return programming_error ("ly:protects is not supported in Guile 2.1");
++  programming_error ("ly:protects is not supported in Guile 2.1");
+ #endif
+ }
+ 
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 27bfc06997d6..e24a72ba576e 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -22,6 +22,7 @@ SLOT="0"
 LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
 IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+PATCHES=(${FILESDIR}/$P-programming_error.patch)
 
 RDEPEND=">=app-text/ghostscript-gpl-8.15
 	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
diff --git a/media-sound/lyvi/Manifest b/media-sound/lyvi/Manifest
index fc2a0d5d2561..33e45587677d 100644
--- a/media-sound/lyvi/Manifest
+++ b/media-sound/lyvi/Manifest
@@ -1,3 +1,3 @@
 DIST lyvi-2.0.0.tar.gz 19307 BLAKE2B 009af146f917ed7867c737a78c50261b688b4b78e104518338462b3f1372656298bcda5ef0b70f8a84db800488a57ba4c665884ff5fa2f992d53d3940e204f47 SHA512 0248ceb16436be427ab38769824ce4be48998997b1997f90ddef751105e7449cff7d865e9a5895fb67c79da0eaf394baefe1a77bdc9e6c5e2b6498d64128b045
 EBUILD lyvi-2.0.0.ebuild 838 BLAKE2B 3e190435e06f8ee0f6752e64296c9d102698584cbfeafd4d07ba16a47c63e5f972fb01c069f05fada4a4e953e7a73b15718cfd0d5e7d446203a97a61a2c1147a SHA512 4820d43681d23e2f74700a1fbc68b8fe8045305739ab0e705b016f41bc76b478bbb026a7af4fe1098cdd1dbee8ee6f8a2265274479da8be57f69931f232ef35e
-MISC metadata.xml 676 BLAKE2B 615cc20d4424b7e765e61c0fdd777a4e62df3aa693db969ea4311122839753d45609f89a727249b903dd549c9e256614657c1427ab13bb54719ee97c51d33d6b SHA512 5214e99e32ebff6a3c42380975b5575e9e1940972e9ce02f07147c06335a208b8f941438d9cd60803c05b3767138be0b66950ed8a7fd17d136d5830940d854a1
+MISC metadata.xml 475 BLAKE2B 553ea1293e265b8b077fe66eb6a3ba954fe417a83b802820ce2d10d32b126c780ac6290729137851628a81bd6f69fe4508e67449db42fa3c41ecfaa1b5a8d6c8 SHA512 563ae54e16871f78847fdb8ca7ca1dcc392994acd6726850730ee664af2a0e404ed7e9572fb1574dbd260f41c405349df0cbcb5623c70e0168c54786c03a2134
diff --git a/media-sound/lyvi/metadata.xml b/media-sound/lyvi/metadata.xml
index ca6b97825291..f3d45549a2d9 100644
--- a/media-sound/lyvi/metadata.xml
+++ b/media-sound/lyvi/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>witold.pilat@gmail.com</email>
-		<name>Witold Piłat</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->	
 	<longdescription>Lyvi is a lyrics, artist info and guitar tabs
 	viewer. On supported terminals, Lyvi can also show artist photos and
 	cover images.
diff --git a/media-sound/mp3_check/Manifest b/media-sound/mp3_check/Manifest
index 82317ec02654..6d8ffd4fae0c 100644
--- a/media-sound/mp3_check/Manifest
+++ b/media-sound/mp3_check/Manifest
@@ -1,5 +1,5 @@
 AUX mp3_check-1.98-makefile.patch 605 BLAKE2B 8245fac6221ff1770dcf0e898adf207d123e9590ab1e97db6c2f257d9fc4a09f5f46784ddab7b846d02987b18576cee41b7a5b2352eb7bea8c333cffba5689b0 SHA512 53b1541b6644f32a03fb13c412badc2ecda775d605a3cb6aba6f97ca0d3dfe2fba80fc9e64f544a53ef55382afcc38eeb33dca837a997f3802155f38bdd0a447
 DIST mp3_check-1.98.tar.gz 83098 BLAKE2B 49f6a368ae0326aa426818e737964aa8019e09e8ed90316b333bee7aad973fdbd5ab9872ae1dcf41f8d9eed911b25c0b3b07f6dd5ba4557c6ed804c764186f87 SHA512 65eac5498ea3d4a63e0ab23c769a0baa233ddc863c907e934b691b1e8eb2a68da8a3bd7c6bd1b53d30d06330ab84d615c397753bb30257b0aac404e4b18ea4a3
-EBUILD mp3_check-1.98-r1.ebuild 660 BLAKE2B f9d9cf96e788969840aaa81b57d9268235dc7182e953d07427517b51b2bb2e4f6235515e7c54cf562f96c957fba2a124e632227c898b4678db1c330d41e85aeb SHA512 840fc7b27fea392bcb1a54a306c3340b8ca9bfd5a87b774c364f0bfecb3ca53bf30b2b1b4f6172f1c2593101b4a33ac9b43e7de79938aefca29559ea18834edb
+EBUILD mp3_check-1.98-r1.ebuild 659 BLAKE2B 983ec6fa7c219792c7af0a625cf6c449eca7590109cc7fb7e55249d55bd4bae71ddb977d1404a515b7cdf977be98038a8de2ee629e3c5437c33566ad9fdf244a SHA512 19954e85bb191bd44828f635073663495ae31dc12da31881795c1c08c31cf7f390226dda6e65cf16fff52ec89ee06bf07c12ca359063e75e8042b13208934058
 EBUILD mp3_check-1.98.ebuild 615 BLAKE2B 65765714f97173c4fb83aca9df49f3f17a1b0c9c0e4ae77ed57fd69f637f70ddcdeff985c3bc89f5aa79132eb896f289480f5fd5b5a2468151834badad3ae5de SHA512 e58ffa203884ca0e71d1de02a8ee1c13878290d50e43dec90ee33c5ddecef0eb9973b288db847e60c6d20f7d11e67b667c083d52d055a9045c841cf3e1f63706
 MISC metadata.xml 393 BLAKE2B d4df38beb932debf1e099affcd85edf27cd78aa872ae91ef365f6037337892aa470011702e3df0efa7d602b0696dcf84e62637726932cfe5c83a3d293c55bf7e SHA512 1d249854ee7bae0e2b8f6c8de7539cb7a4593c76c35e4e938b578f0b866d8d9ef712fbf0f113a0d5370dfa28dfc760b668769a50f17333cf58bd38d4d66a8b22
diff --git a/media-sound/mp3_check/mp3_check-1.98-r1.ebuild b/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
index 525ac68e69a9..9a72794ad46f 100644
--- a/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
+++ b/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mp3check/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 3e1c60bd7385..944e2a6595c7 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -24,5 +24,6 @@ DIST xmms2-0.8DrO_o.tar.bz2 1670726 BLAKE2B e226f197b09ebc205fa274d6a0024190e222
 EBUILD xmms2-0.8-r4.ebuild 7875 BLAKE2B eb19ec1826e269c446706a1c467f5201b292786672b249d18e7d04c37d1e0c7ebf43f2a25381df7ac170286db5328a83acbdc92d081672ed05d5d3423b8e82f3 SHA512 02272a12bec6a7c65522acf08a9174e34fa80af8ee01c551aa870c370e7c4802946fc56f3d7ef0ee441cf9c9f6ffc34147b4c6dbed8bd60af34b0cc65b68c0cc
 EBUILD xmms2-0.8_p20161122-r1.ebuild 7566 BLAKE2B deca0e3471553bf5d346a9338a3aa0fda6b4a2e23f5966575a5ae1184cb87c2b06fc52869b1d5c8aaddf9aa9211e39c08f2e45e30638cc3d1a0e0ea2abd4057b SHA512 e04abc582528c18a2dd45224280458ea1999be0659ec68b9d7d63938bba1bc513c88a378d72aaf2780d39bf8d98e4f8ddd75d64b135826fab813e750bfe3631e
 EBUILD xmms2-0.8_p20161122-r2.ebuild 7531 BLAKE2B 384cc2e5f938bbe842518c9a520eb357d2eeda24b185fe06cffd6f0e395309cfdea26f3daac2444945b7c740762a2ec569a76278d27c7d1f0907fe53b6d9f7be SHA512 a6163a73800122a6860ad9fd4c4e708ddcbde3555e47b232e88fed81e1f4dabc41e52a046504073b8128a0af5442440b8b00c59eb33cafa9cd823b05f8573b24
+EBUILD xmms2-0.8_p20161122-r3.ebuild 7519 BLAKE2B e73c783ee5c3e791ea483f364227efcfa4a36168682ac97c90388e6de1b3e0b74babe65eb7420734301305440dfeecb5fc6d5ef52c82ed4bd76099c7c70c5862 SHA512 8c6201551618bdf284b16bbc0bc0dc70fb8afd3be8b9d0149efa95d2d1f6b0f0dc27d96e5a9018fee9ebd3562a07b30200748f537110cf408677d8711351eaee
 EBUILD xmms2-0.8_p20161122.ebuild 7396 BLAKE2B 7b1eaa463c899ce5d0a2c6cb18e8529b77075cdc205bcc06234f39d74f5ebaf47f06a47f1a35d96031592ae62fb329e8e15aa3861ca522ca1e03e48c74b2fb7f SHA512 7a9c795d826171d5ce9cd24ebe2b385967803a7ca2ee8b7d082c71a5255ded6485f3e6e96c0d4b648d8efdd03f191202296e7990b068dba2b1bb25a0b7bb51c9
 MISC metadata.xml 2619 BLAKE2B db882bae1912243670ae3f8a075704ac0398f50a66f0ce990b4283b26b0c99846ea4d491375d9d920b320bb49da9ced1209bcfc86dd341f1e4cbc0a3649bd38d SHA512 f4477bdfc7575b104a7852dfcc789178631c0f0b470a968af7b763c8b7d70ab6cea8a4ff739b3b9adea280838cc5d8cb773337d899b20ecc0797a9d16ef38e97
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r3.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r3.ebuild
new file mode 100644
index 000000000000..a9ab805984b6
--- /dev/null
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r3.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
+
+# generated as 'python2 ./utils/gen-tarball.py' from clean git tree
+MY_P="${P%_p*}DrO_o-949-gca15e830"
+
+DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
+HOMEPAGE="https://xmms2.org/wiki/Main_Page"
+#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+
+IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
+jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
+perl phonehome pulseaudio python ruby samba +server sid sndfile speex
+test valgrind +vorbis vocoder wavpack xml zeroconf"
+
+RDEPEND="server? (
+		>=dev-db/sqlite-3.3.4
+
+		aac? ( >=media-libs/faad2-2.0 )
+		airplay? ( dev-libs/openssl:0= )
+		alsa? ( media-libs/alsa-lib )
+		ao? ( media-libs/libao )
+		cdda? ( dev-libs/libcdio-paranoia
+			>=media-libs/libdiscid-0.1.1
+			>=media-sound/cdparanoia-3.9.8 )
+		curl? ( >=net-misc/curl-7.15.1 )
+		ffmpeg? ( virtual/ffmpeg )
+		flac? ( media-libs/flac )
+		fluidsynth? ( media-sound/fluidsynth )
+		ices? ( media-libs/libogg
+			media-libs/libshout
+			media-libs/libvorbis )
+		jack? ( virtual/jack )
+		mac? ( media-sound/mac )
+		mms? ( virtual/ffmpeg
+			>=media-libs/libmms-0.3 )
+		modplug? ( media-libs/libmodplug )
+		mad? ( media-libs/libmad )
+		mp3? ( >=media-sound/mpg123-1.5.1 )
+		musepack? ( media-sound/musepack-tools )
+		ofa? ( media-libs/libofa )
+		opus? ( media-libs/opus
+			media-libs/opusfile )
+		pulseaudio? ( media-sound/pulseaudio )
+		samba? ( >=net-fs/samba-4.2 )
+		sid? ( media-sound/sidplay
+			media-libs/resid )
+		sndfile? ( media-libs/libsndfile )
+		speex? ( media-libs/speex
+			media-libs/libogg )
+		vorbis? ( media-libs/libvorbis )
+		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
+		wavpack? ( media-sound/wavpack )
+		xml? ( dev-libs/libxml2 )
+		zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	)
+
+	>=dev-libs/glib-2.12.9
+	cxx? ( >=dev-libs/boost-1.32 )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+
+DEPEND="${RDEPEND}
+	dev-lang/python
+	virtual/pkgconfig
+	perl? ( dev-perl/Module-Build
+		virtual/perl-Module-Metadata )
+	python? ( >=dev-python/cython-0.15.1
+		dev-python/pyrex )
+	test? ( dev-util/cunit
+		valgrind? ( dev-util/valgrind ) )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# used both for building xmms2 and
+	# optionally linking client library
+	# against python
+	python-single-r1_pkg_setup
+}
+
+# use_enable() is taken as proto
+# $1 - useflag
+# $2 - xmms2 option/plugin name (equals to $1 if not set)
+
+xmms2_flag() {
+	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
+
+	local UWORD=${2:-$1}
+
+	case $1 in
+		ENABLED)
+			echo ",${UWORD}"
+			;;
+		DISABLED)
+			;;
+		*)
+			use $1 && echo ",${UWORD}"
+			;;
+	esac
+}
+
+src_prepare() {
+	./waf # inflate waf
+	cd .waf* || die
+	# needs port
+	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
+	cd "${S}"
+
+	eapply "${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
+
+	eapply "${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
+
+	# required to build tarball from git tree
+	eapply "${FILESDIR}/${P}"-tarball.patch
+
+	# 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
+}
+
+src_configure() {
+	# ./configure alike options.
+	local waf_params="--prefix=/usr \
+			--libdir=/usr/$(get_libdir) \
+			--with-target-platform=${CHOST} \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			--datadir=/usr/share \
+			--sysconfdir=/etc \
+			--localstatedir=/var/lib"
+
+	local optionals=""
+	local plugins=""
+	if ! use server ; then
+		waf_params+=" --without-xmms2d"
+	else
+		# some fun static mappings:
+		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
+					"phonehome	et"
+					"ENABLED	launcher"
+					"mlib-update	medialib-updater"
+					"ENABLED	nycli"
+					"		perl"
+					"ENABLED	pixmaps"
+					"		python"
+					"		ruby"
+					"DISABLED	tests"
+					"DISABLED	vistest"
+					"cxx		xmmsclient++"
+					"cxx		xmmsclient++-glib"
+					"DISABLED	xmmsclient-cf"
+					"DISABLED	xmmsclient-ecore" # not in tree
+
+					"test		tests"
+				)
+
+		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
+					"		alsa"
+					"		airplay"
+					"		ao"
+					"ffmpeg		apefile"
+					"ffmpeg		avcodec"
+					"		asf"
+					"ENABLED	asx"
+					"		cdda"
+					"DISABLED	coreaudio" # MacOS only?
+					"		curl"
+					"ENABLED	cue"
+					"zeroconf	daap"
+					"ENABLED	diskwrite"
+					"ENABLED	equalizer"
+					"aac		faad"
+					"ENABLED	file"
+					"		flac"
+					"		fluidsynth"
+					"ffmpeg		flv"
+					"ffmpeg		tta"
+					"DISABLED	gme" # not in tree
+					"DISABLED	gvfs" # obsolete #647604
+					"ENABLED	html"
+					"		ices"
+					"ENABLED	icymetaint"
+					"ENABLED	id3v2"
+					"		jack"
+					"ENABLED	karaoke"
+					"ENABLED	m3u"
+					"		mac"
+					"		mms"
+					"		mad"
+					"ENABLED	midsquash"
+					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
+					"mp3		mpg123"
+					"		modplug"
+					"		musepack"
+					"DISABLED	nms" # not in tree
+					"ENABLED	normalize"
+					"ENABLED	null"
+					"ENABLED	nulstripper"
+					"		ofa"
+					"		opus"
+					"		oss"
+					"ENABLED	pls"
+					"pulseaudio	pulse"
+					"ENABLED	replaygain"
+					"xml		rss"
+					"		samba"
+					"DISABLED	sc68" #not in tree
+					"		sid"
+					"		sndfile"
+					"		speex"
+					"DISABLED	sun" # {Open,Net}BSD only
+					"DISABLED	tremor" # not in tree
+					"		vorbis"
+					"		vocoder"
+					"ffmpeg		tta"
+					"ENABLED	wave"
+					"DISABLED	waveout" # windows only
+					"		wavpack"
+					"xml		xspf"
+					"ENABLED	xml"
+				)
+
+		local option
+		for option in "${option_map[@]}"; do
+			optionals+=$(xmms2_flag $option)
+		done
+
+		local plugin
+		for plugin in "${plugin_map[@]}"; do
+			plugins+=$(xmms2_flag $plugin)
+		done
+	fi # ! server
+
+	# pass them explicitely even if empty as we try to avoid magic deps
+	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
+	waf_params+=" --with-plugins=${plugins:1}"
+	waf_params+=" $(use_with valgrind)"
+
+	CC="$(tc-getCC)"         \
+	CPP="$(tc-getCPP)"       \
+	AR="$(tc-getAR)"         \
+	RANLIB="$(tc-getRANLIB)" \
+	CXX="$(tc-getCXX)"       \
+	    ./waf configure ${waf_params} || die "'waf configure' failed"
+}
+
+src_compile() {
+	# waf is very keen to run tests in build phase (bug #424377) but
+	# it does not bother running tests twice, so the hack below works:
+	./waf --verbose build || ./waf --verbose build || die "waf build failed"
+}
+
+src_test() {
+	# rerun tests
+	./waf --alltests || die "waf --alltests failed"
+}
+
+src_install() {
+	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
+	dodoc AUTHORS TODO
+}
+
+pkg_postinst() {
+	elog "This version is built on experimental development code"
+	elog "If you encounter any errors report them at https://bugs.xmms2.org"
+	elog "and visit #xmms2 at irc://irc.freenode.net"
+	if use phonehome ; then
+		einfo ""
+		einfo "The phone-home client xmms2-et was activated"
+		einfo "This client sends anonymous usage-statistics to the xmms2"
+		einfo "developers which may help finding bugs"
+		einfo "Disable the phonehome useflag if you don't like that"
+	fi
+}