gentoo resync : 20.11.2017

4 files changed, 175 insertions, 4 deletions

diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index 53df12ea3119..e3e61f04f30c 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,8 +1,10 @@
 AUX kopete-17.04.0-kde4qgpgme.patch 2563 SHA256 ff9e9d93e2d74e01f73d06356fa570ca8925cd0b7bea3f6b4571f2cb65250749 SHA512 a8c009540d30e893330392376e7128bc5908e47602d198cd6a6dc5036b170c283d9f0d6cce563f4de5c289fa90ff8f4fc2809a04758a6bd40e8876cdcc48f3bf WHIRLPOOL 5d997fd196b4adb7e949de13c25f65ae51e297f32a6090986e912795de7492ec4588fa108484a712bb3e889d018c412127b6519138253959ffe6699fc59b1143
 DIST kopete-17.04.3.tar.xz 6343664 SHA256 ec48462a464ce9ab724f503813311d9dd3aafc0124972410ac2afe14133be43f SHA512 d9c2ccec7f72e68090cd72632884b86f6b5a9cdd7fd3d23c1dedf3fe0331296d0b750c48050b80f36a58b92815e240983ab2c96eebb18997235c2a22bc4d2b26 WHIRLPOOL 2dffbb43e2eb63aa008ede23322d223436310fc85df4d8d38eec12e6ee7fe3549689beffde4e66ab2a3892ce0433e677f8d913c5ba9d9498264ec2b525815dd3
 DIST kopete-17.08.3.tar.xz 6344464 SHA256 f86ccc1ca809c723d1baf2eed745f158337059263555f6fafa23ea200aacafec SHA512 0c069ec3208bb499ea2ffb92ba5a448980a0190b26a579903b126b7e72bf2c61e59c1ebc90065fc478415aed11aee67d7b4ef0f9d240c18a84e14d6163899f25 WHIRLPOOL 19290b3a238a8c39e2d961d28d32cc4f3590c5b31f52f9a6824ad8e4eafbf012017944d41f1531a6e32cf9d8c253eb759bb36798190843c0bb782285c44c5e90
-EBUILD kopete-17.04.3.ebuild 3925 SHA256 2b00a67d958736024574712d3c0b982c5b7e42c010b490dd6a0cb6e2bfbf4337 SHA512 41fe7d89d22955989e6140c4e3163f0505ca94cb6da586c369fcc4a8ca73e43228962809838e8604aef4dfd774f9caec2d5588bd97d9b148f6c574e243557922 WHIRLPOOL e513be9f99c6972c5edb3c1c9b83b4dde2c95afc3c3f0c89f5371425ba9e808238dd06e8a1d387d609110d6ed46e611e719855edd7d8f412dced5f06d5d2d9d9
-EBUILD kopete-17.08.3.ebuild 3927 SHA256 9eb36338c92c72488cf3d1cd3c5ed22d3376d8575d4938ae1fc0a303c66fb306 SHA512 414c7e129a07f2f5829a0f7ca3bbf252542c02c3642ad6a434c379e7549d7995ea1051c3d35480c9c06249e7f74104d92174b97f7f92ce40f2eb474ef0056755 WHIRLPOOL 94596befdded9599d98aebcc8d6c669d7be301170b4ac6b7c36df29475d07ce2f29990574f0969ac197fface53ae0b379a7c08b17bd75ea64ee4906389149620
+DIST kopete-17.08.3_p20171029.tar.gz 8004208 SHA256 d990006cc05cde0346d13781e9069db92904c52a73c63d411f44ff0633e01ae4 SHA512 bb70dac4f1336502fb79564e132785d3d6faf01520126441e7cde902b75ae8ac36ae796e0d24318f16e6fffeaa0ec1833a6582731ec734a86fd495dd7252fcb8 WHIRLPOOL e39b5cb909150ba2c2fd907928fe9d1fb71caa8ebcdd299b18860335b6be29b0a02bf7ba980eb39f2603eb3d6c5c952682e1aeca54ca423ec8b0e58e987a835b
+EBUILD kopete-17.04.3.ebuild 3925 SHA256 7e0d42f3447731483c9ec49b451d843555105c6d817d2b7bd8aed65458a78945 SHA512 68bca4170333a55e503ab14200261881ba5b912f78d46754441333f9078d850eab4c17c3e6f5a74b12c68940e44d688758d433126a9b74b0812c1fd5c5d975e6 WHIRLPOOL e76b6d8cf326ddf09165892d279ce7198e342e033f23b36da7aecd1d4acf08e3f68973fe1085dd0e22ea535f0529953847164728719bbd44f5a43f1920ab1266
+EBUILD kopete-17.08.3.ebuild 3927 SHA256 186b5c6e1ed71c389fb0eeea5255fb29b794241d6d9eb6c725808ed3f0cf275f SHA512 d3004cf0684654cf14a14ea94a7a1360834d2953354c22bff79f9cd829eafeb993e238dfc05c157a8c57244e3a005d95f274eba82f3cb243cb4bce2e108ced26 WHIRLPOOL 78aff88c68b5be132b114df97379208dfe0fd0a4e9c1ffa374abfd8f5f0e7c1b802bca353932dddbaf4401b55b8308bf93a91f3fff8d471362803ab09661f5d4
+EBUILD kopete-17.08.3_p20171029.ebuild 4199 SHA256 fafbdbda64758d3230a5ca1039304081d06b2868d3923f7b36160acc701d640b SHA512 516687c9aa0474a8e57314ef5ab58b1de2ddd5741cc4cb161f965469ee1068755cd7e8338f5c271a01f8c719477e6681e3cb7d049f170cb6ddeb0cdbf37d71ec WHIRLPOOL 4bfcf1f2048f464fcaccd74975acfcb4e541308b062702c1f4ba25951036e538f2f29c89a740407581e41d27baa56f7de5f7c15e05801d9ab7f8e73616662cac
 MISC ChangeLog 8634 SHA256 e39ddabb0a20f3a41c56e91ec98276fa8e868697cd5cc58c0c9b1045f3eebeec SHA512 7c10796dc3710433f1082c96502c9c47917329c03b54476731c4022c922b4be7ab2e7c26f3bc1b0cfd0036c03a3c68f03162c4d0dbfbedf6d644c99fd59a4857 WHIRLPOOL bf54dd70058a54c61c6ff46da173452cc75ce05b52fdc074c7ee91c0c56efc924fbd1b5c02cf8ea16d2afbea1963b11f6132869fae94d1d30e11dc66637bdd01
 MISC ChangeLog-2015 62767 SHA256 79dd2b2e57bd7c6af44dcb08d71b49138bb2f55bdb682223db6eeb13c68e9492 SHA512 5e2660731d560a26a44b028d1aab170af5bfcb75dcdb1adc44a25a438444643fbeee8cc1d40a090029637da2523cc2e0f7e2fd5b33eb365603fb52414d0c173d WHIRLPOOL c135fc107953fbc517e7bf19d9afe959f792e78995f9851280bf1c0677fdf41d7ebdcd8855265c2f8f4a8ed87e0c40593bd0a3748e55e39e6bf5cb0d62008e83
 MISC metadata.xml 2499 SHA256 f3d6f3e69881bfa58520e86ae223a7d5f8e89552f618f3b52f17ec752bda38f7 SHA512 f38d716a57227ffdba5dcf9f1a40bc990393e9d44586d0734ec2f463b0558e5b95f279fdf81565bc828cba2b64791b0b9921a6b6a2e514c76e48b27c2bb805f5 WHIRLPOOL da9d3eace361a78c6b2897ebd53038225467339a3a8204dd0a1605d63d0022c4d530dc8c51213befd5ed754e1b0729aef90a07265d3a319ab81c96434c103e56
diff --git a/kde-apps/kopete/kopete-17.04.3.ebuild b/kde-apps/kopete/kopete-17.04.3.ebuild
index 744622a4cb41..e2a0526fead3 100644
--- a/kde-apps/kopete/kopete-17.04.3.ebuild
+++ b/kde-apps/kopete/kopete-17.04.3.ebuild
@@ -70,7 +70,7 @@ COMMONDEPEND="
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	kde-frameworks/kdelibs:4[zeroconf?]
 	media-libs/phonon[qt4]
-	media-libs/qimageblitz[-qt5(-)]
+	media-libs/qimageblitz[-qt5(+)]
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	cryptography? ( $(add_kdeapps_dep libkleo '' 4.4.2016.01-r1) )
diff --git a/kde-apps/kopete/kopete-17.08.3.ebuild b/kde-apps/kopete/kopete-17.08.3.ebuild
index 1caf66440ded..6be613b08b5f 100644
--- a/kde-apps/kopete/kopete-17.08.3.ebuild
+++ b/kde-apps/kopete/kopete-17.08.3.ebuild
@@ -70,7 +70,7 @@ COMMONDEPEND="
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	kde-frameworks/kdelibs:4[zeroconf?]
 	media-libs/phonon[qt4]
-	media-libs/qimageblitz[-qt5(-)]
+	media-libs/qimageblitz[-qt5(+)]
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	cryptography? ( $(add_kdeapps_dep libkleo '' 4.4.2016.01-r1) )
diff --git a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
new file mode 100644
index 000000000000..066724406ec8
--- /dev/null
+++ b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=d7dbacb483124d5d6a8ad30586ec126c8514a715
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5 vcs-snapshot
+
+DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+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
+#	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)
+#	yahoo: media-libs/jasper
+#	zeroconf (bonjour): NO DEPS
+# DISABLED until fixed: skype sms
+PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf"
+
+# disabled protocols
+#	telepathy: net-libs/decibel
+#	irc: NO DEPS
+#	msn: net-libs/libmsn
+#	qq: NO DEPS
+
+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] )
+	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
+		sys-libs/zlib
+	)
+	yahoo? ( media-libs/jasper )
+	zeroconf? (
+		$(add_frameworks_dep kdnssd)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/scrnsaverproto
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON
+		-DWITH_qq=OFF
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			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
+}