gentoo resync : 28.12.2017

5 files changed, 1 insertions, 221 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 090902fb7215..167c8685eaae 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index da9851c02d29..f3732d5f2fde 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,6 +1,3 @@
-AUX kopete-17.04.0-kde4qgpgme.patch 2563 BLAKE2B 032014a367932df355af8f239b1313a1c28223c917aeca0fcc583a755fefb1ec29f865aa6d2877a3508110e2fec466999696044f3a257e3a020b1a2b173056a7 SHA512 a8c009540d30e893330392376e7128bc5908e47602d198cd6a6dc5036b170c283d9f0d6cce563f4de5c289fa90ff8f4fc2809a04758a6bd40e8876cdcc48f3bf
-DIST kopete-17.08.3.tar.xz 6344464 BLAKE2B 502c7eaf786c929380c82f0e984cfd29c647beb8279e0324f41a8a93a39978686418816befc1db01d07076f417bec6f29908941dd76cd68d8190c1c8d01ce740 SHA512 0c069ec3208bb499ea2ffb92ba5a448980a0190b26a579903b126b7e72bf2c61e59c1ebc90065fc478415aed11aee67d7b4ef0f9d240c18a84e14d6163899f25
 DIST kopete-17.08.3_p20171029.tar.gz 8004208 BLAKE2B d58fefa127021e2d3c07d55fbe461b958351e2e712922de620f46b20fd8e503bb065b42f93bd81d0a4d109e90bd6cbada80b507d2e6140b97b123c0a15bc801d SHA512 bb70dac4f1336502fb79564e132785d3d6faf01520126441e7cde902b75ae8ac36ae796e0d24318f16e6fffeaa0ec1833a6582731ec734a86fd495dd7252fcb8
-EBUILD kopete-17.08.3.ebuild 3927 BLAKE2B d1fa64467ea436c47d30c95e73b463a8c2079189aaa88ae8018979741ff2f5a90a03482199154f8db61feef988216ea360cbf57e631f1dc61b0fd9d84aa8f759 SHA512 d3004cf0684654cf14a14ea94a7a1360834d2953354c22bff79f9cd829eafeb993e238dfc05c157a8c57244e3a005d95f274eba82f3cb243cb4bce2e108ced26
 EBUILD kopete-17.08.3_p20171029.ebuild 4199 BLAKE2B 19d46299879c04ed9909349834e5be2d704bb94c9887d9fc063ccec210b1a166dc636fca0f8d578bd01b46233a6a47eded608f851b619ee643dc609b90f7f13d SHA512 516687c9aa0474a8e57314ef5ab58b1de2ddd5741cc4cb161f965469ee1068755cd7e8338f5c271a01f8c719477e6681e3cb7d049f170cb6ddeb0cdbf37d71ec
-MISC metadata.xml 2499 BLAKE2B 70f0a339e9ebbaef60a9642a86d3b589920006dc595c1f8785c648d50348ab245b4ca9f115f24c17b7fc04ba181afd856d6ef70dc383a0543b62848929d00517 SHA512 f38d716a57227ffdba5dcf9f1a40bc990393e9d44586d0734ec2f463b0558e5b95f279fdf81565bc828cba2b64791b0b9921a6b6a2e514c76e48b27c2bb805f5
+MISC metadata.xml 2351 BLAKE2B 0f8ef4e3906f98a4be58f252fe1beb8ff8a9bb872584e5be9432d63a4932872a81c3036a9cd0d72d98a1ce961ef79194b613b5115e19970e352d5b832bcb6b44 SHA512 2b0350f15c75e45326fc0a6c16f875a2b923726de45ff8558e55c7a592c3c033c0f518f85f9cb4dea3bf54b9c182ec0ea083f3b11b878d398df6d7429a3f75d1
diff --git a/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch b/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch
deleted file mode 100644
index 59e2a3752e2a..000000000000
--- a/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -98,8 +98,8 @@
- macro_optional_find_package(QJSON)
- macro_log_feature(QJSON_FOUND "QJSON" "JSON handling library for Qt" "http://qjson.sourceforge.net/" FALSE "" "Required for the Jabber protocol")
- 
--macro_optional_find_package(QGpgme)
--macro_log_feature(QGPGME_FOUND "QGpgme" "QGpgME library (from kdepimlibs)" "http://www.kde.org/" FALSE "" "Required for the Cryptography plugin")
-+macro_optional_find_package(KDE4_QGpgme)
-+macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgme" "KDE4_QGpgME library (from kdepimlibs)" "http://www.kde.org/" FALSE "" "Required for the Cryptography plugin")
- 
- macro_optional_find_package(Sqlite)
- macro_log_feature(SQLITE_FOUND "Sqlite" "SQLite is a Binary-Database" "http://www.sqlite.org/" FALSE "" "Required for the Statistic plugin")
---- a/plugins/CMakeLists.txt
-+++ b/plugins/CMakeLists.txt
-@@ -74,6 +74,6 @@
- if (WITH_otr AND LIBOTR_FOUND)
-   add_subdirectory ( otr )
- endif (WITH_otr AND LIBOTR_FOUND)
--if (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND)
-+if (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND)
-   add_subdirectory ( cryptography )
--endif (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND)
-+endif (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND)
---- a/plugins/cryptography/CMakeLists.txt
-+++ b/plugins/cryptography/CMakeLists.txt
-@@ -17,7 +17,7 @@
- 
- kde4_add_plugin(kopete_cryptography ${kopete_cryptography_PART_SRCS})
- 
--target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY}  ${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} ${QGPGME_LIBRARIES} )
-+target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY}  ${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} ${KDE4_QGPGME_LIBRARIES} )
- 
- install(TARGETS kopete_cryptography  DESTINATION ${PLUGIN_INSTALL_DIR})
- 
---- a/plugins/cryptography/cryptographyplugin.cpp
-+++ b/plugins/cryptography/cryptographyplugin.cpp
-@@ -52,12 +52,12 @@
- #include <kleo/signjob.h>
- #include <kleo/keylistjob.h>
- #include <kleo/job.h>
--#include <gpgme++/decryptionresult.h>
--#include <gpgme++/verificationresult.h>
--#include <gpgme++/keylistresult.h>
--#include <gpgme++/signingresult.h>
--#include <gpgme++/encryptionresult.h>
--#include <gpgme++/key.h>
-+#include <kde4_gpgme++/decryptionresult.h>
-+#include <kde4_gpgme++/verificationresult.h>
-+#include <kde4_gpgme++/keylistresult.h>
-+#include <kde4_gpgme++/signingresult.h>
-+#include <kde4_gpgme++/encryptionresult.h>
-+#include <kde4_gpgme++/key.h>
- 
- // kabc stuff
- #include <kabc/addressbook.h>
diff --git a/kde-apps/kopete/kopete-17.08.3.ebuild b/kde-apps/kopete/kopete-17.08.3.ebuild
deleted file mode 100644
index 6be613b08b5f..000000000000
--- a/kde-apps/kopete/kopete-17.08.3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-QT3SUPPORT_REQUIRED="true"
-inherit kde4-base
-
-DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug 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: kde-apps/libkleo:4
-#	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 cryptography +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)
-#	yahoo: media-libs/jasper
-#	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise jingle meanwhile oscar skype
-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_kdeapps_dep kdepimlibs '' 4.14.10_p20160611)
-	dev-libs/libpcre
-	>=dev-qt/qtgui-4.4.0:4[mng]
-	kde-frameworks/kdelibs:4[zeroconf?]
-	media-libs/phonon[qt4]
-	media-libs/qimageblitz[-qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	cryptography? ( $(add_kdeapps_dep libkleo '' 4.4.2016.01-r1) )
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt4(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0
-		>=media-libs/mediastreamer-2.3.0
-		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[qt4(+)]
-		dev-libs/qjson
-		net-dns/libidn
-		sys-libs/zlib
-	)
-	yahoo? ( media-libs/jasper )
-"
-RDEPEND="${COMMONDEPEND}
-	!=kde-apps/kdepimlibs-4.14.11_pre20160211*
-	jingle? ( media-libs/speex )
-	latex? (
-		virtual/imagemagick-tools
-		virtual/latex-base
-	)
-	ssl? ( app-crypt/qca:2[ssl] )
-	winpopup? ( net-fs/samba )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/scrnsaverproto
-	jingle? ( dev-libs/jsoncpp )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-17.04.0-kde4qgpgme.patch" )
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DWITH_LiboRTP=$(usex jingle)
-		-DWITH_Mediastreamer=$(usex jingle)
-		-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
-
-	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF -DWITH_sms=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if ! use ssl; then
-		if use xmpp ; then # || use irc; 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/metadata.xml b/kde-apps/kopete/metadata.xml
index 5ca4a33c2521..64e9226784bf 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -6,7 +6,6 @@
 		<flag name="addbookmarks">Automatically add incoming urls to bookmarks.</flag>
 		<flag name="autoreplace">Automatically replace selected text</flag>
 		<flag name="contactnotes">Enables writing personal notes for contacts.</flag>
-		<flag name="cryptography">Enable cryptography plugin</flag>
 		<flag name="highlight">Allows you to specify highlights on specific events.</flag>
 		<flag name="history">Enables saving chat history.</flag>
 		<flag name="latex">Embed latex formatted text into messages.</flag>
@@ -26,7 +25,6 @@
 		<flag name="irc">Enable the IRC protocol handler.</flag>
 		-->
 		<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
-		<flag name="skype">Enable Skype protocol handler (not fully functional yet).</flag>
 		<!-- uncomment this when enabled in ebuild
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy.</flag>
 		-->