[dev-python/papyon] migrate to farstream

dev-python/papyon/Manifest

@@ -0,0 +1,4 @@
+AUX papyon-0.5.6-farstream.patch 6998 RMD160 6adf376ae2e783813d5ed3748fb4643b62cefe31 SHA1 65d8870db5377fb4a73c77a5aff5139e2b81f080 SHA256 2122664b280b30421ea0f44bb739d9912ea6503d0c253be720343aa4e10ffa79
+DIST papyon-0.5.6.tar.gz 188721 RMD160 f439b074975e2f3c94520640957b4334dfae3a8a SHA1 5eb28e353513ce632072f6df1edbab54130b2280 SHA256 85ce086ad8c0a47609d908325008c27f4fc1d88b9e9f30ed6586bf943bc828ec
+EBUILD papyon-0.5.6.ebuild 897 RMD160 791f760f4a928f483050cb2805e9a250afd1edd2 SHA1 fd2b0afeb01f7998edfa6dcd9cd24f0b0e89e621 SHA256 d1a071e58453fb396aea20e084a4acc7525134b97181689779bc60454f1cac8b
+MISC metadata.xml 243 RMD160 29b397b5e1af12f8a1499987eb91f865c4b6bde3 SHA1 21e8d8287b5926e7adab11737ed0ed327cd6fcc2 SHA256 c7460c1bd0a4a457f7866a9378126b6fb2ab0d3e11981deaf83f4f3ffb8ba0af

dev-python/papyon/files/papyon-0.5.6-farstream.patch

@@ -0,0 +1,168 @@
+diff -up papyon-0.5.6/papyon/media/conference.py.farstream papyon-0.5.6/papyon/media/conference.py
+--- papyon-0.5.6/papyon/media/conference.py.farstream	2012-03-09 22:51:11.102834154 -0500
++++ papyon-0.5.6/papyon/media/conference.py	2012-03-09 22:52:37.955953578 -0500
+@@ -24,7 +24,7 @@ from papyon.event.media import *
+ import pygst
+ pygst.require('0.10')
+ 
+-import farsight
++import farstream
+ import gobject
+ import gst
+ import logging
+@@ -34,44 +34,44 @@ logger = logging.getLogger("papyon.media
+ 
+ codecs_definitions = {
+     "audio" : [
+-        (114, "x-msrta", farsight.MEDIA_TYPE_AUDIO, 16000),
+-        (111, "SIREN", farsight.MEDIA_TYPE_AUDIO, 16000),
+-        (112, "G7221", farsight.MEDIA_TYPE_AUDIO, 16000),
+-        (115, "x-msrta", farsight.MEDIA_TYPE_AUDIO, 8000),
+-        (116, "SIREN", farsight.MEDIA_TYPE_AUDIO, 8000),
+-        (4, "G723", farsight.MEDIA_TYPE_AUDIO, 8000),
+-        (8, "PCMA", farsight.MEDIA_TYPE_AUDIO, 8000),
+-        (0, "PCMU", farsight.MEDIA_TYPE_AUDIO, 8000),
+-        (97, "RED", farsight.MEDIA_TYPE_AUDIO, 8000),
+-        (101, "telephone-event", farsight.MEDIA_TYPE_AUDIO, 8000)
++        (114, "x-msrta", farstream.MEDIA_TYPE_AUDIO, 16000),
++        (111, "SIREN", farstream.MEDIA_TYPE_AUDIO, 16000),
++        (112, "G7221", farstream.MEDIA_TYPE_AUDIO, 16000),
++        (115, "x-msrta", farstream.MEDIA_TYPE_AUDIO, 8000),
++        (116, "SIREN", farstream.MEDIA_TYPE_AUDIO, 8000),
++        (4, "G723", farstream.MEDIA_TYPE_AUDIO, 8000),
++        (8, "PCMA", farstream.MEDIA_TYPE_AUDIO, 8000),
++        (0, "PCMU", farstream.MEDIA_TYPE_AUDIO, 8000),
++        (97, "RED", farstream.MEDIA_TYPE_AUDIO, 8000),
++        (101, "telephone-event", farstream.MEDIA_TYPE_AUDIO, 8000)
+     ],
+     "video" : [
+-        (121, "x-rtvc1", farsight.MEDIA_TYPE_VIDEO, 90000),
+-        (34, "H263", farsight.MEDIA_TYPE_VIDEO, 90000)
++        (121, "x-rtvc1", farstream.MEDIA_TYPE_VIDEO, 90000),
++        (34, "H263", farstream.MEDIA_TYPE_VIDEO, 90000)
+     ]
+ }
+ 
+ types = {
+     0 : None,
+-    farsight.CANDIDATE_TYPE_HOST  : "host",
+-    farsight.CANDIDATE_TYPE_SRFLX : "srflx",
+-    farsight.CANDIDATE_TYPE_PRFLX : "prflx",
+-    farsight.CANDIDATE_TYPE_RELAY : "relay"
++    farstream.CANDIDATE_TYPE_HOST  : "host",
++    farstream.CANDIDATE_TYPE_SRFLX : "srflx",
++    farstream.CANDIDATE_TYPE_PRFLX : "prflx",
++    farstream.CANDIDATE_TYPE_RELAY : "relay"
+ }
+ 
+ protos = {
+-    farsight.NETWORK_PROTOCOL_TCP : "TCP",
+-    farsight.NETWORK_PROTOCOL_UDP : "UDP"
++    farstream.NETWORK_PROTOCOL_TCP : "TCP",
++    farstream.NETWORK_PROTOCOL_UDP : "UDP"
+ }
+ 
+ media_names = {
+-    farsight.MEDIA_TYPE_AUDIO : "audio",
+-    farsight.MEDIA_TYPE_VIDEO : "video"
++    farstream.MEDIA_TYPE_AUDIO : "audio",
++    farstream.MEDIA_TYPE_VIDEO : "video"
+ }
+ 
+ media_types = {
+-    "audio" : farsight.MEDIA_TYPE_AUDIO,
+-    "video" : farsight.MEDIA_TYPE_VIDEO
++    "audio" : farstream.MEDIA_TYPE_AUDIO,
++    "video" : farstream.MEDIA_TYPE_VIDEO
+ }
+ 
+ 
+@@ -125,10 +125,10 @@ class MediaSessionHandler(MediaSessionEv
+         ret = gst.BUS_PASS
+         if msg.type == gst.MESSAGE_ELEMENT:
+             s = msg.structure
+-            if s.has_name("farsight-error"):
+-                logger.error("Farsight error : %s" % s['error-msg'])
+-            if s.has_name("farsight-codecs-changed"):
+-                logger.debug("Farsight codecs changed")
++            if s.has_name("farstream.error"):
++                logger.error("Farstream error : %s" % s['error-msg'])
++            if s.has_name("farstream.codecs-changed"):
++                logger.debug("Farstream codecs changed")
+                 ret = gst.BUS_DROP
+                 ready = s["session"].get_property("codecs-ready")
+                 if ready:
+@@ -136,21 +136,21 @@ class MediaSessionHandler(MediaSessionEv
+                     name = media_names[s["session"].get_property("media-type")]
+                     stream = self._session.get_stream(name)
+                     stream.set_local_codecs(convert_fs_codecs(codecs))
+-            if s.has_name("farsight-new-local-candidate"):
++            if s.has_name("farstream.new-local-candidate"):
+                 logger.debug("New local candidate")
+                 ret = gst.BUS_DROP
+                 name = media_names[s["stream"].get_property("session").get_property("media-type")]
+                 candidate = convert_fs_candidate(s["candidate"])
+                 stream = self._session.get_stream(name)
+                 stream.new_local_candidate(candidate)
+-            if s.has_name("farsight-local-candidates-prepared"):
++            if s.has_name("farstream.local-candidates-prepared"):
+                 logger.debug("Local candidates are prepared")
+                 ret = gst.BUS_DROP
+                 type = s["stream"].get_property("session").get_property("media-type")
+                 name = media_names[type]
+                 stream = self._session.get_stream(name)
+                 stream.local_candidates_prepared()
+-            if s.has_name("farsight-new-active-candidate-pair"):
++            if s.has_name("farstream.new-active-candidate-pair"):
+                 logger.debug("New active candidate pair")
+                 ret = gst.BUS_DROP
+                 type = s["stream"].get_property("session").get_property("media-type")
+@@ -220,10 +220,10 @@ class MediaStreamHandler(MediaStreamEven
+         pad.link(sink.get_pad("sink"))
+ 
+ 
+-# Farsight utility functions
++# Farstream utility functions
+ 
+ def create_notifier(pipeline, filename):
+-    notifier = farsight.ElementAddedNotifier()
++    notifier = farstream.ElementAddedNotifier()
+     notifier.add(pipeline)
+     notifier.set_properties_from_file(filename)
+     return notifier
+@@ -246,14 +246,14 @@ def convert_fs_candidate(fscandidate):
+ def convert_media_candidates(candidates):
+     fscandidates = []
+     for candidate in candidates:
+-        proto = farsight.NETWORK_PROTOCOL_TCP
++        proto = farstream.NETWORK_PROTOCOL_TCP
+         if candidate.transport == "UDP":
+-            proto = farsight.NETWORK_PROTOCOL_UDP
++            proto = farstream.NETWORK_PROTOCOL_UDP
+         type = 0
+         for k,v in types.iteritems():
+             if v == candidate.type:
+                 type = k
+-        fscandidate = farsight.Candidate()
++        fscandidate = farstream.Candidate()
+         fscandidate.foundation = candidate.foundation
+         fscandidate.ip = candidate.ip
+         fscandidate.port = candidate.port
+@@ -269,7 +269,7 @@ def convert_media_candidates(candidates)
+ def build_codecs(type):
+     codecs = []
+     for args in codecs_definitions[type]:
+-        codec = farsight.Codec(*args)
++        codec = farstream.Codec(*args)
+         codecs.append(codec)
+     return codecs
+ 
+@@ -288,7 +288,7 @@ def convert_media_codecs(codecs, name):
+     fscodecs = []
+     media_type = media_types[name]
+     for codec in codecs:
+-        fscodec = farsight.Codec(
++        fscodec = farstream.Codec(
+             codec.payload,
+             codec.encoding,
+             media_type,

dev-python/papyon/metadata.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<herd>voip</herd>
+	<maintainer>
+		<email>tester@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
+

dev-python/papyon/papyon-0.5.6.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/papyon/papyon-0.5.6.ebuild,v 1.5 2012/01/20 17:54:08 ssuominen Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+
+inherit eutils distutils python
+
+DESCRIPTION="Python MSN IM protocol implementation forked from pymsn"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/papyon"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pygobject-2.10:2
+	>=dev-python/pyopenssl-0.6
+	dev-python/gst-python
+	dev-python/pycrypto
+	net-libs/farstream[python]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-farstream.patch"
+
+	distutils_src_prepare
+	python_convert_shebangs -r 2 .
+}