commit:     5820fbc293c9ab58424bd4284d4823b881454581
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 07:54:35 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 07:54:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5820fbc2

dev-qt/qtwebkit: improve is-anything-built check

Gentoo-bug: 572056
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.7.9999.ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild    | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild | 2 +-
 dev-qt/qtwebkit/qtwebkit-5.9999.ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
index 358c4854..4ed2d7c2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild
@@ -110,7 +110,7 @@ src_install() {
        qt5-build_src_install
 
        # bug 572056
-       if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+       if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebKit.so ]]; then
                eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
                die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
        fi

diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.9999.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.7.9999.ebuild
index 358c4854..4ed2d7c2 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.7.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.7.9999.ebuild
@@ -110,7 +110,7 @@ src_install() {
        qt5-build_src_install
 
        # bug 572056
-       if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+       if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebKit.so ]]; then
                eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
                die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
        fi

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild
index 9eef1183..aff0d8f6 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.0.ebuild
@@ -111,7 +111,7 @@ src_install() {
        qt5-build_src_install
 
        # bug 572056
-       if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+       if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebKit.so ]]; then
                eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
                die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
        fi

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
index a5d5b702..a2f4a265 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
@@ -110,7 +110,7 @@ src_install() {
        qt5-build_src_install
 
        # bug 572056
-       if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+       if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebKit.so ]]; then
                eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
                die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
        fi

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index a5d5b702..a2f4a265 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -110,7 +110,7 @@ src_install() {
        qt5-build_src_install
 
        # bug 572056
-       if [[ ! -f "${D%/}/usr/$(get_libdir)/libQt5WebKit.so" ]]; then
+       if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebKit.so ]]; then
                eerror "${CATEGORY}/${PF} could not build due to a broken ruby 
environment."
                die 'Check "eselect ruby" and ensure you have a working ruby in 
your $PATH'
        fi

Reply via email to