Bump to 1.2.3, KDE support (#477510 and #468822).

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

3 files changed, 182 insertions, 2 deletions

diff --git a/net-voip/sflphone/ChangeLog b/net-voip/sflphone/ChangeLog
index 358682e6fdeb..3409080305f6 100644
--- a/net-voip/sflphone/ChangeLog
+++ b/net-voip/sflphone/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/sflphone
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.14 2013/05/08 09:36:18 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.15 2013/08/03 16:13:58 elvanor Exp $
+
+*sflphone-1.2.3 (03 Aug 2013)
+
+  03 Aug 2013; <elvanor@gentoo.org> +sflphone-1.2.3.ebuild:
+  Bump to 1.2.3. KDE support added.
 
   08 May 2013; <elvanor@gentoo.org> sflphone-1.2.2.ebuild:
   Fix for #468740.
diff --git a/net-voip/sflphone/Manifest b/net-voip/sflphone/Manifest
index 55b3aa0e309b..cce621ce6ce4 100644
--- a/net-voip/sflphone/Manifest
+++ b/net-voip/sflphone/Manifest
@@ -6,7 +6,9 @@ AUX sflphone-1.0.1-glib-2.32-headers-3.patch 9145 SHA256 8cd9164589f11179ea52626
 AUX sflphone-1.0.1-pjsip-1.14.patch 4206 SHA256 56a5f544cfb5d0b1020caa5056c7ec81cca3c029414014f2b6aa242837c92f29 SHA512 0206f83d0a2547062701337e59f27d8a2cd97a83e7794eebda8037c75b071427f1898efcb474511013bb3936033f6b4c60db2efa3eb6cbfd84e555db6e2a5a72 WHIRLPOOL 724e24d334914bf8de46e07ea6aa0ac033f597f51b30e3dcab50fbc71e957769b525b48edb8ca204991457e4d26dbec883a1b02023707806fb0545bf73e37e7e
 DIST sflphone-0.9.8.4.tar.gz 7191853 SHA256 db31e642e77543099325a18c3c1f2e7e1ef83615c9d4d27c2a21c5abfb0253a4
 DIST sflphone-1.2.2.tar.gz 9393484 SHA256 1ba2d79a05f6ef059196b321327f22a7bfaf1be36ed657cd01b3d305741a4469 SHA512 b53dd5550f37b8b23fb50a1aee32c65cbec80ed07875c85f3b52f57f41422ec1445f26d42d2c8a6d47491f447680bf46b4088567af0377f482dab1a9f0cf3629 WHIRLPOOL 1cbe7e271f95a1f79588e0adf48241ee253a01c319e9b5ad99ca0c95f7376953b5fa1dd6f4ee50a0629a8d22d91bb624291ba5ce304afae18bee971769d1959b
+DIST sflphone-1.2.3.tar.gz 9712855 SHA256 cd990e3c1e3ad0de7e6f332491d5f557ed78beaa13ce795428b4dc7afca43c2a SHA512 62d1c52d93f3061a5fd794a463bea31c960191dba3342fc66c85c5a98b82ed684f60090418dd0b0408efab765fcc5659b1e4d7d50f4c9a1132d8b86ed96327b1 WHIRLPOOL dbe116e9ce97ec0830c23b0c6dd89dd4d2a8e8af0bbfd63ea1db485e4698afe2e823421243877266a1b98a558f0e7674b84024ba1764833577ac861a18510308
 EBUILD sflphone-0.9.8.4.ebuild 3872 SHA256 0a2efc336622c6d29e4d2b40db0246931b134227df4cf6264a5476b9db088ed0 SHA512 964d713948457e875a2e2387dd979ac79621c1c7b6d3fb8fbcb1b6071612c6943bdf66ec6e1d8b4b5731cde8118ee638fc1093444b844197f8d815fec877f0c7 WHIRLPOOL 348d8ec92fd70e59016d6e6869c72c0e2834d1d5c585f3e020541aacc774c118c5c0de4f662f010b787f565118597a60478a2da04acfc8f09176a72f5fb60bbf
 EBUILD sflphone-1.2.2.ebuild 4796 SHA256 15187d8c2d44517909bc48b063c5bcfece104c7bb471f4fa3ebd72a42b77b7bb SHA512 9afacf394c500d5a992d16f17c5e8fa5dde77865623d6e8e3f8ecca68112dd98db80defbe0283a16f23659454860a48800b573ca0c1677cd1f52726187e8e4e0 WHIRLPOOL ff5604797f57b3c5eac18974c686f58de167808e5020ea07158846f16d4253148aed2bd543c738bae1e2cf0df7dd068cff1ba31d3ce67231f3a283fbc0aeb857
-MISC ChangeLog 2318 SHA256 8b725cc9f024e57606e66fb3eaa3aa18d351c24ce4723e7032c8d84493481623 SHA512 24c7ae1f9f5acefcfb84968dff9d9decccfac1284d72c56952fb0fcd0419ab429495f24b13f05c7515dff83737fc65a918da98f5f86eba2fe5071b6d310ebcaf WHIRLPOOL 17a07e832a2478053f438e819bf45ecf40add768c13128daf8276eb66a45de5146a5ba5ebab61870b4c1a56494463757d50028a4c07e812f596148ce1dd1faad
+EBUILD sflphone-1.2.3.ebuild 4657 SHA256 1217d09b4b85764459299400292aa332f236cbeda16a28536fe1baf3bc58bcb2 SHA512 b1693a78ffcea2a167852b6b01b222b7b2f3daaab2770a7cf55d42111dd3d5b875f59313da35d363d1ac0598a233f1f88fcfb3b62aaa367b5e5e0abfc1e42a6d WHIRLPOOL 2bdb829e7fa731b944ede62dafbe7f48427a4fc370d2b4d805d863b809b6d43d6a88837cabda4ce35d591445520e352b5dc29e078a34638ae7bde08905be3a67
+MISC ChangeLog 2446 SHA256 29df802b8e836db63893c2c6dc907754ee2e50da11e0d6cbe9868b87bc1c6321 SHA512 cdc17ade3311a30f45dd37e937b44abe16d0d29b629ec54a55b1d79ec09c5de6b87e439d32227986b5b6626bf84d8b12d39c4d2b63cb84622185ea4614885729 WHIRLPOOL a9a8687eea7f403e8174471c4f25f180e0d1794a6b541c2c07c73197983de71f5d06d50af47b9b047130343ed112ad2026efee5a2998eec0f7790549c6c9ba0b
 MISC metadata.xml 657 SHA256 472c5a01f8ea3d27cea072d1401a1ab7932e7e476e738f0ce1078397f5225f50 SHA512 42186df2cea677af71a30c6585c1a570330866c1e4b819f8379c1b66cd0a024f31ea3e137c059cadb1d7e381b72e1555d30cf672866e4e0b613047536ecaeba3 WHIRLPOOL 8f8d1c32e61de42ece72485430f0ab551b824adabd2fd8b7edb88939165b296c2a3bf3d4c30afef1172de4ca642f4845371320921ba7477aef1bbf0072d6aa92
diff --git a/net-voip/sflphone/sflphone-1.2.3.ebuild b/net-voip/sflphone/sflphone-1.2.3.ebuild
new file mode 100644
index 000000000000..3c11b5b426b1
--- /dev/null
+++ b/net-voip/sflphone/sflphone-1.2.3.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/sflphone-1.2.3.ebuild,v 1.1 2013/08/03 16:13:58 elvanor Exp $
+
+EAPI="4"
+
+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 doxygen gnome gsm kde networkmanager pulseaudio speex static-libs"
+
+# USE="-iax" does not work. Upstream problem.
+
+CDEPEND="dev-cpp/commoncpp2
+	dev-libs/dbus-c++
+	dev-libs/expat
+	dev-libs/ilbc-rfc3951
+	dev-libs/libpcre
+	dev-libs/libyaml
+	dev-libs/openssl
+	media-libs/alsa-lib
+	media-libs/celt
+	media-libs/libsamplerate
+	pulseaudio? ( media-sound/pulseaudio )
+	net-libs/ccrtp
+	net-libs/libzrtpcpp
+	>=net-libs/pjsip-2.1
+	sys-apps/dbus
+	gnome? ( dev-libs/atk
+		dev-libs/check
+		gnome-base/libgnomeui
+		gnome-base/orbit:2
+		gnome-extra/evolution-data-server
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libart_lgpl
+		net-libs/libsoup:2.4
+		net-libs/webkit-gtk:3
+		x11-libs/cairo
+		x11-libs/libICE
+		x11-libs/libnotify
+		x11-libs/libSM )
+	gsm? ( media-sound/gsm )
+	kde? ( kde-base/kdepimlibs
+		kde-base/kdelibs )
+	networkmanager? ( net-misc/networkmanager )
+	speex? ( media-libs/speex )"
+
+DEPEND="${CDEPEND}
+		>=dev-util/astyle-1.24
+		doxygen? ( app-doc/doxygen )
+		gnome? ( app-text/gnome-doc-utils )
+		virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}"
+
+pkg_setup() {
+	#if  use gnome && use kde ; then
+	#	elog "Both Gnome and KDE flags are set; preference goes to KDE. Only the KDE client will be built."
+	#fi
+
+	if ! use gnome; then
+		ewarn
+		ewarn "Select USE=gnome to get a graphicalclient."
+		ewarn "See"
+		ewarn "https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools/pysflphone"
+		ewarn "for a python command line client."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	cd "${S}/daemon"
+	rm -rf libs/pjproject-2.0.1
+
+	sed -i -e 's!include $(src)/libs/pjproject-2.0.1/build.mak!!' src/audio/codecs/Makefile.in src/audio/codecs/Makefile.am
+	sed -i -e 's!--shared -lc $(top_srcdir)/libs/pjproject-2.0.1/third_party/lib/libilbccodec-$(TARGET_NAME).a!-lilbc!' src/audio/codecs/Makefile.am
+	sed -i -e 's/-$(target)//' -e '/^\t\t\t-L/ d' -e "s/PJSIP_LIBS=\$(APP_LDFLAGS) \$(APP_LDLIBS)/PJSIP_LIBS=$(pkg-config --libs-only-l libpjproject)/" \
+		-e 's!-I$(src)/libs/pjproject-2.0.1!-I/usr/include!' -e 's!include $(src)/libs/pjproject-2.0.1/build.mak!!' \
+		globals.mak || die "sed failed."
+	# Respect CXXFLAGS
+	sed -i -e 's/CXXFLAGS="-g/CXXFLAGS="-g $CXXFLAGS /' \
+		configure.ac || die "sed failed."
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+	if ! use pulseaudio; then
+		myconf="--without-pulse"
+	fi
+
+	cd "${S}/daemon"
+	econf --disable-dependency-tracking $(use_with debug) $(use_with gsm) \
+		$(use_with networkmanager) $(use_with speex) $(use_enable static-libs static) $(use_enable doxygen) ${myconf}
+
+	#if use gnome && ! use kde; then
+	if use gnome; then
+		cd "${S}/gnome"
+		econf $(use_enable static-libs static)
+	fi
+
+	if use kde; then
+		cd "${S}/kde"
+		./config.sh --prefix=/usr
+	fi
+}
+
+src_compile() {
+	cd "${S}/daemon"
+	emake || die "emake failed."
+
+	#if use gnome && ! use kde; then
+	if use gnome; then
+		cd ../gnome
+		emake || die "emake failed."
+	fi
+
+	if use kde; then
+		cd ../kde/build
+		emake || die "emake failed."
+	fi
+}
+
+src_install() {
+	if use gnome; then
+		cd "${S}/gnome"
+		gnome2_src_install
+	fi
+
+	if use kde; then
+		cd "${S}/kde/build"
+		emake -j1 DESTDIR="${D}" install || die "emake install failed"
+		cd ../
+	fi
+
+	cd "${S}/daemon"
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	dodoc test/sflphonedrc-sample
+}
+
+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
+		gnome2_pkg_postinst
+		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
+}