Add telepathy support, per bug #492344

Package-Manager: portage-2.2.7/cvs/Linux x86_64

5 files changed, 21 insertions, 70 deletions

diff --git a/x11-plugins/pidgin-sipe/ChangeLog b/x11-plugins/pidgin-sipe/ChangeLog
index 9ba6a647ab1c..2401780f4b7f 100644
--- a/x11-plugins/pidgin-sipe/ChangeLog
+++ b/x11-plugins/pidgin-sipe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/pidgin-sipe
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.22 2013/11/21 16:43:41 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.23 2013/11/28 15:51:34 thev00d00 Exp $
+
+  28 Nov 2013; Ian Whyman <thev00d00@gentoo.org> -pidgin-sipe-1.16.1.ebuild,
+  metadata.xml, pidgin-sipe-1.17.1.ebuild:
+  Add telepathy support, per bug #492344
 
 *pidgin-sipe-1.17.1 (21 Nov 2013)
 
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index d458a31998f0..070cdebd7a7d 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,7 +1,5 @@
 AUX pidgin-sipe-1.13.2-fix-sandbox-r1.patch 855 SHA256 69fc95e9e05cfa17d7d12fc8330df658542ea5a4cd86a13bb0819074987dcdb8 SHA512 4c13485079b5414056938b9c54945ec3d2430696ce84cbf34e768bf3e95ae090a4c9ee1a50887629a76cc2b9dbf29e4e49be5a8f8b6ef5c81b2997b096279be6 WHIRLPOOL 7d7bdb3672e9528f3b0b8f44405947ab1c57bb5dd7e8072036ccc19114920baab6509359af6d7fbf2be58308eb1045a2d2563dabdfdfc79f94e6b2ba89d7f9d9
-DIST pidgin-sipe-1.16.1.tar.gz 1061242 SHA256 04911c5ddc5d5a7d387b8fffa3f3567c9a26758f5a4fa04d91bfcdbb531a2191 SHA512 16de30460ee3bd9d528c92d81534db0815720b0f7e6e859daf64c93c1d3a3d84a67335518f9b7b69aaf8cb053dabd97db8fd13ad5252572ee2f79822a327aa7a WHIRLPOOL 809a4a77a7a7bb7e2c4e56d1cdc4fcca6752f30b02a6dbfab19716d0c31c288be9039e46742c6594024c85dbd89577ccbb69da60280f4e30d42ae5b7df3ec7ee
 DIST pidgin-sipe-1.17.1.tar.gz 1078581 SHA256 cb4fe6f974f136cd26c9d64c48a4d4d4e6998185e899d7264058a1f1c0cd2a98 SHA512 f883d64b61d186069305274c6b1f30ca0928e44a267e3889aa6d218e9db77e88d39cd90944c81e83c40e6ff0cdded899dd81d92021641199801d2e52e352fbf4 WHIRLPOOL 6bf30032c595861287a99602050351b7028a19597e17a2f2ffd72c722f528b46c83244ebc27496a5f0ab929903aa4c50f36c3b3e8bc3e7da5ac9fae0c958d48f
-EBUILD pidgin-sipe-1.16.1.ebuild 1254 SHA256 1e6a0c9933af9f102339e09386bddaca462ecf75211a09797f30a61a32d7d1c5 SHA512 85621c1558088e2e83c415b8b5a43611296dd89a14705a1ebd56f25f125ce4724210496b824ba2af7f9becb7702720d27e34fa59d2adbd4c93645f3dac34f640 WHIRLPOOL 4860b44704593e7acaf5c4a41010f3010debaed805ecb991e3464f07665d0f4329e7894427b8dc8339058f9851031954b7ed594d32bd4cec0ae067ed081060d6
-EBUILD pidgin-sipe-1.17.1.ebuild 1254 SHA256 70f0ce3fd6c16937006c286472298df054d31386001e4a96d389a3e45ce49d0c SHA512 525ce07de0b513a15beddb14b05f20ce80405a5957d4d84e1e2c6d5804716f8d0c3bb897bcca480fa79111f2ce495cb74b4cf182b0f1a9277c841353b17d0245 WHIRLPOOL 2f3e3c70ce158cfa6eb9d1961289cf5d97ab8756fa9bbc0a6f0178d6efc7f7d8e7dc1fa3c29dd4b34e896517076b714aa701a04cc06a06cb14bbda2fef9f7ac0
-MISC ChangeLog 4034 SHA256 077bd894e5b6116eb31e69bcbcba5fa5a20d2722b6a94f9fb37b8c32c44e27c1 SHA512 c4d809ccb89dd82eb948b3a9ef54b53ba2d5727ec890d62cb1165a24ce0344bdfffce01f8092ef60c77133e27d721859ee868ec6d2d49804d72de42bd243ed8d WHIRLPOOL a80a804e79616e40d660bb6815c497350b529ee9899f5cdc713104c5a52e2340485d9ae3506d6b4c746752de4c9e08600473d5000a60136ebdfbc87e443976ac
-MISC metadata.xml 608 SHA256 5d1a710cf8336c68b7401959efa14672401599fcbd0c40c58e3920bceee31023 SHA512 e5bf5c9a076df3cb5fd9919287e19202871b45d1d34eb3a357fa1d768c195659219b4ae5bf37aec11712e3be6834b697a3f2631e8faeeef7e02e52809ece5a8b WHIRLPOOL fa731fcbf6f806328be21e74e82e70f7dfe6b9c6353bb179166ce6beeb913ec1b8eff0ed767e0a56016b3aa2d459c00efe7725e8c43367ca1c2c68304b175bdd
+EBUILD pidgin-sipe-1.17.1.ebuild 1399 SHA256 c6f736875c796d5e54e03bc0b451b955e46594e534515e8c2b89836725952768 SHA512 42296345a6f22829b7b61110471a5dc25c52bb466708f14e13f14740ca4b30f65b23331fe45df9e2fcad4b77ac75bc02b24557f9f0d73e1b1c642a03878518a7 WHIRLPOOL 738c6829b908046f0f2f433d54d7ca2d7097ba33f490c3f3bef93c907e6e6a91457907064c5579b4fef90e25975f9a7407ec9db265f60465b53e915111264815
+MISC ChangeLog 4196 SHA256 818dd61a13ea1367826c563c5370a99ad7871c6fe7d8d5066533e02d5be2250f SHA512 cb9a6bd250407d100fed163fc3c995d35250ca05884594f0983e58d83c115d8c48e034cedfff69d172f0ae3a4f4ca774c05e7ff0c3b16d85d2dc5a169f567d21 WHIRLPOOL 5926be06af3bc2a9a1e4167b45b04b3ca01c6c03cc85596fa7656dffcf190c5a211f047f671c45aa7e8200d7312d291272365e59d51a398b6a640392851fa7cf
+MISC metadata.xml 684 SHA256 dd4da1ac4ce03e40bd21c636d20e9a807068828ad50f545b24e7507f23cd1e1c SHA512 0cf692b57e4c48e44ecddaff00dd24b61a3ced38e1065e15bae6522c28aa01474d585df377ced83fb825a32b7bcb9d35c12250dae03973c6ff3d8f83289c9381 WHIRLPOOL 541dd29e3bf54734c48d34a78dbd8d483f9d2e91fd1892973b06e3b701be8166409aebc36e2dde0fbbe430332f0e664e32e28a4c4ba610a0424b2c378489880d
diff --git a/x11-plugins/pidgin-sipe/metadata.xml b/x11-plugins/pidgin-sipe/metadata.xml
index fc1ef104e511..3406c48190c1 100644
--- a/x11-plugins/pidgin-sipe/metadata.xml
+++ b/x11-plugins/pidgin-sipe/metadata.xml
@@ -7,10 +7,11 @@
   <name>Ian Whyman</name>
 </maintainer>
 <longdescription lang="en">
-An Open Implementation of SIP/Simple protocol for Live Communications Server 2003/2005/2007.
+An Open Implementation of SIP/Simple protocol for Live Communications Server 2003/2005/2007 and Lync.
 </longdescription>
 <use>
+  <flag name="ocs2005-message-hack">Disable message timeout for OCS2005 clients which causes "false" not delivered error messages</flag>
+  <flag name="telepathy">Support use as a telepathy backend</flag>
   <flag name="voice">Enable experimental voice/video support</flag>
-  <flag name="ocs2005-message-hack">disable message timeout for OCS2005 clients which causes "false" not delivered error messages</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.16.1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.16.1.ebuild
deleted file mode 100644
index 8ab7812d5bce..000000000000
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.16.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.16.1.ebuild,v 1.1 2013/07/18 08:26:27 thev00d00 Exp $
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
-HOMEPAGE="http://sipe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos ocs2005-message-hack voice"
-
-RDEPEND=">=dev-libs/gmime-2.4.16
-	dev-libs/libxml2
-	dev-libs/nss
-	kerberos? ( virtual/krb5 )
-	voice? (
-		>=dev-libs/glib-2.28.0
-		>=net-libs/libnice-0.1.0
-		media-libs/gstreamer:0.10
-		>=net-im/pidgin-2.8.0[gnutls]
-	)
-	!voice? (
-		>=dev-libs/glib-2.12.0
-		net-im/pidgin[gnutls]
-	)
-"
-
-DEPEND="dev-util/intltool
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.13.2-fix-sandbox-r1.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-purple \
-		--disable-quality-check \
-		--disable-telepathy \
-		$(use_enable debug) \
-		$(use_enable ocs2005-message-hack) \
-		$(use_with kerberos krb5) \
-		$(use_with voice vv)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS TODO README
-}
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.17.1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.17.1.ebuild
index 654fd641c077..ae8a2ad2eb50 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.17.1.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.17.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.17.1.ebuild,v 1.1 2013/11/21 16:43:41 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.17.1.ebuild,v 1.2 2013/11/28 15:51:34 thev00d00 Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos ocs2005-message-hack voice"
+IUSE="debug kerberos ocs2005-message-hack telepathy voice"
 
 RDEPEND=">=dev-libs/gmime-2.4.16
 	dev-libs/libxml2
@@ -26,9 +26,15 @@ RDEPEND=">=dev-libs/gmime-2.4.16
 		>=net-im/pidgin-2.8.0[gnutls]
 	)
 	!voice? (
-		>=dev-libs/glib-2.12.0
+		>=dev-libs/glib-2.12.0:2
 		net-im/pidgin[gnutls]
 	)
+	telepathy? (
+		>=sys-apps/dbus-1.1.0
+		>=dev-libs/dbus-glib-0.61
+		>=dev-libs/glib-2.28:2
+		>=net-libs/telepathy-glib-0.18.0
+	)
 "
 
 DEPEND="dev-util/intltool
@@ -45,7 +51,7 @@ src_configure() {
 	econf \
 		--enable-purple \
 		--disable-quality-check \
-		--disable-telepathy \
+		$(use_enable telepathy) \
 		$(use_enable debug) \
 		$(use_enable ocs2005-message-hack) \
 		$(use_with kerberos krb5) \