gentoo resync : 10.02.2019

4 files changed, 50 insertions, 18 deletions

diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 8daaffd80963..3cc605213810 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,5 +1,6 @@
+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.ebuild 1922 BLAKE2B 12ccee76195f41dda18d07239f7b2d5976bfc3de0356ae0a6e5b8b22c3accb47a4d768bf1eff1c6f081de84f1e22c5c47abdf1f6d068b6ec535041728db2baa3 SHA512 e9b361a9f9a5c2588a16c3697fe849619774115205cedb4c225c30f536777188a83bb1d3d5190841260a222ce8bcdfd012e57809d2a7c5db3aabcf48c24dc5d5
-MISC metadata.xml 990 BLAKE2B e06b3b901b9a32b442c8400fa236230f5aa66c567bb971799521e9b1b1df3260e0c28d7769b3666b6caf495ed29c440ef3a83c2a32b4a0c3399a0f7ae5a2abc9 SHA512 ec9e7331521962746ed19da65e086d232fc32806aca80467a4d4eba8df9ac51d74f388b8a6608235263d2ed3831fb0084c9cad499d0aa33eb360872d71194629
+EBUILD ncmpc-0.33-r1.ebuild 2074 BLAKE2B 6c4535a425b2d3febc3f32eabbe400748ceb7cf02235b06c909da777fb6b66f851bc8aae109843e81003e13b484a37cf7160a8f33ebf8268cae3b9618f2a1052 SHA512 8e8e4f24d93397839eb111435314518e1992a2e421d075104c0c6dda7b70d2b5e4b662276bad8c7accbe7fff31ed71df4d8c47b528826e22c5ee0b6d8c813538
+MISC metadata.xml 1049 BLAKE2B 7b19b1d2c404f22864faeb30a96cf87a9eb7429eb4bd0372bc28e03a88a42f827c468fb13fb0b164b8019d8e54a7a8b0f4f6d37c9f33a4f410e930cd00092df8 SHA512 f4b1af0181ec32c85f15e2357db3dd59ea38a820ade7ce658195c61ee0bf2449b06d12a2dd67c40aaaa8895e51fbbd003edd84e54804368d00f0dd1225009cbe
diff --git a/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch b/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
new file mode 100644
index 000000000000..0bc3798bc5e7
--- /dev/null
+++ b/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
@@ -0,0 +1,25 @@
+From 821acdad907d1558c570bca6e2ac63d55905f363 Mon Sep 17 00:00:00 2001
+From: kaliko <kaliko@azylum.org>
+Date: Mon, 10 Dec 2018 13:46:42 +0100
+Subject: [PATCH] Fixed manual install dir
+
+---
+ doc/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index aadea58..f4b491d 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -30,9 +30,9 @@ endif
+ if get_option('manual')
+   custom_target(
+     'Manpage documentation',
+-    output: 'man',
++    output: 'man1',
+     input: ['index.rst', 'conf.py'],
+-    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
++    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@'],
+     build_by_default: true,
+     install: true,
+     install_dir: get_option('mandir'),
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index 240ddfa18ac8..f4eb96c015fc 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="chat-screen">Enable the chat screen</flag>
 		<flag name="help-screen">Enable the help screen</flag>
 		<flag name="key-screen">Enable key editor screen</flag>
+		<flag name="library-screen">Enable library screen</flag>
 		<flag name="lyrics-screen">Enable lyrics screen</flag>
 		<flag name="mouse">Enable curses getmouse support</flag>
 		<flag name="outputs-screen">Enable the outputs screen</flag>
diff --git a/media-sound/ncmpc/ncmpc-0.33.ebuild b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
index 5aa8337eea5c..745b2f2cc692 100644
--- a/media-sound/ncmpc/ncmpc-0.33.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
@@ -5,37 +5,42 @@ EAPI=7
 
 inherit meson
 
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+DESCRIPTION="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"
+SRC_URI="https://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 pcre"
+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="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
 RDEPEND="
 	>=media-libs/libmpdclient-2.9
 	sys-libs/ncurses:0=[unicode]
 	lirc? ( app-misc/lirc )
 	pcre? ( dev-libs/libpcre )
 "
-
 DEPEND="${RDEPEND}
-	>=dev-util/meson-0.47
 	>=dev-libs/boost-1.62
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
 "
 
+PATCHES=( "${FILESDIR}/${P}-mandir.patch" )
+
 src_prepare() {
 	default
 
 	# use correct docdir and don't install license file
-	sed \
-		-e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
 		-e "s/'COPYING', //" \
 		-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() {
@@ -44,22 +49,22 @@ src_configure() {
 		-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 enabled disabled)
 		-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)
+		-Dlibrary_screen=$(usex library-screen true false)
+		-Dlirc=$(usex lirc enabled disabled)
 		-Dlocale=$(usex nls enabled disabled)
+		-Dlyrics_screen=$(usex lyrics-screen true false)
+		-Dmouse=$(usex mouse enabled disabled)
 		-Dmultibyte=$(usex nls true false)
 		-Dnls=$(usex nls enabled disabled)
-		-Dlirc=$(usex lirc enabled disabled)
-		-Dmouse=$(usex mouse enabled disabled)
+		-Doutputs_screen=$(usex outputs-screen true false)
 		-Dregex=$(usex pcre enabled disabled)
+		-Dsearch_screen=$(usex search-screen true false)
+		-Dsong_screen=$(usex song-screen true false)
 	)
 
 	meson_src_configure