From: Michael Palimaka Date: Mon, 16 Nov 2015 15:27:54 +0000 (+1100) Subject: kde-frameworks: remove 5.14.0 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5be40d275e1e25137ca0376a8cb0bf1ba73818cc;p=gentoo.git kde-frameworks: remove 5.14.0 Package-Manager: portage-2.2.24 --- diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest index b60488146c0d..ed0d4cb7eea9 100644 --- a/kde-frameworks/attica/Manifest +++ b/kde-frameworks/attica/Manifest @@ -1,3 +1,2 @@ -DIST attica-5.14.0.tar.xz 60456 SHA256 5eba50b9f0d28163b8a4fbdc909b1b88ad72de60df6f5e850c51849082b3bf58 SHA512 5ec53549738287a673041deed51c3fbb08e75f9fc3ffdf88e1948bff6659b6a9c58a93cc210010fd1a925d4bc665d0c61acccb1e091c62075a15cf9c2735a91b WHIRLPOOL 9bb703438dfa283b7be3928ceea5a6e51df3a7314a74aef0b77faed59d9d2eafd92086022ef1d7887f4931cf1eabe9ae515ac31346a99748747d939293796d6d DIST attica-5.15.0.tar.xz 60476 SHA256 94c928b84a82c44c1331a1b4d585e894524c4a023f90e1906eaf5441d955ad3d SHA512 4cc05218c73f51557a9bbb1c74b401fcb9893ab4e853a5f88f618cc7a503ea845ecf4f04f8a57bcc75979dacaba172d719cb935f7879125a36f444f1c4a9dcf1 WHIRLPOOL 4c44226acd570a4a2c7fb3ab8bea578907cdf8ba6692a8939bac71c5180a23a03fcdaa18957d5076d769ce299a10f585290e870a00a7ee40f06113933529b794 DIST attica-5.16.0.tar.xz 60448 SHA256 bc24370e43061d6fb555a030f82c51cc907113b8420c4207a0fb6d9190bb699c SHA512 76ea353e3eb5995046085671a6dae2fd975798a51614dff7efc37df298993564d12cbdea5b37bacfccb0cfc035e1ac23be3ac8e44236b20b951a424bf54d638f WHIRLPOOL f19ec58a4bc8aa16fd5fa05b9326d5d569877c79d9dd00167903bc03407fba65bf120fdbdb4d37f51422bde503268b62010a5aaca9a9d3dc19b424795955a98e diff --git a/kde-frameworks/attica/attica-5.14.0.ebuild b/kde-frameworks/attica/attica-5.14.0.ebuild deleted file mode 100644 index fa5c97a62fec..000000000000 --- a/kde-frameworks/attica/attica-5.14.0.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit kde5 - -DESCRIPTION="Framework providing access to Open Collaboration Services" -LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-qt/qtnetwork:5 -" -DEPEND="${RDEPEND}" diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest index 698b88f9479c..a310c76a9f6d 100644 --- a/kde-frameworks/baloo/Manifest +++ b/kde-frameworks/baloo/Manifest @@ -1,3 +1,2 @@ -DIST baloo-5.14.0.tar.xz 152668 SHA256 ad082b1d830de72d2aaa2429ae9634d2a2508c4bd8085e531147a04c888ce260 SHA512 9d02de8a9b482da741d6ef7fdf215fece1d766131420750dd076c9f6e9abc3469e048c5952e2d6772c559f0a4b7c293f058ec78cfa0f9cc7cff25fddc1717f36 WHIRLPOOL 9b2bed92e4f8f788cc748f56ad6bff7e245ad5397fd6aff0888d9355c005960d6f2ea2d52386d4aefc4f52a35287cc0c7a578e28a63d7d0214a3f8ea49774139 DIST baloo-5.15.0.tar.xz 169400 SHA256 7fdd56331e7fbf939d18a20d706e9e1299f929ae79b55ddd531c51f825ed1c83 SHA512 d547b156abb286a0ee93b932d7d428ab62585205e73c6cea27f7cf40dcb7a04b1d75dc63c8d789f97874bec675c383dce9069d14ed2f0114cf6a95d421d4a41b WHIRLPOOL 02f60065f9d3900ed75301ec0543bd74fee20baaba620522331eb4cc68e6ab94c1f5e2bbc94f8d9e0638a5f71911726460a34c52f10f66025f249cccf99c99c0 DIST baloo-5.16.0.tar.xz 178032 SHA256 12d5671378ec8d6d6c34496adff6f8b4d1d814771d6af594d4074d35084e1469 SHA512 743525e6a8512846f76d400f72f451335ca9e96b10e24bc3e671b41ff2ef36ba363049cf1025c9e4a501073fe2cd97f7e3cae7dac17892a703061f72160ec687 WHIRLPOOL 64e5cb5d5350bdc2fce48252f669ce4bdafe0e33371ef754e4bab992d2ee9bca6f8c5dffe7fd341e95aa36dfcd5f00083efb6d663017dc5311b9d7b08d8d9770 diff --git a/kde-frameworks/baloo/baloo-5.14.0-r1.ebuild b/kde-frameworks/baloo/baloo-5.14.0-r1.ebuild deleted file mode 100644 index bf7b12e5c8c1..000000000000 --- a/kde-frameworks/baloo/baloo-5.14.0-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_PUNT_BOGUS_DEPS="true" -inherit kde5 - -DESCRIPTION="Framework for searching and managing metadata" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kauth) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kfilemetadata) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep solid) - dev-db/lmdb - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - sys-apps/attr -" -RDEPEND="${DEPEND} - !kde-base/baloo:4[-minimal(-)] -" - -PATCHES=( "${FILESDIR}/${P}-check-if-db-open.patch" ) diff --git a/kde-frameworks/baloo/baloo-5.14.0.ebuild b/kde-frameworks/baloo/baloo-5.14.0.ebuild deleted file mode 100644 index 12430bce3d71..000000000000 --- a/kde-frameworks/baloo/baloo-5.14.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_PUNT_BOGUS_DEPS="true" -inherit kde5 - -DESCRIPTION="Framework for searching and managing metadata" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kauth) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kfilemetadata) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep solid) - dev-db/lmdb - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - sys-apps/attr -" -RDEPEND="${DEPEND} - !kde-base/baloo:4[-minimal(-)] -" diff --git a/kde-frameworks/baloo/files/baloo-5.14.0-check-if-db-open.patch b/kde-frameworks/baloo/files/baloo-5.14.0-check-if-db-open.patch deleted file mode 100644 index 76c71fb7387f..000000000000 --- a/kde-frameworks/baloo/files/baloo-5.14.0-check-if-db-open.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Boudhayan Gupta -Date: Tue, 22 Sep 2015 18:55:36 +0000 -Subject: Fail Baloo::File::load() if the Database is not open. -X-Git-Url: http://quickgit.kde.org/?p=baloo.git&a=commitdiff&h=29fe68f2657df503926e629477a41f7d9435048f ---- -Fail Baloo::File::load() if the Database is not open. -Fixes crash if selecting multiple files in Dolphin with -Baloo disabled. - -BUG: 353049 -REVIEW: 125352 ---- - - ---- a/src/lib/file.cpp -+++ b/src/lib/file.cpp -@@ -98,6 +98,10 @@ - Database *db = globalDatabaseInstance(); - db->open(Database::OpenDatabase); - -+ if (!db->isOpen()) { -+ return false; -+ } -+ - quint64 id = filePathToId(QFile::encodeName(d->url)); - if (!id) { - return false; - diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest index d001c7642b0e..73bf06c47cc1 100644 --- a/kde-frameworks/bluez-qt/Manifest +++ b/kde-frameworks/bluez-qt/Manifest @@ -1,3 +1,2 @@ -DIST bluez-qt-5.14.0.tar.xz 73164 SHA256 5fd2129c6858f6d1eba112ae7fef55a1606c6d001a8224e72d6886d40897d38c SHA512 b52c34b3dda6b4bdb444efd0d3f279355a0c50c754d1b4403c25e36ca1a13b828fda6b83362253b471126c3cd2c4bfda8bbdf8984ddb8d43d00737a43c6e81e7 WHIRLPOOL 49d6074764c71398923e68392d22fb4360891dc23ced23f4f01966d7d7ce785ecf4893a068c62dce862bd5a1376d2c7af0307fd809457462da8c21f951085091 DIST bluez-qt-5.15.0.tar.xz 73348 SHA256 aeb8af820c0980ec93350c727018549b1d603f01059e0d1ef0ae0ee9a2206296 SHA512 e642150c3c556aebc334f979a661400a2e84d508f7994c9403926a2fbbec67432cf92e194d5d60edd23c914f0da508bc5102a20d35cbebaa18c229ecf4e56194 WHIRLPOOL 4ef37ed032dc4bb6b6d13d8d1681d8c07f3e2e794fa79970dd128ffc3725e04fb61d3bb227fddcbb9f18f1bc76dfa85734fe9fbdd4cadbdc00e26ffab019e8cd DIST bluez-qt-5.16.0.tar.xz 73320 SHA256 668e5a728cb541986dfcdf2e9cb40fff372bbfbfd7e49de0ad38463cc9e2b477 SHA512 417c94acd7bb3c3da6bd9a0142d32353676936270591e201d2f62055ba6683176f2a98e3ed6673c8d9aee5c3071890f48e50ecba3bbb1fb8d976d8b94aa84d40 WHIRLPOOL ae143740be10770b6a2825e5bc973a11f805fe32931be4b5dab17fa3a7e3e74c436114cb9a523de15d971171f0cc0a0e720f3b906088365325e44070711753c4 diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.14.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.14.0.ebuild deleted file mode 100644 index 528fd60d2010..000000000000 --- a/kde-frameworks/bluez-qt/bluez-qt-5.14.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit kde5 udev - -DESCRIPTION="Qt wrapper for Bluez 5 DBus API" -LICENSE="LGPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtnetwork:5 -" -RDEPEND="${DEPEND} - !kde-plasma/bluez-qt -" - -src_configure() { - local mycmakeargs=( - -DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d" - ) - - kde5_src_configure -} diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index 3c0f672cf3ab..98e51011324c 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,3 +1,2 @@ -DIST extra-cmake-modules-5.14.0.tar.xz 134436 SHA256 cfefdcada703b28de45ec64756ecae1dc23b305eeca506a477a648a477ceceb0 SHA512 4a4c73ee8ea30201bedd6ee9c81e1cca45b5f5899bb1695aa03d3e6eb56b108370d20d5b9df24794cc1327dae5fff1aa084b663ecb5268cc36fc8b5042d5de49 WHIRLPOOL 46ff0fa7a059636e8028ec7dda3593be101a73ffc4dcdb96ab64cc01b96715096339f4248dcbb6ac426e2d6352e41be23694850f28252b4fb5b0144500a3e806 DIST extra-cmake-modules-5.15.0.tar.xz 135160 SHA256 8f3d4adadfa835c627852ca4a84e8c6be3c9ee68865598a71616e4d0176b02bc SHA512 ba6035e79cc7e49e9d7a1c0ba5133881378275c8ba5f6bfd5beb093c03180501b94e2aee6f3289fbaf11e44ee7f4de9844beffd364a97ab97b6ac95dacb25423 WHIRLPOOL 69f43334006457fb17c53bd4431c61cad4705202ac326bade995678c20044528201257b754e3950327c97e1e683eca156c4c872d48af4a1df5ad33aed772181f DIST extra-cmake-modules-5.16.0.tar.xz 136912 SHA256 09dec88b8ce75831aee9257e15b982b88dba7f89ad626005e4bae52957afae1b SHA512 b88426b7928d6d1007f08496377b0d9abaea6efd94cf5a768d1cd36d6f0482611059191688bd6878d80928c9eeddcb3d6f246c012df369c05fcc36521c3d8b27 WHIRLPOOL 7e40abb2080ddc48f238e87e2f49cb3d39f45932bcd3d6b142b0185139b6530f3c7dbe77b488776473ca21367bdec6bf55f2d1de02c9c8943254149e8f2984ca diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.14.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.14.0.ebuild deleted file mode 100644 index df3da72712d2..000000000000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.14.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -KDE_AUTODEPS="false" -KDE_DEBUG="false" -inherit kde5 python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="doc" - -DEPEND=" - >=dev-util/cmake-2.8.12 - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - ) -" -RDEPEND=" - dev-qt/qtcore:5 -" - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build doc HTML_DOCS) - $(cmake-utils_use_build doc MAN_DOCS) - ) - - cmake-utils_src_configure -} diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest index 464a0e7b12b0..84d8a57ef109 100644 --- a/kde-frameworks/frameworkintegration/Manifest +++ b/kde-frameworks/frameworkintegration/Manifest @@ -1,3 +1,2 @@ -DIST frameworkintegration-5.14.0.tar.xz 1780396 SHA256 c8f7e49d3c2100716f2b87f94c6a779d7b541946208697cc46ac5db9e4829ba4 SHA512 b5f21ee008119a7e14f8a21df5a095795498272bfbc6b2a875bbf128c9495a9a020b0fb201775f6b0c9c73358a3133f9304d20e94e4ff7b8aabcccb8973498dc WHIRLPOOL 11be017f7a760f49faa6b4e9137f4901bc50425785f27a11ee0c8a9e8ce364d0c86319a3227f476b37e3ed7804db857ec0ddcec0e3e3c8c51b91fed9526bb0b7 DIST frameworkintegration-5.15.0.tar.xz 1781464 SHA256 2a7a3d450c28d7f1ac19ddf02cb5e2badcd6903cf3981d82ce70bcd16d644a1b SHA512 7b526f2919f3fa2682a7b45c158b933c9e46a28467ac93c9fdd2a9266b6bee05157bb9dbb5f297a61e312381b9184440e3d935acc7de71c0475efd6f74bef44e WHIRLPOOL 654b5257ec6f5e013d2e1ef593b6e861fb3f81ee6c7f598cdb1d30ef4491a95e08a1b25135631a5d47c10ea5e05ad1ed4d42ff516b25d1f08a8988da26d097ba DIST frameworkintegration-5.16.0.tar.xz 1782444 SHA256 ceb0f3e79497a99a88aea3154c0c50c376ce4e8efea18a9ff4e6de4a061bdb6f SHA512 524bb67a6d8b27523d572fc70000daa9a3b0932b35c94cc2517be6aa6e432ec44bde78801cc5bb0b1e0d4b2a10a3c5b5036e3c944eae0c43f74a48d3ba048a2e WHIRLPOOL 843b2cbbf1805f5e665bb20a903ff9add331ec5ebed0052db9ddf12830cebfa899b1f9f69fd125083a312935f90b88c3ac15cf86edf3d13c4bbc8c6257f562e8 diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.14.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.14.0.ebuild deleted file mode 100644 index 0c41d1b5cf4e..000000000000 --- a/kde-frameworks/frameworkintegration/frameworkintegration-5.14.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Framework for integrating Qt applications with KDE workspaces" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="X" - -RDEPEND=" - $(add_plasma_dep oxygen-fonts) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - X? ( - dev-qt/qtx11extras:5 - x11-libs/libxcb - x11-libs/libXcursor - ) -" -DEPEND="${RDEPEND}" - -# requires running kde environment -RESTRICT="test" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package X XCB) - ) - - kde5_src_configure -} diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest index 22cb7c0c7ede..7ebe131b9d4a 100644 --- a/kde-frameworks/kactivities/Manifest +++ b/kde-frameworks/kactivities/Manifest @@ -1,3 +1,2 @@ -DIST kactivities-5.14.0.tar.xz 172720 SHA256 e91b3a02df48f5fe81b67bc5c2d96cdb215b2af49b03d3918fe35d2fb101cc60 SHA512 c7214c70bb97a05001310aea3e567b11cf4ad7cef2d4a774dbbfa2976c2f66ef587313e72bedc21f742bbb1a6f6a93d8d0ef75a7e9e951770e2b766eb9314119 WHIRLPOOL 2896bdea0a81dd3a31917a71afdc75120de85ba63c5c3a97955d3f22a373fe0f010edd49246865bd10b8e5ce9c48db79755a61c84d5c49eac8728b850451e31a DIST kactivities-5.15.0.tar.xz 175680 SHA256 d8d2603b212081a7137b0647d4e0177f7f50034426c0dbb392e5978c1c3a2e41 SHA512 3d9eaf71e4699c9cf2a94859161ce0eb056615ddfcc51a96101af66fa57d1ff869b04ec4082b260c074fbba67b5aa7f31462c30467576bcb87b45cbaef2cd481 WHIRLPOOL 56e32abeb54b2cd79612261a8dca56568535e4abcb1c4813b3d00679c7d4bc053f580e5ee28027eb223e42dc28e43cca6c2f51a063b541ecee9587a666030197 DIST kactivities-5.16.0.tar.xz 183580 SHA256 b563eb83b0d01ae5bc8e71e7d23bc95d2c59a9b73bd8d6ae4c793cf857f7002b SHA512 a552f091ef472b0be545e69168cdc67e8a5758f0b18abbdeaa4de6f5f3a07fbb70557a996ec3a4dd4fb9e26d342f3305bd175db960f5f0c453b73ed2f816fcbc WHIRLPOOL 5ecd2298a0b6c640a71ef62bef50197622e927f6d77a2fae9cc2921f9c99e37f7749d4b3349ecd45c59db041b63010adaa25017debdea225ecf1f522e56a76cb diff --git a/kde-frameworks/kactivities/kactivities-5.14.0.ebuild b/kde-frameworks/kactivities/kactivities-5.14.0.ebuild deleted file mode 100644 index 23368a13adaa..000000000000 --- a/kde-frameworks/kactivities/kactivities-5.14.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit kde5 - -DESCRIPTION="Framework for working with KDE activities" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - !kde-base/kactivities:4[-minimal(-)] -" -DEPEND="${RDEPEND} - || ( >=dev-libs/boost-1.54 -Date: Fri, 7 Aug 2015 18:59:04 +0200 -Subject: [PATCH] Stop showing the migration wizard by default - -BUG:351056 - -If the migration wizard is needed, then add this to kwalletrc -[Migration] -showMigrationWizard=true - -On systems having kwallet-pam the migration agent would also merge all the old -wallets into the default LocalWallet, as a side effect. This would avoid -wallet creation prompts, though. ---- - src/runtime/kwalletd/main.cpp | 2 +- - src/runtime/kwalletd/migrationagent.cpp | 42 ++++++++++++++++++++++++++------ - src/runtime/kwalletd/migrationagent.h | 5 ++-- - src/runtime/kwalletd/migrationwizard.cpp | 2 +- - 4 files changed, 39 insertions(+), 12 deletions(-) - -diff --git a/src/runtime/kwalletd/main.cpp b/src/runtime/kwalletd/main.cpp -index c0fecaa..62fcd3a 100644 ---- a/src/runtime/kwalletd/main.cpp -+++ b/src/runtime/kwalletd/main.cpp -@@ -186,7 +186,7 @@ int main(int argc, char **argv) - aboutdata.addAuthor(i18n("Thiago Maceira"), i18n("D-Bus Interface"), "thiago@kde.org"); - - KWalletD walletd; -- MigrationAgent migrationAgent(&walletd); -+ MigrationAgent migrationAgent(&walletd, hash); - KDBusService dbusUniqueInstance(KDBusService::Unique | KDBusService::NoExitOnFailure); - - // NOTE: the command should be parsed only after KDBusService instantiation -diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp -index 6eaeb12..192a871 100644 ---- a/src/runtime/kwalletd/migrationagent.cpp -+++ b/src/runtime/kwalletd/migrationagent.cpp -@@ -34,10 +34,12 @@ - - #define SERVICE_KWALLETD4 "org.kde.kwalletd" - #define ENTRY_ALREADY_MIGRATED "alreadyMigrated" -+#define ENTRY_SHOW_MIGRATION_WIZARD "showMigrationWizard" - --MigrationAgent::MigrationAgent(KWalletD* kd) : -+MigrationAgent::MigrationAgent(KWalletD* kd, const char *hash) : - _kf5_daemon(kd) - , _kde4_daemon(0) -+ , _pam_hash(hash) - { - QTimer::singleShot(100, this, SLOT(migrateWallets())); - } -@@ -118,11 +120,27 @@ bool MigrationAgent::isMigrationWizardOk() - { - bool ok = false; - -- MigrationWizard *wizard = new MigrationWizard(this); -- int result = wizard->exec(); -- if (QDialog::Accepted == result) { -- // the user either migrated the wallets, or choose not to be prompted again -- ok = true; -+ // The migration wizard would no longer been shown by default. -+ // see BUG 351056 -+ // NOTE if user wants to show the migration wizard, then he should add the -+ // following setting to the kwalletrc: -+ // [Migration] -+ // showMigrationWizard=true -+ KConfig kwalletrc("kwalletrc"); -+ KConfigGroup cfg(&kwalletrc, "Migration"); -+ bool showMigrationWizard = cfg.readEntry(ENTRY_SHOW_MIGRATION_WIZARD, false); -+ -+ if (showMigrationWizard) { -+ MigrationWizard *wizard = new MigrationWizard(this); -+ int result = wizard->exec(); -+ if (QDialog::Accepted == result) { -+ // the user either migrated the wallets, or choose not to be prompted again -+ ok = true; -+ } -+ } else { -+ if (performMigration(0, true)) { -+ qDebug() << "Migration failed."; -+ } - } - - return ok; -@@ -162,7 +180,7 @@ bool MigrationAgent::isEmptyOldWallet() const { - return wallets.length() == 0; - } - --bool MigrationAgent::performMigration(WId wid) -+bool MigrationAgent::performMigration(WId wid, bool withoutWizard) - { - auto appId = i18n("KDE Wallet Migration Agent"); - try { -@@ -174,7 +192,15 @@ bool MigrationAgent::performMigration(WId wid) - emit progressMessage(i18n("Migrating wallet: %1", wallet)); - emit progressMessage(i18n("* Creating KF5 wallet: %1", wallet)); - -- int handle5 = _kf5_daemon->internalOpen(appId, wallet, false, 0, true, QString()); -+ int handle5 = -1; -+ if (withoutWizard && (_pam_hash != nullptr)) { -+ // see BUG 351056 for why this hacky code -+ // If the user has several wallets, all the values will be -+ // merged into the single LocalWallet -+ handle5 = _kf5_daemon->pamOpen(KWallet::Wallet::LocalWallet(), _pam_hash, 0); -+ } else { -+ handle5 = _kf5_daemon->internalOpen(appId, wallet, false, 0, true, QString()); -+ } - if (handle5 <0) { - emit progressMessage(i18n("ERROR when attempting new wallet creation. Aborting.")); - return false; -diff --git a/src/runtime/kwalletd/migrationagent.h b/src/runtime/kwalletd/migrationagent.h -index 55a251d..c52509e 100644 ---- a/src/runtime/kwalletd/migrationagent.h -+++ b/src/runtime/kwalletd/migrationagent.h -@@ -32,10 +32,10 @@ class KWalletD; - class MigrationAgent : public QObject { - Q_OBJECT - public: -- MigrationAgent(KWalletD* kd); -+ MigrationAgent(KWalletD* kd, const char* hash); - - bool isEmptyOldWallet() const; -- bool performMigration(WId wid); -+ bool performMigration(WId wid, bool withoutWizard); - - private Q_SLOTS: - void migrateWallets(); -@@ -52,6 +52,7 @@ Q_SIGNALS: - private: - KWalletD *_kf5_daemon; - org::kde::KWallet *_kde4_daemon; -+ const char *_pam_hash; - }; - - #endif // _MIGRATIONAGENT_H_ -diff --git a/src/runtime/kwalletd/migrationwizard.cpp b/src/runtime/kwalletd/migrationwizard.cpp -index b7d3f70..cdd2a92 100644 ---- a/src/runtime/kwalletd/migrationwizard.cpp -+++ b/src/runtime/kwalletd/migrationwizard.cpp -@@ -58,7 +58,7 @@ public: - - virtual void initializePage() { - connect(_agent, SIGNAL(progressMessage(QString)), _ui._report, SLOT(append(QString))); -- _migrationCompleted = _agent->performMigration(winId()); -+ _migrationCompleted = _agent->performMigration(winId(), false); - emit completeChanged(); - } - --- -2.4.6 - diff --git a/kde-frameworks/kwallet/kwallet-5.14.0.ebuild b/kde-frameworks/kwallet/kwallet-5.14.0.ebuild deleted file mode 100644 index 9af54c76a59d..000000000000 --- a/kde-frameworks/kwallet/kwallet-5.14.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit kde5 - -DESCRIPTION="Framework providing desktop-wide storage for passwords" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="gpg" - -RDEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - dev-libs/libgcrypt:0= - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - gpg? ( - $(add_kdeapps_dep gpgmepp) - app-crypt/gpgme - ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package gpg Gpgme) - $(cmake-utils_use_find_package gpg KF5Gpgmepp) - ) - kde5_src_configure -} diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest index 0098f85ba4d7..a794d52fac22 100644 --- a/kde-frameworks/kwidgetsaddons/Manifest +++ b/kde-frameworks/kwidgetsaddons/Manifest @@ -1,3 +1,2 @@ -DIST kwidgetsaddons-5.14.0.tar.xz 2129068 SHA256 5bf08e2b4c8454a541be332334a1742dd2f79c8683c7a3a9141f9fe248f9196f SHA512 2dbddea641c9c60c8b8a4a49640065cce5b458dcbbac071bc8dc24abea760b651d6ef1ea588fc31c69ecd6e2ea6c2739cb1dcccff9b99e4408915b500159ea44 WHIRLPOOL 6975bf25f00008487fac2876a216ee4dc50417cfb344af72fcab7f824157b7ade7b2f1b0c60cffc81502f1bf52112ddb43777e04d126779e57a54db421a9af2e DIST kwidgetsaddons-5.15.0.tar.xz 2127512 SHA256 c3e0fed862a3053481a526f923e79cdef890cec93105fe95080e7cd78ad36fd9 SHA512 c7dde9890d4e6d97147f688e42dcac7bb3822e2ae557b891c6d12057d5dcb5978962faf179b0b2a83c905fe7afad5677c2aabfd1751cb1f1fa13b631f48faa17 WHIRLPOOL fd8dc60d1b6b907faa306b5bd407d4f038bdefc73977abd01e54f5cb11121f640859d016869ceaaa9df0dbb8bc342461a4b3c7a4dabb4721cd6b6b8f6344d2b0 DIST kwidgetsaddons-5.16.0.tar.xz 2136216 SHA256 4385540afdf74f696271dbf78a34a1c5e9509094a6a201b96f3a9471f98cfe6f SHA512 183b7216a3d43595ffe2f2f4f3e1d08cb0af2dcb67594333169182d8103fe7cdba2cb9bd32f79e13d7d4ba25276edd8225cde5ae5e081ad216d47c709911720a WHIRLPOOL fb5e0c79ccdb665429400c0d9b5bba515a426c26b04d924c0518814fddf92a4169753c5f63c86ec03a5afb4de6416504243a4df99b5f64dc23af70418e6ad2a5 diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.14.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.14.0.ebuild deleted file mode 100644 index 5381e946714f..000000000000 --- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.14.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="An assortment of high-level widgets for common tasks" -LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -RDEPEND=" - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 -" -DEPEND="${RDEPEND} - nls? ( dev-qt/linguist-tools:5 ) - test? ( dev-qt/designer:5 ) -" diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest index 3cb7071160ab..1eb4f165af61 100644 --- a/kde-frameworks/kwindowsystem/Manifest +++ b/kde-frameworks/kwindowsystem/Manifest @@ -1,3 +1,2 @@ -DIST kwindowsystem-5.14.0.tar.xz 163072 SHA256 016bc2f5aeda773095c5aa6f58907768a75dc0929b3316c2973a3e1b6a5ef839 SHA512 4994f70cfc751b57026581d761f6073104a17c8e7df52498a2f13a1b08150c7ffb51d4abcd51a343c9601d9f734f108ee8a743a8b2f9f6df4e0a111da81c7bde WHIRLPOOL 0b983133cd2d511ce718597888a8b47505f82cf3abc8199302849edf73503dbee29f24cfce18a27603fb3b6370aa4b3e4bc9c133b5a671261211ec232d302729 DIST kwindowsystem-5.15.0.tar.xz 162948 SHA256 1db9fcc1a109556cc41896b17427a031bfa7bdaf6bab36b415f348e3d75317f5 SHA512 f0408ea95440801395397391975ff3582c58774a1eb4a672d2dfcd5468b10a4240fdbbece67f21ae84218cc1cc7736465c11482c2c904bb7888ad7e736273cb2 WHIRLPOOL 99778861a94248fb3f76238c917a9b6c31d2e067267d76f5b43d8a953b3937469c6b61ba7036f5d2a97343a5f4a022dfe5ce6053e790cdbc23dfc944ce4ae174 DIST kwindowsystem-5.16.0.tar.xz 162956 SHA256 2f8aac7a1c9002b8647f26ad556e3265a004cbd1055eff5be3769c02bc06141e SHA512 bbf74016c0bc4df188f47b3dc438b6e5eeee7b5a7ef2ec6cad31770dc1edb88b49c3fb245a324c823828bcd31486b8927a0ba2200ed3215c7665282202aeaf18 WHIRLPOOL d8691537d167226ecdf3ad195eb6a370918a28450dd65ef8afee7c3738cf2bb0d04cdf4c8a96fdc3028ef66099baba9b6634d42565742136a33a57ed301a779a diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.14.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.14.0.ebuild deleted file mode 100644 index 3bf517e0d16f..000000000000 --- a/kde-frameworks/kwindowsystem/kwindowsystem-5.14.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Framework providing access to certain properties and features of the window manager" -LICENSE="LGPL-2+ MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="nls X" - -RDEPEND=" - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - X? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) -" -DEPEND="${RDEPEND} - nls? ( dev-qt/linguist-tools:5 ) - X? ( x11-proto/xproto ) -" - -RESTRICT="test" - -DOCS=( "docs/README.kstartupinfo" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package X X11) - ) - - kde5_src_configure -} diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest index 8b9b752ea137..f330e20bf6d7 100644 --- a/kde-frameworks/kxmlgui/Manifest +++ b/kde-frameworks/kxmlgui/Manifest @@ -1,3 +1,2 @@ -DIST kxmlgui-5.14.0.tar.xz 863108 SHA256 60b0acd3115697ac9185a1f9a102db98667b29a618d329f41a73766ae01975c8 SHA512 201da1b9886c6aeb0bf413d38b4c5d5c7b09c9fa9f32d686825bb2bc564e1b8727689fd344baeb95aaa63ff07afda9ac668e2cb7df67fea4ad07aa3ed5d59255 WHIRLPOOL 240cc5966163b292c0198a379c6dc3b2dc73d1008695d08302cfe12517c5985714c613217a6ccbe93a2772ae1978874c35472b9529111ae4582ef95c1ec7a4c2 DIST kxmlgui-5.15.0.tar.xz 862992 SHA256 b57d2bcfc27f74556228dabcf914bb82e3bfea40ca1ce85ec222cd3f9da8b5b4 SHA512 244c18303beb4ec38760951af3c3aea5eb287b7868d234ca65f16bfb847f1d47fbe3123f0aaf92a4be5fc72b000546f31d6f78ce009279a4a205f5ff56844559 WHIRLPOOL 0bc784ee6778be2a1b0999ee0863be2e043410b612ce673246042cb7e9d6f8935198b70b4d83ede67ad073033d6cb89523f82ce57a24417e36f61ade6951eff7 DIST kxmlgui-5.16.0.tar.xz 864604 SHA256 5ac0d43884b48da7af3b90df2d8a1a26945d165db679163a497696f69270f0ef SHA512 0c34742dc4127fb0b04f0e9006084b997ab98b871ea0fdf06c3fdf2285be6c16486f89285602f22d61795a4fe4f66b246c2236f1fd858220b57af2322de5d156 WHIRLPOOL 2ae39722270137491d3dada864c81ee98ac555cc01c38db63ee9299b422dfa34a1283e832ca38c637096aa54fff67cd0c8b7f36e6f86ea5bc3d2f606c3648aba diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.14.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.14.0.ebuild deleted file mode 100644 index 089dca8c41ca..000000000000 --- a/kde-frameworks/kxmlgui/kxmlgui-5.14.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way" -KEYWORDS="~amd64 ~x86" -LICENSE="LGPL-2+" -IUSE="attica" - -RDEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - attica? ( $(add_frameworks_dep attica) ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package attica KF5Attica) - ) - - kde5_src_configure -} diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest index 20e84381ecee..05384cfd9a04 100644 --- a/kde-frameworks/kxmlrpcclient/Manifest +++ b/kde-frameworks/kxmlrpcclient/Manifest @@ -1,3 +1,2 @@ -DIST kxmlrpcclient-5.14.0.tar.xz 28120 SHA256 1ae0518f82b45a0e391b47fd8439a900ef3b34fe3a9b5c60b4754aa9cfb5418f SHA512 3c3b53f5d5ee53f4f55759ab2f3e716f67ccb7befe314faaf0eadebf70c362a6464810d6257ed109d2c49789659afaab1417efcb7dc6be0a516db4a6e02600ae WHIRLPOOL f51c361c95a1553f73d6508a9606717528cba24546f900835f88fd617f4f5e54a44fc761df54d69f5d5c04f84e59c2b40efa9fa002ef9d335240a00554852399 DIST kxmlrpcclient-5.15.0.tar.xz 28124 SHA256 63903b1b934f7234cb3bacedcdbb66368e211b9932bc342378fecb3686c5930d SHA512 3c5c12349299df32ee0ab9ddcd1dcbfe1e84871ce96f290e2dc40092102238b0e79a99e144363c4dd4deb34cf0be50afef29adf59fed46bd60383f654db7cb9b WHIRLPOOL 8c0baefa91c6e5f7056923d5143c5d81e7896a3c09977ae4267b3f165289786621c07c2eca2d6463029fa3762795fc8e2d200f19df900b598f264e78135fb1b1 DIST kxmlrpcclient-5.16.0.tar.xz 28312 SHA256 0afc266e8ab5ad4be752554f0794e0b1eae6cb67760db92de293f56330704cdd SHA512 c2757a460a0946e357f0a1522f411374af8b00d9a4db7703588fc69946a6c7a871da4b841c3aaabde6dd2a6b20b369d63594d545964feadeaccff9761c9ed059 WHIRLPOOL 9c80552e736295f57d454f15de9102da5144b8dbebb21a61db738721d75f32c9389bb0e4539fd9722eb8351068201355f676cbc19c17230cb0f98eaf6701fdaf diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.14.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.14.0.ebuild deleted file mode 100644 index 1cd348469d46..000000000000 --- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.14.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_DOXYGEN="true" -KDE_TEST="true" -inherit kde5 - -DESCRIPTION="Framework providing client-side support for the XML-RPC protocol" -LICENSE="BSD-2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - dev-qt/qtxml:5 - !