gentoo resync : 10.01.2018

4 files changed, 62 insertions, 50 deletions

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>