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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 25607138334 for ; Sun, 15 Sep 2019 15:24:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 755E2E0891; Sun, 15 Sep 2019 15:24:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51592E0891 for ; Sun, 15 Sep 2019 15:24:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F6BE34B1DB for ; Sun, 15 Sep 2019 15:24:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F7F3744 for ; Sun, 15 Sep 2019 15:24:31 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1568561046.d2acd255464a0f374c31dc5905756003b25ee8d1.sarnex@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/faudio/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/faudio/faudio-19.06.ebuild app-emulation/faudio/faudio-9999.ebuild X-VCS-Directories: app-emulation/faudio/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: d2acd255464a0f374c31dc5905756003b25ee8d1 X-VCS-Branch: master Date: Sun, 15 Sep 2019 15:24:31 +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: e161a770-7eb2-4e98-a3c9-32aa943495c6 X-Archives-Hash: 637b55bacd900dbf79a67a6d488efb7f commit: d2acd255464a0f374c31dc5905756003b25ee8d1 Author: Nick Sarnie gentoo org> AuthorDate: Sun Sep 15 15:24:06 2019 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sun Sep 15 15:24:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=d2acd255 app-emulation/faudio: Sync with ::gentoo and port to 9999 Fixes: https://bugs.gentoo.org/693404 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/faudio/faudio-19.06.ebuild | 6 +++--- app-emulation/faudio/faudio-9999.ebuild | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild index 295da56..a8490f1 100644 --- a/app-emulation/faudio/faudio-19.06.ebuild +++ b/app-emulation/faudio/faudio-19.06.ebuild @@ -52,7 +52,7 @@ multilib_src_configure() { "-DXNASONG=$(usex xnasong ON OFF)" ) if use ffmpeg; then - mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)" ) + mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)" ) fi cmake-utils_src_configure } @@ -70,8 +70,8 @@ multilib_src_install() { # FIXME: do we want to install the FAudio tools? cmake-utils_src_install - sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \ - > "${T}/faudio.pc" \ + sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \ + "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \ || die "sed failed" insinto "/usr/$(get_libdir)/pkgconfig" doins "${T}/faudio.pc" diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild index bd6b12f..a8490f1 100644 --- a/app-emulation/faudio/faudio-9999.ebuild +++ b/app-emulation/faudio/faudio-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # shellcheck disable=SC2034 @@ -52,7 +52,7 @@ multilib_src_configure() { "-DXNASONG=$(usex xnasong ON OFF)" ) if use ffmpeg; then - mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)" ) + mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)" ) fi cmake-utils_src_configure } @@ -70,8 +70,8 @@ multilib_src_install() { # FIXME: do we want to install the FAudio tools? cmake-utils_src_install - sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \ - > "${T}/faudio.pc" \ + sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \ + "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \ || die "sed failed" insinto "/usr/$(get_libdir)/pkgconfig" doins "${T}/faudio.pc"