gentoo resync : 04.05.2019

4 files changed, 3 insertions, 71 deletions

diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index c78fa36abd8a..aa6502d63d6c 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,6 +1,4 @@
 AUX ncmpc-0.33-mandir.patch 884 BLAKE2B efe04cbaecc0c44511f9a4e9eb0bcc29da1ab53a72418cadfcf467ffe13490e243e05d268cddb7aea6150033df03bb01f2b49ecfee5854eaaa776f15d2e1259d SHA512 ca6afc19c2bf900abb770ed915ed8dd583bb0ad04d29291796f8b7bf083d6de1fecac2168aa0ca72413534ce74bf598132521c5b9c59c6aace51c20598935b23
-DIST ncmpc-0.31.tar.xz 249816 BLAKE2B c9c42fc1ba5cb79cab9a9cc86831ba8ca82bb57981885be81b218d57f529ac7ca9adfbb0de1e0bc7dca8215ecf5fdae1481b73ff6d0dfb69c2020390d0c6a1a2 SHA512 0d3fed08f54afd9aef6342928a3f3b63a973d86ec6510f54c59271316aad856cd1a493e193f676971d90c40ef26486789e8580f2df528bd031251265c48a5eac
 DIST ncmpc-0.33.tar.xz 226344 BLAKE2B d52fdcb17adda1d3d61645715029552804edbf8ed95d2f19e0a25ba11f66cf0e7921748aebceb63e8e32b8d31fbc2d387dfbed6bd5c6a735d5ffa4b17d9b4fa3 SHA512 47730003c9a8ad5b6e682de4b4d3c8882d3266659fcd73ea131d1bba3d6b4d9ac66bb1a3522d63cb238ca9e22d8035907b9d7621a0b5106763770b17325f53b9
-EBUILD ncmpc-0.31.ebuild 1783 BLAKE2B 897668f216ced813cc97c2ff2ca45d977f171fcb43603e859f8d36910e7bd3c1c0cf4868393484876cdd5c6111153bbf1762d5506a184d146dc8d36889f229f2 SHA512 dec7ce858c61367633a2a4ac2869067c37492eaef9455a209a275d3514fc3a15933daa129d111b0c828f0608f3d418ef3f3d5d225e9f682691c6e702f3bb8250
-EBUILD ncmpc-0.33-r1.ebuild 2071 BLAKE2B d21b5185449a5329b5b331a4249a020932d051b23454dc3cff44853dcf93b90e647f64a050a147a43708aa3be5738e2f6a6739577fa21ff4e9abbe3ba9025034 SHA512 ec31dcc1cbda6e5b7e52973552781b8300bf134ecb518695116d76ba73e7e346cccc3a85f88d8615d5d533d2599f1a73d11971f19db921113b31a60b0c7557e9
-MISC metadata.xml 1049 BLAKE2B 7b19b1d2c404f22864faeb30a96cf87a9eb7429eb4bd0372bc28e03a88a42f827c468fb13fb0b164b8019d8e54a7a8b0f4f6d37c9f33a4f410e930cd00092df8 SHA512 f4b1af0181ec32c85f15e2357db3dd59ea38a820ade7ce658195c61ee0bf2449b06d12a2dd67c40aaaa8895e51fbbd003edd84e54804368d00f0dd1225009cbe
+EBUILD ncmpc-0.33-r1.ebuild 2070 BLAKE2B e33419a69883824503a54b47a52d95a9f1ffe2ebe7f5c70fa457918198072d90305366236a8dea0c1b9ccbcb738273366aed8830c8e3d3c89c42b350003b140f SHA512 b9f8c0220bcee0a2b6e7deee2960b350b086eeae8a3dc6d1fcbb50790447a7b3fc4754f6e92d9c153ba4beaf4e95044f0043001cd83080afe55d47fd65d05894
+MISC metadata.xml 947 BLAKE2B de28ab3a9263d21b8a2727fb80a70467d4c086c18712bcc6ee51c434f512a7daab42832728a150a677a4552f36950038e08076fd2c1eaf0ec5c2f7e82408efed SHA512 19a555b3375402a4ff9931e2d1c17bb3146d963f3c4665216e9e63deb61b99313267eb9e3815aa9f6d3f4dabee1734131b9ee71ff41562b7e9aa881fe10b1760
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index f4eb96c015fc..43e440230e03 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="artist-screen">Enable artist screen</flag>
 		<flag name="async-connect">Enable asynchronous connect</flag>
 		<flag name="chat-screen">Enable the chat screen</flag>
 		<flag name="help-screen">Enable the help screen</flag>
@@ -17,7 +16,6 @@
 		<flag name="outputs-screen">Enable the outputs screen</flag>
 		<flag name="search-screen">Enable search screen</flag>
 		<flag name="song-screen">Enable song viewer screen</flag>
-		<flag name="tcp">Enable TCP support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">MusicPlayerDaemon/ncmpc</remote-id>
diff --git a/media-sound/ncmpc/ncmpc-0.31.ebuild b/media-sound/ncmpc/ncmpc-0.31.ebuild
deleted file mode 100644
index 6476c056f6db..000000000000
--- a/media-sound/ncmpc/ncmpc-0.31.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="+artist-screen async-connect chat-screen doc +help-screen key-screen lirc lyrics-screen outputs-screen search-screen +song-screen +mouse nls tcp"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libmpdclient
-	sys-libs/ncurses:0=[unicode]
-	lirc? ( app-misc/lirc )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-	)
-	virtual/pkgconfig
-"
-
-DOCS=( doc/. AUTHORS README.rst )
-
-src_prepare() {
-	default
-	sed -i -e '/'-Wl,--gc-sections'./d' meson.build || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcurses=ncursesw
-		-Dcolors=true
-		-Dmini=false
-		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
-		-Dartist_screen=$(usex artist-screen true false)
-		-Dasync_connect=$(usex async-connect true false)
-		-Dchat_screen=$(usex chat-screen true false)
-		-Ddocumentation=$(usex doc true false)
-		-Dhelp_screen=$(usex help-screen true false)
-		-Dkey_screen=$(usex key-screen true false)
-		-Dlyrics_screen=$(usex lyrics-screen true false)
-		-Doutputs_screen=$(usex outputs-screen true false)
-		-Dsearch_screen=$(usex search-screen true false)
-		-Dsong_screen=$(usex song-screen true false)
-		-Dlocale=$(usex nls true false)
-		-Dmultibyte=$(usex nls true false)
-		-Dnls=$(usex nls true false)
-		-Dlirc=$(usex lirc true false)
-		-Dmouse=$(usex mouse true false)
-		-Dtcp=$(usex tcp true false)
-		)
-	meson_src_configure
-}
diff --git a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
index 67297f834180..2746f5e2c156 100644
--- a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
 
 BDEPEND="