gentoo auto-resync : 05:08:2023 - 09:19:42

6 files changed, 71 insertions, 41 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7b7c45e65d5e..0d6de51cfcbe 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/flac123/Manifest b/media-sound/flac123/Manifest
index a5af0f43e1e3..429834cf6069 100644
--- a/media-sound/flac123/Manifest
+++ b/media-sound/flac123/Manifest
@@ -1,6 +1,3 @@
-AUX flac123-0.0.12-clang16.patch 124 BLAKE2B 956bd8bccea2685a3cd2eeedf6006d5d96014143092e7079efc87709611ce96dd5f473f3b467a0a59b9c91c9406856643a2e1b4dc84bd6903427bd685edb0669 SHA512 a2ff2001059c15c67478fb0e8403a8d096e8c55e0e476c8f0ba3d20ca43a342268a5cd7168cf8540285d6597e46ff4f538836ecd76f9806a783b4dcc59cb402c
-DIST flac123-0.0.12-release.tar.gz 129795 BLAKE2B 6c73cdcb350de6431d15af846af4aefc8beafdf9137a31144a7869acca0f5383aeae110ef81165c98a188af7580fff5ad27836955cd9729deca14a4465aa8b0e SHA512 4bfabecae86cf11a13bd45025d7fbdee189918e0cd4eee0128856897710b44afd19df5675cae9426d30e9d8cd09b358333438cd05701fa0a7a00a8493a77e1f7
 DIST flac123-2.1.0.tar.gz 131988 BLAKE2B 0b401951d71d2bce9b2f7964ca8e89739400c638bd363ff484820151d9d740eae973b2b16eb054f8b0ea3b322f4fd2dd7579b9877272c86e46e88ba92b14986a SHA512 ef8a57281d7ed35d8fdf67052021d8956852f8fb5221a99a8834a60d3a067b826d8e53f1d9491c4edc480286ccf97938b12dd494c7dfb23cc8848978b441921f
-EBUILD flac123-0.0.12-r1.ebuild 563 BLAKE2B 54d1f4735fa612787f86e7287dd9ce4580b696314e49180abc682815d3588786a8edbcc317074ee95c6a46066cf98329c031d79754cce28421263d2a2a8823bb SHA512 cea216346334f3b0b09a7c9841db127ff30084cc08cbb4d2051ad166ae5b75495092fc4b759502bf39e35433d194f1f88bb073ae5c1637f0ecf52f7579b3010c
 EBUILD flac123-2.1.0.ebuild 531 BLAKE2B 84dd26598558a72e74c2ecddefdebae9b06ba07277d3414621bf15bd477abb5ef4f52d79ccd9cbff6ce6131203c43fb003662a254e76c1ccbf011e15a9e38792 SHA512 7b6b32091494343b5d8ca0d21dc5595e0a66da0290a80b2d69bb48e47541aded799bd3e5b682fb5455307d82fda91de5984916d4d3de5008b69f1c96461a0771
 MISC metadata.xml 334 BLAKE2B 2ad1db6fb1bf19e8353cdaa9cac184aff7df808e100dfe807129dbead9c3b2803f75254dee9abb8f52fe4baeeae26bf7752a1a03f5bf9b45bf4fed6b6c064a51 SHA512 8ca5beed7b9f020e312ed9e3e902762d6068de9735fd619c4d92ae252f67f6f50bc0c849170f16df3b82a6689138b0cac8f7767da34eeb4509cf51a6cc22e1d5
diff --git a/media-sound/flac123/files/flac123-0.0.12-clang16.patch b/media-sound/flac123/files/flac123-0.0.12-clang16.patch
deleted file mode 100644
index fc27eca8c179..000000000000
--- a/media-sound/flac123/files/flac123-0.0.12-clang16.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-https://bugs.gentoo.org/871204
---- a/remote.c
-+++ b/remote.c
-@@ -22,2 +22,3 @@
- 
-+#include <ctype.h>
- #include <sys/time.h>
diff --git a/media-sound/flac123/flac123-0.0.12-r1.ebuild b/media-sound/flac123/flac123-0.0.12-r1.ebuild
deleted file mode 100644
index 397eb0a1ddb2..000000000000
--- a/media-sound/flac123/flac123-0.0.12-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Console app for playing FLAC audio files"
-HOMEPAGE="https://flac-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flac-tools/${P}-release.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-
-RDEPEND="
-	dev-libs/popt
-	media-libs/flac:=
-	media-libs/libao
-	media-libs/libogg"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-clang16.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index ac8e07b46f08..0a677fae13b8 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,3 +1,5 @@
 DIST ncmpc-0.48.tar.xz 296320 BLAKE2B ee25298af9d50eff646d74aa8908358a3df7b5ca7cf0666b6d3d31027e66d1219c2a48c5097e160d728db2965e2113a0915accac0d97f246d6e75152a2c9a1b3 SHA512 71739fefe696402d4a594a0c931bae0d6fc26f2b7203c51b3d6664c703276ad55f32ea247e1100224a3072386b6de067c1c2e43aa8b6cfac564f7f215ec11f7b
+DIST ncmpc-0.49.tar.xz 296012 BLAKE2B c87c07bcf107e20224982a99fdedb09468ed510f7e6138e6e35386c636bdf62a3fd79e609670f7931966e3be09de668d1119ade950f2b8e4cd7c546d47a405be SHA512 9913f08d90b229af59c8da0ac737445661dc69f0174f996dedbd0c9d9c4833004dbd9319f6bc08dc8b35a191ae167c090a3f31b43167e1918c5fad8f044a4c17
 EBUILD ncmpc-0.48.ebuild 2044 BLAKE2B e824a938e137e3c2355fed621e5eb168e209d1f30a5f762af6a4bac9a97411bafe676bba978ef7d391ebd7adfdf2ca36a6de918dd12d08d963e98c6d555f64a2 SHA512 f64286d2e532db3f8461acf6b7bc126b968c1a50137167b455fd1329a469cdfa53e82b16e57b7c331503492cbf4308a92a4d80eeb1559c111fff5639195e9c6d
+EBUILD ncmpc-0.49.ebuild 2048 BLAKE2B 1990a7c8ba22e7039201f089ccf77b4e09fbede3a9eaffb0bffd883e8e874187b83eb6383602588de7e0f5fa8923f85fe5280324417f8238b1874460a189429d SHA512 224363bac68c1c60b0a4ec6b2e749ac2f209ebb8adff35c950638fd98df8872947b835f05c927c0c3db8e90d0adce3a3d38a69dbc958f83f979fe80cc4aec1d3
 MISC metadata.xml 948 BLAKE2B 712f8c8832f3c6ff6c35609c2042ae62f00b59753ebd648457c919d78f03297b646fc704331e6a605018115fd25ed3752cb5ff41d12c2b072d7929d7357d5e14 SHA512 231ff1ad361ee547df64e26ab6a37bfcddcc373e8e8421e0bc8e594547c844fe3c73fa7d8aa3fb7594f4c2b83b91bb2f52a1268f711a6c8a2a295cdf94f59d72
diff --git a/media-sound/ncmpc/ncmpc-0.49.ebuild b/media-sound/ncmpc/ncmpc-0.49.ebuild
new file mode 100644
index 000000000000..3b96020c8c58
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.49.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~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 test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+RDEPEND="
+	media-libs/libmpdclient
+	sys-libs/ncurses:=[unicode(+)]
+	lirc? ( app-misc/lirc )
+	pcre? ( dev-libs/libpcre2 )
+"
+DEPEND="${RDEPEND}"
+
+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_use test)
+	)
+
+	meson_src_configure
+}