[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/

[Jimi Huotari]

commit:     f45f261f4b594a94aa6f1307e13be8eb378bff08
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 10:15:43 2018 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 10:15:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f45f261f

dev-qt/qtwebengine: remove upstreamed ICU patches from 5.9999

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 0fc2f021..32064b19 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -11,10 +11,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
-SRC_URI+=" system-icu? (
-       
https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2
-)"
-
 IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg 
+system-icu widgets"
 
 RDEPEND="
@@ -84,10 +80,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
        use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
        use system-icu && has_version ">=dev-libs/icu-59" && \
-               PATCHES+=(
-                       "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch"
-                       "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch"
-               )
+               PATCHES+=( "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch" 
)
 
        # bug 620444 - ensure local headers are used
        find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH 
+= |&$$QTWEBENGINE_ROOT/include |' || die