gentoo resync : 05.12.2021

5 files changed, 318 insertions, 5 deletions

diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index b7434ef174bd..933f64d644b8 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,6 +3,8 @@ AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba
 AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b180b3ed4a17dcdc68acea5dbe0b3adc99869270fb93a3f68e6728fad0776b9ce500efb6206f4db3c SHA512 36f3246835d6476e8f4f26795f8148f46b04015141894cdf849bfdd04b1cf5aa7a3d5960587f00e2c7d0f71568ca20fee619b95415df4cd0e4978ce95ca5f897
 DIST mpd-0.22.11.tar.xz 737184 BLAKE2B b47dcbd1e01812b66c81f33a53fc0838ddb8b7a145763744d1cf1aacc7ca38e763b723498f3ab7360f49637bc80c0ada5a69c7d619f3cf167071a7bec2440d20 SHA512 c53d386d42c2360502aad5e7574ae5ff76a20df037696989f9e1700f9cffb88afdd329cce758067356c59308d0cbcf3ba3ccf6f013e2fcec54ddf08bd0212b43
 DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60
-EBUILD mpd-0.22.11.ebuild 8438 BLAKE2B fa57430a830cfaa6cbeba62b0ee9467465eaea4981aa7e4a3a5232f4edfa7fe9666a604a7511d38a7b846cfd071d117e4d3a8f8ee84cc8e3b45b166888a56fa0 SHA512 ad734efd651240eacc1402c3f97be74d3f0f5d8c8181a2586ea7445adb7cc23c72a749525e334c2fd39c8eb89be25bfd73a6db89ce1d425e9dc3c117cb3adc72
-EBUILD mpd-0.22.3-r1.ebuild 8128 BLAKE2B f30f8d3b609102c7f9b8df1b7ea5eee6e5e1f449c4a8ef0e8e69d1025fd288025715fedaaa2d79a0589f085a1de8bd7ad499a17ecd8acbe27919b7bbf4dcaf9b SHA512 0e591e6e5b4955697a93307814ddb56de27545ceb21b3aea4dbac7b34fba47ee3412d7f8a5505c5877a807b4efc7c5a58e5296774298dd0b9702e372732dc0f9
-MISC metadata.xml 2564 BLAKE2B 6187917fb80c7483d2e349c2b63c79707203f1187a453ec5423c2ce0d6c651f702852c94bed3fb54dcc85597ead6b740712082212c6f6b6bc5d5164669369edb SHA512 f6e1acd0a592beb00dbbe025eaf109a3da022ee24ad8ed9d525c0e90b9490520bb96b09896acfdfccaa31c533d6e2b6e2d0209adc0416acac05a31f68bc64fdd
+DIST mpd-0.23.4.tar.xz 768768 BLAKE2B 34ea3f0065edcb26e57350a9cdfc79e8705674a4811b06ff4dfa0a93a1c92bcfae7c9e6ae208210289a1f11fac079aa53ad34a3b317fd5dbe4c6d522883b6623 SHA512 fb476b108a7be842663683fe6ca6737cffad73c0f09874f9d052121d188d16f69b144e993d1691f2edfac713db24aa3c28302b399f4720b29c09c909860c0938
+EBUILD mpd-0.22.11.ebuild 8443 BLAKE2B feec210b7c18ee035be6ae785d80a93cec9d76af775146655834933a05e6962025b2ad2a119f45bb55bf5a187aa541689bbadc0ab9d9ff639fbd70d5923a42b1 SHA512 e4abf4bac79a66e3f8ac058d7be22761a904501adae91d38485e1ab3cf984cd9269e696530b7fd08b1e6386e6b5e0487451e49e7eabb2ba918ca85b1c6f1f3f4
+EBUILD mpd-0.22.3-r1.ebuild 8133 BLAKE2B a627f1a5641ce7a3253aaf140bdc3afbf917ba43a3ba5e6a0271559ae144e13f55ad3abd7d280c39ba9486f4f48c50b06c1465560496f82949ce8c455b4aaec7 SHA512 c688ccf84623fe0e1a3f350587ba34c79cb3bf0ed6cc5f9f61369ceabcf92279fc7c31838148db9d7b43ece61090e498c3e045869d00e27e3f3065e65eff2c1c
+EBUILD mpd-0.23.4.ebuild 9019 BLAKE2B 28f8a0e26fae127b6e46e58c9f1bd08e29a757e5f4758d6aa3c54009fe58ab603710f4f29ddd13641a9b6958095f28670a2f31f02bf3433470bda2ed01d97083 SHA512 3508d6ce920873930266533d7dfd90061680ede9710dc58d1014734a06626ce04f1d28ba03191ed6838e0a47c64ba0e27cb85d582f2ee07f7bfca866849499ff
+MISC metadata.xml 2724 BLAKE2B 08bb2402db4224ccced73cb40aa2e3d7e9a9d699277c999e08f12bb0cb1bbd1406c6fb20b9b80cfe3a41eae05e28f4be30d5e59482132723a82d4ef6de81219f SHA512 112a969c9150a17bc99e18949bc32ef15fb2d06903c0ac5ab455d29ca0cae0f2150b90f0e94cd3a4755c5f545b23c0bd5ec2de93bd154df1d70f224a0f8011c0
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 6676d8b1d67d..ead25559b32b 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -23,11 +23,14 @@
     <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
     <flag name="network">Enables network streaming support</flag>
     <flag name="nfs">Enable support for the Network File System</flag>
+    <flag name="openmpt">OpenMPT decoder plugin</flag>
     <flag name="pipe">Support writing audio to a pipe</flag>
+    <flag name="pipewire">PipeWire support</flag>
     <flag name="qobuz">Build plugin to access qobuz</flag>
     <flag name="recorder">Enables output plugin for recording radio streams</flag>
     <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
     <flag name="signalfd">Use the signalfd function in MPD's event loop</flag>
+    <flag name="snapcast">Snapcast audio plugin</flag>
     <flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
     <flag name="soundcloud">Build plugin to access soundcloud</flag>
     <flag name="tidal">Build plugin to access tidal</flag>
diff --git a/media-sound/mpd/mpd-0.22.11.ebuild b/media-sound/mpd/mpd-0.22.11.ebuild
index c33e3db9b9d8..14851ac1ad98 100644
--- a/media-sound/mpd/mpd-0.22.11.ebuild
+++ b/media-sound/mpd/mpd-0.22.11.ebuild
@@ -22,7 +22,7 @@ IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
 DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+	modplug mpg123 musepack opus flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
 
 REQUIRED_USE="
diff --git a/media-sound/mpd/mpd-0.22.3-r1.ebuild b/media-sound/mpd/mpd-0.22.3-r1.ebuild
index 5f5a7ec2ebe9..6639fe7e08eb 100644
--- a/media-sound/mpd/mpd-0.22.3-r1.ebuild
+++ b/media-sound/mpd/mpd-0.22.3-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
 DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+	modplug mpg123 musepack opus flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
 
 REQUIRED_USE="
diff --git a/media-sound/mpd/mpd-0.23.4.ebuild b/media-sound/mpd/mpd-0.23.4.ebuild
new file mode 100644
index 000000000000..217a56903cae
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.4.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
+	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
+	test twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	openmpt? ( media-libs/libopenmpt )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	pipewire? ( media-video/pipewire:= )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	snapcast? ( media-sound/snapcast )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib:= )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	dev-libs/libfmt:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	 sed -i \
+                -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+                -e 's:^#user.*$:user "mpd":' \
+                -e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+                -e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+                -e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+                -e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+                -e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+                -e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+                -e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+                -e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+                doc/mpdconf.example || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpipewire=$(usex pipewire enabled disabled)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+		-Dsnapcast=$(usex snapcast true false)
+		-Dsndio=$(usex sndio enabled disabled)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopenmpt=$(usex openmpt enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+	fowners mpd:audio -R /var/lib/mpd
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}