| 1 |
commit: d2acd255464a0f374c31dc5905756003b25ee8d1 |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 15 15:24:06 2019 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 15 15:24:06 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=d2acd255 |
| 7 |
|
| 8 |
app-emulation/faudio: Sync with ::gentoo and port to 9999 |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/693404 |
| 11 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
| 12 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
| 13 |
|
| 14 |
app-emulation/faudio/faudio-19.06.ebuild | 6 +++--- |
| 15 |
app-emulation/faudio/faudio-9999.ebuild | 8 ++++---- |
| 16 |
2 files changed, 7 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild |
| 19 |
index 295da56..a8490f1 100644 |
| 20 |
--- a/app-emulation/faudio/faudio-19.06.ebuild |
| 21 |
+++ b/app-emulation/faudio/faudio-19.06.ebuild |
| 22 |
@@ -52,7 +52,7 @@ multilib_src_configure() { |
| 23 |
"-DXNASONG=$(usex xnasong ON OFF)" |
| 24 |
) |
| 25 |
if use ffmpeg; then |
| 26 |
- mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)" ) |
| 27 |
+ mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)" ) |
| 28 |
fi |
| 29 |
cmake-utils_src_configure |
| 30 |
} |
| 31 |
@@ -70,8 +70,8 @@ multilib_src_install() { |
| 32 |
# FIXME: do we want to install the FAudio tools? |
| 33 |
cmake-utils_src_install |
| 34 |
|
| 35 |
- sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \ |
| 36 |
- > "${T}/faudio.pc" \ |
| 37 |
+ sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \ |
| 38 |
+ "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \ |
| 39 |
|| die "sed failed" |
| 40 |
insinto "/usr/$(get_libdir)/pkgconfig" |
| 41 |
doins "${T}/faudio.pc" |
| 42 |
|
| 43 |
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild |
| 44 |
index bd6b12f..a8490f1 100644 |
| 45 |
--- a/app-emulation/faudio/faudio-9999.ebuild |
| 46 |
+++ b/app-emulation/faudio/faudio-9999.ebuild |
| 47 |
@@ -1,4 +1,4 @@ |
| 48 |
-# Copyright 1999-2019 Gentoo Foundation |
| 49 |
+# Copyright 1999-2019 Gentoo Authors |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
# shellcheck disable=SC2034 |
| 53 |
@@ -52,7 +52,7 @@ multilib_src_configure() { |
| 54 |
"-DXNASONG=$(usex xnasong ON OFF)" |
| 55 |
) |
| 56 |
if use ffmpeg; then |
| 57 |
- mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)" ) |
| 58 |
+ mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)" ) |
| 59 |
fi |
| 60 |
cmake-utils_src_configure |
| 61 |
} |
| 62 |
@@ -70,8 +70,8 @@ multilib_src_install() { |
| 63 |
# FIXME: do we want to install the FAudio tools? |
| 64 |
cmake-utils_src_install |
| 65 |
|
| 66 |
- sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \ |
| 67 |
- > "${T}/faudio.pc" \ |
| 68 |
+ sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \ |
| 69 |
+ "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \ |
| 70 |
|| die "sed failed" |
| 71 |
insinto "/usr/$(get_libdir)/pkgconfig" |
| 72 |
doins "${T}/faudio.pc" |
Archives