gentoo resync : 14.07.2018

3 files changed, 39 insertions, 2 deletions

diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index 1876f34f8337..f6767e4a3985 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,6 @@
+AUX kde-dev-utils-18.04.3-ki18n-5.48.patch 826 BLAKE2B 7b1bd3b9c427603070592e795b6df82d9ff015c717909c3b464844a4ac14ed6ef42e7865e9113240a95ff56cc6534a554f71e4ad98bdfaac8e094e81a1893b77 SHA512 d5c3206f47a8b94d3bb11bfca15613c3a2d7681c46bea68bda00529cda5ed16ba4dcb6648726459c18a980832c765e6728481e7e8403e89aca4d84ef7cbcb36b
 DIST kde-dev-utils-17.12.3.tar.xz 61000 BLAKE2B 5bdb7ddfaa792d4a74cc3d55e4c1e110c69af3393421ecbef5871a095097645be566137c2b609ec33c6d13a777e62b388d06f417859af390bfd20e33e406c0c7 SHA512 8f774d33f74eec543772db7a39b18a6a52b4fbade62d5ddad9f632c1719aca58a3a77ceb50bc4f4a96df047c3726c1f37e6e9d21b496cb6a2c082334082ae359
-DIST kde-dev-utils-18.04.2.tar.xz 61388 BLAKE2B 9fb45f3d172d66985aafa619374f855af384a0f7b785bea192960af95b69f39c1e7e6c4eff9dc206e00ebfbfff3232bd3309e601d002f840bf31e5e7c35d60fa SHA512 c72f7573422583d6ae71f35f05c21f9ed6c3bfff650bd371007061c17424f3adab1a1bc5f093fb1d5c51b95c4d0f25979b83a077b1ffec872b613d6bca72d9d2
+DIST kde-dev-utils-18.04.3.tar.xz 61300 BLAKE2B 4c5ca2a6e813146390eb65f6a4e78adf9d70873e8b97458a99786aef1892ba86864280f8e9f4db9b68b28ac17f4297362f85f96eae92294b9835094f069e7bc3 SHA512 585c9d4e7bc426fb758bd352eb1e34091bca3051fd7cd2b29f79f05bacee8804d4a794dab1d4e2329dfc3379b01fb449f406589e4010e1f2d1d065c201f81646
 EBUILD kde-dev-utils-17.12.3.ebuild 646 BLAKE2B f04cd447cd1c22b3542dded1e6beae7bdb7f49e60a9fdc27432ebc880cbe35bd69e65a2d9f252bd865597f573c5c24a4217fedf06fcec07b35315ca0184e03b6 SHA512 4e9066a4830a64b89eedce000fc0addc64ff5a832cb0060f5e02218e21d8bfc6e7197f59561c3f28ad9dba8f9fc91b9aec202922cd5821e1c4bd793bbc31d1aa
-EBUILD kde-dev-utils-18.04.2.ebuild 648 BLAKE2B 19217c351ecc0af8fa5caa88cdd12ca5ab246208a3b9a62d6fd414ada8b526da1fe805722096f977ccad904650a88cbe1dd04c0aeb5d8097d0d5c83dfc9f78dd SHA512 855dfc8e3a1cff2a81a73c1e4dc2d346870d1324c16fae618ab05c3b4d9ca1834b2c5cda2498aab16a74bb07d8494fbed2f20445702944abbc1094f50bb3a29b
+EBUILD kde-dev-utils-18.04.3.ebuild 697 BLAKE2B 68ea795f0b6d5a7e7ed212cb31e60a5f2d4590ffccb01fc5576744a6af00d966f6c8d026d69a7db73523b24987c224de155c9937638b472d5ec1296fff7792c7 SHA512 4c4289a1c48768ad9e9ffa1684ede8b4d7744f30906d7ca335456add43413993e6d5ae8a4e9e5bb72acc4a2f84a153a3a7549929a19f42045fbc706240be408c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/files/kde-dev-utils-18.04.3-ki18n-5.48.patch b/kde-apps/kde-dev-utils/files/kde-dev-utils-18.04.3-ki18n-5.48.patch
new file mode 100644
index 000000000000..3713839d32de
--- /dev/null
+++ b/kde-apps/kde-dev-utils/files/kde-dev-utils-18.04.3-ki18n-5.48.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,5 +10,8 @@
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+ include(ECMQtDeclareLoggingCategory)
+ 
++# Required for ki18n_install(po) added on tarball generation
++find_package(KF5 REQUIRED COMPONENTS I18n)
++
+ add_subdirectory(kpartloader)
+ add_subdirectory(kuiviewer)
+diff --git a/kpartloader/CMakeLists.txt b/kpartloader/CMakeLists.txt
+--- a/kpartloader/CMakeLists.txt
++++ b/kpartloader/CMakeLists.txt
+@@ -11,7 +11,6 @@
+ find_package(KF5 REQUIRED
+     COMPONENTS
+     CoreAddons
+-    I18n
+     Parts
+     WidgetsAddons
+ )
+diff --git a/kuiviewer/CMakeLists.txt b/kuiviewer/CMakeLists.txt
+--- a/kuiviewer/CMakeLists.txt
++++ b/kuiviewer/CMakeLists.txt
+@@ -15,7 +15,6 @@
+     COMPONENTS
+     CoreAddons
+     KIO
+-    I18n
+     Parts
+ )
+ 
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.2.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.04.3.ebuild
index fd428260d4a6..2db803cad042 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.2.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-18.04.3.ebuild
@@ -27,3 +27,5 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!<kde-apps/kde4-l10n-17.03.90:4
 "
+
+PATCHES=( "${FILESDIR}/${P}-ki18n-5.48.patch" )