From f70601e0934acd62f6c5d06c5ede4cc607179514 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Jul 2018 11:42:03 +0100 Subject: gentoo resync : 07.07.2018 --- net-irc/konversation/Manifest | 5 +- .../files/konversation-1.7.4-qt-5.11.patch | 27 -------- net-irc/konversation/konversation-1.7.4-r1.ebuild | 73 ---------------------- net-irc/konversation/konversation-1.7.5.ebuild | 2 +- 4 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch delete mode 100644 net-irc/konversation/konversation-1.7.4-r1.ebuild (limited to 'net-irc/konversation') diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest index 0d0827772c83..3b751df9cc2e 100644 --- a/net-irc/konversation/Manifest +++ b/net-irc/konversation/Manifest @@ -1,7 +1,4 @@ -AUX konversation-1.7.4-qt-5.11.patch 766 BLAKE2B 1293fcd2bc9e7936ce7d181ae4282a4a475a7203dc2114000f76286d17c0c087d3d05582298b9104550ce42639e3f19a836e01ef49111cdd99e467f0519548ca SHA512 aac2d523c42a2578ddb202e34592bbb8371eebf603a60902ba4a8dd3f4973eba41ee89ca8a85996231a94a7b5a1eaaac2f44d2bd03c38a872addcdef0161afcb AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731 -DIST konversation-1.7.4.tar.xz 3737732 BLAKE2B 585ce998bba94fe928c40c41e360d2dbdf5b5f2be586f8dcbf543c4e4c9a6ff8df428c325d638e21c0b54ae2d82875d2cc53e38f8abb01827428652b138ff600 SHA512 8d30fc0c0e533f1fa3268f8360eb5b9321b505fca3103ce189f707247345b2b2c409f590ce45d6fb129a76fc642a4e9f6a802c244a0a3e56aded422ddf4ed19a DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504 -EBUILD konversation-1.7.4-r1.ebuild 1806 BLAKE2B 633fbbf53552962518ba9200a7b42f9c9aac1ee82efc7578b31b5fa0b9fce17c15239e2c02606b91a2a8b6824c81341b7c275ed244bed130c0c8e7fc7aca4b8f SHA512 bd938ea0ca5df8c615319b5e3ba0b36ffb2e0283ccac6b1a2fbc6198d307350b5592d98c93418840e96f32b9e220621d5ec285750dc8459ba6cf32a8c8890b40 -EBUILD konversation-1.7.5.ebuild 1762 BLAKE2B 4a9dc92bf657480e0643e7fd1d5a9724fd4b194ad0ff144177e81f7fc1d60cddaa6ef97d293395f014a89c70c2fec4d025437c2f8e85009dde5ef7fb6092fccc SHA512 a7a8d0003aa601ef3972e07c3eda5c05fe56fae66666e2a531777939306f32d168901e33f7096354a4d5ea72ce270465fdb788be74bcdfeb13d2d5fd165285ff +EBUILD konversation-1.7.5.ebuild 1760 BLAKE2B b158ed541854a14524eeb4309578d8ffce9805f2315ed8422de413b9fb8f1988666c63b850a26cbc34b2fbac263a00ffa750a5f5cbc29c670a78a04778308ce6 SHA512 56517f2248c40d5f486c3f40eba3888e84abf32aba95887ea7c08cafa01b4b0b39699df0ebdb83247d6cd383fad98cae3e4f01a08a56aafe34505961338d2e56 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch b/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch deleted file mode 100644 index 46508bf20a23..000000000000 --- a/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5740a0fdb6805c2e26dce20555a946da8485fe50 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 19 Mar 2018 17:13:30 +0100 -Subject: [PATCH] Fix build with Qt 5.11 (missing QTabWidget) - -Reviewers: #konversation - -Differential Revision: https://phabricator.kde.org/D11490 ---- - src/dcc/transferdetailedinfopanel.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dcc/transferdetailedinfopanel.h b/src/dcc/transferdetailedinfopanel.h -index e8debbc0..0e7391de 100644 ---- a/src/dcc/transferdetailedinfopanel.h -+++ b/src/dcc/transferdetailedinfopanel.h -@@ -16,6 +16,7 @@ - #include "ui_transferdetailedinfopanelui.h" - #include "ui_transferdetailedtimeinfopanelui.h" - -+#include - - class QTimer; - --- -2.16.2 - diff --git a/net-irc/konversation/konversation-1.7.4-r1.ebuild b/net-irc/konversation/konversation-1.7.4-r1.ebuild deleted file mode 100644 index d16bd9092d16..000000000000 --- a/net-irc/konversation/konversation-1.7.4-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="A user friendly IRC Client" -HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org" -SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="+crypt" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(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 kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(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(+)] - sys-devel/gettext - crypt? ( app-crypt/qca:2[qt5(+)] ) -" -RDEPEND="${DEPEND} - !net-irc/konversation:4 - crypt? ( app-crypt/qca:2[ssl] ) -" - -PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package crypt Qca-qt5) - ) - - kde5_src_configure -} - -src_install() { - kde5_src_install - - # Bug 616162 - insinto /etc/xdg - doins "${FILESDIR}"/konversationrc -} diff --git a/net-irc/konversation/konversation-1.7.5.ebuild b/net-irc/konversation/konversation-1.7.5.ebuild index 9b24e2c65001..412eb10ff27c 100644 --- a/net-irc/konversation/konversation-1.7.5.ebuild +++ b/net-irc/konversation/konversation-1.7.5.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konver SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+crypt" DEPEND=" -- cgit v1.2.3