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 4F34F158020 for ; Mon, 7 Nov 2022 21:10:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C945E085E; Mon, 7 Nov 2022 21:10:22 +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 1E5D5E085E for ; Mon, 7 Nov 2022 21:10:22 +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 ECE82340E31 for ; Mon, 7 Nov 2022 21:10:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2066161D for ; Mon, 7 Nov 2022 21:10:19 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1667855326.35683548ca97455f295f52aed45cdf357b878794.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild X-VCS-Directories: media-libs/libcaca/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 35683548ca97455f295f52aed45cdf357b878794 X-VCS-Branch: master Date: Mon, 7 Nov 2022 21:10:19 +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: 66230161-9034-4e9c-a6e2-8b55bad4ae82 X-Archives-Hash: b9cf503cf47ca225532f752c19ff3778 commit: 35683548ca97455f295f52aed45cdf357b878794 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Nov 7 21:04:40 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Nov 7 21:08:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35683548 media-libs/libcaca: avoid mixing ncurses with ncursesw Also only do this with USE=ncurses and use || die (fixes runtime with mpv wrt bug #825058) Closes: https://bugs.gentoo.org/825058 Signed-off-by: Ionen Wolkens gentoo.org> ...{libcaca-0.99_beta19-r10.ebuild => libcaca-0.99_beta19-r11.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild similarity index 97% rename from media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild rename to media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild index 86ee32249914..9466208ef8c1 100644 --- a/media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild +++ b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild @@ -89,8 +89,8 @@ src_prepare() { # bug #653400 append-cxxflags -std=c++11 - # bug #601902 - append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)" + # bug #601902, bug #825058 + use ncurses && append-libs $($(tc-getPKG_CONFIG) --libs tinfow || die) # fix docs install path, bug 543870#c14 sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die