1 |
commit: ced6c96a08740d7ae2066b6637301f6f3c5ffd0e |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 22 02:42:59 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 22 02:43:22 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced6c96a |
7 |
|
8 |
media-sound/timidity++: fix automagic libXaw3d dependency |
9 |
|
10 |
Closes: https://bugs.gentoo.org/829770 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../{timidity++-2.15.0-r1.ebuild => timidity++-2.15.0-r2.ebuild} | 9 +++++++-- |
14 |
1 file changed, 7 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/media-sound/timidity++/timidity++-2.15.0-r1.ebuild b/media-sound/timidity++/timidity++-2.15.0-r2.ebuild |
17 |
similarity index 96% |
18 |
rename from media-sound/timidity++/timidity++-2.15.0-r1.ebuild |
19 |
rename to media-sound/timidity++/timidity++-2.15.0-r2.ebuild |
20 |
index 786cb1c609b4..df3d0aa774b9 100644 |
21 |
--- a/media-sound/timidity++/timidity++-2.15.0-r1.ebuild |
22 |
+++ b/media-sound/timidity++/timidity++-2.15.0-r2.ebuild |
23 |
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" |
24 |
LICENSE="GPL-2" |
25 |
SLOT="0" |
26 |
KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86" |
27 |
-IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X" |
28 |
+IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X Xaw3d" |
29 |
|
30 |
REQUIRED_USE="tk? ( X )" |
31 |
|
32 |
@@ -36,8 +36,9 @@ DEPEND=" |
33 |
vorbis? ( media-libs/libvorbis ) |
34 |
X? ( |
35 |
media-libs/libpng:0= |
36 |
- x11-libs/libXaw |
37 |
x11-libs/libXext |
38 |
+ Xaw3d? ( x11-libs/libXaw3d ) |
39 |
+ !Xaw3d? ( x11-libs/libXaw ) |
40 |
) |
41 |
" |
42 |
|
43 |
@@ -74,6 +75,9 @@ src_configure() { |
44 |
export EXTRACFLAGS="${CFLAGS}" #385817 |
45 |
|
46 |
local audios |
47 |
+ # List by preference |
48 |
+ local xaw_provider=$(usex Xaw3d 'xaw3d' 'xaw') |
49 |
+ |
50 |
local myeconfargs=( |
51 |
--localstatedir=/var/state/${PN} |
52 |
--with-module-dir="${EPREFIX}/usr/share/timidity" |
53 |
@@ -95,6 +99,7 @@ src_configure() { |
54 |
$(use_enable gtk) |
55 |
$(use_enable tk tcltk) |
56 |
$(use_enable motif) |
57 |
+ $(use_with Xaw3d xawlib ${xaw_provider}) |
58 |
) |
59 |
|
60 |
use flac && audios+=",flac" |