--- mediastreamer-2.7.3-r3.ebuild	2012-05-05 12:31:18.000000000 +0400
+++ mediastreamer-2.8.2.ebuild	2012-05-15 16:11:26.000000000 +0400
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils autotools multilib
+inherit autotools multilib
 
 DESCRIPTION="Mediastreaming library for telephony application"
 HOMEPAGE="http://www.linphone.org/"
@@ -16,19 +16,18 @@
 # Many cameras will not work or will crash an application if mediastreamer2 is
 # not built with v4l2 support (taken from configure.ac)
 # TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
-IUSE="+alsa amr bindist coreaudio debug examples gsm ilbc ipv6 jack oss portaudio
-pulseaudio sdl +speex static-libs theora v4l video x264 X"
-REQUIRED_USE="|| ( oss alsa jack portaudio coreaudio pulseaudio )
+IUSE="+alsa amr bindist coreaudio debug examples g726 g729 gsm ilbc ipv6
+oss portaudio pulseaudio sdl +speex silk static-libs theora v4l video x264 X"
+REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
 	video? ( || ( sdl X ) )
 	theora? ( video )
 	X? ( video )
 	v4l? ( video )"
 
-RDEPEND=">=net-libs/ortp-0.16.2[ipv6?]
+RDEPEND=">=net-libs/ortp-0.17[ipv6?]
 	alsa? ( media-libs/alsa-lib )
+	g726? ( >=media-libs/spandsp-0.0.6_pre1 )
 	gsm? ( media-sound/gsm )
-	jack? ( >=media-libs/libsamplerate-0.0.13
-		media-sound/jack-audio-connection-kit )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
 	speex? ( >=media-libs/speex-1.2_beta3 )
@@ -45,7 +44,9 @@
 	x11-proto/videoproto"
 
 PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
+	g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
 	ilbc? ( media-plugins/mediastreamer-ilbc )
+	silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )
 	video? ( x264? ( media-plugins/mediastreamer-x264 ) )"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
@@ -65,17 +66,19 @@
 	sed -i -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" help/Makefile.am \
 		|| die "patching help/Makefile.am failed"
 
-	epatch "${FILESDIR}/${PN}-2.7.3-v4l-automagic.patch"
-	epatch "${FILESDIR}/${P}-sdl-build.patch"
+	epatch "${FILESDIR}/${P}-v4l-automagic.patch"
 
 	# linux/videodev.h dropped in 2.6.38
-	sed -i -e 's:msv4l.c::' src/Makefile.am || die
 	sed -i -e 's:linux/videodev.h ::' configure.ac || die
-	eautoreconf
 
 	# don't build examples in tests/
 	sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \
 		|| die "patching Makefile.in failed"
+
+	# make sure to use host libtool version
+	rm -f m4/libtool.m4 m4/lt*.m4 #282268
+	mkdir m4
+	eautoreconf
 }
 
 src_configure() {
@@ -94,16 +97,17 @@
 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		--datadir="${EPREFIX}"/usr/share/${PN} \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-artsc \
 		--disable-strict \
+		--disable-libv4l1 \
 		--enable-external-ortp \
-		--disable-artsc \
 		$(use_enable alsa) \
 		$(use_enable pulseaudio) \
 		$(use_enable coreaudio macsnd) ${macaqsnd} \
 		$(use_enable debug) \
+		$(use_enable g726 spandsp ) \
 		$(use_enable gsm) \
 		$(use_enable ipv6) \
-		$(use_enable jack) \
 		$(use_enable oss) \
 		$(use_enable portaudio) \
 		$(use_enable speex) \
@@ -111,7 +115,7 @@
 		$(use_enable theora) \
 		$(use_enable video) \
 		$(use_enable v4l) \
-		$(use_enable v4l libv4l) \
+		$(use_enable v4l libv4l2) \
 		$(use_enable sdl) \
 		$(use_enable X x11) \
 		$(use_enable X xv)