gentoo resync : 15.12.2019

3 files changed, 59 insertions, 2 deletions

diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index 061932efac4e..50dae6264ae3 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -2,7 +2,9 @@ AUX mpc-0.31-nodoc.patch 403 BLAKE2B d829c6f40005531ec7657054549b5fa9acd32d15d41
 DIST mpc-0.30.tar.xz 41968 BLAKE2B e7d1156f4fe933c360196a1fdaadeb7b51f12b3c6d7bd2f98f80359485acb9d55ea7afb98c82696078b325ab3662bf33b20653d5e0edf0f52c64624c679dd0b6 SHA512 72d6f742de87ca1a9a09c73987786fa7c93b2829242135b210a9a2269e0319ba9e37367dae1043461ea870087faf5c349425025ce6c02aa9dd513ae90cbe8221
 DIST mpc-0.31.tar.xz 43896 BLAKE2B 2b65307983dfd0bc2738b3e4b1379b43b6fec712352f25a6158adefd2065eb3ff8be194e482fc441c74b69feeb8fba277d7061fb80ee6d7d72432f3284f61fb2 SHA512 48df7d85df704ae901ee0a07193daf9738b682b71a24ebd5bf4458aa562acd11b582f83adcfca814faa9a014ef565cb6c23df837b83a569fd6050f9f3802e6fe
 DIST mpc-0.32.tar.xz 44716 BLAKE2B 66fbbfe886b16382d13eb9409746cd40ed9d01ea422c18d609f956fe9b1d1ae9434aa8ae65a60ce0cfc791141e3b9630adabc2fb0bd0b8bdc61b67b2e5b2e3b3 SHA512 1913249da8b29123005a9877ff2e68f9469f8fd48f5411ea0e651255c93fbe14ef6029dadc7d256a99b566085dc19f4c62bdcf55260b27de3d088b8e9c17fcde
-EBUILD mpc-0.30.ebuild 821 BLAKE2B 11cb4a54988476db7b20eb7ea4c79cc0c974146bbb0dfa1a991cb2abbb26b68e19ad2256c44b87ad0baf061a66c97bb8ec249d4fcaf5a286ee2424ab8c2db4e6 SHA512 7cfb2d1d2c06181f5205b34f4c5f8a184c34995eca8107336e2268569a195e807f7910d1f5588523e5bbe6442724e430f7cdcc2f0fecee0fe6dab62104e607cf
+DIST mpc-0.33.tar.xz 45044 BLAKE2B 220848e088964297fbaddeedf61d5ddc90386df360a6af81b2d3753517f7ee36ff3d9462242f38b17c991996927a7d1fc253e1006253f2f875023ddb75a800c2 SHA512 d3247dfb54ac3c95caf5666088968a952b33eb7e8f941bca4f3715603839cf5a1bc5300488c78fdce6e38f612b243f2252ea682b8d0fec9f230acd760bf3560c
+EBUILD mpc-0.30.ebuild 848 BLAKE2B dfcbc54b6c767644c98e4c1f9cd876e3dccfb802fb113d522c0ca9196e4a65e7d692fb6cdbc68ce8dff23ed36e1c7b775a42c9cf91d65870b7309204dce33b1a SHA512 eba9f4939a527d5275a5ea771669bd67865642cb3c3a2996c2f6aef51a6aae0d3bfef74a8eb67c945443559cafe56df74be5f2d51db1d3d2b0f04817880ef935
 EBUILD mpc-0.31-r1.ebuild 1230 BLAKE2B 8d02b8ea0e981d176afef99720f01c41f6840a2a98c5a670abc88a3239bb0e16c71f33af1082736eeed5b2f524970921c83ae20ff8fec4eb3b4c1bffeefca089 SHA512 10ac37d0f8aae691029961586e8c42ee3ae39386fd823a91d26549efbb9b3ee82284764c5960b84fb22b394d5b16229f079db05e803e53953ef98e063f340653
 EBUILD mpc-0.32.ebuild 1241 BLAKE2B a430ac51b51bf35c99be8ec27e450ab2b5b241dba262a37c91167e40417c912a4f912aa899049f67b096ab3240185f53eb3613a0481d8acf13016540ecc8812b SHA512 a80b698e42d22744d481329024ef534d163d27352752ed266bc009535345ead3d633b97e2f89870e9b32b75bbe494b1303217f513a29a4bbf138905a7a2dbbe9
+EBUILD mpc-0.33.ebuild 1241 BLAKE2B a430ac51b51bf35c99be8ec27e450ab2b5b241dba262a37c91167e40417c912a4f912aa899049f67b096ab3240185f53eb3613a0481d8acf13016540ecc8812b SHA512 a80b698e42d22744d481329024ef534d163d27352752ed266bc009535345ead3d633b97e2f89870e9b32b75bbe494b1303217f513a29a4bbf138905a7a2dbbe9
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-sound/mpc/mpc-0.30.ebuild b/media-sound/mpc/mpc-0.30.ebuild
index f37f250a2c9d..70cabfb92a48 100644
--- a/media-sound/mpc/mpc-0.30.ebuild
+++ b/media-sound/mpc/mpc-0.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 IUSE="iconv test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="media-libs/libmpdclient
 	iconv? ( virtual/libiconv )"
diff --git a/media-sound/mpc/mpc-0.33.ebuild b/media-sound/mpc/mpc-0.33.ebuild
new file mode 100644
index 000000000000..ef6640ae1878
--- /dev/null
+++ b/media-sound/mpc/mpc-0.33.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 meson
+
+DESCRIPTION="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="doc iconv test"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	iconv? ( virtual/libiconv )
+	test? ( dev-libs/check )
+"
+DEPEND="media-libs/libmpdclient"
+RDEPEND="${DEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.31-nodoc.patch" )
+
+src_prepare() {
+	default
+
+	# use correct docdir
+	sed -e "/install_dir:.*contrib/s/meson.project_name()/'${PF}'/" \
+		-i meson.build || die
+
+	# use correct (html) docdir
+	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
+		-i doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Diconv=$(usex iconv enabled disabled)
+		-Dtest=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newbashcomp contrib/mpc-completion.bash mpc
+}