Bump to 1.0.1.

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

4 files changed, 29 insertions, 35 deletions

diff --git a/net-voip/sflphone/ChangeLog b/net-voip/sflphone/ChangeLog
index d9634f823ab2..e4aec4c0e148 100644
--- a/net-voip/sflphone/ChangeLog
+++ b/net-voip/sflphone/ChangeLog
@@ -1,6 +1,11 @@
 # 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.9 2011/03/21 23:20:39 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.10 2011/11/26 16:19:38 elvanor Exp $
+
+*sflphone-1.0.1 (26 Nov 2011)
+
+  26 Nov 2011; <elvanor@gentoo.org> +sflphone-1.0.1.ebuild:
+  Version bump to 1.0.1 along with various fixes.
 
   21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   sflphone-0.9.8.4.ebuild, sflphone-0.9.12.ebuild:
diff --git a/net-voip/sflphone/Manifest b/net-voip/sflphone/Manifest
index e382a90f90cf..1151d6b48ad8 100644
--- a/net-voip/sflphone/Manifest
+++ b/net-voip/sflphone/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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 3924 RMD160 d7e184d7d93e4bdc8befae6c29f2ac2301abd145 SHA1 d5e2c10c83df6563aa54eb8bab49aa2ca2eba065 SHA256 5eca8a554ebbc21bb00bf5f8d2e1f7cd4dc3068c7d3f99ca228df1d2f4026427
+DIST sflphone-1.0.1.tar.gz 4536759 RMD160 619deaa2dcf548a83da6566bb304ef3d2aa54b8a SHA1 c9b1c6822c27b1bdf185a8b3cac680605e19d7b6 SHA256 210abdc040cb9caaab652572e39b1ec7d70f750fa70d2721f459ccc2e7653751
 EBUILD sflphone-0.9.8.4.ebuild 3872 RMD160 1fb06b4f013d9bf04d453239d2cb94f6b01180a4 SHA1 a1790d82192c64eb666c52454f98d1f6adb1173e SHA256 0a2efc336622c6d29e4d2b40db0246931b134227df4cf6264a5476b9db088ed0
-MISC ChangeLog 1380 RMD160 f82679e16010eeb27ea95ae048a353dc5e7659f2 SHA1 6718b7ff0d289560c7f5abcb1a17cffb12195a7c SHA256 83e5d6551d4cf41d712323740737de9318b25752306774f7fd9432833e3fe7d9
-MISC metadata.xml 579 RMD160 27f74d387e21fe2496b38e6224b407c8fd973b6d SHA1 4a10ef0dad3cc8648dae908d2add9eeb56580138 SHA256 283a1de489b125da310fac03a8df623bec9711039e22bb067eed452eafbc96fe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59rqgACgkQfXuS5UK5QB0eRAQAsShnRbCgcNZTuDHA/EEPU0pu
-IN1Qzy3euJJycATMUCXN6YoSo7PUwg7FjhouF/CSa22o1plcb9lulTBRjKKIcErk
-DSVh4wl0EkLyhexs7rWAgSVrQc3OFcTCIDZw9E9SgkWZ+ZXQmrtNM5SFTL1XdWNx
-YY8s95fl6AELQD90VqU=
-=t0Lb
------END PGP SIGNATURE-----
+EBUILD sflphone-1.0.1.ebuild 3912 RMD160 01acc3dbfda73d09525d97765ecaaa9022c62baf SHA1 a28d0e62448cbcaae68d6c389acb4f99bbe003c3 SHA256 6228de436698a140341957652d6283ff36cf438911f7fc939218c3220a31600b
+MISC ChangeLog 1522 RMD160 a737f5f146721282239d9ec4e86fc73a64916d52 SHA1 e0dd48aa9fbf7a8afbecb3d0881bcaa279c2c16e SHA256 5df7cb95a552ee2b40f3a9d535ba4c835e88b13ec1bd55f91d6cd996a0fd6395
+MISC metadata.xml 657 RMD160 d7f4ca8913b771302472ba24669f639667f49d30 SHA1 9bbccab98460659c53adc115d64bb368e06e3035 SHA256 472c5a01f8ea3d27cea072d1401a1ab7932e7e476e738f0ce1078397f5225f50
diff --git a/net-voip/sflphone/metadata.xml b/net-voip/sflphone/metadata.xml
index 1cd0a2004f0a..946d6f8cae53 100644
--- a/net-voip/sflphone/metadata.xml
+++ b/net-voip/sflphone/metadata.xml
@@ -9,6 +9,7 @@
 		SFLphone is a robust standards-compliant enterprise softphone, for desktop and embedded systems. It is designed to handle several hundreds of calls a day. SFLphone is available under the GNU GPL license, version 3.
 	</longdescription>
 	<use>
+		<flag name="doxygen">Support for building documentation with doxygen</flag>
 		<flag name="iax">Support for IAX (Inter Asterisk eXchange)</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-voip/sflphone/sflphone-0.9.12.ebuild b/net-voip/sflphone/sflphone-1.0.1.ebuild
index 88c82aeba631..e084ef70421e 100644
--- a/net-voip/sflphone/sflphone-0.9.12.ebuild
+++ b/net-voip/sflphone/sflphone-1.0.1.ebuild
@@ -1,8 +1,8 @@
 # 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.4 2011/03/21 23:20:39 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/sflphone-1.0.1.ebuild,v 1.1 2011/11/26 16:19:38 elvanor Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit autotools eutils gnome2
 
@@ -13,7 +13,9 @@ 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"
+IUSE="debug doxygen gnome gsm networkmanager speex static-libs"
+
+# USE="-iax" does not work. Upstream problem.
 
 CDEPEND="dev-cpp/commoncpp2
 	dev-libs/expat
@@ -42,7 +44,7 @@ CDEPEND="dev-cpp/commoncpp2
 		media-libs/freetype
 		media-libs/libart_lgpl
 		net-libs/libsoup:2.4
-		net-libs/webkit-gtk:2
+		net-libs/webkit-gtk:3
 		x11-libs/cairo
 		x11-libs/libICE
 		x11-libs/libnotify
@@ -55,8 +57,6 @@ DEPEND="${CDEPEND}
 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."
@@ -67,7 +67,7 @@ src_prepare() {
 	fi
 
 	sed -i -e 's/unpad=paren/unpad-paren/' astylerc || die "sed failed."
-	cd sflphone-common
+	cd daemon
 	#remove "target" from lib-names, remove dep to shipped pjsip
 	sed -i -e 's/-$(target)//' \
 		-e '/^\t\t\t-L/ d' \
@@ -79,45 +79,45 @@ src_prepare() {
 	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
+		cd ../gnome
 		#fix as-needed
-		sed -i -e "s/X11_LIBS)/X11_LIBS) -lebook-1.2 -lwebkit-1.0/" src/Makefile.am || die "sed failed."
+		sed -i -e "s/X11_LIBS)/X11_LIBS) -lebook-1.2/" src/Makefile.am || die "sed failed."
 		eautoreconf
 	fi
 }
 
 src_configure() {
-	cd sflphone-common
+	cd daemon
+	# $(use_with iax iax2) won't work (compilation failure)
 	econf --disable-dependency-tracking $(use_with debug) \
-		$(use_with gsm) $(use_with speex) $(use_with networkmanager)
+		$(use_with gsm) $(use_with networkmanager) $(use_with speex) $(use_enable static-libs static) $(use_enable doxygen)
 
 	if use gnome; then
-		cd ../sflphone-client-gnome
-		econf
+		cd ../gnome
+		econf $(use_enable static-libs static)
 	fi
 }
 
 src_compile() {
-	cd sflphone-common
+	cd daemon
 	emake || die "emake failed."
 
 	if use gnome; then
-		cd ../sflphone-client-gnome
+		cd ../gnome
 		emake || die "emake failed."
 	fi
 }
 
 src_install() {
-	cd sflphone-common
+	cd daemon
 	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 	dodoc test/sflphonedrc-sample
 
 	if use gnome; then
-		cd ../sflphone-client-gnome
+		cd ../gnome
 		gnome2_src_install
 	fi
 }