Version bump to 1.2.2.

(Portage version: 2.1.11.62/cvs/Linux i686, unsigned Manifest commit)

3 files changed, 75 insertions, 202 deletions

diff --git a/net-voip/sflphone/ChangeLog b/net-voip/sflphone/ChangeLog
index 33f6647faf6f..03125094e82f 100644
--- a/net-voip/sflphone/ChangeLog
+++ b/net-voip/sflphone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-voip/sflphone
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.12 2012/08/11 22:31:59 tetromino Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.13 2013/05/04 22:56:25 elvanor Exp $
+
+*sflphone-1.2.2 (04 May 2013)
+
+  04 May 2013; <elvanor@gentoo.org> -sflphone-1.0.1.ebuild,
+  -sflphone-1.0.1-r1.ebuild, +sflphone-1.2.2.ebuild:
+  Version bump to 1.2.2. Removed old versions.
 
 *sflphone-1.0.1-r1 (11 Aug 2012)
 
diff --git a/net-voip/sflphone/sflphone-1.0.1.ebuild b/net-voip/sflphone/sflphone-1.0.1.ebuild
deleted file mode 100644
index 3fa8fae4bee9..000000000000
--- a/net-voip/sflphone/sflphone-1.0.1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/sflphone-1.0.1.ebuild,v 1.3 2012/03/02 14:58:32 elvanor Exp $
-
-EAPI="3"
-
-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 networkmanager speex static-libs"
-
-# USE="-iax" does not work. Upstream problem.
-
-CDEPEND="dev-cpp/commoncpp2
-	dev-libs/dbus-c++
-	dev-libs/expat
-	dev-libs/openssl
-	dev-libs/libpcre
-	dev-libs/libyaml
-	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: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 )"
-
-DEPEND="${CDEPEND}
-		>=dev-util/astyle-1.24
-		doxygen? ( app-doc/doxygen )
-		gnome? ( app-text/gnome-doc-utils )"
-
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	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 daemon
-	#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 utilspp (from curlpp), use system one, see #55185
-
-	if use gnome; then
-		cd ../gnome
-		#fix as-needed
-		sed -i -e "s/X11_LIBS)/X11_LIBS) -lebook-1.2/" src/Makefile.am || die "sed failed."
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	cd daemon
-	# $(use_with iax iax2) won't work (compilation failure)
-	econf --disable-dependency-tracking $(use_with debug) \
-		$(use_with gsm) $(use_with networkmanager) $(use_with speex) $(use_enable static-libs static) $(use_enable doxygen)
-
-	if use gnome; then
-		cd ../gnome
-		econf $(use_enable static-libs static)
-	fi
-}
-
-src_compile() {
-	cd daemon
-	emake || die "emake failed."
-
-	if use gnome; then
-		cd ../gnome
-		emake || die "emake failed."
-	fi
-}
-
-src_install() {
-	cd daemon
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	dodoc test/sflphonedrc-sample
-
-	if use gnome; then
-		cd ../gnome
-		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
-		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
-}
diff --git a/net-voip/sflphone/sflphone-1.0.1-r1.ebuild b/net-voip/sflphone/sflphone-1.2.2.ebuild
index 571a94911c00..a42c7e4a5f0b 100644
--- a/net-voip/sflphone/sflphone-1.0.1-r1.ebuild
+++ b/net-voip/sflphone/sflphone-1.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.0.1-r1.ebuild,v 1.1 2012/08/11 22:31:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/sflphone-1.2.2.ebuild,v 1.1 2013/05/04 22:56:25 elvanor Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit autotools eutils gnome2
 
@@ -13,31 +13,27 @@ SRC_URI="http://www.elvanor.net/files/gentoo/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doxygen gnome gsm networkmanager speex static-libs"
+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/openssl
+	dev-libs/ilbc-rfc3951
 	dev-libs/libpcre
 	dev-libs/libyaml
+	dev-libs/openssl
 	media-libs/alsa-lib
 	media-libs/celt
 	media-libs/libsamplerate
-	media-sound/pulseaudio
+	pulseaudio? ( media-sound/pulseaudio )
 	net-libs/ccrtp
-	net-libs/iax
 	net-libs/libzrtpcpp
-	>=net-libs/pjsip-1.8.10
+	net-libs/pjsip
 	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:2
 		gnome-extra/evolution-data-server
@@ -49,84 +45,107 @@ CDEPEND="dev-cpp/commoncpp2
 		x11-libs/cairo
 		x11-libs/libICE
 		x11-libs/libnotify
-		x11-libs/libSM )"
+		x11-libs/libSM )
+	gsm? ( media-sound/gsm )
+	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 )"
+		gnome? ( app-text/gnome-doc-utils )
+		virtual/pkgconfig"
 
 RDEPEND="${CDEPEND}"
 
-src_prepare() {
-	# Compilation with glib-2.32, bug #427544
-	epatch "${FILESDIR}/${P}-glib-2.32-headers-"{1,2,3}.patch
-	# Compilation with pjsip-1.14
-	epatch "${FILESDIR}/${P}-pjsip-1.14.patch"
+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 kde; then
+		elog "The KDE client is not yet available with this ebuild and won't be built."
+	fi
 
 	if ! use gnome; then
 		ewarn
-		ewarn "No clients selected. Use USE=gnome to get the gnome client."
+		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/unpad=paren/unpad-paren/' astylerc || die "sed failed."
-	cd daemon
-	#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!' \
+	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
+	# Respect CXXFLAGS
 	sed -i -e 's/CXXFLAGS="-g/CXXFLAGS="-g $CXXFLAGS /' \
 		configure.ac || die "sed failed."
-	rm -r libs/pjproject
 	eautoreconf
-
-	#TODO: remove shipped utilspp (from curlpp), use system one, see #55185
-
-	if use gnome; then
-		cd ../gnome
-		#fix as-needed
-		sed -i -e "s/X11_LIBS)/X11_LIBS) -lebook-1.2/" src/Makefile.am || die "sed failed."
-		eautoreconf
-	fi
 }
 
 src_configure() {
-	cd daemon
-	# $(use_with iax iax2) won't work (compilation failure)
-	econf --disable-dependency-tracking $(use_with debug) \
-		$(use_with gsm) $(use_with networkmanager) $(use_with speex) $(use_enable static-libs static) $(use_enable doxygen)
+	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 ../gnome
+		cd "${S}/gnome"
 		econf $(use_enable static-libs static)
 	fi
+
+	#if use kde; then
+	#	cd "${S}/kde"
+	#	./config.sh --prefix=/usr $(use_enable static-libs static)
+#		econf $(use_enable static-libs static)
+	#fi
 }
 
 src_compile() {
-	cd daemon
+	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() {
-	cd daemon
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	dodoc test/sflphonedrc-sample
-
 	if use gnome; then
-		cd ../gnome
+		cd "${S}/gnome"
 		gnome2_src_install
 	fi
+
+	#if use kde; then
+	#	cd "${S}/kde"
+	#	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() {