gentoo resync : 12.08.2018

4 files changed, 14 insertions, 1 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index cc3c7b000fb2..c83a71ae67e2 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 5b96d8856542..23de13cb741e 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -5,9 +5,10 @@ AUX mythbackend.service-28 2689 BLAKE2B 1141975d442d5308700d05710030114cc4c42887
 AUX mythfrontend.conf 474 BLAKE2B d81e2e91bb4a8afef746268ec832129ac6b02c27d0e7414a912a04ac2edec69ca59367d24fa8d80d5f6c8d6b0f462cb022d4307070a267e970405a9cf0448d64 SHA512 8b3967f5e7d719fefe50b8868dc1b974c3f6337335e7e65799ddb331abe07df0fadb4cb619758fefeaa0c4d0d1dac6f00e0982736cab5acac993bdaced0051c2
 AUX mythfrontend.wrapper 794 BLAKE2B f4f8cf24665f75d38d932551534c14d3d93673384719cd494abc77a308bbc1c5842965c39540ff6bdfe5fed660594acd9f9e2767fba8fa7c782ba525eb287d33 SHA512 d69676d3b981c76988bbe60277f74028668c851db7db3c37a60ecc95ae18d9f77cd38511fcd3deb95d1f87bf659d7b0bcd7f1dd469801950d28f7b3f6f6947e3
 AUX mythtv-0.28.1-glibc225.patch 927 BLAKE2B 58189108a9c823c559c5ec15caa8792ca18663e9155df5bb60ffc09e5b19cd0e6f37812dabbe0e7ced4c03d179993bd3296dff69bed4d111412b2b85ee6c14a0 SHA512 33f80de1044cd8130dfd56f3ea6478c3667cc1698953244b7427a8ee055ffac2051f0f81dacc193271ddcc705c351f6fad86fc0b107accd1c949f8aaa7275a7b
+AUX mythtv-0.28.1-qt511.patch 333 BLAKE2B ebed01a04a4e0520ff7d5ed13c032399bd72577a17ff8dd874c8cb4e277fa3738506f8ca5d788724286e99112c71d8a493b58513d8e044c413b76e318d1a07ec SHA512 05b1d0239f68ee845480e07956363225d8a8db38cce72e33d85b37fdfc0ec09af532273d349dce8d9e470470e8d9f3c90c06bff153a78995f6707c43e25b21ee
 AUX mythtv-29.2-freetype_pkgconfig.patch 973 BLAKE2B 627010fe191eb402b54a0851bb886a8ea5fbe671911b929cfb8cd0983c4496f3f992369b431f117c48ae23b775ba969e34277da11cec575e5f111f96f55c108f SHA512 bb2985ccf54b58abd47b637e7b177e9e7a0efd04751d47007c8ca3a7fc765ecc577005bb9bc3820cbfccf8ee6d964d82c05bcf03673877854a3a120c48342218
 AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46dbd7b7bc1295371b7ef451056f902d92e3209654463850d2cbca579c60d25c1f9065ac80ce3e57fa1fe8e661 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-0.28.1.tar.gz 104477892 BLAKE2B bdecfc5723ec3495ab6e49c72caaa5c2dc62c75a11ce7524d3fd5cb8daec82b53b415591b6198eab00322bbbcaff2de7d4f1b7a165d449007f4c3742a69d304b SHA512 67a81858cd19b90f519113b234119ecc248366d8545c862d887755f256cddf04d9ca16a7bf67f63e06f7628730e7dbde2a2099ca8aaeb9061b2e55a5a0b7d5e7
-EBUILD mythtv-0.28.1-r4.ebuild 10211 BLAKE2B 4bd14d0b6ab40d5e589a05f879b811680b0597fd215dbc56c9eba915a11e2326109e8c44ee15c15e3a5c39493bb9d8afebc96365b74921f162bae77c4230c5b1 SHA512 ae087896136ea63f3664a93b1cbc3207648c49b923c4e9921eb990693c25f0608a479ef88af45aee46a10f8fb71f5e5917d21ee8e539ea745a48eb66bef6a456
+EBUILD mythtv-0.28.1-r4.ebuild 10250 BLAKE2B dd97bbbdc8881c11287b945940d9bd292db1a304b4337816f92da076b7e0f66c980eea8303f1c6d4cfc29f9528ade59e4428a34fd1f1e8bf59260c8549699807 SHA512 2fe71589d6351bf8d97b2afc421c43811dc822693226d028634457e9509aee748a77a8629d7d39ddc86cd0187a319236035f0dc82f66ae1c570108d11dbd3e0e
 MISC metadata.xml 2986 BLAKE2B 8bfeb791c20052690820b02f03859a72e1de4ccba6303eee36d05bfee3b04ac204f5dc6ebd24741b39868a0e0b8fcf7875fcfb5aaaf8d855bb06be9a0d03df98 SHA512 a57d539f1f083bb69aaa0e85622862408e5afbc1eb27bfdf13b319b8104909971698ad7f51cc8978b9f5e5e4ab9e9d73b7907c61d65aba7c21867da7bfb36084
diff --git a/media-tv/mythtv/files/mythtv-0.28.1-qt511.patch b/media-tv/mythtv/files/mythtv-0.28.1-qt511.patch
new file mode 100644
index 000000000000..3fab1e6b5480
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-0.28.1-qt511.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -5907,7 +5907,7 @@
+ enabled pic && enable_weak_pic
+ 
+ is_qmake5(){
+-    $1 --version 2>&1 | egrep -q -e "Qt version 5\.[2-9]\.[0-9]"
++    $1 --version 2>&1 | egrep -q -e 'Qt version 5\.(([1-9][0-9]+)|[2-9])\.[0-9]'
+ }
+ 
+ # qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
diff --git a/media-tv/mythtv/mythtv-0.28.1-r4.ebuild b/media-tv/mythtv/mythtv-0.28.1-r4.ebuild
index b5d2925cc375..24a3c0c7042c 100644
--- a/media-tv/mythtv/mythtv-0.28.1-r4.ebuild
+++ b/media-tv/mythtv/mythtv-0.28.1-r4.ebuild
@@ -177,6 +177,7 @@ src_prepare() {
 
 	eapply "${FILESDIR}/${P}-glibc225.patch"
 	eapply -p2 "${FILESDIR}/${PN}-29.2-freetype_pkgconfig.patch" #658534
+	eapply "${FILESDIR}/${P}-qt511.patch"
 }
 
 src_configure() {