Version bump, bug 542136. Some credits to wojtask9.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

5 files changed, 172 insertions, 18 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index 06e899000de7..09509fe6d37b 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/kadu
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.154 2015/02/22 18:41:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.155 2015/07/05 20:17:08 reavertm Exp $
+
+*kadu-2.1 (05 Jul 2015)
+
+  05 Jul 2015; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/kadu-2.1-qt5-compilation.patch, +kadu-2.1.ebuild, metadata.xml:
+  Version bump, bug 542136. Some credits to wojtask9.
 
   22 Feb 2015; Michał Górny <mgorny@gentoo.org> kadu-0.12.3.ebuild:
   Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index afec528197a3..06d5c9d26c16 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,26 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kadu-2.1-qt5-compilation.patch 542 SHA256 5a18b98d3bc6182e489344157057d60802c52f70f7fa8063254b4b9570df94a2 SHA512 294a2d90145d8765e0ae25482607f326f5fc8a86c589ed686ad37e02a13a5d487c28c5b0fbc3495de690864cc5b120cc5a75297dfc5ff28a4b6e4eaf7eade5d8 WHIRLPOOL db78ee7f4ac1c2eade749d8d6e1e86daf437514288042c111a5caa605f6f14595cae664310cabcf89b3c19d289d2b5c520cc237d65b6ff48efb82bfebeccdd83
 DIST kadu-0.12.3.tar.bz2 5106482 SHA256 d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8 SHA512 0aeaec9ac3ce5a1860571721e307a8d5e6657a30780125e21d153901ce5f2870ba3ea6ebc272bbb6f35a56ed9a24127abfc8f25b9eb88d01ecf9c931fa5c851c WHIRLPOOL 0a2b1b9684577d95027b9107fc51e8a8f290b7ed38a18bf282f9589eb3dd5ca7a9fa61b088e2fb2be8d4d16e6d4e72d766476e36f7d65cc55a2d5efae53bb8ca
+DIST kadu-2.1.tar.bz2 6013519 SHA256 9f8092756d4a870c1ecb016c0cba2c833e1697b3eb7e9bf51813b1f0a541ffb8 SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a WHIRLPOOL 10b214ca8d1964054918dc0e1b85bf1157d2496e3ad340958302083a0374ac4fb7b6ac96741637f3847ac06dd9c322b0e529f9c204b9ebc6658157f7b7c2b8a2
 EBUILD kadu-0.12.3.ebuild 2608 SHA256 d75075050e8934070730fc2ef406772c770c37d2ef04871aea443c74c95455fb SHA512 b6cecb694053bda06970944adce7be549dbd974cd6cfcc7858ea9ef1668a6f91a2c76a7cb78170dd925e8a03059ea6a94dcb78cc0c852f3c135ef8fb8cccd963 WHIRLPOOL d42b098d2a56074bcf9ae881d40c2cb263fd6b983aebb52d1024a85d2713be5e0ef635523206ff0331e314c3cc0ee0c6fe3d2b3eb2cee6dcdd9d1598c869f103
-MISC ChangeLog 22225 SHA256 7ebb4c378d905c45e380711993109109567b218e5cb407a00b4c38ef36099d63 SHA512 86a39ce83a63ee43a204f41a6a5047f1ac0f367ab67f2b98d612f2fa9dee90f406cded94d23052d9d446c13e450fc9b55fb92ea094c60fbbee5813a3b16b417f WHIRLPOOL 48fcc46a8615718a71f924ed21388f84a9b6b98d3fec22cf8b80c0552c2c42101c702a47700d3a970928500a7ccb488ad2a3ebd5c6f6482b65750d746703eef4
-MISC metadata.xml 577 SHA256 38cad9cdfd2009798cc27cff9bb4946903f3bd8e42fd09f1af4c6327a4c513dc SHA512 18dc27fa927c25ea682f5548dc63b52c5227c8fd29343be73254ba2c4fa5d374f9315e7a468ed310926fe58044fbbf07a1893d77b405d94871120fdd2444610d WHIRLPOOL 381df376b9754e3a594624d648e85b7ee79bc25509373a8011404cc44d51a8d13f38242717fa1601f2985f2195571cfd4f46e7768016c79ae1fb4ce55a75cbe1
+EBUILD kadu-2.1.ebuild 2876 SHA256 6186977d420bda292313155a82ea6e79ed9613d3a5fc7592f75fe7c0ded7737d SHA512 968b392868d70d70eb388e4f2eea51a83dd2ed9ca173cb8386e967e921d32b0ec6a36f484b055e9930674d6439ea0f49304e4d1897db76c2d77f68940f649ca6 WHIRLPOOL ad7e41476c3d48ddce69b0116f5cc71c44835fa4409f815cee2ac1a8d80cf51f5356172f3adbfb23f04d5105a9e5d7b8304373bd50db4f3ae2c0556beef80bd0
+MISC ChangeLog 22434 SHA256 f9f3c80a9a225f15bb8572fd9c4afc1d5ca895a7dd4a8b43f3f0937b689e3ebd SHA512 24e2037d251c24ae0479e8f3dff3f9000b9e2cfc870c9bd3c6a84361a778300de2bcc88e45713ceaf4dfd0f7615ff17da3cb5eabfbb786790acd56dddac03a1d WHIRLPOOL 960058a68efb6f9dd3bbaea831f1223f27bf7a17e07e40249b85b37fe6ac2e99077dd55587dc0667e69839a91bcadce7ca21607580b3480374c92b93ff109199
+MISC metadata.xml 642 SHA256 7bf85f6bb5f8f27ada5629c0a2aebb079a36aceba83a86be759574e534d06b8f SHA512 0250f972b05701b8ed2e40e5f5a66fce41fa03a4b6fc506befa6cf3177c17501893303f2a25b59ebadcd48b60f96039669ff0f78fdaf1ef30ab369665d762945 WHIRLPOOL 922bbdcffad928c654c9745cb9872511caf95137f76c542b666f6576c9ff609c76719ad60d7a355a525adc8d9e426bc93a0b295c63a3f9699f52c58d6e097c74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU6iLhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmdkP/R450WDdORxJgk224zBnhRYF
-LHSA6L0q3mtg6J8ZfGv8UouR9EopqaIhWITx0tGwj3SA1NsBPbJoN3kmhrsjQFXt
-z5ooHK8pXm4iYHPOBcSLU/Xjc+ZD1js0Sskyz/0INrvgAeYTfb7XYRDUANjKfVPX
-g0puMNLyHfNAdxzq5556pOvn/945qdRx8Hv87yWjN/DZEN0tkNvuoEShTFYoWaFb
-YgFqlPycMGbEzT/kLFWTpJFj5MgxZB6uE/bI7DVZgWpD8VNALvFzVrQSO0VAZODe
-pMUZDY95lGP1xLq7JO/8ZdwE4jR4MUioS7i4TXHz6qIenwfDnO3ML0zTEFIj3qe5
-YeWnXdg+153H+Wr87uhQ/DJpa6TpoeVvC12Kvwyb0GNKmuF/LEyqZaDcoo6WsuTe
-yEjL/2A8cTayWyGer3XC/l2U9wayzQKy2HDs695F25etjjSYgIFjW/9G19m79gBp
-6rdwKenjuw3CcR0CYS9mDn/kxiCieJP3xlVvkut0JD5+/7h5pqBOCG1TsZD7HNOe
-jrSj53pmLg4rqNgac3cOS+so1j/+fD61Enm1kUGbONt+P3scScshOAxU8dqh6qSq
-goraro6lg4t4wQZV6kmaWZ2nbpXz/LnXb7FEvfUTrU5JRTyW2e4w+/3kM/mW9xiZ
-CvMiZh1nLJ3U8IqT3aRk
-=hWKW
+iEYEAREIAAYFAlWZkOAACgkQFuHa/bHpVds1JwCghwL/grH44FGxonVftbMekoIz
+mmUAnAu18LmFsrqZAaTgENmLjDYiMUPn
+=Xe6H
 -----END PGP SIGNATURE-----
diff --git a/net-im/kadu/files/kadu-2.1-qt5-compilation.patch b/net-im/kadu/files/kadu-2.1-qt5-compilation.patch
new file mode 100644
index 000000000000..68120a4ede0e
--- /dev/null
+++ b/net-im/kadu/files/kadu-2.1-qt5-compilation.patch
@@ -0,0 +1,11 @@
+diff -ruN kadu-2.1/kadu-core/os/single-application/single-application.cpp my/kadu-core/os/single-application/single-application.cpp
+--- kadu-2.1/kadu-core/os/single-application/single-application.cpp	2015-03-24 22:13:18.000000000 +0100
++++ my/kadu-core/os/single-application/single-application.cpp	2015-07-05 21:08:09.044685214 +0200
+@@ -26,6 +26,7 @@
+ #include "long-lived-lock-file.h"
+ 
+ #include <QtCore/QCoreApplication>
++#include <QtCore/QDataStream>
+ #include <QtCore/QDir>
+ #include <QtCore/QRegExp>
+ #include <QtNetwork/QLocalServer>
diff --git a/net-im/kadu/kadu-2.1.ebuild b/net-im/kadu/kadu-2.1.ebuild
new file mode 100644
index 000000000000..76ee612732f7
--- /dev/null
+++ b/net-im/kadu/kadu-2.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-2.1.ebuild,v 1.1 2015/07/05 20:17:08 reavertm Exp $
+
+EAPI="5"
+
+inherit base cmake-utils flag-o-matic
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client"
+HOMEPAGE="http://www.kadu.net"
+SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+gadu mpd otr phonon sdk speech spell xmpp"
+REQUIRED_USE="
+	|| (
+		gadu
+		xmpp
+	)
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[openssl,qt5]
+	>=dev-libs/injeqt-1.0.0
+	>=dev-qt/linguist-tools-5.2.0:5
+	>=dev-qt/qtcore-5.2.0:5
+	>=dev-qt/qtdbus-5.2.0:5
+	>=dev-qt/qtgui-5.2.0:5
+	>=dev-qt/qtmultimedia-5.2.0:5
+	>=dev-qt/qtnetwork-5.2.0:5
+	>=dev-qt/qtquick1-5.2.0:5
+	>=dev-qt/qtscript-5.2.0:5
+	>=dev-qt/qtsql-5.2.0:5
+	>=dev-qt/qtsvg-5.2.0:5
+	>=dev-qt/qtwebkit-5.2.0:5
+	>=dev-qt/qtwidgets-5.2.0:5
+	>=dev-qt/qtx11extras-5.2.0:5
+	>=dev-qt/qtxml-5.2.0:5
+	>=dev-qt/qtxmlpatterns-5.2.0:5
+	>=app-arch/libarchive-2.6[lzma]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXScrnSaver
+	gadu? ( >=net-libs/libgadu-1.11.1[threads] )
+	mpd? ( media-libs/libmpdclient )
+	otr? (
+		>=dev-libs/libgcrypt-1.2.2:0
+		>=net-libs/libotr-4.1.0
+	)
+	phonon? (
+		|| (
+			media-libs/phonon[qt5]
+			>=dev-qt/qtphonon-4.7.0:4
+		)
+	)
+	spell? ( app-text/enchant )
+	xmpp? (
+		net-dns/libidn
+		sys-libs/zlib
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	speech? ( app-accessibility/powiedz )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt5-compilation.patch"
+)
+
+PLUGINS='
+antistring
+auto_hide
+autoaway
+autoresponder
+autostatus
+cenzor
+chat_notify
+config_wizard
+desktop_docking
+docking
+emoticons
+encryption_ng
+encryption_ng_simlite
+exec_notify
+ext_sound
+falf_mediaplayer
+filedesc
+firewall
+freedesktop_notify
+hints
+history
+idle
+imagelink
+last_seen
+mediaplayer
+mprisplayer_mediaplayer
+pcspeaker
+qt4_docking
+qt4_docking_notify
+screenshot simpleview
+single_window
+sms
+sound
+sql_history
+tabs
+word_fix
+'
+
+src_configure() {
+	# Filter out dangerous flags
+	filter-flags -fno-rtti
+	strip-unsupported-flags
+
+	# Ensure -DQT_NO_DEBUG is added
+	append-cppflags -DQT_NO_DEBUG
+
+	# Plugin selection
+	use gadu && PLUGINS+=' gadu_protocol history_migration profiles_import'
+	use mpd && PLUGINS+=' mpd_mediaplayer'
+	use otr && PLUGINS+=' encryption_otr'
+	use phonon && PLUGINS+=' phonon_sound'
+	use speech && PLUGINS+=' speech'
+	use spell && PLUGINS+=' spellchecker'
+	use xmpp && PLUGINS+=' jabber_protocol'
+
+	# Configure package
+	local mycmakeargs=(
+		-DBUILD_DESCRIPTION='Gentoo Linux'
+		-DCOMPILE_PLUGINS="${PLUGINS}"
+		-DNETWORK_IMPLEMENTATION="Qt"
+		$(cmake-utils_use sdk INSTALL_SDK)
+		$(cmake-utils_use_with spell ENCHANT)
+	)
+	unset PLUGINS
+
+	cmake-utils_src_configure
+}
diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml
index af134fb5a226..d54eca9f9ee3 100644
--- a/net-im/kadu/metadata.xml
+++ b/net-im/kadu/metadata.xml
@@ -9,6 +9,7 @@
 	<use>
 		<flag name="gadu">Enables Gadu communication protocol</flag>
 		<flag name="mpd">Enables Music Player Daemon support</flag>
+		<flag name="otr">Enable char encryption via OTR library</flag>
 		<flag name="phonon">Enables phonon audio plugin</flag>
 		<flag name="sdk">Install Kadu SDK (cmake module, API headers)</flag>
 		<flag name="speech">Enables speech module</flag>