gentoo resync : 10.01.2018

11 files changed, 70 insertions, 62 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index c2d3e62bb0bb..18ca70897164 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/bempc/Manifest b/media-sound/bempc/Manifest
index 81491fae523e..e517f20d99d0 100644
--- a/media-sound/bempc/Manifest
+++ b/media-sound/bempc/Manifest
@@ -1,3 +1,3 @@
-DIST bempc-0.11.tar.xz 182588 BLAKE2B 52ce00bca550d1a33df3418fde578ab760b1cb8e9deb881ae0aafea257e90fe630d8fb33513616725d9ca26c30ee27fb053eaf51dc803db98c9584b4b2256b69 SHA512 ec1cd82d7b93b45c16ff54e6e14f0625af0042b863c65f72e06eeaf67933384fd527f6db15725363fc02ca1ce9a6855fbf215da2bef2e8c52e8fec70d742de5c
-EBUILD bempc-0.11.ebuild 1127 BLAKE2B e9c3fbb1a2967cdae7c66c6e9617392cf31e33e3b50e564b94ee82e535831edc69bda45551793f64dde8ac00607745641d15642273a9b6377b725db2064db934 SHA512 a05cca0b16fc36fc16aeacf6c96300dc90c21c3bce8aea18c5db9473c741b2c5420bbb8506e5c136823f211a92e01dc7563538b1a37a6af3b5212559f7d71baf
-MISC metadata.xml 369 BLAKE2B 4c601affa377b58251e056778dc261d058a9a5ce98ac6a82a08d154425ca6ef1fafbf29a333a0235b85e071d00dd987d90c9caa04b638b48f085c4557f166694 SHA512 4a5f9587d7d6e58b88a42d1873d0945de00c2ec12d27b2e2d04807e4d3d64155a253570e0e2afb56e75404ae30358d5bdb0421da1e52d3a175a4f5ac710f8041
+DIST bempc-0.11_p20160207.zip 237795 BLAKE2B 80ccfa052fd5c41ff948e99cfef22a767a0788de7addec482804c1d28304c48deaf64ea2d43ead590675169e9f0574793c14e072c58056108df4c5aea964e284 SHA512 8e8d85db3d9c1ec9dce5f4a5f3bfa9981a2ff9b7f80abfcf38958fe36ac843c3c6f7dafa27a018899d4d4376acb910ac779b9a9dd6e1e95cd9cc1f9db0bc4a5e
+EBUILD bempc-0.11_p20160207.ebuild 1196 BLAKE2B a6e10b6aae63f9707759c9b606ab18c854989e11b95d23a83e0c86c8bb4f841c6c39857d60b9175a5aa3f7a8d5d45eb730e65b85b7003bbc7b103f0d3f703c87 SHA512 8560dd8b1ea3c721748ea5bb3e1c97c384374f6136a0bc59a5fbc42616671ad52228b55d1c0d645fe1cdb4137c85395dfba163424f5d3cf50b934dd4e5902204
+MISC metadata.xml 255 BLAKE2B 9f51a02d2acccc5f1267f6e68121a58bbd29caff66ec55599ee1e2f7736a3bcc0dc899ebc9b11309282fcfdcaf6976076e18c80bbb1704de335a7bf827924768 SHA512 dbe33cd3f3bcb9830184753a5662fe66b8522ac7fce91d405601fd5a475c370d0b88b8dcefbe7d6fd921c8c7829b8d441db483cf5e7fc02aa0f91f1bb19db4cf
diff --git a/media-sound/bempc/bempc-0.11.ebuild b/media-sound/bempc/bempc-0.11.ebuild
deleted file mode 100644
index a37a3c92b55d..000000000000
--- a/media-sound/bempc/bempc-0.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-LANGS="cs de"
-inherit qt4-r2 fdo-mime
-
-DESCRIPTION="Qt4 MPD client with experimental UI"
-HOMEPAGE="http://qt-apps.org/content/show.php?content=137091"
-SRC_URI="http://qt-apps.org/CONTENT/content-files/137091-${P}.txz -> ${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libmpdclient
-	>=dev-qt/qtcore-4.6:4
-	>=dev-qt/qtgui-4.6:4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local INSTALLED_LANGS= LANG=
-
-	# Install on live fs should be done by portage itself
-	sed -ie 's/postinstall/#postinstall/g' be.mpc.pro
-
-	# Install only chosen locales
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} ${LANGS}; then
-			INSTALLED_LANGS="${INSTALLED_LANGS} be.mpc_${LANG}.qm"
-		fi
-	done
-	sed -ie "s/i18n.files += be.mpc_cs.qm be.mpc_de.qm/i18n.files += ${INSTALLED_LANGS}/" be.mpc.pro
-
-	# Fix invalid desktop file
-	sed -ie 's/Categories=Application;Qt;Audio;/Categories=Qt;AudioVideo;Audio;/' be.mpc.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-sound/bempc/bempc-0.11_p20160207.ebuild b/media-sound/bempc/bempc-0.11_p20160207.ebuild
new file mode 100644
index 000000000000..d0cee23dcc87
--- /dev/null
+++ b/media-sound/bempc/bempc-0.11_p20160207.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=783ea4e61cbfe54250e809498b1496d6cbd5afa1
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Qt5 MPD client with experimental UI"
+HOMEPAGE="http://qt-apps.org/content/show.php?content=137091"
+SRC_URI="https://sourceforge.net/code-snapshots/git/b/be/be-mpc/code.git/be-mpc-code-${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libmpdclient
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	default
+	mv be-mpc-code-"${COMMIT}" "${A%.zip}" || die
+}
+
+src_prepare() {
+	default
+
+	# Install on live fs should be done by portage itself
+	sed -e 's/postinstall/#postinstall/g' \
+		-i be.mpc.pro
+
+	# Fix invalid desktop file
+	sed -e 's/Categories=Application;Qt;Audio;/Categories=Qt;AudioVideo;Audio;/' \
+		-i be.mpc.desktop
+
+	eqmake5 be.mpc.pro
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	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/bempc/metadata.xml b/media-sound/bempc/metadata.xml
index 7039969c29c6..422952ab825a 100644
--- a/media-sound/bempc/metadata.xml
+++ b/media-sound/bempc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>pinkbyte@gentoo.org</email>
-    <name>Sergey Popov</name>
-  </maintainer>
   <maintainer type="project">
     <email>qt@gentoo.org</email>
     <name>Gentoo Qt Project</name>
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index f446ecf8b811..cd314cccc1a9 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -2,5 +2,5 @@ AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
 EBUILD clementine-1.3.1_p20171113.ebuild 4949 BLAKE2B c191c95fe3eeed9a429120b212e449b6bec7de077f0da771612fb5a3d04c3b3d64f34c92ba48fb13037f930a243695fe0768ce0df03b877f7f4479dd8bcc6d48 SHA512 5a6038ab815b894e46c1f5d84c73754a3265e105b7aca76e4cb828749d3fad64fd2ea5ea153dd26ebb602bcdd6510a185c6547df5d5e4950372a1e8ce7cc6020
-EBUILD clementine-9999.ebuild 5176 BLAKE2B 423a007735c3e04ae15a1440278ba5c17de46419c12fdfcfb739681ef3ebedbb528d007e436cfd31d62d749ee45321da3b782fbf516d9c9b62033684bee8315f SHA512 7f86faf6d5346c6385a2452336fdc718220c857f4975273863c589b30b21155d3cf2574ef3df147420ad607c9af1d7bce3412b58dd1858d82e79972c8968c3f2
+EBUILD clementine-9999.ebuild 5178 BLAKE2B 8dc7dd9b86b6860c5eab23ec4da3f4c29e19df4a6cdceae5c1fef1070fd2641d639c1575c6cffa35478b0f3a51439be693eb00f716ae430c8166955801a9c534 SHA512 d90eba077e830647838ee437a167f4c2148dfccbbffb5afd756a10d92689300b363b39dd8766fbf047c7ba8c71e5e9857dcc003459d2a32629a9007b153cf58b
 MISC metadata.xml 1415 BLAKE2B 9bdad36fc6b032413a003f93cb53ccc439d6dc437d8ab6b7da03ea148a550eafe5ec6910c984e90abf39bd4a427567a7e5de98fea8a36ed54452fc822ef28dda SHA512 02122e10260ba62b72ea2a5de32eb45fb1578cfb20f67294467ff2fcc1ac78f917dc415cf0c5dd587c509c5e05420a07c7c75379eb88fd97f03b962c77fd2213
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 518f5159473c..c80ccee1bf4a 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -137,7 +137,7 @@ src_configure() {
 		-DUSE_SYSTEM_GMOCK=ON
 		-DUSE_SYSTEM_PROJECTM=ON
 		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DLINGUAS=$(l10n_get_locales)
+		-DLINGUAS="$(l10n_get_locales)"
 		-DENABLE_BOX="$(usex box)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DENABLE_DBUS="$(usex dbus)"
diff --git a/media-sound/jaaa/Manifest b/media-sound/jaaa/Manifest
index ba57b2164de6..1bd3801abb63 100644
--- a/media-sound/jaaa/Manifest
+++ b/media-sound/jaaa/Manifest
@@ -6,5 +6,5 @@ DIST jaaa-0.6.0.tar.bz2 25375 BLAKE2B 773183f25846a6a56a55c0fc2e9d72bd6bc4bea2e5
 DIST jaaa-0.8.4.tar.bz2 25282 BLAKE2B b42d5f21fcdcc522724bb609e4e0d2c151a23d10368d7db1ba7b4d34fb648b924a623ed1d21501733af236be1b73a819d2b4cdfe6075047e6f709b4ecdfa6416 SHA512 d83dad995d4d6919e719671e19610be9cc6b9c14d922eabc6892f3427584baaacc212b37f0466373a38f1fcc65838851c09bb2ae72d9dfdc9c52921b594cbe8d
 EBUILD jaaa-0.4.2.ebuild 828 BLAKE2B 09d40349e6be32a57dd6f8a4cb04df27d2a35e8946243465776da8e2c1faa5a5a964c882a6a64eb9fdb66b37bd4bc2127c25db4885e1c7d871a717b1f16e3866 SHA512 8bf0eea950e5a1bd775c6ab36045217e5180452fe90c76f6d7e13213b90a842c677feb1d3f29b7682234d7589cb785fd822bd4dd4f72cead99fbb34ce6e74ba0
 EBUILD jaaa-0.6.0.ebuild 853 BLAKE2B f2d5402d07be9d730918375827c69354a36ae79ae812c3724a054dcbadaa3411f8b40bbf8c2a97268e4c4024c2559d479636c60838c23ec6d6edaacf90546e43 SHA512 5ee1a764c3599480d826e475daec4700355ac331cc8e5d540b8efc90118e6abc2348a9d320430599e3ae463f27ccba651e8591a52db9ec3bf9405a1aad63ca55
-EBUILD jaaa-0.8.4.ebuild 888 BLAKE2B 83f6fa5535edde560afc7cd2f497e23a2265a92bb231238c8c02d94e95473596944343872ea28ede5aaec944cfa39c4353c0b358768f0f1b71cf1abd0b7c6831 SHA512 0e2c397cae5be4d2f85f2a2702549c4981b7708f2abf9c1d37f12af83294b94a143368ab1ffbaf9d4cc61b322d51f43000e390c6872f844bf0f52962a1775413
+EBUILD jaaa-0.8.4.ebuild 893 BLAKE2B 3345bd56a15f179c010075488180cfc7ac16a93a789ea3cbbd0a37f71890c6f794f659ad3c0201ad5c689d8bf11ba3b7ac5984c4ba2b71b6794fdf66dfa8868b SHA512 d653666f3773f276ac14fff5c90e1414a6468cc767afe89b0f2ccbdf1e65daa031fe78fbbfa6bd55c0b072cbfc6b3e304b1051ebd66b3ee0d542fc8527248329
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/jaaa/jaaa-0.8.4.ebuild b/media-sound/jaaa/jaaa-0.8.4.ebuild
index 468c1cc0ebaa..ae8bc0452914 100644
--- a/media-sound/jaaa/jaaa-0.8.4.ebuild
+++ b/media-sound/jaaa/jaaa-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="media-libs/zita-alsa-pcmi
diff --git a/media-sound/rgain/Manifest b/media-sound/rgain/Manifest
index 7f75c3052730..9f85270bf010 100644
--- a/media-sound/rgain/Manifest
+++ b/media-sound/rgain/Manifest
@@ -1,3 +1,3 @@
 DIST rgain-1.2.1.tar.gz 24741 BLAKE2B f920fa45c31f4cda367b93443b9f358827d4032dcd1ce5adce3bd3e7f3834899a2e58fb384d40cb53f9d099d957fe422b3752d1c56da975a7931767f40b37a77 SHA512 ac9a0c9918e55150d34b07dfbe839a0e497f8c5793ecbaad4f35063f2e00e0ebd1cb9739c5d0022513c2fe9b0aa880941ba848d791a4db31373ad0d421a133df
-EBUILD rgain-1.2.1.ebuild 857 BLAKE2B 5ac19f5fd9b04da92f072456b3f0873886cc1fc42fce9ea74e91842aca779a1c94ba0c46a3af08ff43dd2e1eb5a534cb70fcefaa37684876a8a7ea1338351367 SHA512 c9ca1e9ae6a9ce1cd60714543d7bbfacb6bef8096f9eb7fba46051bf2a2dfd57bc66bd7c93799667d3e5906d4205d8f7b6aa40263cc18bc5b2b978271c7364ae
+EBUILD rgain-1.2.1-r1.ebuild 705 BLAKE2B c5c31129ab3fb4010c4b54111e8b2f9c1df928ab1bbb8541e50812dd57a7e5791070102e96d16fe81e0a32b3a017feba515ee32cd723d0894fd181b5c8439617 SHA512 7d968ef88708c3afa2420e8e6126c10ba51f496190d70f6d14b23176aaf6bcd9795fbe454a23129a021ce09440912195ded0fcfe3ecc80ed40c8f78c7961a50d
 MISC metadata.xml 941 BLAKE2B cbab8ea24959d93c4ce88b85abe7957c0eba6d99fb0510bdc272a1a69cac37f47530db1f553bc68fd4ff6927fe7b8e8081b5759052937a95e0f51ff5b98609cb SHA512 d4dbb433f49bb08cb4a6dde9dc3bcc94228769db10f52b8058aef9c86f00b879cef3361b1b17423bb2f2a4e4798d6f1cbbf50da9fdc26992566b1cba69435993
diff --git a/media-sound/rgain/rgain-1.2.1.ebuild b/media-sound/rgain/rgain-1.2.1-r1.ebuild
index 9c0e7c069f0d..76302e53f211 100644
--- a/media-sound/rgain/rgain-1.2.1.ebuild
+++ b/media-sound/rgain/rgain-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,11 +20,7 @@ DEPEND=">=dev-python/docutils-0.9"
 RDEPEND="media-libs/mutagen
 	dev-python/pygobject:3[$PYTHON_USEDEP]
 	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0[vorbis?]
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-	mp3? ( media-plugins/gst-plugins-mad:1.0 )
-	wavpack? ( media-plugins/gst-plugins-wavpack:1.0 )
+	media-plugins/gst-plugins-meta:1.0[flac?,mp3?,vorbis?,wavpack?]
 "
 
 src_install() {