Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpc/files/, media-sound/ncmpc/
Date: Sat, 09 Feb 2019 18:17:20
Message-Id: 1549733979.ab242c068b17ec82352a34f04cefdccbe56e1b8e.asturm@gentoo
1 commit: ab242c068b17ec82352a34f04cefdccbe56e1b8e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 9 17:31:23 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 9 17:39:39 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab242c06
7
8 media-sound/ncmpc: Fix USE=doc man dir path
9
10 Bug: https://bugs.gentoo.org/676084
11 Package-Manager: Portage-2.3.59, Repoman-2.3.12
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 media-sound/ncmpc/files/ncmpc-0.33-mandir.patch | 25 +++++++++
15 media-sound/ncmpc/ncmpc-0.33-r1.ebuild | 68 +++++++++++++++++++++++++
16 2 files changed, 93 insertions(+)
17
18 diff --git a/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch b/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
19 new file mode 100644
20 index 00000000000..0bc3798bc5e
21 --- /dev/null
22 +++ b/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
23 @@ -0,0 +1,25 @@
24 +From 821acdad907d1558c570bca6e2ac63d55905f363 Mon Sep 17 00:00:00 2001
25 +From: kaliko <kaliko@××××××.org>
26 +Date: Mon, 10 Dec 2018 13:46:42 +0100
27 +Subject: [PATCH] Fixed manual install dir
28 +
29 +---
30 + doc/meson.build | 4 ++--
31 + 1 file changed, 2 insertions(+), 2 deletions(-)
32 +
33 +diff --git a/doc/meson.build b/doc/meson.build
34 +index aadea58..f4b491d 100644
35 +--- a/doc/meson.build
36 ++++ b/doc/meson.build
37 +@@ -30,9 +30,9 @@ endif
38 + if get_option('manual')
39 + custom_target(
40 + 'Manpage documentation',
41 +- output: 'man',
42 ++ output: 'man1',
43 + input: ['index.rst', 'conf.py'],
44 +- command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
45 ++ command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@'],
46 + build_by_default: true,
47 + install: true,
48 + install_dir: get_option('mandir'),
49
50 diff --git a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
51 new file mode 100644
52 index 00000000000..d1eff94cb12
53 --- /dev/null
54 +++ b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
55 @@ -0,0 +1,68 @@
56 +# Copyright 1999-2019 Gentoo Authors
57 +# Distributed under the terms of the GNU General Public License v2
58 +
59 +EAPI=7
60 +
61 +inherit meson
62 +
63 +DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
64 +HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
65 +SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
66 +
67 +LICENSE="GPL-2+"
68 +SLOT="0"
69 +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
70 +IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen outputs-screen search-screen +song-screen +mouse nls pcre"
71 +
72 +BDEPEND="
73 + virtual/pkgconfig
74 + doc? ( dev-python/sphinx )
75 +"
76 +RDEPEND="
77 + >=media-libs/libmpdclient-2.9
78 + sys-libs/ncurses:0=[unicode]
79 + lirc? ( app-misc/lirc )
80 + pcre? ( dev-libs/libpcre )
81 +"
82 +DEPEND="${RDEPEND}
83 + >=dev-libs/boost-1.62
84 +"
85 +
86 +PATCHES=( "${FILESDIR}/${P}-mandir.patch" )
87 +
88 +src_prepare() {
89 + default
90 +
91 + # use correct docdir and don't install license file
92 + sed \
93 + -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
94 + -e "s/'COPYING', //" \
95 + -i meson.build || die
96 +}
97 +
98 +src_configure() {
99 + local emesonargs=(
100 + -Dcurses=ncursesw
101 + -Dcolors=true
102 + -Dmini=false
103 + -Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
104 + -Dlibrary_screen=$(usex library-screen true false)
105 + -Dasync_connect=$(usex async-connect true false)
106 + -Dchat_screen=$(usex chat-screen true false)
107 + -Ddocumentation=$(usex doc enabled disabled)
108 + -Dhelp_screen=$(usex help-screen true false)
109 + -Dkey_screen=$(usex key-screen true false)
110 + -Dlyrics_screen=$(usex lyrics-screen true false)
111 + -Doutputs_screen=$(usex outputs-screen true false)
112 + -Dsearch_screen=$(usex search-screen true false)
113 + -Dsong_screen=$(usex song-screen true false)
114 + -Dlocale=$(usex nls enabled disabled)
115 + -Dmultibyte=$(usex nls true false)
116 + -Dnls=$(usex nls enabled disabled)
117 + -Dlirc=$(usex lirc enabled disabled)
118 + -Dmouse=$(usex mouse enabled disabled)
119 + -Dregex=$(usex pcre enabled disabled)
120 + )
121 +
122 + meson_src_configure
123 +}