gentoo resync : 24.03.2019

3 files changed, 3 insertions, 40 deletions

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 8daac4c5470c..311eb64400ae 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,7 +1,6 @@
 AUX kdiff3-0.9.98_p20170219-cli-args.patch 3620 BLAKE2B c85c377a8c5898a15233f5f4a1260dbd24c50f53869e673979c9d5ac42c2729a7cad39d066e0f4b6ae2f31687aa246c9420f1803c003168eb8e9b3bd7d43ed1b SHA512 5231791c4147a6e54d784fbb39d0088dedd22d15c77c91e293bccb42046417bb32d6354a5032f5da1daa60b3ef9a46800932092b0891c58bdbc0dd9592be7a41
-AUX kdiff3-0.9.98_p20190224-clangtidy-optional.patch 1178 BLAKE2B bed1ad8015283d3fa80bc16468ac4973cf0675f734d63c660c75c4710f50fec476d1d4651fb1affd43482a9086f39e9de96d73675f4ceb26592c847afb4035c8 SHA512 32e8da69ac37e81a24018f35c99aac990602e0c27497c826067e74a8a57d92cf248d097b5c319b4d2141bba9891d892ab41a3581de4a691454237f8ea50ab268
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927 SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
-DIST kdiff3-0.9.98_p20190224.tar.gz 501286 BLAKE2B 3bb7550b2546b0e6fb57209e27777954718e0b0c03fda0fa5c24ef347b16e9669ebd98cf6718a670d96aa2b36b9fee5615807b63a2d615e13e96b5ceb91de1bf SHA512 a2c4aef6797593a127a2f7ffaf1fbbde45422a823902a3ab7bf32aeb7bd4216e52f223ee914f39035db2ce5ca6758e00581b228acf3dcf295e87feb3a6326419
+DIST kdiff3-0.9.98_p20190317.tar.gz 501849 BLAKE2B 3cfda0333293cfa032305e3431cbafb7bb66c0985c2de7ab1858e2f030b9508f4104db9148a50895db2c7eef79c758ca3e34de9fd74b10ef0aee97fd5b2498fa SHA512 b9592d072f084c4fe2dbf16e33e34e93203996dfbb86229ccebac47c1f44120e3f05c11713efc27180e361c69f45a88385a2b41a88d6bac27d390a362047b47f
 EBUILD kdiff3-0.9.98_p20170219-r1.ebuild 914 BLAKE2B 2575524af4656ebad0ca450a2ebf7039a3bd76128b14a6e9b0e9e08707ba79b4a7b328a9026ab5ebb5ac589f8539e750ce12a3a302d23e61334ba793618396ab SHA512 65821bcbcdec147a55c9b989cde2c45ea68bbf947436c890aaf3b3affc4dc0f293183f5036ac81b12e5d41e9e86cb6815edac3aff235eebaa5afa4ca93007d0c
-EBUILD kdiff3-0.9.98_p20190224.ebuild 1030 BLAKE2B 3f909979b832036b05ec7bbe55658397f78a3101c4d2583ea1c4bfe6a788f81556cc30df9ca8b38988909984adccad77058c5b63fb1a77f92e0f767bd2903bdb SHA512 4500962be0ab52a63a15cee260ef0d940c2c8377323c84e74fb2caa701019e1c326d4ae76725dc614a64a996d80719419acaeeef1c70e5d3866de19c6818c265
+EBUILD kdiff3-0.9.98_p20190317.ebuild 973 BLAKE2B 1c01110777a4cfd375cd09398ba80ed530603e7acc83eb0716432d2a630eb544a56272c2423b52595b07018dbeaff65eca76d8086202391616348c84e9d96487 SHA512 fd7c89236a670c419cd9d902f0d85a816d7ed5e9bb3501da05db999f235ef1ba04b9b1a3abaaf6583fa6775afa89fbc75288df8a193db2452356aa4bc59ba106
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
deleted file mode 100644
index a2a5f54f7d13..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 26657d8bf425415c97801fe976939329f11c3979 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 4 Mar 2019 11:21:31 +0100
-Subject: [PATCH] Optionalise clang-tidy
-
-It should not be run as part of a standard build.
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b1d72a7..2e8bad4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,6 +50,7 @@ find_package(
-     IconThemes
- )
- 
-+option(ENABLE_CLANG_TIDY "Run clang-tidy if available and cmake version >=3.6" OFF)
- 
- set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::Crash KF5::IconThemes )
- 
-@@ -68,7 +69,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- endif()
- 
- #new in cmake 3.6+ integrate clang-tidy
--if(NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
-+if(ENABLE_CLANG_TIDY AND NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
-     find_program(CLANG_TIDY_EXE NAMES "clang-tidy" "clang-tidy-7" "clang-tidy-6.0" "clang-tidy-6" DOC "Path to clang-tidy executable")
-     if(NOT CLANG_TIDY_EXE)
-         message(STATUS "clang-tidy not found disabling integration.")
--- 
-2.21.0
-
diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98_p20190317.ebuild
index 43713fc03ec4..c8deed4412f1 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20190317.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-COMMIT="5a8ebed6a30bba2e001fc5c5acc4f414d6405005"
+COMMIT="d9a7796cc8989885fec921723da0bfa88a6ae939"
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
@@ -36,6 +36,4 @@ RDEPEND="${DEPEND}
 	!kde-misc/kdiff3:4
 "
 
-PATCHES=( "${FILESDIR}/${P}-clangtidy-optional.patch" )
-
 S="${WORKDIR}/${PN}-${COMMIT}"