gentoo resync : 24.12.2018

4 files changed, 56 insertions, 5 deletions

diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index dd21c19cc590..812edb7de176 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,6 @@
-DIST knotifyconfig-5.50.0.tar.xz 83784 BLAKE2B 1d56f7f57cbd78ce7f1cc3f3a5dc6db25b525de5b709292ce6c7d81a5bc8645914216ad73b72e04055f41039ef5c98859da4f0ccf6ad0ddbed772fde7c6ccb4d SHA512 1a00c395e2cc52b3215a4e8d87e1b4d376f4b5f4b4ef0a4afd48ec776924314604549d9b6b0d3514e70a090643fdc8f30be405593f108f2cdf05ecd7c9a920c4
+AUX knotifyconfig-5.53.0-phonon-optional.patch 1473 BLAKE2B 10feddd1082c2a14f55f70ebf464f9e41abc7cbb8b1c8b811c623e3ffaa61feb3350b4f09b30f2e69a33356a081be84fa23410ae6130c98af7e920bab3447921 SHA512 3c841ec69d8ee9b50dd010258487fac1cf7d8f15894b36ce3c8534f5b7793100b8719ca21728d3fee56ea51c1260fd57f646d0f1ae76597e7758846d809ad646
 DIST knotifyconfig-5.52.0.tar.xz 83572 BLAKE2B c1cfaeb01460005592b2efccd4623249dded6e5d629f9287d99fef224f47e9c903cb6f4c29110a45795597aa5fd425e8d5d4a83926753dece7ef847c7e2e7aa5 SHA512 ee02d6d54b4f35d6142b742397962d9d64925893da69d41b5faa2f9993fbddcf438e11a54417fc55f9e3f0ee4177559ef55817eaa860c4dccfce86ed6b481e58
-EBUILD knotifyconfig-5.50.0.ebuild 533 BLAKE2B e2263c67ccd2731b3b70951bc65a484b56e946a06a37b650c4a86b31d1eb4229c56f131bbff401d9a155dfe36b9fa26bed2850e9f4526aec46cf9dac6859f42f SHA512 13ba145e32d3ae2f192ac8d62f6eea5b5c1b16ad5a94630efa98659790379b33a558d5473fed38ba6683137a7aeddb9f4387a96a09113aa758efd2d2b9310b23
-EBUILD knotifyconfig-5.52.0.ebuild 535 BLAKE2B cb84fb874b5d14c92934ed8da305bba00a1f874c28a6b7e940ae199e2e2707276bdd04646f13778d2616242ca3571438393fcb5e48150acd713c1cf63cb499c7 SHA512 acc9f0b3efd3981aa993491f207c6802e5b1deff63926bca1a53b26f2d52b2b789476d1d7269a528a58558c4f6dcdc236f5336e7ae4d5833576c021d4d12f139
+DIST knotifyconfig-5.53.0.tar.xz 83544 BLAKE2B 5788992eb5ef448c40ad21b9b628e02f0516719a97431b28374b65845350047b4a00fad03a40278718a26d1ae3f02b33f072d95ca8f1ada92187c195ec325176 SHA512 5f54556c57559707905f5e7ef684004dce7354bb11387bc19e38da91bcfd6ea1edbf65b97b31926f3613e9db98efc013987daaa74a821564f57cbb91a88f1c36
+EBUILD knotifyconfig-5.52.0.ebuild 533 BLAKE2B e2263c67ccd2731b3b70951bc65a484b56e946a06a37b650c4a86b31d1eb4229c56f131bbff401d9a155dfe36b9fa26bed2850e9f4526aec46cf9dac6859f42f SHA512 13ba145e32d3ae2f192ac8d62f6eea5b5c1b16ad5a94630efa98659790379b33a558d5473fed38ba6683137a7aeddb9f4387a96a09113aa758efd2d2b9310b23
+EBUILD knotifyconfig-5.53.0.ebuild 589 BLAKE2B b3014715520ecc986dabfa0274404146f9327783f86e7ddd5f429bf55481381236ae831724fece69c640fd09b6caf8c375d580a252f4102fb2dee56d332d2461 SHA512 1b75df77ed408bb93dd9382664f3f4336168caf690be67c9591a1e1b68c4b728330a024bf80ef903a9eb6fd5bd7efc6cfe597eb17efdadd9f6c8a992e9315a65
 MISC metadata.xml 344 BLAKE2B c11bdb097349febc683046711b82d656d79473ecef4d5d539c71b458f4dc5e9b7f0ced04d5fd59fcdf14377a22591130c85f47a0041d2bf4096675c9c6b802fe SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221
diff --git a/kde-frameworks/knotifyconfig/files/knotifyconfig-5.53.0-phonon-optional.patch b/kde-frameworks/knotifyconfig/files/knotifyconfig-5.53.0-phonon-optional.patch
new file mode 100644
index 000000000000..0854b76da840
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/files/knotifyconfig-5.53.0-phonon-optional.patch
@@ -0,0 +1,48 @@
+From 78a1dcc794f57be993ada7c6f129586ebb6b181e Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Mon, 10 Dec 2018 16:15:08 +0100
+Subject: Fix build without Phonon
+
+Summary:
+f6d55baf5aa88eaab6b2f96c025064f081d13cea replaced ${PHONON_LIBS} with
+Phonon's imported target. This breaks in the case when Phonon isn't
+found or disabled via -DCMAKE_DISABLE_FIND_PACKAGES_Phonon4Qt5=TRUE
+because the imported target isn't known. It worked previously because
+${PHONON_LIBS} was just empty when Phonon wasn't available.
+
+Test Plan:
+Building without phonon works now and and it still builds
+with phonon available and successfully links to it.
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D17479
+---
+ src/CMakeLists.txt | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3dd0039..b93cabc 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -27,9 +27,15 @@ target_link_libraries(KF5NotifyConfig
+         PRIVATE
+             KF5::I18n
+             KF5::KIOWidgets     # KUrlRequester
+-            Phonon::phonon4qt5
+             Qt5::DBus)
+ 
++if(HAVE_PHONON)
++    target_link_libraries(KF5NotifyConfig
++        PRIVATE
++            Phonon::phonon4qt5
++    )
++endif()
++
+ set_target_properties(KF5NotifyConfig PROPERTIES
+    VERSION      ${KNOTIFYCONFIG_VERSION_STRING}
+    SOVERSION    ${KNOTIFYCONFIG_SOVERSION}
+-- 
+cgit v1.1
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.52.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.52.0.ebuild
index 7c834ad4baff..2ac79566cf47 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.52.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.52.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for configuring desktop notifications"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="phonon"
 
 RDEPEND="
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.50.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.53.0.ebuild
index 2ac79566cf47..65aca3a9a07b 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.50.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.53.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for configuring desktop notifications"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="phonon"
 
 RDEPEND="
@@ -22,3 +22,5 @@ RDEPEND="
 	phonon? ( media-libs/phonon[qt5(+)] )
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-phonon-optional.patch" )