Bug #343043.

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 198 insertions, 2 deletions

diff --git a/net-voip/sflphone/ChangeLog b/net-voip/sflphone/ChangeLog
index 3f86e0d5f4cb..9f117877c824 100644
--- a/net-voip/sflphone/ChangeLog
+++ b/net-voip/sflphone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-voip/sflphone
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.6 2011/01/30 14:07:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.7 2011/02/22 14:12:11 elvanor Exp $
+
+*sflphone-0.9.12 (22 Feb 2011)
+
+  22 Feb 2011; <elvanor@gentoo.org> +sflphone-0.9.12.ebuild,
+  +files/sflphone-0.9.12-libnotify-0.7.patch:
+  Version bump, bug #343043.
 
   30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> sflphone-0.9.8.4.ebuild,
   +files/sflphone-0.9.8.4-libnotify-0.7.patch:
diff --git a/net-voip/sflphone/Manifest b/net-voip/sflphone/Manifest
index 43aab37788a3..2044eb42b6a1 100644
--- a/net-voip/sflphone/Manifest
+++ b/net-voip/sflphone/Manifest
@@ -1,5 +1,8 @@
+AUX sflphone-0.9.12-libnotify-0.7.patch 1196 RMD160 26f6061983dc7cb4c9db1969ac9821fc9be6cde0 SHA1 a1086804168a07908786f4d3f059abb3239c9725 SHA256 6947d55e7c5fc273262d97accc4d8d48518645f3a80ac15f7818b3eeb44d0509
 AUX sflphone-0.9.8.4-libnotify-0.7.patch 1178 RMD160 35e1c268d71908c4ec2264a8e8f654c713e8499f SHA1 6da41c27e77a291492fc80598d0a8223b77f36eb SHA256 68a00825842b3f307f5c62e66de2e29d54afb73127954acf076d9aa22c086472
+DIST sflphone-0.9.12.tar.gz 7248712 RMD160 64c6842e5a6de930e4c32964195ed4b81e0ef0ba SHA1 f56db9a32883c73e26f4e3b4b77f65da5e4e19f4 SHA256 eab77836d1205402ad05fc33af2fb9734f69743eabbec4d93fdb5ae7bfdef02b
 DIST sflphone-0.9.8.4.tar.gz 7191853 RMD160 b42af5a80c851b34b0362cbc920241345b795b8a SHA1 a29ec6febb2c1b2c78ab70019ada17fb5fe65e0e SHA256 db31e642e77543099325a18c3c1f2e7e1ef83615c9d4d27c2a21c5abfb0253a4
+EBUILD sflphone-0.9.12.ebuild 4011 RMD160 276aff028892ec675580133c442fa585289bab92 SHA1 ecbc915cba10ef3da4df2c24d8814e7a0014db37 SHA256 0a6e80137113946fd99b16ade076a9584ca6258fb6594e4411a381dcd83c5cd6
 EBUILD sflphone-0.9.8.4.ebuild 3867 RMD160 404474018bf8d48323a0c1b9d68fb05ac2d51c14 SHA1 2406d2c56c29f9b4ba26d1c4605a405cf07bbb8e SHA256 dccffcb08bb23593b48843a66fb06b36c639c028c6754e86e72856e57b93ce0a
-MISC ChangeLog 985 RMD160 46eee8a747ecb8ff35b9c6a61dfb7f9fd8b6189b SHA1 76050bf6a88ed77c31e3b4078d054004ba072b6e SHA256 97cf44860065c08a59b5e213d60d3485a356b2b30f933d47006ad98b11c0ab5a
+MISC ChangeLog 1152 RMD160 ab802a8517ae0e7c8f3845a903c542396ab3dc80 SHA1 2ad4aa409d92b5c6c2858dbf8607e0ec1a1f49a0 SHA256 30e96d6724068c2cd1338037e11dc99d3609c442a2ac5b6173f9af34b5f74775
 MISC metadata.xml 601 RMD160 5d90dfb1c2b55f04de3becb09acd78d91d7f3263 SHA1 87cba5b018223ee925bc2666635ed95683912692 SHA256 6010d087c96b75b655fac51c9e9b362ae91a02dd8d6b7c91388db7773bb0e048
diff --git a/net-voip/sflphone/files/sflphone-0.9.12-libnotify-0.7.patch b/net-voip/sflphone/files/sflphone-0.9.12-libnotify-0.7.patch
new file mode 100644
index 000000000000..20fa9c97da15
--- /dev/null
+++ b/net-voip/sflphone/files/sflphone-0.9.12-libnotify-0.7.patch
@@ -0,0 +1,34 @@
+--- sflphone-client-gnome/src/sflnotify.c
++++ sflphone-client-gnome/src/sflnotify.c
+@@ -31,6 +31,10 @@
+ #include "sflnotify.h"
+ #include <eel-gconf-extensions.h>
+
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ GnomeNotification *_gnome_notification;
+
+ void create_new_gnome_notification (gchar *title, gchar *body, NotifyUrgency urgency, gint timeout, GnomeNotification **notif)
+@@ -44,12 +48,20 @@
+         notify_init ("SFLphone");
+
+         // Set struct fields
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++        _notif->notification = notify_notification_new (title, body, NULL);
++#else
+         _notif->notification = notify_notification_new (title, body, NULL, NULL);
++#endif
+         //_notif->icon = gdk_pixbuf_new_from_file_at_size (LOGO, 120, 120, NULL);
+         _notif->icon = gdk_pixbuf_new_from_file (LOGO_SMALL, NULL);
+ #if GTK_CHECK_VERSION(2,10,0)
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++       // notify_notification_attach_to_status_icon function was removed
++#else
+         notify_notification_attach_to_status_icon (_notif->notification , get_status_icon());
+ #endif
++#endif
+
+         notify_notification_set_urgency (_notif->notification, urgency);
+
diff --git a/net-voip/sflphone/sflphone-0.9.12.ebuild b/net-voip/sflphone/sflphone-0.9.12.ebuild
new file mode 100644
index 000000000000..f093e4e26a6d
--- /dev/null
+++ b/net-voip/sflphone/sflphone-0.9.12.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/sflphone-0.9.12.ebuild,v 1.1 2011/02/22 14:12:11 elvanor Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="SFLphone is a robust standards-compliant enterprise softphone, for desktop and embedded systems."
+HOMEPAGE="http://www.sflphone.org/"
+SRC_URI="http://www.elvanor.net/files/gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome gsm networkmanager speex"
+
+CDEPEND="dev-cpp/commoncpp2
+	dev-libs/expat
+	dev-libs/openssl
+	dev-libs/libpcre
+	dev-libs/libyaml
+	>=dev-util/astyle-1.24
+	media-libs/alsa-lib
+	media-libs/celt
+	media-libs/libsamplerate
+	media-sound/pulseaudio
+	net-libs/ccrtp
+	net-libs/iax
+	net-libs/libzrtpcpp
+	>=net-libs/pjsip-1.8.10
+	sys-apps/dbus
+	gsm? ( media-sound/gsm )
+	speex? ( media-libs/speex )
+	networkmanager? ( net-misc/networkmanager )
+	gnome? ( dev-libs/atk
+		dev-libs/check
+		dev-libs/log4c
+		gnome-base/libgnomeui
+		gnome-base/orbit
+		gnome-extra/evolution-data-server
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libart_lgpl
+		net-libs/libsoup
+		net-libs/webkit-gtk
+		x11-libs/cairo
+		x11-libs/libICE
+		x11-libs/libnotify
+		x11-libs/libSM )"
+
+DEPEND="${CDEPEND}
+		gnome? ( app-text/gnome-doc-utils )"
+
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
+	if ! use gnome; then
+		ewarn
+		ewarn "No clients selected. Use USE=gnome to get the gnome client."
+		ewarn "See"
+		ewarn "https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools/pysflphone"
+		ewarn "for a python command line client."
+		ewarn
+	fi
+
+	sed -i -e 's/unpad=paren/unpad-paren/' astylerc || die "sed failed."
+	cd sflphone-common
+	#remove "target" from lib-names, remove dep to shipped pjsip
+	sed -i -e 's/-$(target)//' \
+		-e '/^\t\t\t-L/ d' \
+		-e 's!-I$(src)/libs/pjproject!-I/usr/include!' \
+		globals.mak || die "sed failed."
+	#respect CXXFLAGS
+	sed -i -e 's/CXXFLAGS="-g/CXXFLAGS="-g $CXXFLAGS /' \
+		configure.ac || die "sed failed."
+	rm -r libs/pjproject
+	eautoreconf
+
+	#TODO: remove shipped dbus-c++ use system one (see #220767)
+	#TODO: remove shipped utilspp (from curlpp), use system one, see #55185
+
+	if use gnome; then
+		cd ../sflphone-client-gnome
+		#fix as-needed
+		sed -i -e "s/X11_LIBS)/X11_LIBS) -lebook-1.2 -lwebkit-1.0/" src/Makefile.am || die "sed failed."
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	cd sflphone-common
+	econf --disable-dependency-tracking \
+		$(use_with debug) \
+		$(use_with gsm) \
+		$(use_with speex) \
+		$(use_with networkmanager) || die "econf failed."
+
+	if use gnome; then
+		cd ../sflphone-client-gnome
+		econf || die "econf failed."
+	fi
+}
+
+src_compile() {
+	cd sflphone-common
+	emake || die "emake failed."
+
+	if use gnome; then
+		cd ../sflphone-client-gnome
+		emake || die "emake failed."
+	fi
+}
+
+src_install() {
+	cd sflphone-common
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	dodoc test/sflphonedrc-sample
+
+	if use gnome; then
+		cd ../sflphone-client-gnome
+		emake DESTDIR="${D}" install || die "emake install failed"
+		gnome2_src_install
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "You need to restart dbus, if you want to access"
+	elog "sflphoned through dbus."
+	elog
+	elog
+	elog "If you use the command line client"
+	elog "(https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools/pysflphone)"
+	elog "extract /usr/share/doc/${PF}/${PN}drc-sample to"
+	elog "~/.config/${PN}/${PN}drc for example config."
+	elog
+	elog
+	elog "For calls out of your browser have a look in sflphone-callto"
+	elog "and sflphone-handler. You should consider to install"
+	elog "the \"Telify\" Firefox addon. See"
+	elog "https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools"
+	elog
+	if use gnome; then
+		elog
+		elog "sflphone-client-gnome: To manage your contacts you need"
+		elog "mail-client/evolution or access to an evolution-data-server"
+		elog "connected backend."
+		elog
+	fi
+}