gentoo resync : 01.01.2018

3 files changed, 66 insertions, 2 deletions

diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index 4d8b4960f625..02f3ea3e3226 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,3 +1,4 @@
+AUX basket-2.49a_p20170225-fixes.patch 2428 BLAKE2B 1b1ed57b33d819ac8bde1f4d26b768c69b2414a90363dcbb83ed92378124cf9c46980c3999e6cc8295114f4eb956a298e0a62b9f53e17927d9f2d3657ba32539 SHA512 52aa945f6994fce6c6204ae3893ccc7c656a1c97aeee85062328f7d9f8fdadc354abc0307865b0b2053a1d2da6c95fd1431d9c1e15f699acdd333c16dc1bd27b
 DIST basket-2.49a_p20170225.tar.gz 4680129 BLAKE2B f6a7acc8b83596815a79f9dd73879f9471d2a9ae9096d521ef98faeaaa2f3f2c6dc46c05ed0097fa1b20cf66479b5127b625eb60b0257fb1579bfc1d73f2e989 SHA512 87d454d33bfa881ac5958a4d02c5775b8d54e83c6b86e1b2732565132b2d0339be630a3ab0bbd0169da950aa43750e4088add45a94ce10fd3ffa05e0b3e26b1c
-EBUILD basket-2.49a_p20170225.ebuild 1858 BLAKE2B 8972e1432a0979fa12bd0af9dd153777a8f24732b6e1b89b626b5b1a393f716a481a0f899902859776a73ec94fe2a57ac168db7d24c0d03aa7f1997cd08b4dce SHA512 342a60a4b9f0d930d7442fc054f251f4a8638085dffbce8194aa63e521d228ca63be7a08c6533752cd1bb4712ca093b2747d3867d88f7395348a7701688c803d
+EBUILD basket-2.49a_p20170225-r1.ebuild 1902 BLAKE2B e2476253e623c07caac40c7477802049f63ad91b3af4573c6aece440fda941cd1b901f6c31a961d058f3916f11a1a1bbc3d7ea31ae76e51af369ec8410850d6f SHA512 3d0012399a25791fe9f3a0bb5d4ebd3e40d669aff4889e1fcf078f0de1401c52c9e8e87d581417c4cad52f5b60986d54dfa51b956ec4d414e427530099e4be89
 MISC metadata.xml 336 BLAKE2B 0a9704885fd7a47cb2b0b01f51baf34c3cfac7eefcfb06c4328d83aa51b4909e5ad20a29ffc7df79df38d01d1a86e37ece806a0f905714eb0e86a29f12e2aade SHA512 8c2e68454f9153eefec98b4c918de8390de6e3384b0d3339b64bcbe54592e582c933a372852444f031fe0574e4d1ad3e4b6fcd80fe9f610cd6624e13eaec3eb0
diff --git a/kde-misc/basket/basket-2.49a_p20170225.ebuild b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
index 7666068bfbb8..6effe58212f8 100644
--- a/kde-misc/basket/basket-2.49a_p20170225.ebuild
+++ b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,6 +54,8 @@ DEPEND="${RDEPEND}
 	$(add_qt_dep qtconcurrent)
 "
 
+PATCHES=( "${FILESDIR}/${P}-fixes.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	if ! use test; then
diff --git a/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch b/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch
new file mode 100644
index 000000000000..82ca2e8e26e1
--- /dev/null
+++ b/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch
@@ -0,0 +1,61 @@
+From 26e8fe568123cc957ea500c4b747f44fa8193edc Mon Sep 17 00:00:00 2001
+From: Gleb Baryshev <gleb.baryshev@gmail.com>
+Date: Sun, 13 Aug 2017 21:37:52 +0300
+Subject: [PATCH] Fix KF5 issues
+
+#33 Library has wrong versioning (libbasketcommon.so.SOVERSION)
+#34 Translations are not properly used
+#35 Documentation still requires kdelibs4support for dtd/ktex.dtd
+---
+ CMakeLists.txt       | 3 +++
+ doc/en/index.docbook | 4 ++--
+ src/CMakeLists.txt   | 4 ++--
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2997365e..7b54ace3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,6 +92,9 @@ ENDIF(GPGME_FOUND)
+ 
+ #TODO: find meinproc
+ 
++#Make libbasketcommon search for translations in basket.mo
++ADD_DEFINITIONS(-DTRANSLATION_DOMAIN=\"basket\")
++
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ 
+diff --git a/doc/en/index.docbook b/doc/en/index.docbook
+index ddef489a..586014e8 100644
+--- a/doc/en/index.docbook
++++ b/doc/en/index.docbook
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
+   <!ENTITY basket "<application>BasKet</application>">
+   <!ENTITY % addindex "IGNORE">
+   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9ea886d5..f4cf523f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -59,7 +59,7 @@ IF(HAVE_BALOO)
+   list(INSERT basketcommon_LIB_SRCS 10 nepomukintegration.cpp)
+ ENDIF(HAVE_BALOO)
+ 
+-qt5_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui)
++ki18n_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui)
+ 
+ QT5_ADD_DBUS_ADAPTOR(basketcommon_LIB_SRCS org.basket.BNPView.xml bnpview.h BNPView)
+ 
+@@ -93,7 +93,7 @@ IF(HAVE_BALOO)
+   target_link_libraries(basketcommon KF5::BalooFiles)
+ ENDIF(HAVE_BALOO)
+ 
+-set_target_properties(basketcommon PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
++set_target_properties(basketcommon PROPERTIES VERSION ${Qt5Core_VERSION} SOVERSION ${Qt5Core_VERSION_MAJOR})
+ 
+ install(TARGETS basketcommon DESTINATION ${LIB_INSTALL_DIR})
+