aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2016-04-09 17:46:04 +0200
committerDavide Pesavento <pesa@gentoo.org>2016-04-09 17:46:51 +0200
commitfb28a66aaf9dd756bdefdba7b8be4f6a3d75a7c5 (patch)
treece7119707d33d3c385c80fd0549c1c884d9027da
parentqt5-build.eclass: drop 5.4 support (diff)
downloadqt-fb28a66aaf9dd756bdefdba7b8be4f6a3d75a7c5.tar.gz
qt-fb28a66aaf9dd756bdefdba7b8be4f6a3d75a7c5.tar.bz2
qt-fb28a66aaf9dd756bdefdba7b8be4f6a3d75a7c5.zip
dev-qt/qtwebkit: re-manifest and remove syncqt call
Upstream replaced the 5.6.0 tarball with one that fixes the screwup of bug 577574. So update the Manifest and drop the workaround from the ebuild. Gentoo-Bug: 579352 Package-Manager: portage-2.2.28
-rw-r--r--dev-qt/qtwebkit/Manifest2
-rw-r--r--dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild5
2 files changed, 2 insertions, 5 deletions
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 03306a23..e64eb239 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,2 +1,2 @@
-DIST qtwebkit-opensource-src-5.6.0.tar.xz 35301228 SHA256 d5c4daac8eef1b24290cda59db432ccc390761af17661f64f3028482647521a1 SHA512 eb4c073f9270cc3d48947df931536d5df91229aacc83a74b096252d4a9368bf23a56118ef63ad05d7d8360bb67708578ba8aa100fb041cf87216ba3c203e9844 WHIRLPOOL 8266d2a5af7337b449a904873f5fdce69d02755cd786e848f2550afee71ecff36957f96ae352670a7572e25d655b68e8a125663ef8f858f1f5dfaa0e06d65f5f
+DIST qtwebkit-opensource-src-5.6.0.tar.xz 35302972 SHA256 9ca72373841f3a868a7bcc696956cdb0ad7f5e678c693659f6f0b919fdd16dfe SHA512 d9a2d10960cbdf8cf144f1cdaebf52ff95a6ad70b94b19c9ffcd0dd653d98c1e1fab6516e7dc481a4d199af5fb98d36ac41a309e10b96ada0e18f581946bb1af WHIRLPOOL 851174164ed88d3edbffe78b95d3808809f035379a9b2210baad36bbf0f14376f33356c9c84f720c450776aca98bf7bcdf27c3624ccdb96bd3bdc34ec7804dcb
DIST qtwebkit-opensource-src-5.7.0-alpha.tar.xz 35300100 SHA256 088834e1e54d6f39eb4e5eed22fc4a2ce617f64d2a811c3ccfb523216311bfa2 SHA512 5ccdf3eff3b3079a8ad55cb0c707820368a43679a1f6537fe16400e86d41a8f5e85fe96df14f91255d15280cbb673ef72cdcbac349ec3c08928a02c481f8552d WHIRLPOOL b0890bf10661180d4c9253c2a02f7d020dc003fcf0ea9875a895fd1d5f0e42c5b010d61898b0baee3aef4a82759a2abbb6d8430d0a7076757c1c7d57efbe373c
diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
index 89f2921d..58876f11 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qmake-utils qt5-build
+inherit python-any-r1 qt5-build
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
@@ -105,8 +105,5 @@ src_prepare() {
# bug 458222
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
- # bug 577574
- "$(qt5_get_bindir)"/syncqt.pl -version ${PV%_*} Source/sync.profile || die
-
qt5-build_src_prepare
}