Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

3 files changed, 183 insertions, 2 deletions

diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index c2d67d1f629e..03aa5bbaee82 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,3 +1,5 @@
+DIST kopete-18.08.3.tar.xz 9382668 BLAKE2B 3a45ca45c89dada7aab805997c66c58d3cd68294acf15cca738e5246cc4c23b45ce96869e0a126a0cacb545b919e4ae1490a967cc6ae5bc59f806d18d400507d SHA512 411222369e82395610604e62794442bd34e3916a8874533873debe29afb42dc24877137ceebb6872f2ec3717a80a6a6b14242d2549892dce6573668a2f8ac02c
 DIST kopete-18.12.3.tar.xz 9347932 BLAKE2B 279ddc7188eff9c4697c17482e6b25caa2359fd8628319a2b6279b910547b820827f343bde938802209c880903e2e5b48404ac77347cf4cbde13588183eb6c07 SHA512 f96304c33e2803ecc79958c493e827add1ce5fda5b7b3ad405d560dfa6b323341623e682cd5a522bdaa948e158aeae2d0e812a7138322d6040bdbe4f0fa54f44
-EBUILD kopete-18.12.3.ebuild 4540 BLAKE2B e80c75a3933c1f21d47e5885a684c5df1c0062eee016cd769a0467609b95400346aa8dfd9fe15eb5959689504d15a15fe68bceaae92524b0480a286af80d0818 SHA512 d8ff3c8a93a72dafc68b94fc43f4284b343df33e430f351409da3a4c2e2ed2fae730ab5b165657001f17996eec7c6bc82d7f26d397131813a74e572a15f093a3
+EBUILD kopete-18.08.3.ebuild 4510 BLAKE2B 38fe478e55503659c0ed71a43d5e40f61419549d78fba5eb1eba291af818dbebd4f69adee7b0a16d29c844c529629bcf771dd6304de3132eddfbe503c7c5e706 SHA512 221894084ce809fc7837a0a9e3ac784e40ec2ac51a5aa25338c99af15df3877c0934ea8b059f1e93a4bb4b78bce4756f0c67ea3da8efb1e7523eee229ebb28fd
+EBUILD kopete-18.12.3.ebuild 4542 BLAKE2B 960c41713d7b942c3eaf79ea8f489185c3b3b3d5b637f3a56bae4702a667a55f551ed1b2f63fd1ebcbbc38a50a9bf9688cb92a63f22a81aceb55aa69dbe8dba1 SHA512 3630b38f49532269823fab6ba34ac8cdc717e4c4977fcdd6cd910d53be685c1adda4c41f95524e00d886eb1005a2623b9465fc32082c5c20813633276a972b68
 MISC metadata.xml 2031 BLAKE2B 10d27c95c13f44ac3a3149072350e9434ef5b88c2dc4d493bd628d398e531de6a0d7b25071981246da3d53cd5aaff20d392b32d358da3af3f4238fc76143f6b0 SHA512 790e5f6a88bf63533cc6555b44b1a4fd43fd9697d4dac284b0770d67b5dea6cbaa33d399f8ac653d976bb12a29ae583cacc734f2c2bc63be9363ef4921efc568
diff --git a/kde-apps/kopete/kopete-18.08.3.ebuild b/kde-apps/kopete/kopete-18.08.3.ebuild
new file mode 100644
index 000000000000..0ce96c78264d
--- /dev/null
+++ b/kde-apps/kopete/kopete-18.08.3.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/Kopete https://www.kde.org/applications/internet/kopete"
+KEYWORDS="amd64 x86"
+IUSE="ssl v4l"
+
+# tests hang, last checked for 4.2.96
+RESTRICT+=" test"
+
+# 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
+#	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"
+
+# disabled protocols
+#	irc: NO DEPS
+#	qq: NO DEPS
+#	telepathy: net-libs/decibel
+#	skype, sms (until fixed)
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	$(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
+	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 )
+	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? (
+		$(add_frameworks_dep kdnssd)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	!kde-apps/kde4-l10n
+	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="${COMMONDEPEND}
+	x11-base/xorg-proto
+	jingle? ( dev-libs/jsoncpp )
+"
+
+src_configure() {
+	local x x2
+	# 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)
+	)
+	# 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
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_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-18.12.3.ebuild b/kde-apps/kopete/kopete-18.12.3.ebuild
index 01e505467f58..2dd15e3af0b3 100644
--- a/kde-apps/kopete/kopete-18.12.3.ebuild
+++ b/kde-apps/kopete/kopete-18.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
 HOMEPAGE="https://userbase.kde.org/Kopete https://www.kde.org/applications/internet/kopete"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="ssl v4l"
 
 # Available plugins