gentoo resync : 25.08.2018

9 files changed, 79 insertions, 3 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index faeea0bc80dc..137baf0a15fc 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 9b56d6046379..63468e2f8a3e 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,5 +1,6 @@
+AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
 DIST extra-cmake-modules-5.46.0.tar.xz 317056 BLAKE2B c67e5a4d207cb5fd3f7ff7d0e2dd16c5a0a44c562c0a9c0b7eac3a54930ae59b6fd8b36d7a464e7d03950c44c101befc57825f8ee2f23b35e3f7ddc792d5267e SHA512 6431ad8e5230bbc0a5e1199037102014c376a682d711211b257359c35c8a3aaddb6128277721ca40cedf43fcca77312a2754f306487a1b3dbea728d643f0ad3a
 DIST extra-cmake-modules-5.49.0.tar.xz 323488 BLAKE2B a15972adbc6a810aa3c2cb8a1919a9ec61117691e7eb232bc79e392850348d1ab6071ec9a320974fcf6f35f61bf1d8b0b8ea00ab9164acc2107b8e1b297b7251 SHA512 ed9925d4096f79241bc915b065a48b3a5cda78e53f6f2514d453232aabbfbe83e0b700040ef811bb9043567d5304e9681ba218b9a948685114c12b6dc6108279
 EBUILD extra-cmake-modules-5.46.0.ebuild 1275 BLAKE2B 26d0cbbedbb94bdd3a120927ddc53fecade47a421da8a4d0a44e59a35931a577ea20c5eb41da2fc4c2cfbb215b124bc9d7494b6e14941b57b3b77671819ac678 SHA512 617e537fb35c8d79db273839da20dc16bc94aa245a9cc9e292f6a651cc2bd7ba75a9a399e01211613040d785e68720c0a83af80988384898f76d39a13ba2a999
-EBUILD extra-cmake-modules-5.49.0.ebuild 1279 BLAKE2B ebde1e71c55192ad5cf4647cf14059dcd04d0463d0215b4f4f72ff9afbed908b9a385cfc1a229d6ee721743f06f2c02235b15d9f4067f8a872a8223ac49cce59 SHA512 bc872ce6523cb5d5391113eab1526ed6dbf7755ea0f93ce0701e114ac43d378f5153f1114d18494a24d644b00dcd19d2b5f0f63f1c7267a3b371f2f9e7d4bc93
+EBUILD extra-cmake-modules-5.49.0-r1.ebuild 1343 BLAKE2B 6734190613d2bf2b4d981206b7cba91be7366b227a82b1237681789343df7e688eef25d2b1b8da0a7f1a455968e09815d7e41df9f9d78fd812503cd0c2c50e44 SHA512 3949b9b497d6be87617bda80444dea100bc2e3d005c22000ed548b135c26ab702952b5ac981e07f7c19ca469da19af50749f22ac777bff06c83ceb69c64599a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild
index 376fd4315892..7003678df8f5 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild
@@ -31,6 +31,8 @@ RDEPEND="
 	app-arch/libarchive[bzip2]
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
+
 python_check_deps() {
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch
new file mode 100644
index 000000000000..f71d19d5fc86
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch
@@ -0,0 +1,19 @@
+Avoid triggering a build failure with GCC8 and ld.gold producing warnings.
+
+Bug: https://bugs.gentoo.org/663512
+
+diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
+index 44358fb..0270aa5 100644
+--- a/kde-modules/KDECompilerSettings.cmake
++++ b/kde-modules/KDECompilerSettings.cmake
+@@ -344,8 +344,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR
+         (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) OR
+         (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
+     # Linker warnings should be treated as errors
+-    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
+-    set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
++#    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
++#    set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
+ 
+     # Do not allow undefined symbols, even in non-symbolic shared libraries
+     set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 84b42d62eea9..1bf526da5a3a 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,7 @@
+AUX kholidays-5.49.0-headers.patch 562 BLAKE2B c2546bad6dc0128db13c367db0f0b6c028f06f95a639326e6cc21e7d96a29ab17ceab20fc27559653a80c3eb07de3732072fa896c17bfe54fc82b16119c79fb7 SHA512 4cc9414b096dc54a54d0f156d9ce237a9c4bd87fe8facb2d6dbdebbfcdc0631bbe8f7f61f2fd6d4b816f17d247a510d382f095208d0ff1715f276b41d2ab65a6
 DIST kholidays-5.46.0.tar.xz 199124 BLAKE2B 0b4eab230fe53cb21307b73cee70a9d1b89c5dbc4f1302ae5c048f60569f659c91ab1b7560ae9dd47d125cb1e802dd89d52d91bb8eb069b6bc228baf67c1e80f SHA512 c94bff75cea9df8654407b92d87947204cbf2111925d46d5384e7174f7f47960a226f3b85864f3adbc4b3c3255e439bc139b192b05cf32483b6f1e3de0840df2
 DIST kholidays-5.49.0.tar.xz 199772 BLAKE2B 18d7652018d4be00f2b1e56f9c233a5113eeb1d737a00bee37aeae9f2a557d8a2be8ff0fb1f277d4cc8a237e63f343a1b0d0fb6f3eb1c42ff8a0d2aa4be8c0e3 SHA512 f64607c874456f2a289d9af2629f838b6d32a3c5af89c261f4010db63ece90513194ee6770170aa06e75f9c99abbd8292425d7164bcb57d89c3a77b1e14344ad
 EBUILD kholidays-5.46.0.ebuild 668 BLAKE2B 046e3b683238030503ebf6be077ac139057a0ff676cf80a4cd0a801296c89e0baa106e2563e5f20fbe9830b51978155cecb78caeddb25011c5dc0d685099cbbb SHA512 313514359845f736fc0d3a516221de4e8ecb7fc1e6b9971cd8a859fb243cf71a03b58177de3a3bf18086025f018146f2998351170130f35dfad0c36ad9074749
+EBUILD kholidays-5.49.0-r1.ebuild 716 BLAKE2B 813a85a27851d88d4f1fb0677855072bd64fcece95d5d07a298fdc9a3fe13c0f2ae6a6f23af97aa2e94e2704442d82e75d389f4cf6a9b2ec8d6c330a66ec94ab SHA512 777fea88a489424f7d233d9ff359c31cf4c7f0bfedd1f18abc34c1507a9951c0b7a598cc9b92194c4ec5591a1233fde6360a09f8fad052b11d9e1c0ec906f55c
 EBUILD kholidays-5.49.0.ebuild 670 BLAKE2B aa850acd6bce28b47d064561f1a3e0344baa720921879a38d107de29e62180968f010924c0f8becf8ad41de42c5e6d7437adfffc2014a8ed19cf9c42c206fb6c SHA512 1faa2d177e7748b81fa92464a6b2150aee7ac79feb86dd65a2775d14acaf65b0524b0d3a5eb094be435aa23dd90b1dfac5a6456386ed83ede4dcae8183938ecb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kholidays/files/kholidays-5.49.0-headers.patch b/kde-frameworks/kholidays/files/kholidays-5.49.0-headers.patch
new file mode 100644
index 000000000000..aefc8b7a977c
--- /dev/null
+++ b/kde-frameworks/kholidays/files/kholidays-5.49.0-headers.patch
@@ -0,0 +1,20 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ )
+ 
+ add_library(KF5Holidays ${kholidays_SRCS})
+-generate_export_header(KF5Holidays BASE_NAME kholidays)
++generate_export_header(KF5Holidays BASE_NAME KHolidays)
+ 
+ add_library(KF5::Holidays ALIAS KF5Holidays)
+ 
+@@ -59,7 +59,6 @@
+ install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/kholidays_export.h
+   ${KHolidays_HEADERS}
+-  ${KHolidays_CamelCase_HEADERS}
+   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KHolidays/kholidays
+   COMPONENT Devel
+ )
diff --git a/kde-frameworks/kholidays/kholidays-5.49.0-r1.ebuild b/kde-frameworks/kholidays/kholidays-5.49.0-r1.ebuild
new file mode 100644
index 000000000000..c71538e58db6
--- /dev/null
+++ b/kde-frameworks/kholidays/kholidays-5.49.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdeclarative)
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kholidays:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-headers.patch" )
+
+src_test() {
+	# bug 624214
+	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
+	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
+	kde5_src_test
+}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 84238bc61026..8db440fb10ec 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,5 @@
 DIST kirigami2-5.46.0.tar.xz 316028 BLAKE2B 89673cce2423d98e9c7d80dbee487aa001de65ef32b984f0394b442f2dcb4ab84ad5e58df76affe47f4dbec6ef165a148d67cc66461e894bea648d4345e15c9b SHA512 06adddbe7db2c734707ba2d121b3fd9f5fb36a9fe38c9af926d051efb52158f7b970eebc06b1f23c8ff7af936a8f8c210b1beb5e384207a29915e872d4a2de8b
 DIST kirigami2-5.49.0.tar.xz 326532 BLAKE2B a2689340a102bfbbc7ea503998f7a62f28266ac526429790e09139743d81c7a7627a4793f43b58cddfe32fc61ea31352f3ed93654c400504d195ba129f7e381f SHA512 61a97106f6929ceb149816e02189a7fe4e2ba3f6265f6715ece36b35268238da0ba125779ecaa6b4764c680b1c3f488e95d605076102bb953a18b4830909d5c1
 EBUILD kirigami-5.46.0-r1.ebuild 933 BLAKE2B 561bd233a9e94d585c5c79f52ffc243a523736dc4b39a26731394039a32197661f9679f95ee7a76076a06247be3d5211ee4386fb55bd84cfb4b58bd54e256f48 SHA512 e937f977fae02bf5091b7760251cb136a05fce439d2149653a533995b46df96707f3c893521f08c667645ae39ae299b1ae5f72f7fa1a26332adfe332c3b911c1
-EBUILD kirigami-5.49.0.ebuild 935 BLAKE2B 716ff4a224086f76f11bafb98382aa12d4a6932250291f219b05a5f849580105493208221d63cf809cef11b91a5004c9c0efd4a275f817e870527952aa441ee0 SHA512 4837cf73ffc2413af6ca663c54f692250e363de54f4a3be73b5432e5c5671d045199f116476f81718cf9a98cd66fda6456189d92bc60b403b55289799b3c6b13
+EBUILD kirigami-5.49.0.ebuild 931 BLAKE2B cce782cfebc87cfd92f988d36f6578f07dc4eeccbbd13b40c2af1bc018e19ec26fc206e9eb179d7e712afbe8e0ba5148f3af4a33ff3e68bdbce954f63e9b5586 SHA512 d912d50311aaec847be7ffdf0f94422248d9ea659938afc57f509a691eeac66bfe20353c724609b340d1eee9d3cb6eb2477f9a75798a912d8366fdca47747846
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.49.0.ebuild b/kde-frameworks/kirigami/kirigami-5.49.0.ebuild
index 202e831c2807..ad65ba9e2fa4 100644
--- a/kde-frameworks/kirigami/kirigami-5.49.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.49.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 KDE_EXAMPLES="true"
 KDE_QTHELP="false"
-KDE_TEST="optional"
+KDE_TEST="true"
 KMNAME="${PN}2"
 inherit kde5