diff options
| author |   Nick Sarnie <sarnex@gentoo.org> | 2019-09-15 11:24:06 -0400 |
|---|---|---|
| committer | Nick Sarnie <sarnex@gentoo.org> | 2019-09-15 11:24:06 -0400 |
| commit | d2acd255464a0f374c31dc5905756003b25ee8d1 (patch) | |
| tree | d2f6ec9f993da97876feee36e364ee308023a60c | |
| parent | app-emulation/wine-staging: Bump to 4.16 (diff) | |
| download | wine-d2acd255.tar.gz wine-d2acd255.tar.bz2 wine-d2acd255.zip | |
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 <sarnex@gentoo.org>
| -rw-r--r-- | app-emulation/faudio/faudio-19.06.ebuild | 6 | ||||
| -rw-r--r-- | 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" |