gentoo auto-resync : 18:07:2024 - 12:29:01

5 files changed, 17 insertions, 150 deletions

diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 60b11350e3ed..8be65d725037 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,7 +1,4 @@
-AUX ncmpcpp-taglib-pc.patch 1582 BLAKE2B 1997e7dc25c6a36ad108003d7b6b23e5eed894fb795c43f2ec1ec877ebc9d4ec6219aa0622f3ebab6e1af71567c25b5c3b2a2173031ec2c344112e33f71c0e1b SHA512 f0e1f482d5e6a3a7d835ac5de2a3bf2f58e327d6c5c6dfce8f34fff960a6602b921db8b1a2fee5dbccdb732bebdb2f363fb9b185dcdee7a861f1a00a2adaf09c
-DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce4a538e35f54f31b06f3ed66691f02b37198cca46b475b7296aebbc864cb62a4398c60bd1e43907f9907a9bc118 SHA512 bbcb3b50233e363412af3c1cf1c0118122733dc376759cd35dee79950f42e098a0402ff670684df91847b990b26022630c9a71192e462bd46e70628e31489742
 DIST ncmpcpp-0.9.2_p20221231.gh.tar.gz 229678 BLAKE2B edb03554a14b90fbb5a4c99cb46ed73ffd702ff2fa417765d4e4bdaddd6bc40554f18aae10db81af87bbc8c91a4f966785fefdf43cfc97b18fc950c1aa59a370 SHA512 8affb5115c7531ee005544f002068b0b13b6aa41c5e11213ba8c979373a5328f298612903e531b6d384749469d6fa0ddb0d06ac4dac5ab2ca5485c7814db32a3
-EBUILD ncmpcpp-0.9.2-r3.ebuild 1530 BLAKE2B 11e396d91a64e20797206c3167ee47b9801bdc8de5d2fec6aeca68a883fac019a758c0e23f0514fd9443987a7a275727541e15ae19d3352df4f09f723f154414 SHA512 207b3f33a94c7b23dfc717da041c956fc5397006d8bb2e342b5e01f77aa0f02eaa00b3e024a3470b60bbad58b5ebb4cdb93abeaa306762705c0f8c9da0e14492
-EBUILD ncmpcpp-0.9.2_p20221231.ebuild 1606 BLAKE2B d5b7c2b80db7b2a55ea9d481c6f953754f1f6ed87d941b4ed8546d527a2cd321a331c96dfb552281a5827aa597d2fc0410ad5e40bf96e26be90ba15ec967334a SHA512 5d4500dbd44d4cee4d65eab405538604cdf67df6343422422f1ed5c910c96e83604732a401a4a335159176aa15d16d5f57b846146d8df9f70696ec1f2d1a9756
-EBUILD ncmpcpp-9999.ebuild 1410 BLAKE2B 1aecf9dc70e99d7d56477630d21c2bbe4272e571a60382f48d9e7d4cfb60bdb86ebf7357e1063884bc683c0ac9f5d9a5acb5b89fb69b9e70c26ef2f2c2985f10 SHA512 96d3e4d109862c8c60a455e2a8c09e2961ba5c7707ce42147d93e0fdbe90711d76440adb5ec35c245782225f27c003de3e5e041b640da1f427dc4c0ff932574c
+EBUILD ncmpcpp-0.9.2_p20221231.ebuild 1616 BLAKE2B 3359a58bb1e4037187ca37fb7d9f9ab97c3b1d3dcbd32e087c8e50837d3ea1df8f9aa59b3c783e04f3443c035343f5637f2b2f4e47bc17f3e914bdeed4b50de7 SHA512 42d28c92e5e380ceaa0bd3fe24332153a28d41111d72216040aa528a7e0e7ae74fd297ee5e86250d978727c763bbf26418fd89cb404a958ca02ea823f399b0f6
+EBUILD ncmpcpp-9999.ebuild 1428 BLAKE2B 2c4e043cb89840f4018dfe7bbe6e80d7284d4888f5dd6c65afc73b2d357128e10c48812fb0b38f6c0374c3a0dd40fe2142debc16aabb70bc1b17d09dbffa3881 SHA512 adda232410f3c1451ca394f398181cebe49627f8c9a2b684424e2dfbff5a0dfbf272f941d2405b4e37c911c774943f9b75f1250ca786b763edd7cedc738a0e78
 MISC metadata.xml 1298 BLAKE2B 23fbb704bcb628530ce2b9c2b62ca52bc2bca6f8cc5b99e0941da96236827acff653645073f4711adea29c8b35c74c959a5f36398630d89d5e041d0471a170de SHA512 c5b8a39b31b543afa7f12f79233e174b27b27f8d0813c88e92650c3d9b211f18991750b8eff55b2fd433b13fa49e1f8e764de0c4f92651d1ef652c610678e0a9
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch b/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
deleted file mode 100644
index 3a3c55e923d9..000000000000
--- a/media-sound/ncmpcpp/files/ncmpcpp-taglib-pc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index 88dfc6c7e3b7..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="
-	https://rybczak.net/ncmpcpp/
-	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 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() {
-	# --with-lto only appends -flto
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable visualizer) \
-		--without-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
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild
index 4f310241770f..90bf5a5ab81a 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.2_p20221231.ebuild
@@ -8,8 +8,12 @@ inherit autotools
 NCMPCPP_COMMIT="9f44edf0b1d74da7cefbd498341d59bc52f6043f"
 
 DESCRIPTION="Featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
+HOMEPAGE="
+	https://rybczak.net/ncmpcpp/
+	https://github.com/ncmpcpp/ncmpcpp/
+"
 SRC_URI="https://github.com/ncmpcpp/ncmpcpp/archive/${NCMPCPP_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${NCMPCPP_COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,9 +21,9 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
+	>=media-libs/libmpdclient-2.1
 	dev-libs/boost:=[icu,nls]
 	dev-libs/icu:=
-	media-libs/libmpdclient
 	net-misc/curl
 	sys-libs/ncurses:=[unicode(+)]
 	sys-libs/readline:=
@@ -29,8 +33,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${NCMPCPP_COMMIT}"
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 83a7d42906c9..8c02f3f600fe 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools git-r3
 
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+DESCRIPTION="Featureful ncurses based MPD client inspired by ncmpc"
 HOMEPAGE="
 	https://rybczak.net/ncmpcpp/
 	https://github.com/ncmpcpp/ncmpcpp/
 "
 EGIT_REPO_URI="https://github.com/ncmpcpp/ncmpcpp"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 IUSE="clock outputs taglib visualizer"
 
@@ -26,18 +26,15 @@ RDEPEND="
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
-
-	sed -i -e '/^docdir/d' {,doc/}Makefile.am || die
-	sed -i -e 's|COPYING||g' Makefile.am || die
-
 	eautoreconf
+
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
 }
 
 src_configure() {
@@ -60,7 +57,7 @@ src_install() {
 pkg_postinst() {
 	echo
 	elog "Example configuration files have been installed at"
-	elog "${ROOT}/usr/share/doc/${PF}"
+	elog "${EROOT}/usr/share/doc/${PF}"
 	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
 	elog "as user configuration files."
 	echo