From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10763158086 for ; Wed, 22 Dec 2021 03:57:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 418672BC01E; Wed, 22 Dec 2021 03:57:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D19372BC01A for ; Wed, 22 Dec 2021 03:57:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D3B1342EB1 for ; Wed, 22 Dec 2021 03:57:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 451D0258 for ; Wed, 22 Dec 2021 03:57:13 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1640141002.ced6c96a08740d7ae2066b6637301f6f3c5ffd0e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/timidity++/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/timidity++/timidity++-2.15.0-r1.ebuild media-sound/timidity++/timidity++-2.15.0-r2.ebuild X-VCS-Directories: media-sound/timidity++/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ced6c96a08740d7ae2066b6637301f6f3c5ffd0e X-VCS-Branch: master Date: Wed, 22 Dec 2021 03:57:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e0ffb07d-45db-4929-90c5-fa7611584783 X-Archives-Hash: 54a66ff857cd807500e75fd3fb9ff464 commit: ced6c96a08740d7ae2066b6637301f6f3c5ffd0e Author: Sam James gentoo org> AuthorDate: Wed Dec 22 02:42:59 2021 +0000 Commit: Sam James gentoo 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 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"