commit: ced6c96a08740d7ae2066b6637301f6f3c5ffd0e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Dec 22 02:42:59 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 22 02:43:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced6c96a
media-sound/timidity++: fix automagic libXaw3d dependency Closes: https://bugs.gentoo.org/829770 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{timidity++-2.15.0-r1.ebuild => timidity++-2.15.0-r2.ebuild} | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/media-sound/timidity++/timidity++-2.15.0-r1.ebuild b/media-sound/timidity++/timidity++-2.15.0-r2.ebuild similarity index 96% rename from media-sound/timidity++/timidity++-2.15.0-r1.ebuild rename to media-sound/timidity++/timidity++-2.15.0-r2.ebuild index 786cb1c609b4..df3d0aa774b9 100644 --- a/media-sound/timidity++/timidity++-2.15.0-r1.ebuild +++ b/media-sound/timidity++/timidity++-2.15.0-r2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86" -IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X" +IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X Xaw3d" REQUIRED_USE="tk? ( X )" @@ -36,8 +36,9 @@ DEPEND=" vorbis? ( media-libs/libvorbis ) X? ( media-libs/libpng:0= - x11-libs/libXaw x11-libs/libXext + Xaw3d? ( x11-libs/libXaw3d ) + !Xaw3d? ( x11-libs/libXaw ) ) " @@ -74,6 +75,9 @@ src_configure() { export EXTRACFLAGS="${CFLAGS}" #385817 local audios + # List by preference + local xaw_provider=$(usex Xaw3d 'xaw3d' 'xaw') + local myeconfargs=( --localstatedir=/var/state/${PN} --with-module-dir="${EPREFIX}/usr/share/timidity" @@ -95,6 +99,7 @@ src_configure() { $(use_enable gtk) $(use_enable tk tcltk) $(use_enable motif) + $(use_with Xaw3d xawlib ${xaw_provider}) ) use flac && audios+=",flac"
