gentoo resync : 25.11.2020

3 files changed, 7 insertions, 197 deletions

diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index dde111e75801..5fae3246850f 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,3 @@
-DIST kopete-20.04.3.tar.xz 9371772 BLAKE2B 467a219dc6cc761c9ec2721138c13abc17ccfdd95e0021ad4f1625feb38517286967bf2df967dad009612623c9dd114f0e4bdb2c90292c0d9043a788131282eb SHA512 979f84c986f78aaab9bd23fb9e0df265ea8734d855b8370c93adbe037d6dfeb4271658dbd27c2b315b363731976a62750e2ed5dace45bc69e72c0645a533b5a0
-DIST kopete-20.08.1.tar.xz 9384840 BLAKE2B c2027e2445dd2f42acf58d926be9a27196bdfc25d8b116964c3e76b99e53d29639520d76e1336a8b2da553a2e7095cd6925b4862be0e81442579c2237c9f5c2b SHA512 8a02f93facc113e5ae13de27e8c96087d970f6c5df4abba4d3ea9e6c0d4554e735420e578f1ff315a6c75f34d63eed083958dbaf3dd3efe2ec9143628b261bb7
-EBUILD kopete-20.04.3.ebuild 4711 BLAKE2B 4cb57c7bc710df5aa27438b8a6bd1e8d45609ee53156d815133278534e230469653610e7056c5f90222eee4922cb51b68caaf2f14f3533cd9154a4f2fc7f6436 SHA512 5f283efd5e2c3e4765aaf9925182f5ffa01c0b66509da37ed32ac70cde0e0429f6545a54899154d7b4425c96d74949783fcb8ae028334825e3b8f773fc663ef3
-EBUILD kopete-20.08.1.ebuild 4723 BLAKE2B b4c214e3f4339def3c4b54a86b4543b6675b32a9f9136bb48a9deee36db3ff6a10a368e519ed409fdc376b604c21f7b0338d7ece9d98015ff4d09b15e3a9c5a3 SHA512 aea15a58b93f70923899f2abb1991875fdc1a5c794ddd9e1cb46d41e2735f4f589bdd502238b69cda27a3eb506f0db843cad1ce3c8b656cd8850026f729037c7
+DIST kopete-20.08.3.tar.xz 9385476 BLAKE2B 5c465bd4d4408a396910697dbbbb87d64b826317d34c0d9e6fa1683df21b3cb02a605af32473fec5a50f87d0d22068cb90e66584c0ab1816410fa2c4c81db7cb SHA512 c888864c11ed108ca2f8b49b35d8354c6619ed5b9295be2680c89647ee78c76163f1c2b8aec8ee5effb8f0179d9539ced39094c603d41f9cbf4437919c1162b4
+EBUILD kopete-20.08.3.ebuild 4597 BLAKE2B 42d9f3d1d9b8322f36125dbde7eb874f449c67829df41e696f538e11b2e98cbf34019cfeffafb4bdca456767e16bbdebf8ff5ae8ae9645be391679090f7bfd6e SHA512 5872256074c3fd9650442446517e9d8f533fb18cb1672bc24f9d1b234f6eeacf74e17b80706bad8c789e9e25ff4a4a97d02c1f13aa7bb430b3f4e1dcfb4f5e68
 MISC metadata.xml 2102 BLAKE2B 8d82dc772819389b671c1661ad0be0f97703668a6a940c2e142163f4f6e06c110e6d6146144d12ef04b37fb6eb06c57d0bdb766f2c8155848174529111933f2a SHA512 5ca6a22e974c0cb1a24d0dba5ae3f5ff2a860354d653b800655640679c179b90331f436b4ab62338e22e01e145b7c7df2cb9bba82ad8d02436dbbd044d1bfef8
diff --git a/kde-apps/kopete/kopete-20.04.3.ebuild b/kde-apps/kopete/kopete-20.04.3.ebuild
deleted file mode 100644
index 9a965e352467..000000000000
--- a/kde-apps/kopete/kopete-20.04.3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.kopete
-https://userbase.kde.org/Kopete"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="ssl v4l"
-
-# Available plugins
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
-otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
-
-# Available protocols
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
-#	meanwhile: net-libs/meanwhile
-#	oscar: NO DEPS
-#	telepathy: net-libs/decibel
-#	testbed: NO DEPS
-#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
-
-# disabled protocols
-#	irc: NO DEPS
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	qq: NO DEPS
-#	telepathy: net-libs/decibel
-#	skype, sms (until fixed)
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMON_DEPEND="
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt5(+)] )
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2[qt5(+)]
-		net-dns/libidn:0=
-		sys-libs/zlib
-	)
-	zeroconf? (
-		>=kde-apps/kidentitymanagement-${PVCUT}:5
-		>=kde-frameworks/kdnssd-${KFMIN}:5
-	)
-"
-#	jingle? (
-#		dev-libs/expat
-#		dev-libs/openssl:0=
-#		>=media-libs/mediastreamer-2.3.0
-#		media-libs/speex
-#		net-libs/libsrtp:0=
-#		net-libs/ortp:=
-#	)
-RDEPEND="${COMMON_DEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( app-crypt/qca:2[ssl] )
-"
-#	sms? ( app-mobilephone/smssend )
-#	winpopup? ( net-fs/samba )
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-#	jingle? ( dev-libs/jsoncpp )
-
-# tests hang, last checked for 4.2.96
-RESTRICT+=" test"
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DWITH_qq=OFF
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-#		$(cmake_use_find_package jingle LiboRTP)
-#		$(cmake_use_find_package jingle Mediastreamer)
-#		$(cmake_use_find_package jingle Speex)
-
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			jingle) x2=libjingle ;;
-			xmpp) x2=jabber ;;
-			zeroconf) x2=bonjour ;;
-			*) x2=${x/+/} ;;
-		esac
-		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
-	done
-
-	# disable until fixed:
-	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! use ssl; then
-		if use xmpp ; then
-			if ! has_version "app-crypt/qca:2[ssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=ssl."
-			fi
-		fi
-	fi
-}
diff --git a/kde-apps/kopete/kopete-20.08.1.ebuild b/kde-apps/kopete/kopete-20.08.3.ebuild
index 42cb37d56607..cef1a12bbac0 100644
--- a/kde-apps/kopete/kopete-20.08.1.ebuild
+++ b/kde-apps/kopete/kopete-20.08.3.ebuild
@@ -6,17 +6,16 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.kopete
-https://userbase.kde.org/Kopete"
+HOMEPAGE="https://apps.kde.org/en/kopete"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="ssl v4l"
 
 # Available plugins
@@ -75,10 +74,8 @@ COMMON_DEPEND="
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdelibs4support-${KFMIN}:5
 	>=kde-frameworks/kemoticons-${KFMIN}:5