gentoo resync : 15.12.2019

4 files changed, 85 insertions, 77 deletions

diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index a5e6bea2a66f..dd0831107b9f 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,5 @@
-DIST kopete-19.04.3.tar.xz 9361392 BLAKE2B def10363b7915b83fa326394275e8901c1509287ae039c12ae488f13d507172ab376fc57003169e61426e6f98b90abcfb8499e39f99b9b607cbc4d007c9e1ae4 SHA512 eeb3aed92512976503abd81454433f3ddcb397ade98dd3b21091eb81dad838c57c07d4d4131e9ce0757d54b51ba5f7d50e553e3d864fc55e0602ab5242b969c2
 DIST kopete-19.08.3.tar.xz 9367624 BLAKE2B c7f33d5666f1e72c978c48482ec5c0d260310cf4a90e6ed913b6f2130537db3d9356761bab4186183bb5b86c61ca63303da27dfbb7a6386328d2b85bece23e40 SHA512 41bc20909ec15d6b3cd7c975363dae7a4822a6c563cc721dc2c7afc3ec6c71bc2b7fa90d08d36dedff63e0c68443c55a794743ef0d65b85306a472babe0f2c12
-EBUILD kopete-19.04.3.ebuild 4494 BLAKE2B b63141893bda97e60e931a359722fca6d1f6aa9d84e70f7a88d9e30de39f431451821b312bed179bdf347b11a6f4769426840a55e60e108ad25f5d4be1f42df7 SHA512 5692c604836f16e8c3678029d581b24bddf8e61eadc3be86649667d408fd47ad4b3d8f5d455be2f7f7d7d0c7da02939a46a69d52978c0a4f1624ab2c123e4810
-EBUILD kopete-19.08.3.ebuild 4720 BLAKE2B c7d52f100307ebad824057d2b3f9db11667d7793a901bbeb2d307a4bfe649fc9d797544c5f0fa343d37b18ffa841be3108ccf232503ed26d4a62f2d7225a3045 SHA512 f26d776becf380e68bc485f3106826208136bca21ffc7b1dac44fa3669a8085ca98cf929d1be59b41a7e0cbdf11bd95892c1600dd69d7b95596b79871a255e28
-MISC metadata.xml 2161 BLAKE2B 84471657b718896fb48148e88a6d42ea8779d0a34a459a1a134b6a2d5ded707ff3348857521e96d5f7643e100b249aff5b2e77bec686991511851f1890a7764a SHA512 e884576673c0739b0a3b2a12e6cb33ac83da1b99b6f2440f78d6cdd7689cef7622ef7db44bcf6246311754246c0f896d3ba4f5d46580ed5feb365ebafbe910a6
+DIST kopete-19.12.0.tar.xz 9386240 BLAKE2B 4e6c439f6554786feed37ab736f86d12bc529c2f78713f987889e180bcb2d1f3e80ad79712bd84c935dc403c556ee50ff322b933ab746dd61c0cb63c34ace373 SHA512 fab1e74fbee8606f5deb3bd75f69ca78c448ed926309d3efff9ed83eae2334aef84dd21d73d0434f0248103ad2ab21274259aaad8b977be361107b6eb38d8c8d
+EBUILD kopete-19.08.3-r1.ebuild 4711 BLAKE2B e5919dcd28d222a80e0e20689c790d2f563ac00e5f9a3314412997a30d4053e9cfe0ce1f290ba2477f4125e6d814651c355fc8b060c3b785a341a12631b16d49 SHA512 70f6b3d91d82f80648c8a1581067f3270081fb819053306cca020f2b95004ce3901b142456c3f60e899df87df1b8cb4ad238a223ad369d8c73f0dcafc16ed327
+EBUILD kopete-19.12.0.ebuild 4714 BLAKE2B 2e3891aa4decc9ee7856424e826e8c62a5c31b45ea800df4e3a916a92911c5029f2e94b0ed24066cf026817ce55c3f2b961bde4a644ff68bc02ef9c88bbc78b5 SHA512 d04a5bb2031aa5715f5a48d4164025680780403fecae29d29860eac42c0014bbbbe837fd6bf227154388da7ca996fd12b3e11919afa9828d4149a125b89277c1
+MISC metadata.xml 2102 BLAKE2B 8d82dc772819389b671c1661ad0be0f97703668a6a940c2e142163f4f6e06c110e6d6146144d12ef04b37fb6eb06c57d0bdb766f2c8155848174529111933f2a SHA512 5ca6a22e974c0cb1a24d0dba5ae3f5ff2a860354d653b800655640679c179b90331f436b4ab62338e22e01e145b7c7df2cb9bba82ad8d02436dbbd044d1bfef8
diff --git a/kde-apps/kopete/kopete-19.04.3.ebuild b/kde-apps/kopete/kopete-19.08.3-r1.ebuild
index d6c4f2254f30..d72c9101bfd9 100644
--- a/kde-apps/kopete/kopete-19.04.3.ebuild
+++ b/kde-apps/kopete/kopete-19.08.3-r1.ebuild
@@ -3,17 +3,23 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/Kopete https://kde.org/applications/internet/kopete"
+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
@@ -40,17 +46,17 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence
 #	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	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 jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
+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)
@@ -58,42 +64,34 @@ PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 	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(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0=
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
 	meanwhile? ( net-libs/meanwhile )
 	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
@@ -105,13 +103,21 @@ COMMON_DEPEND="
 	xmpp? (
 		app-crypt/qca:2[qt5(+)]
 		net-dns/libidn:0=
-		sys-libs/zlib:=
+		sys-libs/zlib
 	)
 	zeroconf? (
-		$(add_frameworks_dep kdnssd)
-		$(add_kdeapps_dep kidentitymanagement)
+		>=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? (
 		|| (
@@ -126,8 +132,8 @@ RDEPEND="${COMMON_DEPEND}
 #	winpopup? ( net-fs/samba )
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
-	jingle? ( dev-libs/jsoncpp )
 "
+#	jingle? ( dev-libs/jsoncpp )
 
 # tests hang, last checked for 4.2.96
 RESTRICT+=" test"
@@ -137,11 +143,12 @@ src_configure() {
 	# Handle common stuff
 	local mycmakeargs=(
 		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
 		-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
@@ -161,11 +168,11 @@ src_configure() {
 		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
 	done
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	if ! use ssl; then
 		if use xmpp ; then
diff --git a/kde-apps/kopete/kopete-19.08.3.ebuild b/kde-apps/kopete/kopete-19.12.0.ebuild
index b63404fc64ea..6c7ba9683a0f 100644
--- a/kde-apps/kopete/kopete-19.08.3.ebuild
+++ b/kde-apps/kopete/kopete-19.12.0.ebuild
@@ -6,19 +6,20 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
+KFMIN=5.63.0
 QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/Kopete https://kde.org/applications/internet/kopete"
+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
@@ -45,17 +46,17 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence
 #	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	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 jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
+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)
@@ -63,6 +64,14 @@ PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf
 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
@@ -78,27 +87,11 @@ COMMON_DEPEND="
 	>=kde-frameworks/knotifyconfig-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
 	media-libs/phonon[qt5(+)]
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2[qt5(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0=
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
 	meanwhile? ( net-libs/meanwhile )
 	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
@@ -110,13 +103,21 @@ COMMON_DEPEND="
 	xmpp? (
 		app-crypt/qca:2[qt5(+)]
 		net-dns/libidn:0=
-		sys-libs/zlib:=
+		sys-libs/zlib
 	)
 	zeroconf? (
-		>=kde-frameworks/kdnssd-${KFMIN}:5
 		>=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? (
 		|| (
@@ -131,8 +132,8 @@ RDEPEND="${COMMON_DEPEND}
 #	winpopup? ( net-fs/samba )
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
-	jingle? ( dev-libs/jsoncpp )
 "
+#	jingle? ( dev-libs/jsoncpp )
 
 # tests hang, last checked for 4.2.96
 RESTRICT+=" test"
@@ -142,11 +143,12 @@ src_configure() {
 	# Handle common stuff
 	local mycmakeargs=(
 		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
 		-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
diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index ff8a38c8d6a7..414ef28fffea 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="contactnotes">Enables writing personal notes for contacts.</flag>
 		<flag name="highlight">Allows you to specify highlights on specific events.</flag>
 		<flag name="history">Enables saving chat history.</flag>
-		<flag name="jingle">Enable voice calls for jabber</flag>
 		<flag name="latex">Embed latex formatted text into messages.</flag>
 		<flag name="nowlistening">Shows song you currently listen to in your status/etc. Bindings for many players.</flag>
 		<flag name="oscar">Enable Oscar (AIM/ICQ) IM protocol support</flag>