From: Andreas Sturmlechner Date: Sun, 7 May 2017 15:17:55 +0000 (+0200) Subject: kde-apps: Drop KDE PIM 4.14.11_pre20160211 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9794aac65db36b79cd49c6222e49461bdbdd3ad0;p=gentoo.git kde-apps: Drop KDE PIM 4.14.11_pre20160211 Package-Manager: Portage-2.3.5, Repoman-2.3.1 --- diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest index 88f8a5bfdf9e..0067953f51cd 100644 --- a/kde-apps/akonadiconsole/Manifest +++ b/kde-apps/akonadiconsole/Manifest @@ -1,3 +1,2 @@ DIST akonadiconsole-17.04.0.tar.xz 185444 SHA256 6dccfa21b11149f9786a30800aec191c24c1c0a846e92b4474fe8bf4c3fe4d05 SHA512 e59181f4e2b4f431c8ceba2ad4683815ffd067e6afec06a09ec2404ade719552d36dd11d3dbe78b004f88cd5da5f6895986b41083aaad0da91dca328a70a98fd WHIRLPOOL d67cd0e95488aac19698928aa8abf5c1811c6ebd139c31aafcf8017fb02c7769bf44369da81e82234f36541d7f5c23c705fa39c6ed4c2784a9ea18e0c138419a -DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5 diff --git a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild deleted file mode 100644 index 6a8cbc637a1e..000000000000 --- a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KMNAME="kdepim" -EGIT_BRANCH="KDE/4.14" -inherit kde4-meta - -DESCRIPTION="Akonadi developer console" -COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9" -SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz" - -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="debug" - -DEPEND=" - $(add_kdeapps_dep kdepimlibs 'akonadi(+)') - $(add_kdeapps_dep kdepim-common-libs) - kde-apps/akonadi:4 -" -RDEPEND="${DEPEND}" - -KMEXTRACTONLY=" - akonadi_next/ - calendarsupport/ - messageviewer/ -" diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest index bccefa473e4f..38336866312a 100644 --- a/kde-apps/akregator/Manifest +++ b/kde-apps/akregator/Manifest @@ -1,4 +1,3 @@ DIST akregator-17.04.0.tar.xz 2254720 SHA256 a5c6389d7a6f83a81b3cb062653c667272df596215650c6fbd817a3a42f7fbb6 SHA512 6544fe124a6e82e6af06e66a8997f3cee3ae10fc993c9cad0a007b2c342d626a866794f4b060d0f019a5fbc345903c50a35ba9069b5de08cdd233ba46b4356b6 WHIRLPOOL 402e852db5cd2209782cee11625ec7d538ec6b63550144cbee3b33e091067e84da9dcb9db360d1871a308baeec8889051f15856db7a7ed9cd10d3862dbc687ca -DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a diff --git a/kde-apps/akregator/akregator-4.14.11_pre20160211.ebuild b/kde-apps/akregator/akregator-4.14.11_pre20160211.ebuild deleted file mode 100644 index c1cc1ddc6bd1..000000000000 --- a/kde-apps/akregator/akregator-4.14.11_pre20160211.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KMNAME="kdepim" -EGIT_BRANCH="KDE/4.14" -inherit kde4-meta - -DESCRIPTION="KDE news feed aggregator" -HOMEPAGE="https://www.kde.org/applications/internet/akregator" -COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9" -SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz" - -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="debug" - -DEPEND=" - $(add_kdeapps_dep kdepimlibs 'akonadi(+)') - $(add_kdeapps_dep kdepim-common-libs) -" -RDEPEND="${DEPEND}" - -KMLOADLIBS="kdepim-common-libs" diff --git a/kde-apps/blogilo/Manifest b/kde-apps/blogilo/Manifest index a452155db0d9..19f213572dfd 100644 --- a/kde-apps/blogilo/Manifest +++ b/kde-apps/blogilo/Manifest @@ -1,4 +1,3 @@ DIST blogilo-17.04.0.tar.xz 804220 SHA256 ab3951df4a110ef6d8ffcaf2f5c99da0df45239e983a9fdcdaabe8e864d83b6d SHA512 9f576294e62f04a2eeaa1652917d92faeaf54dc0d474032277e7aa3619f3f9b8418bda6b44c620e4cdb38cba6dacf31c1e5e11ddc55c5159ef1288cb9f03348e WHIRLPOOL 8568079bc31642aa6dcfff1180524d3f31a361fb857b26616850873665ae5541da93b008d3470ee51f2baabbdc2d932cccfcda237f0795c19bf240dfe676589a -DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a diff --git a/kde-apps/blogilo/blogilo-4.14.11_pre20160211.ebuild b/kde-apps/blogilo/blogilo-4.14.11_pre20160211.ebuild deleted file mode 100644 index 3482082e795d..000000000000 --- a/kde-apps/blogilo/blogilo-4.14.11_pre20160211.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KMNAME="kdepim" -EGIT_BRANCH="KDE/4.14" -inherit kde4-meta - -DESCRIPTION="KDE Blogging Client" -HOMEPAGE="https://www.kde.org/applications/internet/blogilo" -COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9" -SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz" - -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="debug" - -DEPEND=" - $(add_kdeapps_dep kdepim-common-libs) - $(add_kdeapps_dep kdepimlibs 'akonadi(+)') - $(add_kdeapps_dep libkgapi '' 2.2.0) -" -RDEPEND="${DEPEND}" - -KMEXTRACTONLY=" - composereditor-ng/ - pimcommon/ -" diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest index e65b6ef00c26..67c5e6c5df49 100644 --- a/kde-apps/calendarjanitor/Manifest +++ b/kde-apps/calendarjanitor/Manifest @@ -1,3 +1,2 @@ DIST akonadi-calendar-tools-17.04.0.tar.xz 221520 SHA256 3578d824b54055f80404fde67e0ede910a7cb6aa22ec215673a178124daa6468 SHA512 27595ad1ed647858c70b9d9b4e3e32e8d5107fb1123d7c50ea49a7601f3db6b2c8d1d3b32c8818d756dec841a7650d5706d7aca29a4081f46f54b16aa96f3290 WHIRLPOOL 673a8099f7c6560a67c25cae31776a5c802cd35f9fdaac93c449fc00f3af36db0498bb713cfee9234f694db4fc69a1a711e12f8c48b89583bec3d367e1252e30 -DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5 diff --git a/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160211.ebuild b/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160211.ebuild deleted file mode 100644 index e5220e683970..000000000000 --- a/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160211.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KMNAME="kdepim" -EGIT_BRANCH="KDE/4.14" -KMMODULE="console/${PN}" -inherit kde4-meta - -DESCRIPTION="A tool to scan calendar data for buggy instances" -HOMEPAGE="https://www.kde.org/" -COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9" -SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz" - -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="debug" - -DEPEND=" - $(add_kdeapps_dep kdepim-common-libs) - $(add_kdeapps_dep kdepimlibs 'akonadi(+)') -" -RDEPEND="${DEPEND}" - -KMEXTRACTONLY=" - calendarsupport/ -" - -KMLOADLIBS="kdepim-common-libs" diff --git a/kde-apps/gpgmepp/Manifest b/kde-apps/gpgmepp/Manifest index c16eba243037..37423552ac16 100644 --- a/kde-apps/gpgmepp/Manifest +++ b/kde-apps/gpgmepp/Manifest @@ -1,3 +1,2 @@ DIST gpgmepp-16.08.3.tar.xz 68576 SHA256 bfc44e36d410e131c57ad6f3a18d761056e3dd6b589d2da2d4df575f5614aa69 SHA512 d159f9d1fe532769260e2a00abd3e236de1f0503e1aec822b724736ffcfe625720595674ba4b32911906a391bd66281850c6ac4a519b889a8973d638399e815f WHIRLPOOL 0c6106a0cff8e5799640f3f009a72409a6dabbfc1edbe72a27e0b1fa217b660ba8423ba68b3a0dd481284ed12e275c7b30397e62d870a2aaee93f6d21fb647c9 -DIST kdepimlibs-4.14.11_pre20160211.tar.gz 4300730 SHA256 3c2559987871761ac13185b0ffa9f7575fe0a5c2e00950b433b25edea7ec47fd SHA512 d0977a5387b0937d850fb3adc8c0bc8086ddb0894d238272f0586e53cc8a157a50b7e6d4aeb97a7fb944521de4f8978a23f172a6bf1b8e6afbbba5a183832b1c WHIRLPOOL 28bdf9c93de2c500fe2c1264c8dff42cc816d414d6b15820bc6c6aaaafc0fe67008ce13b678e0c41ac6780863e94eccb43ab18beb4c052230cad312f4530f58d DIST kdepimlibs-4.14.11_pre20160611.tar.xz 2860084 SHA256 15ebde0f9683f42b89dc2ad6656bc71bf516e2b885333cc5438891217e59ddd4 SHA512 19560362f07328f3743b5aabdef74a55e3ac7f8016f1bb6d63aa792985b9b0c4d3f34e979df6022df31623ffb7f701c90f9262a70cc9326596429ff1395c4f6d WHIRLPOOL cddf5beb57f66e19b60baa896ba08879c1537d44cb35fb33776c439461411a1e0b07ec03229bc1d4a6d086235e50c19022411fe1d2a56d7901d8a6e9c1fbcbd0 diff --git a/kde-apps/gpgmepp/files/kdepimlibs-4.14.11-boostincludes.patch b/kde-apps/gpgmepp/files/kdepimlibs-4.14.11-boostincludes.patch deleted file mode 100644 index 1b5cdcb52e46..000000000000 --- a/kde-apps/gpgmepp/files/kdepimlibs-4.14.11-boostincludes.patch +++ /dev/null @@ -1,15 +0,0 @@ -Make sure that the Boost headers are actually found, since they are -referenced in the kdepimlibs headers. -Patch by Alex Turbov, see https://bugs.kde.org/show_bug.cgi?id=306323 - ---- a/KdepimLibsConfig.cmake.in.org 2012-08-13 12:46:24.000000000 +0400 -+++ b/KdepimLibsConfig.cmake.in 2012-09-06 08:53:53.000000000 +0400 -@@ -15,7 +15,7 @@ - set(KDEPIMLIBS_DBUS_INTERFACES_DIR "@KDEPIMLIBS_DBUS_INTERFACES_DIR@") - set(KDEPIMLIBS_DBUS_SERVICES_DIR "@KDEPIMLIBS_DBUS_SERVICES_DIR@") - set(KDEPIMLIBS_INCLUDE_DIR "@KDEPIMLIBS_INCLUDE_DIR@") --set(KDEPIMLIBS_INCLUDE_DIRS "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE") -+set(KDEPIMLIBS_INCLUDE_DIRS "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE" "@Boost_INCLUDE_DIR@") - set(KDEPIMLIBS_LIB_DIR "@KDEPIMLIBS_LIB_DIR@") - set(KDEPIMLIBS_BIN_DIR "@KDEPIMLIBS_BIN_DIR@") - set(KDEPIMLIBS_LIBEXEC_DIR "@KDEPIMLIBS_LIBEXEC_DIR@") diff --git a/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160211.ebuild b/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160211.ebuild deleted file mode 100644 index 0d979eda7bbe..000000000000 --- a/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160211.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KMNAME="kdepimlibs" -EGIT_BRANCH="KDE/4.14" -inherit kde4-base - -DESCRIPTION="C++ bindings for gpgme" -COMMIT_ID="a791b69599c3571ff2f4b1cc9033d8fb30f1bc33" -SRC_URI="https://quickgit.kde.org/?p=kdepimlibs.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz" - -KEYWORDS="amd64 x86" -LICENSE="LGPL-2.1" -IUSE="debug" - -DEPEND=" - >=app-crypt/gpgme-1.1.6 - >=dev-libs/boost-1.35.0-r5:= - dev-libs/libgpg-error -" -# boost is not linked to, but headers which include it are installed -# bug #418071 -RDEPEND="${DEPEND} - !kde-apps/kdepimlibs:4 -" - -PATCHES=( "${FILESDIR}/kdepimlibs-4.14.11-boostincludes.patch" ) - -S=${WORKDIR}/${KMNAME} - -src_prepare() { - cmake_comment_add_subdirectory kmime - kde4-base_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_doc=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Prison=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Ldap=ON - -DKDEPIM_ONLY_KLEO=ON - -DKDEPIM_NO_KCAL=ON - -DKDEPIM_NO_KRESOURCES=ON - ) - - kde4-base_src_configure -} - -src_install() { - kde4-base_src_install - - # Collisions with kdepimlibs:4 - rm -f "${ED}"usr/share/apps/cmake/modules/CheckTimezone.cmake \ - "${ED}"usr/share/apps/cmake/modules/Find{Ldap,Libical,QtOAuth}.cmake \ - "${ED}"usr/share/doc/"${PF}"/{akonadi,kabc,kalarmcal,kresources,kxmlrpcclient}.README* \ - "${ED}"usr/share/doc/"${PF}"/{kabc,kmime,kresources,mailtransport}.TODO* \ - "${ED}"usr/share/doc/"${PF}"/kabc.HACKING* \ - "${ED}"usr/share/doc/"${PF}"/ktnef.AUTHORS || die -} diff --git a/kde-apps/kabcclient/Manifest b/kde-apps/kabcclient/Manifest index 2da6ebd9cbd4..2e6c7bd033f5 100644 --- a/kde-apps/kabcclient/Manifest +++ b/kde-apps/kabcclient/Manifest @@ -1,3 +1,2 @@ -DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a diff --git a/kde-apps/kabcclient/kabcclient-4.14.11_pre20160211.ebuild b/kde-apps/kabcclient/kabcclient-4.14.11_pre20160211.ebuild deleted file mode 100644 index 3fce87698a89..000000000000 --- a/kde-apps/kabcclient/kabcclient-4.14.11_pre20160211.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KMNAME="kdepim" -EGIT_BRANCH="KDE/4.14" -KMMODULE="console/${PN}" -inherit kde4-meta - -DESCRIPTION="Command line client for accessing the KDE addressbook" -COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9" -SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz" - -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="debug" - -DEPEND=" - $(add_kdeapps_dep kdepimlibs 'akonadi(+)') -" -RDEPEND="${DEPEND}" - -src_install() { - kde4-meta_src_install - - # work around NULL DT_RPATH in kabc2mutt - dosym kabcclient /usr/bin/kabc2mutt -} diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest index 0fce347b4f2b..b183d9adf00e 100644 --- a/kde-apps/kaddressbook/Manifest +++ b/kde-apps/kaddressbook/Manifest @@ -1,4 +1,3 @@ DIST kaddressbook-17.04.0.tar.xz 561852 SHA256 9f50478678b2b9073b8bc9ca3de5d8174d9d08aba2e9af248d78451b85edf4e1 SHA512 db9f61c87721ed3c4ace8b4063ab34fce31402e2f8c5c9c1a108cbee3e34c3af2de48b9f30b82edf0d81d3bd8006743cded1632a53fbab5c09f3de4f8fe9b095 WHIRLPOOL 40952cd3ab27f4103a5509a25b7a5318fdfa5713ceeaaed143f2c0324ccb39c82c8bc64d8747927364e721a6c9d1eb86c5692281513bb7ba7688d154efa6dd83 -DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a diff --git a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211.ebuild b/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211.ebuild deleted file mode 100644 index 6c56b30617e3..000000000000 --- a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KMNAME="kdepim" -EGIT_BRANCH="KDE/4.14" -inherit kde4-meta - -DESCRIPTION="The KDE Address Book" -HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/" -COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9" -SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz" - -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="debug" - -DEPEND=" - $(add_kdeapps_dep kdepimlibs 'akonadi(+)') - $(add_kdeapps_dep kdepim-common-libs) - dev-libs/grantlee:0 - !kde-base/contactthemeeditor -" -RDEPEND="${DEPEND} - !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3 -" - -KMEXTRA=" - grantleeeditor/contactthemeeditor - plugins/kaddressbook/ - plugins/ktexteditor/ -" -KMCOMPILEONLY=" - grantleetheme/ - kaddressbookgrantlee/ -" -KMEXTRACTONLY=" - akonadi_next/ - calendarsupport/ - grantleeeditor/grantleethemeeditor/ - libkleo/ - pimcommon/ -" - -KMLOADLIBS="kdepim-common-libs" - -pkg_postinst() { - kde4-meta_pkg_postinst - - if ! has_version kde-apps/kdepim-kresources:${SLOT}; then - echo - elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}" - echo - fi -} diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest index 3d7e1abd6058..1549c2e1c19a 100644 --- a/kde-apps/kalarm/Manifest +++ b/kde-apps/kalarm/Manifest @@ -1,4 +1,3 @@ DIST kalarm-17.04.0.tar.xz 1823760 SHA256 e7911fee91804f9e401a11ac0423f0a2fe5e04741146dcdcf08053c7cba30bff SHA512 1c7eba06e9998addb1ca36375f556f2ffbc401acaf8a6240b14ff245ec52eddfa503ea2ccfa608b743522c1e3787d9a5f4f6488e67803552cad1519efd907545 WHIRLPOOL 10b45398ced32722439925399ed6b6f9a7ef68725cae1b5e73593a8de643feb86e7ced15de7183b1cf0a205bd59b2ca205d691423aefd8173b0fbde196ec00d1 -DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a diff --git a/kde-apps/kalarm/kalarm-4.14.11_pre20160211.ebuild b/kde-apps/kalarm/kalarm-4.14.11_pre20160211.ebuild deleted file mode 100644 index 96418a1d4227..000000000000 --- a/kde-apps/kalarm/kalarm-4.14.11_pre20160211.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KMNAME="kdepim" -EGIT_BRANCH="KDE/4.14" -inherit kde4-meta - -DESCRIPTION="Personal alarm message, command and email scheduler by KDE" -HOMEPAGE+=" https://userbase.kde.org/KAlarm" -COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9" -SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz" - -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="debug" - -RDEPEND=" - $(add_kdeapps_dep kdepimlibs 'akonadi(+)') - $(add_kdeapps_dep kdepim-common-libs) - $(add_kdeapps_dep ktimezoned) - media-libs/phonon[qt4] - x11-libs/libX11 -" -DEPEND="${RDEPEND}" - -KMEXTRACTONLY=" - kmail/ -" diff --git a/kde-apps/kdepim-common-libs/Manifest b/kde-apps/kdepim-common-libs/Manifest index e440cd850115..4684ba427675 100644 --- a/kde-apps/kdepim-common-libs/Manifest +++ b/kde-apps/kdepim-common-libs/Manifest @@ -1,2 +1 @@ -DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5 diff --git a/kde-apps/kdepim-common-libs/files/install-composereditorng.patch b/kde-apps/kdepim-common-libs/files/install-composereditorng.patch deleted file mode 100644 index 37dc26c3f4b0..000000000000 --- a/kde-apps/kdepim-common-libs/files/install-composereditorng.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/composereditor-ng/CMakeLists.txt 2013-02-25 03:16:44.129528884 +0000 -+++ b/composereditor-ng/CMakeLists.txt.new 2013-02-25 03:18:48.016192479 +0000 -@@ -58,8 +58,8 @@ - install(TARGETS composereditorng ${INSTALL_TARGETS_DEFAULT_ARGS} ) - install( FILES data/composereditorinitialhtml DESTINATION ${DATA_INSTALL_DIR}/composereditor ) - --#install( FILES --# composereditor_export.h --# composereditor.h --# DESTINATION ${INCLUDE_INSTALL_DIR}/composereditorng COMPONENT Devel ) -+install( FILES -+ composereditor_export.h -+ composereditor.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/composereditorng COMPONENT Devel ) - diff --git a/kde-apps/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch b/kde-apps/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch deleted file mode 100644 index f0037beac4cd..000000000000 --- a/kde-apps/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch +++ /dev/null @@ -1,86 +0,0 @@ -Install headers needed by Kopete's cryptography plugin. - -Patch borrowed from Fedora. - -diff --git a/libkleo/CMakeLists.txt b/libkleo/CMakeLists.txt -index 84e660f..bfb92f8 100644 ---- a/libkleo/CMakeLists.txt -+++ b/libkleo/CMakeLists.txt -@@ -124,3 +124,61 @@ install ( FILES libkleopatrarc-win32.desktop DESTINATION ${CONFIG_INSTALL_DIR} R - else () - install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc ) - endif () -+ -+install( FILES -+ kleo/kleo_export.h -+ kleo/enum.h -+ kleo/oidmap.h -+ kleo/cryptobackend.h -+ kleo/cryptobackendfactory.h -+ kleo/cryptoconfig.h -+ kleo/dn.h -+ kleo/job.h -+ kleo/keylistjob.h -+ kleo/keygenerationjob.h -+ kleo/abstractimportjob.h -+ kleo/importjob.h -+ kleo/importfromkeyserverjob.h -+ kleo/exportjob.h -+ kleo/changeexpiryjob.h -+ kleo/changeownertrustjob.h -+ kleo/downloadjob.h -+ kleo/deletejob.h -+ kleo/encryptjob.h -+ kleo/decryptjob.h -+ kleo/signjob.h -+ kleo/specialjob.h -+ kleo/verifydetachedjob.h -+ kleo/verifyopaquejob.h -+ kleo/decryptverifyjob.h -+ kleo/signencryptjob.h -+ kleo/signkeyjob.h -+ kleo/adduseridjob.h -+ kleo/refreshkeysjob.h -+ kleo/multideletejob.h -+ kleo/hierarchicalkeylistjob.h -+ kleo/keyfilter.h -+ kleo/keyfiltermanager.h -+ kleo/changepasswdjob.h -+ kleo/checksumdefinition.h -+ kleo/exception.h -+ kleo/kconfigbasedkeyfilter.h -+ kleo/listallkeysjob.h -+ kleo/stl_util.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel) -+ -+install ( FILES -+ ui/kdhorizontalline.h -+ ui/messagebox.h -+ ui/progressbar.h -+ ui/progressdialog.h -+ ui/keylistview.h -+ ui/keyselectiondialog.h -+ ui/keyrequester.h -+ ui/keyapprovaldialog.h -+ ui/dnattributeorderconfigwidget.h -+ ui/cryptoconfigmodule.h -+ ui/cryptoconfigdialog.h -+ ui/directoryserviceswidget.h -+ ui/filenamerequester.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel) -diff --git a/libkpgp/CMakeLists.txt b/libkpgp/CMakeLists.txt -index 4be58ba..de868ad 100644 ---- a/libkpgp/CMakeLists.txt -+++ b/libkpgp/CMakeLists.txt -@@ -35,3 +35,11 @@ add_subdirectory( tests ) - install(FILES kconf_update/kpgp.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) - install(PROGRAMS kconf_update/kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) - -+install(FILES -+ kpgp.h -+ kpgpbase.h -+ kpgpblock.h -+ kpgpkey.h -+ kpgpui.h -+ libkpgp_export.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel ) diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r1.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r1.ebuild deleted file mode 100644 index 0fcd4f30030a..000000000000 --- a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KMNAME="kdepim" -EGIT_BRANCH="KDE/4.14" -KMNOMODULE="true" -WEBKIT_REQUIRED="always" -inherit kde4-meta - -DESCRIPTION="Common libraries for KDE PIM apps" -COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9" -SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz" - -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="debug google" - -DEPEND=" - $(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r3) - app-crypt/gpgme - dev-libs/grantlee:0 - kde-apps/akonadi:4 - kde-frameworks/baloo:4 - google? ( $(add_kdeapps_dep libkgapi '' 2.2.0) ) -" -RDEPEND="${DEPEND} - !kde-apps/libkdepim:4 - !kde-apps/libkleo:4 - !kde-apps/libkpgp:4 - !kde-apps/kdepimlibs-4.14.11_pre20160211-r3 - ! -Date: Sun Mar 5 18:28:45 2017 +0100 - - Adapt to >=gpgme-1.8.0, need for -phtread is gone - -diff --git a/cmake/modules/FindGpgme.cmake b/cmake/modules/FindGpgme.cmake -index 5da9a60..268314a 100644 ---- a/cmake/modules/FindGpgme.cmake -+++ b/cmake/modules/FindGpgme.cmake -@@ -11,12 +11,12 @@ - # - GPGME_INCLUDES is the same for all of the above - # - GPGME_FOUND is set if any of the above was found - # - *nix: --# There's also three variants: gpgme{,-pthread,-pth}. -+# There's also two variants: gpgme{,-pth}. - # - The variant used determines the multithreaded use possible: --# - gpgme: no multithreading support available --# - gpgme-pthread: multithreading available using POSIX threads -+# - gpgme: >=GpgME-1.8.0 multithreading support available - # - gpgme-pth: multithreading available using GNU PTH (cooperative multithreading) --# - GPGME_{VANILLA,PTH,PTHREAD}_{FOUND,LIBRARIES} will be set for each of the above -+# - GPGME_{VANILLA,PTH}_{FOUND,LIBRARIES} will be set for each of the above -+# - GPGME_PTHREAD_{FOUND,LIBRARIES} will be set for legacy compatibility - # - GPGME_INCLUDES is the same for all of the above - # - GPGME_FOUND is set if any of the above was found - # -@@ -164,7 +164,7 @@ else() # not WIN32 - if ( _seem_to_have_cached_gpgme ) - - macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_VANILLA_FOUND ) -- macro_bool_to_bool( GPGME_PTHREAD_LIBRARIES GPGME_PTHREAD_FOUND ) -+ macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_PTHREAD_FOUND ) - macro_bool_to_bool( GPGME_PTH_LIBRARIES GPGME_PTH_FOUND ) - - if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND ) -@@ -189,7 +189,7 @@ else() # not WIN32 - - exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION ) - -- set( _GPGME_MIN_VERSION "1.1.7" ) -+ set( _GPGME_MIN_VERSION "1.7.99" ) - if( ${GPGME_VERSION} VERSION_GREATER ${_GPGME_MIN_VERSION} ) - set( _GPGME_INSTALLED_VERSION_OK TRUE ) - endif() -@@ -207,7 +207,7 @@ else() # not WIN32 - set( _gpgme_config_vanilla_libs ) - endif() - -- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret ) -+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret ) - if ( _ret ) - set( _gpgme_config_pthread_libs ) - endif() -@@ -294,7 +294,7 @@ else() # not WIN32 - # This comment above doesn't make sense, the four following lines seem to do nothing. Alex - set( GPGME_INCLUDES ${GPGME_INCLUDES} ) - set( GPGME_VANILLA_LIBRARIES ${GPGME_VANILLA_LIBRARIES} ) -- set( GPGME_PTHREAD_LIBRARIES ${GPGME_PTHREAD_LIBRARIES} ) -+ set( GPGME_PTHREAD_LIBRARIES ${GPGME_VANILLA_LIBRARIES} ) - set( GPGME_PTH_LIBRARIES ${GPGME_PTH_LIBRARIES} ) - - if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND ) -@@ -319,7 +319,7 @@ else() # not WIN32 - - macro_bool_to_01( GPGME_FOUND HAVE_GPGME ) - macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_VANILLA ) -- macro_bool_to_01( GPGME_PTHREAD_FOUND HAVE_GPGME_PTHREAD ) -+ macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_PTHREAD ) - macro_bool_to_01( GPGME_PTH_FOUND HAVE_GPGME_PTH ) - - endif() # WIN32 | Unix -diff --git a/cmake/modules/FindQGpgme.cmake b/cmake/modules/FindQGpgme.cmake -index 50013eb..4d94af6 100644 ---- a/cmake/modules/FindQGpgme.cmake -+++ b/cmake/modules/FindQGpgme.cmake -@@ -12,13 +12,8 @@ find_package(Gpgme QUIET) - - if(GPGME_FOUND) - -- if ( WIN32 ) -- find_library(_QGPGME_EXTRA_LIBRARY gpgme++ -- HINTS ${GPGME_LIBRARY_DIR}) -- else ( WIN32 ) -- find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread -- HINTS ${GPGME_LIBRARY_DIR}) -- endif() -+ find_library(_QGPGME_EXTRA_LIBRARY gpgme++ -+ HINTS ${GPGME_LIBRARY_DIR}) - - find_library(QGPGME_LIBRARY qgpgme - HINTS ${GPGME_LIBRARY_DIR}) -@@ -34,7 +29,7 @@ if(GPGME_FOUND) - if ( WIN32 ) - set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES} ${GPGME_QT_LIBRARIES}) - else ( WIN32 ) -- set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_PTHREAD_LIBRARIES}) -+ set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES}) - endif() - - endif() diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966-r1.patch b/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966-r1.patch deleted file mode 100644 index 9bea5726d037..000000000000 --- a/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966-r1.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 176fee25ca79145ab5c8e2275d248f1a46a8d8cf Mon Sep 17 00:00:00 2001 -From: Montel Laurent -Date: Fri, 30 Sep 2016 15:55:35 +0200 -Subject: [PATCH] Backport avoid to transform as a url when we have a quote - ---- - kpimutils/linklocator.cpp | 30 +++++++++++++++++++++++++++--- - kpimutils/linklocator.h | 3 ++- - 2 files changed, 29 insertions(+), 4 deletions(-) - -diff --git a/kpimutils/linklocator.cpp b/kpimutils/linklocator.cpp -index f5d9afd..f30e8fc 100644 ---- a/kpimutils/linklocator.cpp -+++ b/kpimutils/linklocator.cpp -@@ -95,6 +95,12 @@ int LinkLocator::maxAddressLen() const - - QString LinkLocator::getUrl() - { -+ return getUrlAndCheckValidHref(); -+} -+ -+ -+QString LinkLocator::getUrlAndCheckValidHref(bool *badurl) -+{ - QString url; - if ( atUrl() ) { - // NOTE: see http://tools.ietf.org/html/rfc3986#appendix-A and especially appendix-C -@@ -129,13 +135,26 @@ QString LinkLocator::getUrl() - - url.reserve( maxUrlLen() ); // avoid allocs - int start = mPos; -+ bool previousCharIsADoubleQuote = false; - while ( ( mPos < (int)mText.length() ) && - ( mText[mPos].isPrint() || mText[mPos].isSpace() ) && - ( ( afterUrl.isNull() && !mText[mPos].isSpace() ) || - ( !afterUrl.isNull() && mText[mPos] != afterUrl ) ) ) { - if ( !mText[mPos].isSpace() ) { // skip whitespace -- url.append( mText[mPos] ); -- if ( url.length() > maxUrlLen() ) { -+ if (mText[mPos] == QLatin1Char('>') && previousCharIsADoubleQuote) { -+ //it's an invalid url -+ if (badurl) { -+ *badurl = true; -+ } -+ return QString(); -+ } -+ if (mText[mPos] == QLatin1Char('"')) { -+ previousCharIsADoubleQuote = true; -+ } else { -+ previousCharIsADoubleQuote = false; -+ } -+ url.append( mText[mPos] ); -+ if ( url.length() > maxUrlLen() ) { - break; - } - } -@@ -367,7 +386,12 @@ QString LinkLocator::convertToHtml( const QString &plainText, int flags, - } else { - const int start = locator.mPos; - if ( !( flags & IgnoreUrls ) ) { -- str = locator.getUrl(); -+ bool badUrl = false; -+ str = locator.getUrlAndCheckValidHref(&badUrl); -+ if (badUrl) { -+ return locator.mText; -+ } -+ - if ( !str.isEmpty() ) { - QString hyperlink; - if ( str.left( 4 ) == QLatin1String("www.") ) { -diff --git a/kpimutils/linklocator.h b/kpimutils/linklocator.h -index 3049397..375498d 100644 ---- a/kpimutils/linklocator.h -+++ b/kpimutils/linklocator.h -@@ -107,6 +107,7 @@ class KPIMUTILS_EXPORT LinkLocator - @return The URL at the current scan position, or an empty string. - */ - QString getUrl(); -+ QString getUrlAndCheckValidHref(bool *badurl = 0); - - /** - Attempts to grab an email address. If there is an @ symbol at the -@@ -155,7 +156,7 @@ class KPIMUTILS_EXPORT LinkLocator - */ - static QString pngToDataUrl( const QString & iconPath ); - -- protected: -+protected: - /** - The plaintext string being scanned for URLs and email addresses. - */ --- -2.7.3 - -From 8bbe1bd3fdc55f609340edc667ff154b3d2aaab1 Mon Sep 17 00:00:00 2001 -From: Montel Laurent -Date: Tue, 11 Oct 2016 11:47:41 +0200 -Subject: [PATCH] Backport show bad url text - ---- - kpimutils/linklocator.cpp | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/kpimutils/linklocator.cpp b/kpimutils/linklocator.cpp -index f30e8fc..4abe968 100644 ---- a/kpimutils/linklocator.cpp -+++ b/kpimutils/linklocator.cpp -@@ -389,7 +389,23 @@ QString LinkLocator::convertToHtml( const QString &plainText, int flags, - bool badUrl = false; - str = locator.getUrlAndCheckValidHref(&badUrl); - if (badUrl) { -- return locator.mText; -+ QString resultBadUrl; -+ const int helperTextSize(locator.mText.count()); -+ for (int i = 0; i < helperTextSize; ++i) { -+ const QChar chBadUrl = locator.mText[i]; -+ if (chBadUrl == QLatin1Char('&')) { -+ resultBadUrl += QLatin1String("&"); -+ } else if (chBadUrl == QLatin1Char('"')) { -+ resultBadUrl += QLatin1String("""); -+ } else if (chBadUrl == QLatin1Char('<')) { -+ resultBadUrl += QLatin1String("<"); -+ } else if (chBadUrl == QLatin1Char('>')) { -+ resultBadUrl += QLatin1String(">"); -+ } else { -+ resultBadUrl += chBadUrl; -+ } -+ } -+ return resultBadUrl; - } - - if ( !str.isEmpty() ) { --- -2.7.3 - diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r3.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r3.ebuild deleted file mode 100644 index 0e0fe5316481..000000000000 --- a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -CPPUNIT_REQUIRED="optional" -EGIT_BRANCH="KDE/4.14" -inherit kde4-base - -DESCRIPTION="Common library for KDE PIM apps" -COMMIT_ID="a791b69599c3571ff2f4b1cc9033d8fb30f1bc33" -SRC_URI="https://quickgit.kde.org/?p=kdepimlibs.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz" -S=${WORKDIR}/${PN} - -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="debug ldap prison" - -# some akonadi tests timeout, that probaly needs more work as its ~700 tests -RESTRICT="test" - -DEPEND=" - >=app-crypt/gpgme-1.8.0 - >=dev-libs/boost-1.35.0-r5:= - dev-libs/libgpg-error - >=dev-libs/libical-0.48-r2:= - dev-libs/cyrus-sasl - >=dev-libs/qjson-0.8.1 - kde-apps/akonadi:4 - media-libs/phonon[qt4] - x11-misc/shared-mime-info - prison? ( kde-frameworks/prison:4 ) - ldap? ( net-nds/openldap ) -" -# boost is not linked to, but headers which include it are installed -# bug #418071 -RDEPEND="${DEPEND} - !app-crypt/gpgme[cxx] - !app-crypt/gpgme[qt5] - !