--- linphone-3.3.2.ebuild	2011-01-02 00:01:11.000000000 +0300
+++ linphone-3.4.1.ebuild	2011-03-01 17:12:38.000000000 +0300
@@ -12,13 +12,13 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos"
 IUSE="doc gtk ipv6 ncurses nls video"
 
-RDEPEND=">=media-libs/mediastreamer-2.4.0[video?]
+RDEPEND=">=media-libs/mediastreamer-2.7.1[video?]
 	>=net-libs/libeXosip-3.0.2
 	>=net-libs/libosip-3.0.0
-	>=net-libs/ortp-0.16.2
+	>=net-libs/ortp-0.16.4
 	gtk? ( dev-libs/glib:2
 		>=gnome-base/libglade-2.4.0:2.0
 		>=x11-libs/gtk+-2.4.0:2 )
@@ -51,14 +51,14 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.99.1-external-mediastreamer.patch
-	epatch "${FILESDIR}"/${PN}-3.2.1-nls.patch
+	epatch "${FILESDIR}"/${P}-automake.patch
+	epatch "${FILESDIR}"/${P}-nls.patch
 
 	# remove speex check, avoid bug when mediastreamer[-speex]
-	sed -i -e '/SPEEX/d' configure.in || die "patching configure.in failed"
+	epatch "${FILESDIR}"/${P}-speex.patch
 
 	# fix path to use lib64
-	sed -i -e "s:lib\(/liblinphone\):$(get_libdir)\1:" configure.in \
+	sed -i -e "s:lib\(/liblinphone\):$(get_libdir)\1:" configure.ac \
 		|| die "patching configure.in failed"
 
 	# removing bundled libs dir prevent them to be reconf
@@ -67,10 +67,6 @@
 	sed -i -e "s:oRTP::;s:mediastreamer2::" Makefile.am \
 		|| die "patching Makefile.am failed"
 
-	# don't know why, but exosip macro references a non-existing framework
-	sed -i -e "s/-framework CFNetwork//" m4/exosip.m4 \
-		|| die "patching m4/exosip.m4 failed"
-
 	# make sure to use host libtool version
 	rm -f m4/libtool.m4 m4/lt*.m4 #282268
 	eautoreconf
@@ -99,7 +95,5 @@
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dosym linphone-3 /usr/bin/linphone || die
 	dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO || die
-	#cp "${ED}/usr/share/pixmaps/"{linphone/linphone2.png,linphone2.png} || die
 }