gentoo resync : 16.06.2019

4 files changed, 2 insertions, 101 deletions

diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 8cd22eca7dcc..2edaffbe9570 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,6 +1,3 @@
-AUX ncmpc-0.33-mandir.patch 884 BLAKE2B efe04cbaecc0c44511f9a4e9eb0bcc29da1ab53a72418cadfcf467ffe13490e243e05d268cddb7aea6150033df03bb01f2b49ecfee5854eaaa776f15d2e1259d SHA512 ca6afc19c2bf900abb770ed915ed8dd583bb0ad04d29291796f8b7bf083d6de1fecac2168aa0ca72413534ce74bf598132521c5b9c59c6aace51c20598935b23
-DIST ncmpc-0.33.tar.xz 226344 BLAKE2B d52fdcb17adda1d3d61645715029552804edbf8ed95d2f19e0a25ba11f66cf0e7921748aebceb63e8e32b8d31fbc2d387dfbed6bd5c6a735d5ffa4b17d9b4fa3 SHA512 47730003c9a8ad5b6e682de4b4d3c8882d3266659fcd73ea131d1bba3d6b4d9ac66bb1a3522d63cb238ca9e22d8035907b9d7621a0b5106763770b17325f53b9
 DIST ncmpc-0.34.tar.xz 227892 BLAKE2B 19d9d9abe3d85cb2567a222c8ce108889d4517272e2bb82f4064ef76af68d610ff4c7516102b976f66380e0e3d3ee7ed00023116cb6b2d1628e3d38796705a09 SHA512 e206cc2d61799a97edf1182de4cee1c0fa447bd1fac136dc48670cb624a7efc903c693b0c541fbc00fcb94e055c83be1ca6370386c99131a1b571f47b67c35f4
-EBUILD ncmpc-0.33-r1.ebuild 2070 BLAKE2B e33419a69883824503a54b47a52d95a9f1ffe2ebe7f5c70fa457918198072d90305366236a8dea0c1b9ccbcb738273366aed8830c8e3d3c89c42b350003b140f SHA512 b9f8c0220bcee0a2b6e7deee2960b350b086eeae8a3dc6d1fcbb50790447a7b3fc4754f6e92d9c153ba4beaf4e95044f0043001cd83080afe55d47fd65d05894
-EBUILD ncmpc-0.34.ebuild 2029 BLAKE2B 55343ff919bf9bea000d6a82f6e8f4331bb40756269b80e751f5229025deff346cfafdce20697b12b0a77baa8b718a409943e3ac3580d55208baad5178d95144 SHA512 f09cb501e27d1e6d0c054af77f47e6dd8a650b9727ba195db9ffd84f3f7dd4ea5338641c793b6cad9aff01efcb2fae8c537bfe5963b47cc973f8b5101b1901fb
+EBUILD ncmpc-0.34.ebuild 2025 BLAKE2B 47179d220da464802c3f9691d9fc3f88a89ce920acffd9fc12b33dba67e109cc092e06aa23ab2e0d4af5fcadcfb3abab89da68fa596391d29b59399dc6fd6c7e SHA512 0c5e498d359add5c95a65b2a47eb690be1d3eab989c913e073e5998bf683a3864a70034b599b24c0e5e0a510c7b349efe88490c3b1872a339597fc8fdfa09c8b
 MISC metadata.xml 947 BLAKE2B de28ab3a9263d21b8a2727fb80a70467d4c086c18712bcc6ee51c434f512a7daab42832728a150a677a4552f36950038e08076fd2c1eaf0ec5c2f7e82408efed SHA512 19a555b3375402a4ff9931e2d1c17bb3146d963f3c4665216e9e63deb61b99313267eb9e3815aa9f6d3f4dabee1734131b9ee71ff41562b7e9aa881fe10b1760
diff --git a/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch b/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
deleted file mode 100644
index 0bc3798bc5e7..000000000000
--- a/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/ncmpc-0.33-r1.ebuild b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
deleted file mode 100644
index 2746f5e2c156..000000000000
--- a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-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="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-libs/boost-1.62
-"
-
-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}'/" \
-		-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() {
-	local emesonargs=(
-		-Dcurses=ncursesw
-		-Dcolors=true
-		-Dmini=false
-		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
-		-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)
-		-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)
-		-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
-}
diff --git a/media-sound/ncmpc/ncmpc-0.34.ebuild b/media-sound/ncmpc/ncmpc-0.34.ebuild
index fdb5a17612dc..61366c96ff3c 100644
--- a/media-sound/ncmpc/ncmpc-0.34.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.34.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="