gentoo auto-resync : 18:05:2024 - 00:01:41

3 files changed, 157 insertions, 4 deletions

diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 4ce5ddb0b512..593df0e0ea51 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,5 +1,7 @@
 AUX cmus-2.9.1-atomic.patch 554 BLAKE2B 1a5e2b4497ed3ccc95bf5345607a8f4efedbff6852cb0abc40d0665180e0e74a25e17ba8bb121e1343f1964cf7523abdf987595c1eefc1486fd459bfb0b6a696 SHA512 9e64c6ff6184862e02c248b9a26cbde785740d622370bf761df949824ed8759825ad9bb208180f0d5d1aacd3c506994561c98690902b25cc34cbb87929e3c886
 DIST cmus-2.10.0.tar.gz 324121 BLAKE2B 7a9b17b04f9461b5375f51584f1dce35dcb6863d57eb9b28391cbfb6abb4eae1f541ee6f10cbbf4c7048c08fd77307647700fd08e41eb56bbad89b67657dd876 SHA512 c055dc974a88f32c7f19fb2e4260ede37fbddc3f23707a98e7f669032c1b4fd9a1032eb5c808cf5ee635617d3abf176e78d1e8596cbe669bbad95cd5c50dde7c
+DIST cmus-2.11.0.tar.gz 335367 BLAKE2B 69584b929afcf82e540e8a4382bc3b3ee4a24dc00fe27d0956941ceb0d446395f824068405c52732c4f684d7b32b5436b246cf7b97c73ba9ebbabbb479e2326f SHA512 370c8eea6e67b328befb24d98ef3945fabc65b33d0bb9ae09cedd1c453b18a307061c042b2119f37f3684a4a39b86b3535efaa2c955e58c8e680628ef0a03452
 EBUILD cmus-2.10.0-r1.ebuild 3743 BLAKE2B ac5445c524535fc7d0b7a56d89ea705a198b63b2d5014e824a83490271a8cc17ca2b3e957ebfa9aa6bb40ab798c91c21b904ae5335cf60a5f667e0bf08a1b4d1 SHA512 5e2ed25ded6717572b5901d98e83e26756c5dc8c1f8e4e6c68aad188dd50aa4583f1036c25217398bd559c424e462de43e9509b814226cca3ea766bf737cb963
-EBUILD cmus-9999.ebuild 3746 BLAKE2B 77c791c9e5abc572addcd8fa8d821dac2e448b621fcb028d972ea41e7881409af1d97f41b0c1827186a2883b06abdd671cdf3998dde0a40e964c2c84b1fe3c66 SHA512 5610da42e80318941e10a14eff6326ba7934179bf8d04c1f15a1d8b15632166e6f73d62f8dc82944a0579f32cd773d7c1109b63d115e1066eea8718c8305e380
+EBUILD cmus-2.11.0.ebuild 3746 BLAKE2B 58ba14fe233737a35e09195d90c5ee0caa614b2056d18d3554f8bb50e38d0ff7993adbf7bc41e6fe56d25e04f1bf772e882c3be4765a718eaf60196875a9bb85 SHA512 5aced3c1995fdbb5c1647e62e8db696b6bf9fd566d0d801c73a936da54dc42d453f7c4d605969bd67fbceb29107db053c642e74e469cb08b61eac75c49b55613
+EBUILD cmus-9999.ebuild 3746 BLAKE2B 58ba14fe233737a35e09195d90c5ee0caa614b2056d18d3554f8bb50e38d0ff7993adbf7bc41e6fe56d25e04f1bf772e882c3be4765a718eaf60196875a9bb85 SHA512 5aced3c1995fdbb5c1647e62e8db696b6bf9fd566d0d801c73a936da54dc42d453f7c4d605969bd67fbceb29107db053c642e74e469cb08b61eac75c49b55613
 MISC metadata.xml 958 BLAKE2B b211738ed9ee8dd733e05e877b1cdcd5c16531cb9e36339168be39eabe6ea8d187152b07865be002dc153c21b6f826e254824169aa650ef7c9b8d094e608b24f SHA512 54123e923ff9451c5ee495d7672386e205add00907270bafb011e3c1e384169ab04ffbdf15b5a72db196ed327e57ef668ab704a67cef97f10805e08da0900558
diff --git a/media-sound/cmus/cmus-2.11.0.ebuild b/media-sound/cmus/cmus-2.11.0.ebuild
new file mode 100644
index 000000000000..78b2cf8d7a3c
--- /dev/null
+++ b/media-sound/cmus/cmus-2.11.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/cmus/cmus.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Ncurses based music player with plugin support for many formats"
+HOMEPAGE="https://cmus.github.io/"
+
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
+	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio sndio systemd tremor +unicode
+	+vorbis wavpack"
+
+# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
+REQUIRED_USE="
+	?? ( elogind systemd )
+	tremor? ( vorbis )
+	mp4? ( aac )" # enabling mp4 adds -lfaad
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	cddb? ( media-libs/libcddb )
+	cdio? ( dev-libs/libcdio-paranoia )
+	discid? ( media-libs/libdiscid )
+	elogind? ( sys-auth/elogind )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac:= )
+	jack? ( virtual/jack )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	modplug? ( media-libs/libmodplug )
+	mp4? ( media-libs/libmp4v2:0 )
+	musepack? ( media-sound/musepack-tools )
+	opus? ( media-libs/opusfile )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio )
+	systemd? ( sys-apps/systemd )
+	tremor? ( media-libs/tremor )
+	!tremor? ( vorbis? ( media-libs/libvorbis ) )
+	wavpack? ( media-sound/wavpack )
+"
+RDEPEND="${DEPEND}
+	pidgin? (
+		dev-python/dbus-python
+		net-im/pidgin
+	)
+"
+
+DOCS=( AUTHORS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.9.1-atomic.patch"
+)
+
+src_configure() {
+	my_config() {
+		local value
+		use ${1} && value=a || value=n
+		myconf+=( ${2}=${value} )
+	}
+
+	local debuglevel=1
+	use debug && debuglevel=2
+	local myconf=(
+		CONFIG_CUE=y
+		CONFIG_ARTS=n
+		CONFIG_SUN=n
+		CONFIG_SNDIO=n
+		CONFIG_WAVEOUT=n
+		CONFIG_VTX=n
+		CONFIG_ROAR=n
+	)
+
+	my_config cddb CONFIG_CDDB
+	my_config cdio CONFIG_CDIO
+	my_config discid CONFIG_DISCID
+	my_config flac CONFIG_FLAC
+	my_config mad CONFIG_MAD
+	my_config modplug CONFIG_MODPLUG
+	my_config mikmod CONFIG_MIKMOD
+	my_config musepack CONFIG_MPC
+	my_config vorbis CONFIG_VORBIS
+	my_config tremor CONFIG_TREMOR
+	my_config opus CONFIG_OPUS
+	my_config wavpack CONFIG_WAVPACK
+	my_config mp4 CONFIG_MP4
+	my_config aac CONFIG_AAC
+	my_config ffmpeg CONFIG_FFMPEG
+	my_config pulseaudio CONFIG_PULSE
+	my_config alsa CONFIG_ALSA
+	my_config jack CONFIG_JACK
+	my_config sndio CONFIG_SNDIO
+	my_config libsamplerate CONFIG_SAMPLERATE
+	my_config ao CONFIG_AO
+	my_config oss CONFIG_OSS
+
+	if use elogind || use systemd; then
+		myconf+=( CONFIG_MPRIS=a )
+	else
+		myconf+=( CONFIG_MPRIS=n )
+	fi
+
+	./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
+		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
+}
+
+src_compile() {
+	tc-export_build_env BUILD_CC
+	emake V=2 \
+		CC="$(tc-getCC)" LD="$(tc-getCC)" \
+		HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_CC}" \
+		HOST_CFLAGS="${BUILD_CFLAGS}" HOST_LDFLAGS="${BUILD_LDFLAGS}"
+}
+
+src_install() {
+	default
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/_cmus
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use pidgin; then
+		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
+	fi
+}
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index 0bd63fdecd83..78b2cf8d7a3c 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,6 +16,8 @@ fi
 DESCRIPTION="Ncurses based music player with plugin support for many formats"
 HOMEPAGE="https://cmus.github.io/"
 
+S="${WORKDIR}/${P/_/-}"
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
@@ -66,8 +68,6 @@ RDEPEND="${DEPEND}
 
 DOCS=( AUTHORS README.md )
 
-S="${WORKDIR}/${P/_/-}"
-
 PATCHES=(
 	"${FILESDIR}/${PN}-2.9.1-atomic.patch"
 )