gentoo resync : 21.09.2018

4 files changed, 19 insertions, 67 deletions

diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index faa180a67201..0690df4abb6e 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,5 +1,3 @@
-DIST ncmpc-0.27.tar.xz 302636 BLAKE2B 95cedfdcd93d011aa21b773c3a91a20cf9c816dfa421e95802b6cc73e39d39e80bed7734764caf8e29102df6b734dcc0c64be6ef3060de8ac590dc1229b63fd4 SHA512 255b5529a5eae14d89d9419dfb06d91c50b68a9e05f2e124fc07035e2a4619c7b6801c08d52c639d934b50f939cf1dc58f3c5265805ce8eeeba211803108f663
-DIST ncmpc-0.30.tar.xz 245212 BLAKE2B 9e64188ec5d209a682f10587c033d1e958501ed84660bc8cc0a00ff3650a1509464e48431240eebe4a061dc154acbc7d6f552cb48b208107ecdc5c0e6807d9ee SHA512 bc92c51c78f7919eb6b5cebaac8bda1231701fd9011fcadd6da8bbc5cc16e5dbe30d33d6e2f7d4cc07399299bcd3de572c9516f90d0376212771fd2c3af8afc7
-EBUILD ncmpc-0.27.ebuild 1556 BLAKE2B feb8ae8cec6b8f2613453c7396b3f4986aad39aa2958365b9d87ee07aa2666704f8dc38636d370258260f4fba5a5c68145d490ba75616f81c57f3ec27672868e SHA512 eaca37338463b79c500b0d1fdeb89e10910764b457c18e1c8fc866308b0e56df81a8103a23346594c2e1a752193114ec7a48445cef86b1d2381c18cc95bb913a
-EBUILD ncmpc-0.30.ebuild 1791 BLAKE2B 0f018ecb992a4138c178f8ec1c59d2621098468e8bbe96eaea3b7760a6367e5d920ce3ef557819292f884060b4c012362645a5af0b3c3a9cf4bfab367a470e3c SHA512 95d536c33c0da807c42d5eeb488102926dc1200fd7cab6614ca3f8d71f4542a6072d6b70d102713f91d77fb6f2cc5139b6617e170be15b65d96c8b5547e8f0b2
-MISC metadata.xml 1040 BLAKE2B 465e51e6825b3d3f9c1f0538d42a98cb8f0ba90d71f2adfbfcf07474eed25514cb8e75f4b9aa3a38334fc33a8b00acfef302589b3dfcfc7d5f9828545fc0fb06 SHA512 d998c855bd6cb4b115a12bf9067836645fe60f4dab17b8612c7150f9f61958d49cfba61b7515f032b23839fda3a74d22fe21de11cc6440464b18e4aeb9ef03e7
+DIST ncmpc-0.31.tar.xz 249816 BLAKE2B c9c42fc1ba5cb79cab9a9cc86831ba8ca82bb57981885be81b218d57f529ac7ca9adfbb0de1e0bc7dca8215ecf5fdae1481b73ff6d0dfb69c2020390d0c6a1a2 SHA512 0d3fed08f54afd9aef6342928a3f3b63a973d86ec6510f54c59271316aad856cd1a493e193f676971d90c40ef26486789e8580f2df528bd031251265c48a5eac
+EBUILD ncmpc-0.31.ebuild 1783 BLAKE2B 897668f216ced813cc97c2ff2ca45d977f171fcb43603e859f8d36910e7bd3c1c0cf4868393484876cdd5c6111153bbf1762d5506a184d146dc8d36889f229f2 SHA512 dec7ce858c61367633a2a4ac2869067c37492eaef9455a209a275d3514fc3a15933daa129d111b0c828f0608f3d418ef3f3d5d225e9f682691c6e702f3bb8250
+MISC metadata.xml 990 BLAKE2B e06b3b901b9a32b442c8400fa236230f5aa66c567bb971799521e9b1b1df3260e0c28d7769b3666b6caf495ed29c440ef3a83c2a32b4a0c3399a0f7ae5a2abc9 SHA512 ec9e7331521962746ed19da65e086d232fc32806aca80467a4d4eba8df9ac51d74f388b8a6608235263d2ed3831fb0084c9cad499d0aa33eb360872d71194629
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index 204c72476004..240ddfa18ac8 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -9,7 +9,6 @@
 		<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="colors">Enable color support</flag>
 		<flag name="help-screen">Enable the help screen</flag>
 		<flag name="key-screen">Enable key editor screen</flag>
 		<flag name="lyrics-screen">Enable lyrics screen</flag>
diff --git a/media-sound/ncmpc/ncmpc-0.27.ebuild b/media-sound/ncmpc/ncmpc-0.27.ebuild
deleted file mode 100644
index 3f602e28d29a..000000000000
--- a/media-sound/ncmpc/ncmpc-0.27.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
-
-RDEPEND=">=dev-libs/glib-2.30:2
-	>=media-libs/libmpdclient-2.9
-	sys-libs/ncurses:0=[unicode]
-	lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
-
-src_configure() {
-	# upstream lirc doesn't have pkg-config file wrt #250015
-	if use lirc; then
-		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
-		export LIBLIRCCLIENT_LIBS="-llirc_client"
-	fi
-
-	# use_with lyrics-screen is for multilib
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--with-ncursesw \
-		$(use_enable artist-screen) \
-		$(use_enable chat-screen) \
-		$(use_enable colors) \
-		$(use_enable debug) \
-		$(use_enable help-screen) \
-		$(use_enable key-screen) \
-		$(use_enable lirc) \
-		$(use_enable lyrics-screen) \
-		$(use_enable mouse) \
-		$(use_enable nls locale) \
-		$(use_enable nls multibyte) \
-		$(use_enable nls) \
-		$(use_enable search-screen) \
-		$(use_enable song-screen) \
-		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
-}
diff --git a/media-sound/ncmpc/ncmpc-0.30.ebuild b/media-sound/ncmpc/ncmpc-0.31.ebuild
index 737d9ce04b02..6476c056f6db 100644
--- a/media-sound/ncmpc/ncmpc-0.30.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.31.ebuild
@@ -11,18 +11,24 @@ SRC_URI="http://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="+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 )"
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libmpdclient
+	sys-libs/ncurses:0=[unicode]
+	lirc? ( app-misc/lirc )
+"
 
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx
-	       app-doc/doxygen )
-	virtual/pkgconfig"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+	)
+	virtual/pkgconfig
+"
 
 DOCS=( doc/. AUTHORS README.rst )
 
@@ -34,7 +40,7 @@ src_prepare() {
 src_configure() {
 	local emesonargs=(
 		-Dcurses=ncursesw
-		-Dcolors=ncursesw
+		-Dcolors=true
 		-Dmini=false
 		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
 		-Dartist_screen=$(usex artist-screen true false)