commit: 4fa81d4970e404a5483d9d1e721dee220b1f26fd Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Wed Jul 6 03:45:42 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Jul 6 03:45:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa81d49
media-sound/cmus: bump to 2.10.0 - eapi8, deps versions cleanup, updated live Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/cmus/Manifest | 1 + .../cmus/{cmus-9999.ebuild => cmus-2.10.0.ebuild} | 22 +++++++++++++--------- media-sound/cmus/cmus-9999.ebuild | 22 +++++++++++++--------- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest index c5a79155862c..7f6c0c62fa01 100644 --- a/media-sound/cmus/Manifest +++ b/media-sound/cmus/Manifest @@ -1 +1,2 @@ +DIST cmus-2.10.0.tar.gz 324121 BLAKE2B 7a9b17b04f9461b5375f51584f1dce35dcb6863d57eb9b28391cbfb6abb4eae1f541ee6f10cbbf4c7048c08fd77307647700fd08e41eb56bbad89b67657dd876 SHA512 c055dc974a88f32c7f19fb2e4260ede37fbddc3f23707a98e7f669032c1b4fd9a1032eb5c808cf5ee635617d3abf176e78d1e8596cbe669bbad95cd5c50dde7c DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05 diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-2.10.0.ebuild similarity index 89% copy from media-sound/cmus/cmus-9999.ebuild copy to media-sound/cmus/cmus-2.10.0.ebuild index 3a73e7ed9e71..7a06ebbe8099 100644 --- a/media-sound/cmus/cmus-9999.ebuild +++ b/media-sound/cmus/cmus-2.10.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit bash-completion-r1 toolchain-funcs @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Ncurses based music player with plugin support for many formats" @@ -30,7 +30,7 @@ BDEPEND=" DEPEND=" sys-libs/ncurses:=[unicode(+)?] aac? ( media-libs/faad2 ) - alsa? ( >=media-libs/alsa-lib-1.0.11 ) + alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) @@ -40,16 +40,16 @@ DEPEND=" flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) - mad? ( >=media-libs/libmad-0.14 ) + mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) - modplug? ( >=media-libs/libmodplug-0.7 ) - mp4? ( >=media-libs/libmp4v2-1.9:0 ) - musepack? ( >=media-sound/musepack-tools-444 ) + modplug? ( media-libs/libmodplug ) + mp4? ( media-libs/libmp4v2:0 ) + musepack? ( media-sound/musepack-tools ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) - !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) + !tremor? ( vorbis? ( media-libs/libvorbis ) ) wavpack? ( media-sound/wavpack ) " RDEPEND="${DEPEND} @@ -67,6 +67,10 @@ DOCS=( AUTHORS README.md ) S="${WORKDIR}/${P/_/-}" +PATCHES=( + "${FILESDIR}/${PN}-2.9.1-atomic.patch" +) + src_configure() { my_config() { local value diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild index 3a73e7ed9e71..7a06ebbe8099 100644 --- a/media-sound/cmus/cmus-9999.ebuild +++ b/media-sound/cmus/cmus-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit bash-completion-r1 toolchain-funcs @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Ncurses based music player with plugin support for many formats" @@ -30,7 +30,7 @@ BDEPEND=" DEPEND=" sys-libs/ncurses:=[unicode(+)?] aac? ( media-libs/faad2 ) - alsa? ( >=media-libs/alsa-lib-1.0.11 ) + alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) @@ -40,16 +40,16 @@ DEPEND=" flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) - mad? ( >=media-libs/libmad-0.14 ) + mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) - modplug? ( >=media-libs/libmodplug-0.7 ) - mp4? ( >=media-libs/libmp4v2-1.9:0 ) - musepack? ( >=media-sound/musepack-tools-444 ) + modplug? ( media-libs/libmodplug ) + mp4? ( media-libs/libmp4v2:0 ) + musepack? ( media-sound/musepack-tools ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) - !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) + !tremor? ( vorbis? ( media-libs/libvorbis ) ) wavpack? ( media-sound/wavpack ) " RDEPEND="${DEPEND} @@ -67,6 +67,10 @@ DOCS=( AUTHORS README.md ) S="${WORKDIR}/${P/_/-}" +PATCHES=( + "${FILESDIR}/${PN}-2.9.1-atomic.patch" +) + src_configure() { my_config() { local value