Fixed Qt WebKit/WebEngine dependencies 2.11 and later.

4 files changed, 21 insertions, 9 deletions

diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index fa73c8d..a6fac2c 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -24,8 +24,8 @@ DIST bibletime-2.9_rc1.tar.bz2 5730529 SHA256 7992fb599d3c9688f7afaa332c2e3ab74d
 DIST bibletime-2.9_rc2.tar.bz2 5729573 SHA256 617d765b7788ddb1636c64cf5c4ae9743c04006e4809298f1c14356d9003dfa4 SHA512 0eaeb2a2eb36a4f403e667bc569657df6320f1462af39cd4edc74d3747c8bd96a77ec95cc887321be3920c7f314c6b74e11d58f306a742f8a3573d9019c2e3ef WHIRLPOOL faa700459176168f78529bb635eddd14dc0d12781f2ca230b36ba16e751e3b227f28a6fda5b88d586a8aba210777aa2d695eac423f7c2791a9dde4b74c3f54ca
 EBUILD bibletime-2.10.0.ebuild 831 SHA256 a3b412a6cf6afc7754270a9ef5f26f02c03dcade7ddb5dd794f19a8e5483c17d SHA512 d8bf2b735ba6ea779275fe166f7fd2275e2aee0a2642a1a38ba3e8825285a675ddb20e0ff0f45fe86abc8abc691130eb5de063ae85de0e076cbd48b1d3b1ee4f WHIRLPOOL 1e199cfd6ad1cbeb63378ada27a0d4baa859eeaa57ccc5a3bb56d8e8d022f99ece397cfd915d4a2c4b668201ecfe6a0e7694cab86d0ab8bf503a8acc97257bbb
 EBUILD bibletime-2.10.1.ebuild 831 SHA256 a3b412a6cf6afc7754270a9ef5f26f02c03dcade7ddb5dd794f19a8e5483c17d SHA512 d8bf2b735ba6ea779275fe166f7fd2275e2aee0a2642a1a38ba3e8825285a675ddb20e0ff0f45fe86abc8abc691130eb5de063ae85de0e076cbd48b1d3b1ee4f WHIRLPOOL 1e199cfd6ad1cbeb63378ada27a0d4baa859eeaa57ccc5a3bb56d8e8d022f99ece397cfd915d4a2c4b668201ecfe6a0e7694cab86d0ab8bf503a8acc97257bbb
-EBUILD bibletime-2.11_beta1.ebuild 940 SHA256 ecd10a15e21fd8720e299a354138a10907b62c831ed809c0a89f7d96478dd67b SHA512 f4d0b12b5a7543af8cfc769bb2ac3b5ff1b386acc3568ec0d7a8c778e1d57fb68dae2cdbbf766095fc2132d62ae1439b6432b05657145bd5278380bf992f6ef4 WHIRLPOOL 688e8d5b3901289548ce2f720e9216cd05537dc90a9698991d1f5b0086742bb0d814235d97375712f67110d26756417e940eda58e319d3d3b9b62818e105b785
-EBUILD bibletime-2.11_rc1.ebuild 940 SHA256 ecd10a15e21fd8720e299a354138a10907b62c831ed809c0a89f7d96478dd67b SHA512 f4d0b12b5a7543af8cfc769bb2ac3b5ff1b386acc3568ec0d7a8c778e1d57fb68dae2cdbbf766095fc2132d62ae1439b6432b05657145bd5278380bf992f6ef4 WHIRLPOOL 688e8d5b3901289548ce2f720e9216cd05537dc90a9698991d1f5b0086742bb0d814235d97375712f67110d26756417e940eda58e319d3d3b9b62818e105b785
+EBUILD bibletime-2.11_beta1.ebuild 1066 SHA256 1c5e693e87b589ceb09e7c4ac39e58555fb6b87b68dbb12e7834d99901768ace SHA512 2c8a2e5407ccff7286981e4619ae967eb9782e0c9b72a8ead1c1ceb960469733b9abaa190f2154a21fc0327cfb5a6a86442673cbd51fa78adec7badf24d15796 WHIRLPOOL 7c94f15d266b1b4c463db67f567786caa062ab4b8aa92ead774eaf5f7c4d4f085ebf49edb4f547a034583b3f59315349da287a078f03fed524f22467f8da0d9a
+EBUILD bibletime-2.11_rc1.ebuild 1066 SHA256 1c5e693e87b589ceb09e7c4ac39e58555fb6b87b68dbb12e7834d99901768ace SHA512 2c8a2e5407ccff7286981e4619ae967eb9782e0c9b72a8ead1c1ceb960469733b9abaa190f2154a21fc0327cfb5a6a86442673cbd51fa78adec7badf24d15796 WHIRLPOOL 7c94f15d266b1b4c463db67f567786caa062ab4b8aa92ead774eaf5f7c4d4f085ebf49edb4f547a034583b3f59315349da287a078f03fed524f22467f8da0d9a
 EBUILD bibletime-2.6.ebuild 853 SHA256 1a02084df7737d0be721e3ebc876f6163196e607afc39eb51f092c92d1b739b9 SHA512 c9d65566f1b17794e98a27c2b8a07e293409c37a977357d4161b4fecb84dde07afc5e901d74303652960baa3ebcaf7fb74870575e4ce94c168959e658b096a53 WHIRLPOOL 9261417c014de6ced3862c377147cf24761a9d91c166bfcc208a9ee1e5fcb2df0fa47bb7d3ece61bce97526360e2da7fcb70e09cdb09df8c618a6775a2e5ca6d
 EBUILD bibletime-2.7.1.ebuild 853 SHA256 1a02084df7737d0be721e3ebc876f6163196e607afc39eb51f092c92d1b739b9 SHA512 c9d65566f1b17794e98a27c2b8a07e293409c37a977357d4161b4fecb84dde07afc5e901d74303652960baa3ebcaf7fb74870575e4ce94c168959e658b096a53 WHIRLPOOL 9261417c014de6ced3862c377147cf24761a9d91c166bfcc208a9ee1e5fcb2df0fa47bb7d3ece61bce97526360e2da7fcb70e09cdb09df8c618a6775a2e5ca6d
 EBUILD bibletime-2.7.2.ebuild 853 SHA256 1a02084df7737d0be721e3ebc876f6163196e607afc39eb51f092c92d1b739b9 SHA512 c9d65566f1b17794e98a27c2b8a07e293409c37a977357d4161b4fecb84dde07afc5e901d74303652960baa3ebcaf7fb74870575e4ce94c168959e658b096a53 WHIRLPOOL 9261417c014de6ced3862c377147cf24761a9d91c166bfcc208a9ee1e5fcb2df0fa47bb7d3ece61bce97526360e2da7fcb70e09cdb09df8c618a6775a2e5ca6d
@@ -46,4 +46,4 @@ EBUILD bibletime-2.9_beta1.ebuild 824 SHA256 c18bd15c493b717e8fbfd3c648dd19c061d
 EBUILD bibletime-2.9_beta2.ebuild 824 SHA256 c18bd15c493b717e8fbfd3c648dd19c061d4c65e6aac5e1cc4a7a4a2ce4549fc SHA512 26ea6bc4065ac044d3304b71448ac35aa0b8b4769fcc701b4bb023e73e671137c4f63f6b77be9cdf70bc64412f25621a65cb07857eeb5df8284ec355074748d2 WHIRLPOOL 4efd8c60c98ef14e69cf3327c1d4bbb7d9153b5f3835f3481e1260e022366eae8f153001db12f1330902fe60dc50c6f86c14fee433ab6519e03262f7a8c6604e
 EBUILD bibletime-2.9_rc1.ebuild 824 SHA256 c18bd15c493b717e8fbfd3c648dd19c061d4c65e6aac5e1cc4a7a4a2ce4549fc SHA512 26ea6bc4065ac044d3304b71448ac35aa0b8b4769fcc701b4bb023e73e671137c4f63f6b77be9cdf70bc64412f25621a65cb07857eeb5df8284ec355074748d2 WHIRLPOOL 4efd8c60c98ef14e69cf3327c1d4bbb7d9153b5f3835f3481e1260e022366eae8f153001db12f1330902fe60dc50c6f86c14fee433ab6519e03262f7a8c6604e
 EBUILD bibletime-2.9_rc2.ebuild 824 SHA256 c18bd15c493b717e8fbfd3c648dd19c061d4c65e6aac5e1cc4a7a4a2ce4549fc SHA512 26ea6bc4065ac044d3304b71448ac35aa0b8b4769fcc701b4bb023e73e671137c4f63f6b77be9cdf70bc64412f25621a65cb07857eeb5df8284ec355074748d2 WHIRLPOOL 4efd8c60c98ef14e69cf3327c1d4bbb7d9153b5f3835f3481e1260e022366eae8f153001db12f1330902fe60dc50c6f86c14fee433ab6519e03262f7a8c6604e
-EBUILD bibletime-9999.ebuild 949 SHA256 c0c7600a0f2de78189426f2603f8bdc18cef3ad34e3fff258eb38ab85be07253 SHA512 dbbd6af65ab296d19c9e3a18228a1a51647691360ccae166bd8b67584c26effc071e8bb6203656a5362d11a58ead008ae5c7a576fb300c4ff24db96ad5bcacca WHIRLPOOL bded1fcba899e13d2845299ccb6f4cb757488bc260abe90845a6c06fd9612fe1292fb1ad1dd481237527f31059432a65fa47861b325249d520733a8f76cf4256
+EBUILD bibletime-9999.ebuild 1075 SHA256 6611cd113725e145cfd59b7b19312995d5ca284ad867e12c4a9d1c8fe9a9ad03 SHA512 d12b85a89feee77aa728915fcb85e61bb6bc3644644d2556bade10a50abf72422c4750880b1d48f3d2af31e11fe91e7525c67924d1441308b952673c63eec54a WHIRLPOOL e40f721e777aab7b86fd12cd774717229540ab5f2141d14b8684e1c170e56233548e9bc23dd563530fe357a817e20ea77d707efd193001fc0ebbc9e33a9ef830
diff --git a/app-text/bibletime/bibletime-2.11_beta1.ebuild b/app-text/bibletime/bibletime-2.11_beta1.ebuild
index 8e46c48..9c62736 100644
--- a/app-text/bibletime/bibletime-2.11_beta1.ebuild
+++ b/app-text/bibletime/bibletime-2.11_beta1.ebuild
@@ -19,13 +19,17 @@ RDEPEND="
   >=app-text/sword-1.7[curl]
   >=dev-cpp/clucene-0.9.16a
   dev-qt/linguist-tools:5
-  dev-qt/qtcore:5
+  || ( ( <dev-qt/qtcore-5.6.0:5
+         dev-qt/qtwebkit:5 )
+       ( >=dev-qt/qtcore-5.6.0:5
+         dev-qt/qtwebengine:5
+         dev-qt/qtwebchannel:5 )
+     )
   dev-qt/qtgui:5
   dev-qt/qtnetwork:5
   dev-qt/qtprintsupport:5
   dev-qt/qtscript:5
   dev-qt/qtsvg:5
-  dev-qt/qtwebkit:5
   dev-qt/qtwidgets:5
   dev-qt/qtxml:5"
 DEPEND="${RDEPEND}
diff --git a/app-text/bibletime/bibletime-2.11_rc1.ebuild b/app-text/bibletime/bibletime-2.11_rc1.ebuild
index 8e46c48..9c62736 100644
--- a/app-text/bibletime/bibletime-2.11_rc1.ebuild
+++ b/app-text/bibletime/bibletime-2.11_rc1.ebuild
@@ -19,13 +19,17 @@ RDEPEND="
   >=app-text/sword-1.7[curl]
   >=dev-cpp/clucene-0.9.16a
   dev-qt/linguist-tools:5
-  dev-qt/qtcore:5
+  || ( ( <dev-qt/qtcore-5.6.0:5
+         dev-qt/qtwebkit:5 )
+       ( >=dev-qt/qtcore-5.6.0:5
+         dev-qt/qtwebengine:5
+         dev-qt/qtwebchannel:5 )
+     )
   dev-qt/qtgui:5
   dev-qt/qtnetwork:5
   dev-qt/qtprintsupport:5
   dev-qt/qtscript:5
   dev-qt/qtsvg:5
-  dev-qt/qtwebkit:5
   dev-qt/qtwidgets:5
   dev-qt/qtxml:5"
 DEPEND="${RDEPEND}
diff --git a/app-text/bibletime/bibletime-9999.ebuild b/app-text/bibletime/bibletime-9999.ebuild
index 207b47d..a2c5643 100644
--- a/app-text/bibletime/bibletime-9999.ebuild
+++ b/app-text/bibletime/bibletime-9999.ebuild
@@ -18,13 +18,17 @@ RDEPEND="
   >=app-text/sword-1.7[curl]
   >=dev-cpp/clucene-0.9.16a
   dev-qt/linguist-tools:5
-  dev-qt/qtcore:5
+  || ( ( <dev-qt/qtcore-5.6.0:5
+         dev-qt/qtwebkit:5 )
+       ( >=dev-qt/qtcore-5.6.0:5
+         dev-qt/qtwebengine:5
+         dev-qt/qtwebchannel:5 )
+     )
   dev-qt/qtgui:5
   dev-qt/qtnetwork:5
   dev-qt/qtprintsupport:5
   dev-qt/qtscript:5
   dev-qt/qtsvg:5
-  dev-qt/qtwebkit:5
   dev-qt/qtwidgets:5
   dev-qt/qtxml:5"
 DEPEND="${RDEPEND}