1 |
commit: 4fa81d4970e404a5483d9d1e721dee220b1f26fd |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 6 03:45:42 2022 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 6 03:45:50 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa81d49 |
7 |
|
8 |
media-sound/cmus: bump to 2.10.0 - eapi8, deps versions cleanup, updated live |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
media-sound/cmus/Manifest | 1 + |
13 |
.../cmus/{cmus-9999.ebuild => cmus-2.10.0.ebuild} | 22 +++++++++++++--------- |
14 |
media-sound/cmus/cmus-9999.ebuild | 22 +++++++++++++--------- |
15 |
3 files changed, 27 insertions(+), 18 deletions(-) |
16 |
|
17 |
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest |
18 |
index c5a79155862c..7f6c0c62fa01 100644 |
19 |
--- a/media-sound/cmus/Manifest |
20 |
+++ b/media-sound/cmus/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
+DIST cmus-2.10.0.tar.gz 324121 BLAKE2B 7a9b17b04f9461b5375f51584f1dce35dcb6863d57eb9b28391cbfb6abb4eae1f541ee6f10cbbf4c7048c08fd77307647700fd08e41eb56bbad89b67657dd876 SHA512 c055dc974a88f32c7f19fb2e4260ede37fbddc3f23707a98e7f669032c1b4fd9a1032eb5c808cf5ee635617d3abf176e78d1e8596cbe669bbad95cd5c50dde7c |
23 |
DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05 |
24 |
|
25 |
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-2.10.0.ebuild |
26 |
similarity index 89% |
27 |
copy from media-sound/cmus/cmus-9999.ebuild |
28 |
copy to media-sound/cmus/cmus-2.10.0.ebuild |
29 |
index 3a73e7ed9e71..7a06ebbe8099 100644 |
30 |
--- a/media-sound/cmus/cmus-9999.ebuild |
31 |
+++ b/media-sound/cmus/cmus-2.10.0.ebuild |
32 |
@@ -1,7 +1,7 @@ |
33 |
-# Copyright 1999-2021 Gentoo Authors |
34 |
+# Copyright 1999-2022 Gentoo Authors |
35 |
# Distributed under the terms of the GNU General Public License v2 |
36 |
|
37 |
-EAPI=7 |
38 |
+EAPI=8 |
39 |
|
40 |
inherit bash-completion-r1 toolchain-funcs |
41 |
|
42 |
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then |
43 |
inherit git-r3 |
44 |
else |
45 |
SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" |
46 |
- KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
47 |
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" |
48 |
fi |
49 |
|
50 |
DESCRIPTION="Ncurses based music player with plugin support for many formats" |
51 |
@@ -30,7 +30,7 @@ BDEPEND=" |
52 |
DEPEND=" |
53 |
sys-libs/ncurses:=[unicode(+)?] |
54 |
aac? ( media-libs/faad2 ) |
55 |
- alsa? ( >=media-libs/alsa-lib-1.0.11 ) |
56 |
+ alsa? ( media-libs/alsa-lib ) |
57 |
ao? ( media-libs/libao ) |
58 |
cddb? ( media-libs/libcddb ) |
59 |
cdio? ( dev-libs/libcdio-paranoia ) |
60 |
@@ -40,16 +40,16 @@ DEPEND=" |
61 |
flac? ( media-libs/flac ) |
62 |
jack? ( virtual/jack ) |
63 |
libsamplerate? ( media-libs/libsamplerate ) |
64 |
- mad? ( >=media-libs/libmad-0.14 ) |
65 |
+ mad? ( media-libs/libmad ) |
66 |
mikmod? ( media-libs/libmikmod:0 ) |
67 |
- modplug? ( >=media-libs/libmodplug-0.7 ) |
68 |
- mp4? ( >=media-libs/libmp4v2-1.9:0 ) |
69 |
- musepack? ( >=media-sound/musepack-tools-444 ) |
70 |
+ modplug? ( media-libs/libmodplug ) |
71 |
+ mp4? ( media-libs/libmp4v2:0 ) |
72 |
+ musepack? ( media-sound/musepack-tools ) |
73 |
opus? ( media-libs/opusfile ) |
74 |
pulseaudio? ( media-sound/pulseaudio ) |
75 |
systemd? ( sys-apps/systemd ) |
76 |
tremor? ( media-libs/tremor ) |
77 |
- !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) |
78 |
+ !tremor? ( vorbis? ( media-libs/libvorbis ) ) |
79 |
wavpack? ( media-sound/wavpack ) |
80 |
" |
81 |
RDEPEND="${DEPEND} |
82 |
@@ -67,6 +67,10 @@ DOCS=( AUTHORS README.md ) |
83 |
|
84 |
S="${WORKDIR}/${P/_/-}" |
85 |
|
86 |
+PATCHES=( |
87 |
+ "${FILESDIR}/${PN}-2.9.1-atomic.patch" |
88 |
+) |
89 |
+ |
90 |
src_configure() { |
91 |
my_config() { |
92 |
local value |
93 |
|
94 |
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild |
95 |
index 3a73e7ed9e71..7a06ebbe8099 100644 |
96 |
--- a/media-sound/cmus/cmus-9999.ebuild |
97 |
+++ b/media-sound/cmus/cmus-9999.ebuild |
98 |
@@ -1,7 +1,7 @@ |
99 |
-# Copyright 1999-2021 Gentoo Authors |
100 |
+# Copyright 1999-2022 Gentoo Authors |
101 |
# Distributed under the terms of the GNU General Public License v2 |
102 |
|
103 |
-EAPI=7 |
104 |
+EAPI=8 |
105 |
|
106 |
inherit bash-completion-r1 toolchain-funcs |
107 |
|
108 |
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then |
109 |
inherit git-r3 |
110 |
else |
111 |
SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" |
112 |
- KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
113 |
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" |
114 |
fi |
115 |
|
116 |
DESCRIPTION="Ncurses based music player with plugin support for many formats" |
117 |
@@ -30,7 +30,7 @@ BDEPEND=" |
118 |
DEPEND=" |
119 |
sys-libs/ncurses:=[unicode(+)?] |
120 |
aac? ( media-libs/faad2 ) |
121 |
- alsa? ( >=media-libs/alsa-lib-1.0.11 ) |
122 |
+ alsa? ( media-libs/alsa-lib ) |
123 |
ao? ( media-libs/libao ) |
124 |
cddb? ( media-libs/libcddb ) |
125 |
cdio? ( dev-libs/libcdio-paranoia ) |
126 |
@@ -40,16 +40,16 @@ DEPEND=" |
127 |
flac? ( media-libs/flac ) |
128 |
jack? ( virtual/jack ) |
129 |
libsamplerate? ( media-libs/libsamplerate ) |
130 |
- mad? ( >=media-libs/libmad-0.14 ) |
131 |
+ mad? ( media-libs/libmad ) |
132 |
mikmod? ( media-libs/libmikmod:0 ) |
133 |
- modplug? ( >=media-libs/libmodplug-0.7 ) |
134 |
- mp4? ( >=media-libs/libmp4v2-1.9:0 ) |
135 |
- musepack? ( >=media-sound/musepack-tools-444 ) |
136 |
+ modplug? ( media-libs/libmodplug ) |
137 |
+ mp4? ( media-libs/libmp4v2:0 ) |
138 |
+ musepack? ( media-sound/musepack-tools ) |
139 |
opus? ( media-libs/opusfile ) |
140 |
pulseaudio? ( media-sound/pulseaudio ) |
141 |
systemd? ( sys-apps/systemd ) |
142 |
tremor? ( media-libs/tremor ) |
143 |
- !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) |
144 |
+ !tremor? ( vorbis? ( media-libs/libvorbis ) ) |
145 |
wavpack? ( media-sound/wavpack ) |
146 |
" |
147 |
RDEPEND="${DEPEND} |
148 |
@@ -67,6 +67,10 @@ DOCS=( AUTHORS README.md ) |
149 |
|
150 |
S="${WORKDIR}/${P/_/-}" |
151 |
|
152 |
+PATCHES=( |
153 |
+ "${FILESDIR}/${PN}-2.9.1-atomic.patch" |
154 |
+) |
155 |
+ |
156 |
src_configure() { |
157 |
my_config() { |
158 |
local value |