commit: f7493160af6b9efeeb7649c9bba1da2a87a95988 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Mar 20 14:01:45 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Mar 20 14:02:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7493160
kde-misc/kdiff3: Drop 0.9.98_p20190224 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-misc/kdiff3/Manifest | 1 - ...diff3-0.9.98_p20190224-clangtidy-optional.patch | 34 ------------------ kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild | 41 ---------------------- 3 files changed, 76 deletions(-) diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index e99fcd53f34..795f4022597 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,3 +1,2 @@ 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 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 a2a5f54f7d1..00000000000 --- 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 <[email protected]> -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_p20190224.ebuild deleted file mode 100644 index 43713fc03ec..00000000000 --- a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -COMMIT="5a8ebed6a30bba2e001fc5c5acc4f414d6405005" -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="Frontend to diff3 based on KDE Frameworks" -HOMEPAGE="https://userbase.kde.org/KDiff3"; -SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kparts) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND} - sys-apps/diffutils - !kde-misc/kdiff3:4 -" - -PATCHES=( "${FILESDIR}/${P}-clangtidy-optional.patch" ) - -S="${WORKDIR}/${PN}-${COMMIT}"
