From 721254b86a09bdedd5eefd0de7899c90ea2ead1a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 Jan 2018 20:42:22 +0000 Subject: gentoo resync : 01.01.2018 --- kde-misc/Manifest.gz | Bin 5799 -> 5805 bytes kde-misc/basket/Manifest | 3 +- kde-misc/basket/basket-2.49a_p20170225-r1.ebuild | 72 +++++++++++++++++++++ kde-misc/basket/basket-2.49a_p20170225.ebuild | 70 -------------------- .../files/basket-2.49a_p20170225-fixes.patch | 61 +++++++++++++++++ kde-misc/zanshin/Manifest | 2 + kde-misc/zanshin/zanshin-0.4.1_p20171231.ebuild | 63 ++++++++++++++++++ 7 files changed, 200 insertions(+), 71 deletions(-) create mode 100644 kde-misc/basket/basket-2.49a_p20170225-r1.ebuild delete mode 100644 kde-misc/basket/basket-2.49a_p20170225.ebuild create mode 100644 kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch create mode 100644 kde-misc/zanshin/zanshin-0.4.1_p20171231.ebuild (limited to 'kde-misc') diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz index 634027e7803e..1a9dd4ef349d 100644 Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ 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-r1.ebuild b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild new file mode 100644 index 000000000000..6effe58212f8 --- /dev/null +++ b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +COMMIT="8de0345d99f3eb08d9406bd07e88b31afe46f315" +KDE_TEST="true" +KDE_HANDBOOK="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 vcs-snapshot + +DESCRIPTION="A DropDrawers clone. Multiple information organizer" +HOMEPAGE="http://basket.kde.org/ https://github.com/basket-notepads/basket" +SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="amd64 x86" +IUSE="crypt git" + +RDEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kfilemetadata) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + media-libs/phonon[qt5(+)] + x11-libs/libX11 + crypt? ( app-crypt/gpgme ) + git? ( dev-libs/libgit2 ) +" +DEPEND="${RDEPEND} + $(add_qt_dep qtconcurrent) +" + +PATCHES=( "${FILESDIR}/${P}-fixes.patch" ) + +src_prepare() { + kde5_src_prepare + if ! use test; then + sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package crypt Gpgme) + $(cmake-utils_use_find_package git Libgit2) + ) + kde5_src_configure +} diff --git a/kde-misc/basket/basket-2.49a_p20170225.ebuild b/kde-misc/basket/basket-2.49a_p20170225.ebuild deleted file mode 100644 index 7666068bfbb8..000000000000 --- a/kde-misc/basket/basket-2.49a_p20170225.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -COMMIT="8de0345d99f3eb08d9406bd07e88b31afe46f315" -KDE_TEST="true" -KDE_HANDBOOK="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 vcs-snapshot - -DESCRIPTION="A DropDrawers clone. Multiple information organizer" -HOMEPAGE="http://basket.kde.org/ https://github.com/basket-notepads/basket" -SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="crypt git" - -RDEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kfilemetadata) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - x11-libs/libX11 - crypt? ( app-crypt/gpgme ) - git? ( dev-libs/libgit2 ) -" -DEPEND="${RDEPEND} - $(add_qt_dep qtconcurrent) -" - -src_prepare() { - kde5_src_prepare - if ! use test; then - sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package crypt Gpgme) - $(cmake-utils_use_find_package git Libgit2) - ) - kde5_src_configure -} 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 +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 @@ + +-BasKet"> + + +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}) + diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest index 8ae93a143679..484c8f3bb7a4 100644 --- a/kde-misc/zanshin/Manifest +++ b/kde-misc/zanshin/Manifest @@ -1,3 +1,5 @@ DIST zanshin-0.4.1_p20170701.tar.xz 358700 BLAKE2B cda820dab0234568f94aa1511fbb542eca921a3bd78b4f3f85e5e14147c8326041163b76448982703a3e043e2f9f7d099f41208b6d09d6cf492e2c8d73e8079c SHA512 f4725e72e3444f16df18058abeb3edd3056a95eee47b6321171043e9445886caacc18ba7f7aa8b346e41c099e36c0ce068cf709dd03c2ed78f35bab30b2a56fa +DIST zanshin-0.4.1_p20171231.tar.gz 490747 BLAKE2B 3c90f7213b5f588cea1c11754a5b49e1fa38172be62eb10025c803a554a7e5084daf0196ac3f3319abcedd1b2474dc12f4445e9a4b72ae7ffffa27f9682ce791 SHA512 ec5e2af0c4169de67838eee74cd8acc43265b0b7a368b9c5998cf96112d1294e35e31c57c9e52f7ec1c7f39a660d1d8665b70fe4b471bdea3e0ac14bad906603 EBUILD zanshin-0.4.1_p20170701.ebuild 1658 BLAKE2B df378985562224066908ce88da6697ebad67cfc3ab78b0427f2c063b7862451a96480296f7229a2a6fe35d8de87dfd12854e41081349639932868f08fa358b2d SHA512 e08e7f259a96c337795d6c54a0b06ecaf1a9d8842b49ee9ae64d02f0947349e47e03554beb5571dd65118d02e0f712c7b10ab932f01f8f5612ff51d7329ff4c4 +EBUILD zanshin-0.4.1_p20171231.ebuild 1764 BLAKE2B 82bcae56b49fdb0f0c632a1f8db4ffebab39cf16e6a22b0ecb55dbc811074538814cfd46bf58bbcc495d5fdec260273702b51bc77dd26c924a3adee22e79ed54 SHA512 6d812e0e9a8923344afdf9db96f7f29073c829986af9422ad9bd114293dc305e981c6c9cdc6f605c362b87b2623c2e87189a09a1a5818d6be0aa103540104e19 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-misc/zanshin/zanshin-0.4.1_p20171231.ebuild b/kde-misc/zanshin/zanshin-0.4.1_p20171231.ebuild new file mode 100644 index 000000000000..70204ef4d2c8 --- /dev/null +++ b/kde-misc/zanshin/zanshin-0.4.1_p20171231.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +COMMIT=6239128a6c6693e71def64e9782f31bdd9621d19 +KDE_APPS_MINIMAL="17.12.0" +KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 vcs-snapshot + +DESCRIPTION="Getting things done application by KDE" +HOMEPAGE="https://zanshin.kde.org/" +SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="|| ( GPL-2 GPL-3 )" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# FIXME: bundles libkdepim +COMMON_DEPEND=" + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kparts) + $(add_frameworks_dep krunner) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_kdeapps_dep akonadi) + $(add_kdeapps_dep akonadi-calendar) + $(add_kdeapps_dep akonadi-contacts) + $(add_kdeapps_dep akonadi-notes) + $(add_kdeapps_dep akonadi-search) + $(add_kdeapps_dep kcalcore) + $(add_kdeapps_dep kcontacts) + $(add_kdeapps_dep kidentitymanagement) + $(add_kdeapps_dep kldap) + $(add_kdeapps_dep kmime) + $(add_kdeapps_dep kontactinterface) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwidgets) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + test? ( $(add_kdeapps_dep akonadi 'tools') ) +" +RDEPEND="${COMMON_DEPEND} + !kde-misc/zanshin:4 + $(add_kdeapps_dep kdepim-runtime) +" -- cgit v1.2.3