gentoo Easter resync : 12.04.2020

4 files changed, 53 insertions, 67 deletions

diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 1291f5a51599..3826e06bf933 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,6 +1,5 @@
 AUX konsole-19.12.2-darkbackground-detect.patch 823 BLAKE2B 8b28b3823c2b42b9cc511c7535efc539ad869216374fb89c7a8ee17df460fbcae5fc0ca556d63cb2c39a248947aca2fcb6c49100c53985c0af032ad8a20f606a SHA512 e2a91949ff80579a50c3e16d83d493f42258cf889e443dde464f23f158428157a9b049d7bf684acf5914436dcef12b664516d8d9fd76ccf2f66d138dc0aec3dc
-DIST konsole-19.08.3.tar.xz 1147832 BLAKE2B 65d781a3a571b2c80d496c5885d517c9df89623858ce0fb6954d05eabc497add8fcc546b7994413d93de613877e30edc7bcb4944a1d95fc2c443c66d95bc0510 SHA512 140a34b8f73786557b71ac5b23b500950c598ef88795e660c7fde3077c9f5d842ae1eed73966eb14dfb54d2833fa63c310fa2cb340a81c30f31fdd77e9f263dc
-DIST konsole-19.12.2.tar.xz 1159780 BLAKE2B 6a95ac5a37f25c7ec6387ff51e9c2318bc9bf9a9460c00c646e85febca1405e26a4ebbd8ed665e759c7a8fc5357792c881fd106b3d0cccf0443d341dd4c87809 SHA512 90d0bcf53a6721fb9bc7391be961cd6ed83fdb4c6ad1517fcaf1685e0aa2c9d4a3a7755c8036b6e54f35fa087dc13d4effb076c8218e7be5c9e13da63e12b9f9
-EBUILD konsole-19.08.3.ebuild 1658 BLAKE2B 79664a72d7097627ac2835d6ea2f99e0be07f52d27e438ba3e71419b038b4625acad2f3de7ddfb0e472796a121ae2c3baa6caea9d8735b75f1cb326f229b339e SHA512 4b5476bcb5820c7538d74631d649b37b37778826641cd1397436adc29fcfb93d4b6d16998cf746e77ab986dbc5a864915f6c87626323ef604d4e38306a399d99
-EBUILD konsole-19.12.2-r1.ebuild 1736 BLAKE2B 0a71aed7c39a38cf58149aa988e98f73191d41924496edc09f1dd9b5c8fa1c3e81b7f22c63b3a2d7675cb6da934c16183e5fd884bd8bc66ba87d0af914472edf SHA512 6e7e0e182a3abd8483302b084caf3a50239cdc12fe5964a07cccb319161e12e0c1599494aa106b2f18b99d6bd15bd59faf2e40e5ff58bf524c7f4bad1275cf0d
+AUX konsole-19.12.3-no-ccache.patch 1784 BLAKE2B 39b0a9e6406a614dd49434ab0f872f9956d2f3f54e3a9fb1693f2db6aefa779ad83d8cacea0503ed3459edcfec230588f14e747fb973678c41518630f9d0ca4c SHA512 83c99ca0c6b3b3562691c5d77746c85f3ef6a736cfa573420c716cefe806138dde5737e94132488e8b2d9938f7b5052ed63ace674cef82a8a668548033b60ec7
+DIST konsole-19.12.3.tar.xz 1160780 BLAKE2B b4a6c794951081ff9354c68c1177836b8462c0e2ec19b39b08c6e90f8837b58109e5559ab93cd1f7520a6ffbbd651d0d92bcc3c359815e7264744fcfbde02cb0 SHA512 980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289
+EBUILD konsole-19.12.3.ebuild 1779 BLAKE2B 9ec486214a5937bfdaaf10fa071f2a6912e95c3e153ea41fd2cccc60e289dcc31ddb6f6108b8c3451a1b0d95539f058121fb2fc11e8358077f3c45c6e0aeecbe SHA512 a37d4007bd1ceed603fec0f10c3f90994a873844101bf472008dc893812c5a4d48563d1ac8a6494ddcbccfdc7237bd372d2cb6d437e1bb8eefc4724988ebcea8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch b/kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch
new file mode 100644
index 000000000000..9419ea5c6127
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch
@@ -0,0 +1,45 @@
+From 3529286a0a4885ad3626a4081407fb56a8a568f9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 24 Mar 2020 00:24:05 +0100
+Subject: [PATCH] Revert "CMakeLists.txt: use ccache if present"
+
+This was added for feature-parity with Meson-based projects; but an individual
+package is the wrong place for that. To avoid the proliferation of auto-
+detected ccache support in kde.org packages please submit such a proposal to
+kde-frameworks-devel instead, where it could be added for the benefit of all
+the projects using ECM. And more importantly, with a standard switch to disable
+it for packaging environments.
+
+This reverts commit 007c2a08523887cf9c0445a288ad82994bd02a57.
+
+Differential Revision: https://phabricator.kde.org/D24805
+---
+ CMakeLists.txt | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17c82b0d..45ab9f62 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,18 +17,6 @@ set (KF5_MIN_VERSION "5.6.0")
+ # Release script will create bugzilla versions
+ project(konsole VERSION ${RELEASE_SERVICE_VERSION})
+ 
+-find_program(CCACHE_FOUND "ccache")
+-set(CCACHE_SUPPORT ON CACHE BOOL "Enable ccache support")
+-if (CCACHE_FOUND AND CCACHE_SUPPORT)
+-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" # GNU is GNU GCC
+-      OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-    # without this compiler messages in `make` backend would be uncolored
+-    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto")
+-  endif()
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "ccache")
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "ccache")
+-endif()
+-
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
+ 
+-- 
+2.25.1
+
diff --git a/kde-apps/konsole/konsole-19.08.3.ebuild b/kde-apps/konsole/konsole-19.08.3.ebuild
deleted file mode 100644
index 4904b5fcf7f1..000000000000
--- a/kde-apps/konsole/konsole-19.08.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://kde.org/applications/system/konsole https://konsole.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="X"
-
-DEPEND="
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/konsole/konsole-19.12.2-r1.ebuild b/kde-apps/konsole/konsole-19.12.3.ebuild
index 3e45534a5d5a..a0cd125f570a 100644
--- a/kde-apps/konsole/konsole-19.12.2-r1.ebuild
+++ b/kde-apps/konsole/konsole-19.12.3.ebuild
@@ -16,7 +16,7 @@ https://konsole.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="
@@ -53,7 +53,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-darkbackground-detect.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch"
+	"${FILESDIR}/${P}-no-ccache.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(