gentoo resync : 15.09.2018

4 files changed, 2 insertions, 56 deletions

diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 1bf526da5a3a..4ed823d45a57 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,7 +1,5 @@
-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
+DIST kholidays-5.50.0.tar.xz 201296 BLAKE2B dbc7eee04c15d3c1832605ae0af12f56abc204219a218495499287d982560995187e420b635fcfdf2e2ad7aa296e381d4a274c5dbddf71841fd6d9c002a6b594 SHA512 019c22a2806d73fd726157854a70206c7e91cdfc8ac23a84b5c64cdbdc474fd4a7daaaecf5f0a3636790e85e8ebb86e9e5a9dd1a64a9fbd728c39ae68fe94f9e
 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
+EBUILD kholidays-5.50.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
deleted file mode 100644
index aefc8b7a977c..000000000000
--- a/kde-frameworks/kholidays/files/kholidays-5.49.0-headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index c71538e58db6..000000000000
--- a/kde-frameworks/kholidays/kholidays-5.49.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/kholidays/kholidays-5.49.0.ebuild b/kde-frameworks/kholidays/kholidays-5.50.0.ebuild
index 1fbb3b26dce1..1fbb3b26dce1 100644
--- a/kde-frameworks/kholidays/kholidays-5.49.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.50.0.ebuild