gentoo resync : 18.11.2018

3 files changed, 41 insertions, 34 deletions

diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index 7c508622f7fd..389801b39452 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -1,5 +1,5 @@
-DIST mpc-0.28.tar.xz 109172 BLAKE2B de0155bd1d723c0affc02055fe8923a174d6a393e431bd71399e0c0833dda5488569fa90bbdb0c650a367bbc0c384d91215bc0997f013a372c0eae015d7acc27 SHA512 1d0c96c3c7cee2eac2d3cf25f09d74b5807b8ea56ff7dfc033b8fa690fd4d42de726a641e4f2552550d8a1c1b2840575aec5c595166ca5ae5776fcc93c8fb7cf
 DIST mpc-0.30.tar.xz 41968 BLAKE2B e7d1156f4fe933c360196a1fdaadeb7b51f12b3c6d7bd2f98f80359485acb9d55ea7afb98c82696078b325ab3662bf33b20653d5e0edf0f52c64624c679dd0b6 SHA512 72d6f742de87ca1a9a09c73987786fa7c93b2829242135b210a9a2269e0319ba9e37367dae1043461ea870087faf5c349425025ce6c02aa9dd513ae90cbe8221
-EBUILD mpc-0.28.ebuild 769 BLAKE2B e402677f91a26693a9c3d7598ac518406e4a67811660498e4800ae0be4b0b58f5ffd6a0a444259269a90024383b665e59af52e805e03be166f724e373783b086 SHA512 b321017aa79736c7da21dc3dfb210f12c29c8fc7e39843e429eb8f62f9c0367cf376bead4c41a6d126332194c9be92a1319b8305c1254706614f76448d4872a6
+DIST mpc-0.31.tar.xz 43896 BLAKE2B 2b65307983dfd0bc2738b3e4b1379b43b6fec712352f25a6158adefd2065eb3ff8be194e482fc441c74b69feeb8fba277d7061fb80ee6d7d72432f3284f61fb2 SHA512 48df7d85df704ae901ee0a07193daf9738b682b71a24ebd5bf4458aa562acd11b582f83adcfca814faa9a014ef565cb6c23df837b83a569fd6050f9f3802e6fe
 EBUILD mpc-0.30.ebuild 821 BLAKE2B 11cb4a54988476db7b20eb7ea4c79cc0c974146bbb0dfa1a991cb2abbb26b68e19ad2256c44b87ad0baf061a66c97bb8ec249d4fcaf5a286ee2424ab8c2db4e6 SHA512 7cfb2d1d2c06181f5205b34f4c5f8a184c34995eca8107336e2268569a195e807f7910d1f5588523e5bbe6442724e430f7cdcc2f0fecee0fe6dab62104e607cf
+EBUILD mpc-0.31.ebuild 870 BLAKE2B df930ab67691618ed141d743fbafb702d324dd6652bceead49b69e7c6f3aa8e035b1d2cb336bca6685a5d28bfd135c24f75177983b6b44573ccba66c6d40298b SHA512 2adbd8c19282c054700e3634fedd29477da4d5345159ee6494189b3a5f52cef62e9b31bfc77b26b8d51d15a9ab68df70f54319ae9d4dd9e94f547b033de9a629
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-sound/mpc/mpc-0.28.ebuild b/media-sound/mpc/mpc-0.28.ebuild
deleted file mode 100644
index 8903c35bc907..000000000000
--- a/media-sound/mpc/mpc-0.28.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1
-
-DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sparc x86"
-IUSE="iconv"
-
-RDEPEND=">=media-libs/libmpdclient-2.9
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/mpd-m3u-handler.sh doc/mppledit doc/mpd-pls-handler.sh )
-
-src_configure() {
-	econf \
-		$(use_enable iconv) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	newbashcomp doc/mpc-completion.bash ${PN}
-}
diff --git a/media-sound/mpc/mpc-0.31.ebuild b/media-sound/mpc/mpc-0.31.ebuild
new file mode 100644
index 000000000000..2429ef0a37b6
--- /dev/null
+++ b/media-sound/mpc/mpc-0.31.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 meson
+
+DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="iconv test"
+
+RDEPEND="media-libs/libmpdclient"
+
+DEPEND="${RDEPEND}
+	dev-python/sphinx
+	iconv? ( virtual/libiconv )
+	test? ( dev-libs/check )"
+
+BDEPEND="virtual/pkgconfig"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local emesonargs=(
+		-Dtest=$(usex test true false)
+		-Diconv=$(usex iconv enabled disabled)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newbashcomp contrib/mpc-completion.bash mpc
+}