commit: 6ea0f04cb68805a4bf42fe298189be559b4ac27e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Aug 28 19:40:18 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Aug 28 19:54:44 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ea0f04c
*/*: Cleanup app-crypt/qca[qca(+)] and depend on >=app-crypt/qca-2.3.0:2 Standardise all on >=app-crypt/qca-2.3.0:2, first version to have dropped Qt4. Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-editors/okteta/okteta-9999.ebuild | 2 +- app-office/calligra/calligra-9999.ebuild | 2 +- app-office/calligraplan/calligraplan-9999.ebuild | 2 +- app-office/skrooge/skrooge-9999.ebuild | 2 +- kde-apps/kget/kget-20.08.49.9999.ebuild | 2 +- kde-apps/kget/kget-9999.ebuild | 2 +- kde-apps/kopete/kopete-20.08.49.9999.ebuild | 6 +++--- kde-apps/kopete/kopete-9999.ebuild | 6 +++--- kde-apps/ksirk/ksirk-20.08.49.9999.ebuild | 2 +- kde-apps/ksirk/ksirk-9999.ebuild | 2 +- kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.49.9999.ebuild | 4 ++-- kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild | 4 ++-- kde-apps/okular/okular-20.08.49.9999.ebuild | 2 +- kde-apps/okular/okular-9999.ebuild | 2 +- kde-misc/kdeconnect/kdeconnect-20.08.49.9999.ebuild | 2 +- kde-misc/kdeconnect/kdeconnect-9999.ebuild | 2 +- kde-plasma/plasma-nm/plasma-nm-5.19.49.9999.ebuild | 2 +- kde-plasma/plasma-nm/plasma-nm-9999.ebuild | 2 +- media-sound/amarok/amarok-9999.ebuild | 2 +- net-im/choqok/choqok-9999.ebuild | 2 +- net-irc/konversation/konversation-2.9999.ebuild | 4 ++-- net-irc/konversation/konversation-9999.ebuild | 4 ++-- net-libs/libktorrent/libktorrent-9999.ebuild | 2 +- sys-libs/kpmcore/kpmcore-9999.ebuild | 4 ++-- 24 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app-editors/okteta/okteta-9999.ebuild b/app-editors/okteta/okteta-9999.ebuild index a03835d9b8..8a83c7915c 100644 --- a/app-editors/okteta/okteta-9999.ebuild +++ b/app-editors/okteta/okteta-9999.ebuild @@ -50,7 +50,7 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - crypt? ( app-crypt/qca:2[qt5(+)] ) + crypt? ( >=app-crypt/qca-2.3.0:2 ) " RDEPEND="${DEPEND}" diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index 240ca9b02e..03cbf17a3e 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -73,7 +73,7 @@ COMMON_DEPEND=" virtual/libiconv activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) charts? ( dev-libs/kdiagram:5 ) - crypt? ( app-crypt/qca:2[qt5(+)] ) + crypt? ( >=app-crypt/qca-2.3.0:2 ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] ) gsl? ( sci-libs/gsl ) diff --git a/app-office/calligraplan/calligraplan-9999.ebuild b/app-office/calligraplan/calligraplan-9999.ebuild index 0998d0ed17..fc312d1130 100644 --- a/app-office/calligraplan/calligraplan-9999.ebuild +++ b/app-office/calligraplan/calligraplan-9999.ebuild @@ -60,7 +60,7 @@ DEPEND=" activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) kwallet? ( - app-crypt/qca:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 >=kde-frameworks/kwallet-${KFMIN}:5 ) X? ( diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild index 32ff2e965e..3ed8aceba6 100644 --- a/app-office/skrooge/skrooge-9999.ebuild +++ b/app-office/skrooge/skrooge-9999.ebuild @@ -29,7 +29,7 @@ BDEPEND=" virtual/pkgconfig " COMMON_DEPEND=" - app-crypt/qca:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 dev-db/sqlcipher dev-libs/grantlee:5 >=dev-qt/qtconcurrent-${QTMIN}:5 diff --git a/kde-apps/kget/kget-20.08.49.9999.ebuild b/kde-apps/kget/kget-20.08.49.9999.ebuild index f9855c3073..b796188447 100644 --- a/kde-apps/kget/kget-20.08.49.9999.ebuild +++ b/kde-apps/kget/kget-20.08.49.9999.ebuild @@ -19,6 +19,7 @@ KEYWORDS="" IUSE="bittorrent gpg kde mms sqlite" RDEPEND=" + >=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 @@ -46,7 +47,6 @@ RDEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 - app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-${PLASMA_MINIMAL}:5 ) diff --git a/kde-apps/kget/kget-9999.ebuild b/kde-apps/kget/kget-9999.ebuild index 6c05a0481c..7091834249 100644 --- a/kde-apps/kget/kget-9999.ebuild +++ b/kde-apps/kget/kget-9999.ebuild @@ -19,6 +19,7 @@ KEYWORDS="" IUSE="bittorrent gpg kde mms sqlite" RDEPEND=" + >=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 @@ -46,7 +47,6 @@ RDEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 - app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-${PLASMA_MINIMAL}:5 ) diff --git a/kde-apps/kopete/kopete-20.08.49.9999.ebuild b/kde-apps/kopete/kopete-20.08.49.9999.ebuild index 74f652658f..c85ba028ee 100644 --- a/kde-apps/kopete/kopete-20.08.49.9999.ebuild +++ b/kde-apps/kopete/kopete-20.08.49.9999.ebuild @@ -91,7 +91,7 @@ COMMON_DEPEND=" x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) - groupwise? ( app-crypt/qca:2[qt5(+)] ) + groupwise? ( >=app-crypt/qca-2.3.0:2 ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) @@ -101,7 +101,7 @@ COMMON_DEPEND=" dev-libs/libxslt ) xmpp? ( - app-crypt/qca:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 net-dns/libidn:0= sys-libs/zlib ) @@ -126,7 +126,7 @@ RDEPEND="${COMMON_DEPEND} ) virtual/latex-base ) - ssl? ( app-crypt/qca:2[ssl] ) + ssl? ( >=app-crypt/qca-2.3.0:2[ssl] ) " # sms? ( app-mobilephone/smssend ) # winpopup? ( net-fs/samba ) diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild index e82adee29d..03781f708e 100644 --- a/kde-apps/kopete/kopete-9999.ebuild +++ b/kde-apps/kopete/kopete-9999.ebuild @@ -91,7 +91,7 @@ COMMON_DEPEND=" x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) - groupwise? ( app-crypt/qca:2[qt5(+)] ) + groupwise? ( >=app-crypt/qca-2.3.0:2 ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) @@ -101,7 +101,7 @@ COMMON_DEPEND=" dev-libs/libxslt ) xmpp? ( - app-crypt/qca:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 net-dns/libidn:0= sys-libs/zlib ) @@ -126,7 +126,7 @@ RDEPEND="${COMMON_DEPEND} ) virtual/latex-base ) - ssl? ( app-crypt/qca:2[ssl] ) + ssl? ( >=app-crypt/qca-2.3.0:2[ssl] ) " # sms? ( app-mobilephone/smssend ) # winpopup? ( net-fs/samba ) diff --git a/kde-apps/ksirk/ksirk-20.08.49.9999.ebuild b/kde-apps/ksirk/ksirk-20.08.49.9999.ebuild index 0a7492fd20..62e90dcf72 100644 --- a/kde-apps/ksirk/ksirk-20.08.49.9999.ebuild +++ b/kde-apps/ksirk/ksirk-20.08.49.9999.ebuild @@ -19,7 +19,7 @@ KEYWORDS="" IUSE="" DEPEND=" - app-crypt/qca:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 diff --git a/kde-apps/ksirk/ksirk-9999.ebuild b/kde-apps/ksirk/ksirk-9999.ebuild index aea8bb3ca8..daaf23bebd 100644 --- a/kde-apps/ksirk/ksirk-9999.ebuild +++ b/kde-apps/ksirk/ksirk-9999.ebuild @@ -19,7 +19,7 @@ KEYWORDS="" IUSE="" DEPEND=" - app-crypt/qca:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.49.9999.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.49.9999.ebuild index 6f774b69aa..4d36d0a19c 100644 --- a/kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.49.9999.ebuild +++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.49.9999.ebuild @@ -17,7 +17,7 @@ KEYWORDS="" IUSE="" DEPEND=" - app-crypt/qca:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 @@ -35,5 +35,5 @@ DEPEND=" net-libs/telepathy-qt[qt5(+)] " RDEPEND="${DEPEND} - app-crypt/qca:2[ssl] + >=app-crypt/qca-2.3.0:2[ssl] " diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild index 5ad10ece8d..84af026253 100644 --- a/kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild +++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild @@ -17,7 +17,7 @@ KEYWORDS="" IUSE="" DEPEND=" - app-crypt/qca:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 @@ -35,5 +35,5 @@ DEPEND=" net-libs/telepathy-qt[qt5(+)] " RDEPEND="${DEPEND} - app-crypt/qca:2[ssl] + >=app-crypt/qca-2.3.0:2[ssl] " diff --git a/kde-apps/okular/okular-20.08.49.9999.ebuild b/kde-apps/okular/okular-20.08.49.9999.ebuild index 80da659569..e3cb101d50 100644 --- a/kde-apps/okular/okular-20.08.49.9999.ebuild +++ b/kde-apps/okular/okular-20.08.49.9999.ebuild @@ -46,7 +46,7 @@ DEPEND=" dev-libs/chmlib >=kde-frameworks/khtml-${KFMIN}:5 ) - crypt? ( app-crypt/qca:2[qt5(+)] ) + crypt? ( >=app-crypt/qca-2.3.0:2 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild index beb96269e3..4c64f4cb3f 100644 --- a/kde-apps/okular/okular-9999.ebuild +++ b/kde-apps/okular/okular-9999.ebuild @@ -46,7 +46,7 @@ DEPEND=" dev-libs/chmlib >=kde-frameworks/khtml-${KFMIN}:5 ) - crypt? ( app-crypt/qca:2[qt5(+)] ) + crypt? ( >=app-crypt/qca-2.3.0:2 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( diff --git a/kde-misc/kdeconnect/kdeconnect-20.08.49.9999.ebuild b/kde-misc/kdeconnect/kdeconnect-20.08.49.9999.ebuild index 3864d7f0ed..15081a14f3 100644 --- a/kde-misc/kdeconnect/kdeconnect-20.08.49.9999.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-20.08.49.9999.ebuild @@ -22,7 +22,7 @@ KEYWORDS="" IUSE="bluetooth pulseaudio wayland X" DEPEND=" - >=app-crypt/qca-2.1.0:2[qt5(+),ssl] + >=app-crypt/qca-2.3.0:2[ssl] >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild index a8097178f2..4e3d52af0d 100644 --- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild @@ -22,7 +22,7 @@ KEYWORDS="" IUSE="bluetooth pulseaudio wayland X" DEPEND=" - >=app-crypt/qca-2.1.0:2[qt5(+),ssl] + >=app-crypt/qca-2.3.0:2[ssl] >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 diff --git a/kde-plasma/plasma-nm/plasma-nm-5.19.49.9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.19.49.9999.ebuild index c93d0347c1..241f5d2742 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.19.49.9999.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.19.49.9999.ebuild @@ -17,7 +17,7 @@ KEYWORDS="" IUSE="modemmanager openconnect teamd" DEPEND=" - >=app-crypt/qca-2.1.1:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] >=dev-qt/qtgui-${QTMIN}:5 diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild index 62fb663b23..01f6921c17 100644 --- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild @@ -17,7 +17,7 @@ KEYWORDS="" IUSE="modemmanager openconnect teamd" DEPEND=" - >=app-crypt/qca-2.1.1:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] >=dev-qt/qtgui-${QTMIN}:5 diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild index 0fc8f0d83b..fd1ec9e9cc 100644 --- a/media-sound/amarok/amarok-9999.ebuild +++ b/media-sound/amarok/amarok-9999.ebuild @@ -18,7 +18,7 @@ IUSE="ipod lastfm mtp ofa podcast wikipedia" # ipod requires gdk enabled and also gtk compiled in libgpod BDEPEND="virtual/pkgconfig" DEPEND=" - app-crypt/qca:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 dev-db/mysql-connector-c:= >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 diff --git a/net-im/choqok/choqok-9999.ebuild b/net-im/choqok/choqok-9999.ebuild index 770e46dcd3..91890d4375 100644 --- a/net-im/choqok/choqok-9999.ebuild +++ b/net-im/choqok/choqok-9999.ebuild @@ -22,7 +22,7 @@ SLOT="5" IUSE="attica share telepathy" DEPEND=" - app-crypt/qca[qt5(+)] + >=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetworkauth-${QTMIN}:5 diff --git a/net-irc/konversation/konversation-2.9999.ebuild b/net-irc/konversation/konversation-2.9999.ebuild index f774d691a0..05bb5163da 100644 --- a/net-irc/konversation/konversation-2.9999.ebuild +++ b/net-irc/konversation/konversation-2.9999.ebuild @@ -53,11 +53,11 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 media-libs/phonon[qt5(+)] - crypt? ( app-crypt/qca:2[qt5(+)] ) + crypt? ( >=app-crypt/qca-2.3.0:2 ) " RDEPEND="${DEPEND} >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - crypt? ( app-crypt/qca:2[ssl] ) + crypt? ( >=app-crypt/qca-2.3.0:2[ssl] ) " PATCHES=( diff --git a/net-irc/konversation/konversation-9999.ebuild b/net-irc/konversation/konversation-9999.ebuild index e63dc863b1..3455cd2f0b 100644 --- a/net-irc/konversation/konversation-9999.ebuild +++ b/net-irc/konversation/konversation-9999.ebuild @@ -49,10 +49,10 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 media-libs/phonon[qt5(+)] - crypt? ( app-crypt/qca:2[qt5(+)] ) + crypt? ( >=app-crypt/qca-2.3.0:2 ) " RDEPEND="${DEPEND} - crypt? ( app-crypt/qca:2[ssl] ) + crypt? ( >=app-crypt/qca-2.3.0:2[ssl] ) " src_configure() { diff --git a/net-libs/libktorrent/libktorrent-9999.ebuild b/net-libs/libktorrent/libktorrent-9999.ebuild index 8e82bcdddd..4c34895d0e 100644 --- a/net-libs/libktorrent/libktorrent-9999.ebuild +++ b/net-libs/libktorrent/libktorrent-9999.ebuild @@ -21,7 +21,7 @@ IUSE="" BDEPEND="sys-devel/gettext" COMMON_DEPEND=" - app-crypt/qca:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= >=dev-qt/qtnetwork-${QTMIN}:5 diff --git a/sys-libs/kpmcore/kpmcore-9999.ebuild b/sys-libs/kpmcore/kpmcore-9999.ebuild index d9ba96a5b5..93d3e9e130 100644 --- a/sys-libs/kpmcore/kpmcore-9999.ebuild +++ b/sys-libs/kpmcore/kpmcore-9999.ebuild @@ -23,8 +23,8 @@ IUSE="" BDEPEND="virtual/pkgconfig" DEPEND=" || ( - app-crypt/qca[botan] - app-crypt/qca[ssl] + >=app-crypt/qca-2.3.0:2[botan] + >=app-crypt/qca-2.3.0:2[ssl] ) >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5