Version bump to 1.2.2.

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

4 files changed, 78 insertions, 220 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/Manifest b/net-voip/sflphone/Manifest
index 666bd3aa82e8..f89eda0c1084 100644
--- a/net-voip/sflphone/Manifest
+++ b/net-voip/sflphone/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX sflphone-0.9.12-libnotify-0.7.patch 1196 SHA256 6947d55e7c5fc273262d97accc4d8d48518645f3a80ac15f7818b3eeb44d0509 SHA512 0d522619f33bc04da05f497f1e358133b3252b5acc717560723aab094bc4c5227f4bb64e535f92f3720238b8bba57a8144b7a9e73a01c7f9ba3a93cb512c05ad WHIRLPOOL ab84a412aeb7a295182da96a66b3d04066709b5ed12693d0d45978ce24c9a843caafdb5333d859fe2d8c401fd569e5a6987511800634d47b9d82c1420c119c60
 AUX sflphone-0.9.8.4-libnotify-0.7.patch 1178 SHA256 68a00825842b3f307f5c62e66de2e29d54afb73127954acf076d9aa22c086472 SHA512 9ddd0c09b4a4245a8619ce2eb7565f5a393f767271b8bc9ca89d93f7536b6442c4438ccd2f0b9635d76e3cd5b3c76a5006960f1a6586a993b0dc0d00cf6f03d7 WHIRLPOOL 940f4c433180e7508e72e65a7d952f823528b4bdecae65bdb62d3c48df5a154c2364c1f8d50b28c01b7734ea6df62d316cfc91dda0055616bec2315e52a9bae5
 AUX sflphone-1.0.1-glib-2.32-headers-1.patch 739 SHA256 e0aa86c35f8bd8395d39d2e3cf4530c94e419319b34d772a63ab503209c2ba96 SHA512 54606d7a469e3e0ba7b3937d697807f8ed8ce7f5093ec805067a4d6c879a8471101548db1ad332b75620165ae14868890d6b1caaefba577a6d36d294b91a0211 WHIRLPOOL ef260643fb565536bff8c8ce8c9b5b517de3f3bec185a5a5c49206fd446a2017298d99df53456116f3657d51c5effc7d4cea3da97e9e27636ac7a91391c22c00
@@ -8,20 +5,8 @@ AUX sflphone-1.0.1-glib-2.32-headers-2.patch 3936 SHA256 dd7295323f6bfe5ed7ad234
 AUX sflphone-1.0.1-glib-2.32-headers-3.patch 9145 SHA256 8cd9164589f11179ea5262661a6e4b52b046f4efd6c8a159aec3a6db36ce6c25 SHA512 a1fec41fe098ca1beafc02b1b1e0fe9d36ec67448a775a2c9c16e40dbae6c0c9c2623f73051ce42ee4e98b14769073be4a4cc052e980c7616e553d30c7efa353 WHIRLPOOL 1c1abdaf790bac6eccd10a5cc03b5f3d4715ad556545e1204e169b67cbb30f39ef49004dab3037dae43680f21f4dc110fb53c196a5041b3baae9025d813abd32
 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.0.1.tar.gz 4536759 SHA256 210abdc040cb9caaab652572e39b1ec7d70f750fa70d2721f459ccc2e7653751 SHA512 854282176a0df4ea3800220cbe80883aa8491b4f9d7a16e9ec680e3fc28ad65145292c7e8268e637d2cab53c562dcb7fe4a50d0ddf919ffd2fbb9a6fd74e29c5 WHIRLPOOL f6f578e0b441e5a34f2ab472f2ec23dc6fd227e52da1f781df72df074ee740aec3e9e411c6dfe379839929aa8266d082f44aa080baa52a22126f0db2fbfb6480
+DIST sflphone-1.2.2.tar.gz 9393484 SHA256 1ba2d79a05f6ef059196b321327f22a7bfaf1be36ed657cd01b3d305741a4469 SHA512 b53dd5550f37b8b23fb50a1aee32c65cbec80ed07875c85f3b52f57f41422ec1445f26d42d2c8a6d47491f447680bf46b4088567af0377f482dab1a9f0cf3629 WHIRLPOOL 1cbe7e271f95a1f79588e0adf48241ee253a01c319e9b5ad99ca0c95f7376953b5fa1dd6f4ee50a0629a8d22d91bb624291ba5ce304afae18bee971769d1959b
 EBUILD sflphone-0.9.8.4.ebuild 3872 SHA256 0a2efc336622c6d29e4d2b40db0246931b134227df4cf6264a5476b9db088ed0 SHA512 964d713948457e875a2e2387dd979ac79621c1c7b6d3fb8fbcb1b6071612c6943bdf66ec6e1d8b4b5731cde8118ee638fc1093444b844197f8d815fec877f0c7 WHIRLPOOL 348d8ec92fd70e59016d6e6869c72c0e2834d1d5c585f3e020541aacc774c118c5c0de4f662f010b787f565118597a60478a2da04acfc8f09176a72f5fb60bbf
-EBUILD sflphone-1.0.1-r1.ebuild 4145 SHA256 44d389cc6d387e25bd84861db8a0a21392eadfba9676143f8558b288a85d448f SHA512 e5e3ce8aee34df893a14e105f6e54b2e39c3c8d4adf407737c4ae08b478dce980d6d5b02854d760b5b9c808aadd5b2c4b547cf37235336847fc9be42732612b0 WHIRLPOOL a039458883e55c2cebc9b2a3eeec48660f72c28ff067d070c22703ee2a8fa39528d0adb7a393fab9aab516ccd349050cf1f116485934dc3288e0e50a34d33a17
-EBUILD sflphone-1.0.1.ebuild 3962 SHA256 f69d1f5ea62c6fe54e84e5011766d3fa76ce3929c32fa6566412e97768ab4e0a SHA512 3a16b09c3de043be0115267d2546d96969fc7df1cc51b1e07534fbde4c986830cdca61b869da4b00877cb68fe0c2893cb283fdda78b207b4aa579752d96389db WHIRLPOOL eddfaedf507b4091af46d3980cbd123adb382d1177891223887af9c6bc0a6bca3b4deba473404b1aee51a7fd34e4360583bbb191e6fe995bc1e913223986d2b4
-MISC ChangeLog 2049 SHA256 3c0c9d8a6b9cf0e0724ad0f829cc01db3988ca1427e3e12c265ff1ce7e84fc34 SHA512 05265f8e55907a9910ba220e5850f9fc43cbda39a7f783dc04810d15a86b9e03f50d17ce9bf33f43949f17ffd36aefe6fd27329ea97d2a9714cd821f59d3294a WHIRLPOOL 8103b1dd019521e896beffa477a67fadb150cfedc46f372a5ef96f7546054e8bb9513c5b713998a9ece904984612d34c3c9a02c520eca0c6afbfbd36ea910c95
+EBUILD sflphone-1.2.2.ebuild 4790 SHA256 703e95bd624cc25650afe5212efa60fddac94e091465cf7b434a9ad18505eaaf SHA512 b20dfda78d3c9b951544a4c6208779420f0c344bd505b49d51ed233e94e9b9fe43b1a61561b4de4dca846c88f414a08ea85432828e6a0612ee4d04dbc6cf3782 WHIRLPOOL 0f5bb3d93944a09b12473576e14689056969336437963a289a46d50b399208da3b73fa89c08d0588cb0dd7b84ffaa73d2680caccf3e9a0f4200e3dddd6db6230
+MISC ChangeLog 2239 SHA256 b8c87f943f2b2a954a81a49042b8efd16fe604a497eb83f26e108e71df32a6d1 SHA512 a6e246e1a7606f8fac3a99b25392fc7990accbb0f3309dbac08262da9187e48a59bad9f18624cb0f64120675d4a2777e949a21332848088a299d21b818a4ecbe WHIRLPOOL 16d49f18ebf2c729db98eee02310ff4d8fc8dded93b782e484fc3fa060992bd84ca01a517924c8feca6d26d5dc389477e7f82695e637664fe035cdd748d130db
 MISC metadata.xml 657 SHA256 472c5a01f8ea3d27cea072d1401a1ab7932e7e476e738f0ce1078397f5225f50 SHA512 42186df2cea677af71a30c6585c1a570330866c1e4b819f8379c1b66cd0a024f31ea3e137c059cadb1d7e381b72e1555d30cf672866e4e0b613047536ecaeba3 WHIRLPOOL 8f8d1c32e61de42ece72485430f0ab551b824adabd2fd8b7edb88939165b296c2a3bf3d4c30afef1172de4ca642f4845371320921ba7477aef1bbf0072d6aa92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQJt1lAAoJEJ0WA1zPCt1hW1gIAKwxUTM5aoJ+HpYLImfvauew
-TYP2b4ZaZwTkFWD62OVzzkSJD9UnZZ53B48w8a3K9E3GfQCWx4HocfZ11UCXAZtI
-gA14zs6zT1nSd4+L0iJc50Y+mV+Ax7TijJ+LWdSMGbml8bUOPBIrGurYGbZaLsTA
-BLaL5KvnuTYSByuXSRSuu9vO/zdymJSiMp+oBpqROoKE/GOUPglJAhjCVdJ22T4i
-h03o5M8hz9T8eOuFV/edWRl5BfKniBoavSsyddc/n4NJIFv/rQYUtR0coQIxroci
-RJgMQDrzfm+LkY/TmrvNf+v3Ceqyr+I4m6tsDvkG3O0Uq1IEffDcuMUXhOsEkvA=
-=aNzE
------END PGP SIGNATURE-----
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() {