commit: 91a277f56ef8f48d9a2c8f5e399930964da28cac Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Mar 25 03:39:07 2022 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Mar 25 03:45:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a277f5
app-text/calibre: use qt5_get_bindir Closes: https://bugs.gentoo.org/835923 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-text/calibre/calibre-5.16.1-r1.ebuild | 6 +++--- app-text/calibre/calibre-5.39.1.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app-text/calibre/calibre-5.16.1-r1.ebuild b/app-text/calibre/calibre-5.16.1-r1.ebuild index 32b84b85f211..f0ce3cbefb85 100644 --- a/app-text/calibre/calibre-5.16.1-r1.ebuild +++ b/app-text/calibre/calibre-5.16.1-r1.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{8..9} ) PYTHON_REQ_USE="ipv6(+),sqlite,ssl" -inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils +inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 qmake-utils xdg-utils DESCRIPTION="Ebook management application" HOMEPAGE="https://calibre-ebook.com/"; @@ -176,7 +176,7 @@ src_install() { cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die - export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake" + export QMAKE="$(qt5_get_bindir)/qmake" # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox # violation with kbuildsycoca as in bug #287067, comment #13. @@ -207,7 +207,7 @@ src_install() { addpredict /dev/dri #665310 - PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ + PATH=${T}/bin:$(qt5_get_bindir):${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ "${PYTHON}" setup.py install \ --root="${D}" \ --prefix="${EPREFIX}/usr" \ diff --git a/app-text/calibre/calibre-5.39.1.ebuild b/app-text/calibre/calibre-5.39.1.ebuild index a9f64cfe2e57..ec684bf96296 100644 --- a/app-text/calibre/calibre-5.39.1.ebuild +++ b/app-text/calibre/calibre-5.39.1.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..9} ) PYTHON_REQ_USE="ipv6(+),sqlite,ssl" -inherit toolchain-funcs python-single-r1 xdg-utils +inherit toolchain-funcs python-single-r1 qmake-utils xdg-utils DESCRIPTION="Ebook management application" HOMEPAGE="https://calibre-ebook.com/"; @@ -196,7 +196,7 @@ src_compile() { local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)" export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}" - PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die + PATH="${T}/bin:$(qt5_get_bindir):${PATH}" ${EPYTHON} setup.py build || die } src_test() { @@ -229,7 +229,7 @@ src_install() { cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die - export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake" + export QMAKE="$(qt5_get_bindir)/qmake" # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox # violation with kbuildsycoca as in bug #287067, comment #13.
