4 files changed, 129 insertions, 0 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 53b57d8ba2b7..16c5bc646a35 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index ba041fa8f361..ac162a6543a1 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,4 +1,6 @@
+AUX ncmpcpp-taglib-pc.patch 1582 BLAKE2B 1997e7dc25c6a36ad108003d7b6b23e5eed894fb795c43f2ec1ec877ebc9d4ec6219aa0622f3ebab6e1af71567c25b5c3b2a2173031ec2c344112e33f71c0e1b SHA512 f0e1f482d5e6a3a7d835ac5de2a3bf2f58e327d6c5c6dfce8f34fff960a6602b921db8b1a2fee5dbccdb732bebdb2f363fb9b185dcdee7a861f1a00a2adaf09c
 DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce4a538e35f54f31b06f3ed66691f02b37198cca46b475b7296aebbc864cb62a4398c60bd1e43907f9907a9bc118 SHA512 bbcb3b50233e363412af3c1cf1c0118122733dc376759cd35dee79950f42e098a0402ff670684df91847b990b26022630c9a71192e462bd46e70628e31489742
 EBUILD ncmpcpp-0.9.2-r2.ebuild 1455 BLAKE2B 9c12dd5e51980975c864c080663eb9f6488c9d82a64847fa110458bc8f1b61bf0ffc8ecda3f6042afc424c4ba3f5b6c89b8d4fd056dd8b72209ded67111ad0ce SHA512 a53e0ea0cf6b1860d55cad47919645f6d12db8986469fecdde51f38ba6ccced770d747042dc72981822b29c4788fcb1e43c36559d8afda543a24e37478449439
+EBUILD ncmpcpp-0.9.2-r3.ebuild 1537 BLAKE2B 50eb220f61551c2310e8f228d2a91e26a54d42e92606a2002d93e43d3614e0f6d25a3bc267dbc8b255607d39c41a7e544e690d1583f73b2d740c6c30c28eec44 SHA512 bfbbd0ff3c89183887c15cf9c07cb7525c24d7843a5eb10e0bb581076c29e77b0f1688a3fe5371319d24e70779703acb2caa52b4affbbba9814f0f302c707462
 EBUILD ncmpcpp-9999.ebuild 1427 BLAKE2B 6041fc0d24bb4699badee97b67f4c282eb1519478c5a7231d5d5466f2609285a750fbe13f58819df35da83ef966d6d034dfbba5ecaa840eafbc91d5574c7cf3d SHA512 fc5d4eb76d74856700d57f6fa1cb8f3d2c97b7e736cd528b3d1d3baecf3de4209e7eb051090bcedcc8f40d99ec7a69927a7b78f051bb25dac1337f1f6a2254cb
 MISC metadata.xml 1155 BLAKE2B 811f69b7ff365a83ccde8c2bf8f7a2b45f1f4b5cb116f6ca731491b4ecfda51fbeaf58d557335073ed563c23ada01f1007da6503b5e487174c3a153e57b4e8f1 SHA512 a8f74bc0184c10799591c66d16713439249a8c2eb974eb6263ef61c026d4f85fc366d51bfb942eecd44f2ec2eb6b8ac96a9a04ad9ee58537aef6bca62bf67d8d
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch b/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
new file mode 100644
index 000000000000..3a3c55e923d9
--- /dev/null
+++ b/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
@@ -0,0 +1,56 @@
+From 8796a4469795dfb067d02e19ddb3ae380d9b2fc3 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Thu, 10 Nov 2022 23:58:33 +0000
+Subject: [PATCH] Check for taglib with pkg-config before trying taglib-config
+
+Programs like taglib-config are not good when cross-compiling.
+---
+ configure.ac | 27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ef0c52b7..193840e6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -257,19 +257,30 @@ PKG_CHECK_MODULES([libcurl], [libcurl], [
+ 
+ # taglib
+ if test "$taglib" != "no" ; then
+-	AC_PATH_PROG(TAGLIB_CONFIG, taglib-config)
+-	if test "$TAGLIB_CONFIG" != "" ; then
+-		CPPFLAGS="$CPPFLAGS `$TAGLIB_CONFIG --cflags`"
+-		LIBS="$LIBS `$TAGLIB_CONFIG --libs`"
++	PKG_CHECK_MODULES([taglib], [taglib], [
++		AC_SUBST(taglib_CFLAGS)
++		AC_SUBST(taglib_LIBS)
++	], [
++		AC_PATH_PROG([TAGLIB_CONFIG], [taglib-config])
++		if test "$TAGLIB_CONFIG" != ""; then
++			taglib_CFLAGS=`$TAGLIB_CONFIG --cflags`
++			taglib_LIBS=`$TAGLIB_CONFIG --libs`
++		else
++			if test "$taglib" = "yes" ; then
++				AC_MSG_ERROR([could not find taglib.pc or taglib-config executable])
++			fi
++		fi
++	])
++
++	if test "$TAGLIB_CONFIG$taglib_LIBS" != "" ; then
++		CPPFLAGS="$CPPFLAGS $taglib_CFLAGS"
++		LIBS="$LIBS $taglib_LIBS"
++
+ 		AC_CHECK_HEADERS([taglib.h], ,
+ 			if test "$taglib" = "yes" ; then
+ 				AC_MSG_ERROR([missing taglib.h header])
+ 			fi
+ 		)
+-	else
+-		if test "$taglib" = "yes" ; then
+-			AC_MSG_ERROR([taglib-config executable is missing])
+-		fi
+ 	fi
+ fi
+ 
+-- 
+2.38.1
+
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild
new file mode 100644
index 000000000000..4c09ce6aed9e
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
+SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clock lto outputs taglib visualizer"
+
+RDEPEND="
+	>=media-libs/libmpdclient-2.1
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	net-misc/curl
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/readline:=
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-taglib-pc.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
+}
+
+src_configure() {
+	filter-flags '-flto*'
+
+	econf \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable visualizer) \
+		$(use_with lto) \
+		$(use_with taglib) \
+		$(use_with visualizer fftw)
+}
+
+src_install() {
+	default
+
+	dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${EROOT}/usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}