gentoo resync : 24.12.2018

4 files changed, 57 insertions, 6 deletions

diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 432af0713d72..8c6e4370372b 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,6 @@
-DIST konqueror-18.04.3.tar.xz 7694900 BLAKE2B fa20f95abee369084796785b622056b759c3acf11f6feee597a0ac788c9d64740283f6bb4e45150b2eb52f4de8689f1e66d3c4f3cf1e8f6d50ead6eae8900e16 SHA512 c55c0bf0f97c5ecaa73c7c56e2fd236642620b9256ef6f7dc3bd922b8d590e33c2524ea154d8308fc9dac9196e5cac3bf08d109565afa756ee6d54264ee4ab3b
+AUX konqueror-18.08.3-tidyhtml5.patch 1645 BLAKE2B 9c9edb5f6cf7f40bcce3764c3c778752baeb27b9df55efbba96db603be61f5a1d01257538abaa8ee44e59d13d0942fdf8afd16860018c07c9c232ec7d2538b90 SHA512 98e13b59d94b65dc163827f0b8b85ee8b4d02afa794ff5e3156a6b7ab0a996df3958fe272e766b5799daf1c5cbb746f48c520f01d6a808f0ce19925d3a95e38c
 DIST konqueror-18.08.3.tar.xz 7742624 BLAKE2B 13b4ee924a3ba1f5373c35676ac940ff446aa5d4beb34fc32b34afc80387695e270543ad720a541c249ef560dc04e87b067a7377986778348c5ffb0dcab1e8a9 SHA512 ac7f03c03e8fed6c052350654d7248c35832d8b13ab325afc7d48e1beb321c3016ff57c434e7121fedc12a9e52780390cdcbe2745c290bb52a5f2dab64a7113c
-EBUILD konqueror-18.04.3-r1.ebuild 2995 BLAKE2B 4c5f270217b06f782ef1930aa9c14f6bc52b189d860207e7ef0acf86a2edaceca9a581519e1892aba73e438f703e17d629ee7f556fee0a965de77858efe4ed5c SHA512 8b7016e5b2f365b18269c6df9195768f30250a2111072a05791ff9f74b845f7a6e82ebc5cfceb199d55664d119182e6c2e160c815cabf60d2b22a0cf151d9f0b
-EBUILD konqueror-18.08.3.ebuild 2994 BLAKE2B f7476f99c10a5c3e004f868f5ef2b46bbe36ddf26fff9c9eb96a7ee99d17b766829853e2d021862d2ee9a5d34d03253810e55129ef0404365b1c15ae62adc03c SHA512 d679ec7403089a025db446a3c9b738b6f09f60a5f8fda346f209139f43d4c273d82ff05724d93f7a64b3d66b19e0c3351e7bf1af9bc9a84c6e50a75d720dff80
+DIST konqueror-18.12.0.tar.xz 7756100 BLAKE2B 8c95aca3fe46c634a0e8de7c43b8cc826fb038b66a847f51a151cb3a16c459ca4f974f32ea668ac5a247ab2aa73cd55e7d1801362c8429fcee743cbb65d412ec SHA512 045b26702c098591ee09556becdc338f8f359b316cfb0433f4035666ff74d88f8fe6482bbfc00df53d50fef60623b29b943ae380abc1a0b5f6c508203672f3c0
+EBUILD konqueror-18.08.3-r1.ebuild 3042 BLAKE2B 8765eea7e54e670282d66e40c1339618e6dc897525772e12aff82bb2e7397e957e40a3e67bb949cf3304b765e67ba01fb94548e6e906eda65ae417649dc63da5 SHA512 60f46ee94d108bd849ee942a49e5113cb5528ea528e5baeec9d6320331845b51c70382d616b14acd30ed40f33c6907715f71f177f1704caa0c758aaadf132e47
+EBUILD konqueror-18.12.0.ebuild 3053 BLAKE2B 1cbe146f7d3850de1b525954a4b464b5a5dd439f6cb7a39dfda8cd4fab6ae1f977163c2c6d98d2d128556d7e02248ac6b0537015770bdc0f3900e4b45082d2ae SHA512 53a0418b201fb22dca2a7fd70b10744e604a9bf8a591abbbfc07f322c1a3eaac8a0dfb32afe717650e393ed55e7f408f7b418a332da6f64e6068c0689facb654
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
new file mode 100644
index 000000000000..dae1486d5807
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
@@ -0,0 +1,46 @@
+From 29955abce07526d01f3298da9d2f15bd9eb5e6f4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 18 Nov 2018 18:07:32 +0100
+Subject: [PATCH] Switch to tidy-html5 and use tidybuffio.h instead of buffio.h
+
+Summary: Header was renamed a few years ago.
+
+Test Plan: Builds and validates fine.
+
+Reviewers: #konqueror
+
+Differential Revision: https://phabricator.kde.org/D16982
+---
+ plugins/validators/CMakeLists.txt     | 2 +-
+ plugins/validators/tidy_validator.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/validators/CMakeLists.txt b/plugins/validators/CMakeLists.txt
+index cf3b70694..7f6060e9c 100644
+--- a/plugins/validators/CMakeLists.txt
++++ b/plugins/validators/CMakeLists.txt
+@@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
+ find_package(LibTidy)
+ find_package(KF5 REQUIRED KHtml WidgetsAddons IconThemes)
+ set_package_properties(LibTidy PROPERTIES DESCRIPTION "HTML Tidy"
+-                       URL "http://tidy.sourceforge.net"
++                       URL "http://www.html-tidy.org/"
+                        TYPE OPTIONAL
+                        PURPOSE "Gives the Konqueror validators plugin the ability to validate HTML"
+                       )
+diff --git a/plugins/validators/tidy_validator.cpp b/plugins/validators/tidy_validator.cpp
+index 3247199f9..ac22429d0 100644
+--- a/plugins/validators/tidy_validator.cpp
++++ b/plugins/validators/tidy_validator.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include <kdebug.h>
+ 
+-#include <buffio.h>
++#include <tidybuffio.h>
+ #include <tidy.h>
+ 
+ #include <config-konq-validator.h>
+-- 
+2.19.1
+
diff --git a/kde-apps/konqueror/konqueror-18.04.3-r1.ebuild b/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild
index fa56ec002dee..a735711ee864 100644
--- a/kde-apps/konqueror/konqueror-18.04.3-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	sys-libs/zlib
 	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/htmltidy )
+	tidy? ( app-text/tidy-html5 )
 	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 	X? ( $(add_qt_dep qtx11extras) )
 "
@@ -66,6 +66,8 @@ RDEPEND="${COMMON_DEPEND}
 	!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-tidyhtml5.patch" )
+
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
diff --git a/kde-apps/konqueror/konqueror-18.08.3.ebuild b/kde-apps/konqueror/konqueror-18.12.0.ebuild
index 9d8010e34005..503376e9dc64 100644
--- a/kde-apps/konqueror/konqueror-18.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-18.12.0.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	sys-libs/zlib
 	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/htmltidy )
+	tidy? ( app-text/tidy-html5 )
 	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 	X? ( $(add_qt_dep qtx11extras) )
 "
@@ -66,6 +66,8 @@ RDEPEND="${COMMON_DEPEND}
 	!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-18.08.3-tidyhtml5.patch" )
+
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc