Stop installing mediastreamer headers/libs so that we can install the external library package.

Package-Manager: portage-2.1.4

4 files changed, 112 insertions, 8 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index b67dff357835..86d774555efa 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.5 2008/01/14 12:51:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.6 2008/01/14 14:03:46 vapier Exp $
+
+*linphone-2.0.1-r1 (14 Jan 2008)
+
+  14 Jan 2008; Mike Frysinger <vapier@gentoo.org> +linphone-2.0.1-r1.ebuild:
+  Stop installing mediastreamer headers/libs so that we can install the
+  external library package.
 
 *linphone-2.0.1 (14 Jan 2008)
 
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index 4851c4f1ec62..d50600deb842 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -27,14 +27,18 @@ EBUILD linphone-1.7.1.ebuild 2079 RMD160 1468451776de6dfd69b1efefe413a9be558ac51
 MD5 cc6ef2e51a0a52f971c5998a0d5d0571 linphone-1.7.1.ebuild 2079
 RMD160 1468451776de6dfd69b1efefe413a9be558ac51d linphone-1.7.1.ebuild 2079
 SHA256 92009903c30c552aa1ac3d81dd3d5a1336a61cf9bb6c6e58ac586952b41f863f linphone-1.7.1.ebuild 2079
+EBUILD linphone-2.0.1-r1.ebuild 2787 RMD160 a78d76fb593e9c33fe9ba099bca1104d5a897c0c SHA1 483ddd8f61273594041b875f8595f7d13da25201 SHA256 6cbb8435c74062e7bf17d73696672b0060d1e03af9013f94b0b0443be8083b84
+MD5 a6c9f0cec7135ee0ddf06bdb2dee41ba linphone-2.0.1-r1.ebuild 2787
+RMD160 a78d76fb593e9c33fe9ba099bca1104d5a897c0c linphone-2.0.1-r1.ebuild 2787
+SHA256 6cbb8435c74062e7bf17d73696672b0060d1e03af9013f94b0b0443be8083b84 linphone-2.0.1-r1.ebuild 2787
 EBUILD linphone-2.0.1.ebuild 2629 RMD160 d3e8faa69a4555005064f9f32af4d1d01743fb68 SHA1 a3f11664fb0d776a9c77dd030b959bddf082cbc8 SHA256 ad68e2b918c7a7ede1ca029da667dce1b2756b511bceeac9d453efc21b9dc6cf
 MD5 c1395e756c6e2ba7ce176a1544ba585e linphone-2.0.1.ebuild 2629
 RMD160 d3e8faa69a4555005064f9f32af4d1d01743fb68 linphone-2.0.1.ebuild 2629
 SHA256 ad68e2b918c7a7ede1ca029da667dce1b2756b511bceeac9d453efc21b9dc6cf linphone-2.0.1.ebuild 2629
-MISC ChangeLog 7064 RMD160 ca8c450c4484f746fea58800135ccbfeb281c788 SHA1 dadef88623e6a6e58056d3e372b6dc7100e55d2a SHA256 3aa2d742ba3446768747490279fc2d35efbdba2027c8b5d881b3824caf5fc948
-MD5 340b3802c2c01fe2f50d5363390823fd ChangeLog 7064
-RMD160 ca8c450c4484f746fea58800135ccbfeb281c788 ChangeLog 7064
-SHA256 3aa2d742ba3446768747490279fc2d35efbdba2027c8b5d881b3824caf5fc948 ChangeLog 7064
+MISC ChangeLog 7276 RMD160 6880876f687f3101ab19699082f24ce26047fe06 SHA1 22a905a8326b2373aa36c422de7665d9b68ff77d SHA256 f051d56f76b5acb888ab6b0911bc1f722cef0b3db7a2b00b341498fc5e149ec1
+MD5 bf4f0a4a00849a014e216af4b8491199 ChangeLog 7276
+RMD160 6880876f687f3101ab19699082f24ce26047fe06 ChangeLog 7276
+SHA256 f051d56f76b5acb888ab6b0911bc1f722cef0b3db7a2b00b341498fc5e149ec1 ChangeLog 7276
 MISC metadata.xml 312 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 SHA1 17015753e1e8e33227e3bf6260fff1a6447d32a0 SHA256 008abe484ed1f0a62e625789a99281919f3c933a222bbecef1bf9652728e6d38
 MD5 4147a43d9c89e23a84621861984e010e metadata.xml 312
 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 metadata.xml 312
@@ -48,10 +52,13 @@ SHA256 12390b0f2c5828795cabbf7a38c1e2a977483149c7cc3b6fb3e43d8ef06b50b5 files/di
 MD5 527393064be06ff9228f3acb01aae088 files/digest-linphone-2.0.1 247
 RMD160 964804940b794602f6fc98ae79eae6418e54e173 files/digest-linphone-2.0.1 247
 SHA256 0188b5b395f8a9f060e085021891a3d5f98850ed47c567a1a2f8f1edbd8a5ac7 files/digest-linphone-2.0.1 247
+MD5 527393064be06ff9228f3acb01aae088 files/digest-linphone-2.0.1-r1 247
+RMD160 964804940b794602f6fc98ae79eae6418e54e173 files/digest-linphone-2.0.1-r1 247
+SHA256 0188b5b395f8a9f060e085021891a3d5f98850ed47c567a1a2f8f1edbd8a5ac7 files/digest-linphone-2.0.1-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHi1yfj9hvisErhMIRAljhAJwL0K7mjSGoIN2VNHSLPzDz7/W+UgCg2uqm
-27at3RPHTHRXe8NxHIEMKdk=
-=vOxk
+iD8DBQFHi2vHj9hvisErhMIRArs+AJ9ydER/yNCsBXXlePBlkdNy2BIcegCgqHun
+vPwYu2rjCUrx2hSFPlgqEaA=
+=b+zP
 -----END PGP SIGNATURE-----
diff --git a/net-voip/linphone/files/digest-linphone-2.0.1-r1 b/net-voip/linphone/files/digest-linphone-2.0.1-r1
new file mode 100644
index 000000000000..dc7dd3302cdc
--- /dev/null
+++ b/net-voip/linphone/files/digest-linphone-2.0.1-r1
@@ -0,0 +1,3 @@
+MD5 30ef5d5cec0f0ff74d84f8191779fd6b linphone-2.0.1.tar.gz 7638627
+RMD160 89c120e5118c931daf9f58d1d988185a28bbcf05 linphone-2.0.1.tar.gz 7638627
+SHA256 33f9e17eba38c55c6b2260e02c98db642dd47d3c38677478a05caa0ae702d16f linphone-2.0.1.tar.gz 7638627
diff --git a/net-voip/linphone/linphone-2.0.1-r1.ebuild b/net-voip/linphone/linphone-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..04d80b4a470b
--- /dev/null
+++ b/net-voip/linphone/linphone-2.0.1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-2.0.1-r1.ebuild,v 1.1 2008/01/14 14:03:46 vapier Exp $
+
+# Note: video support in linphone relies on swscaler being disabled
+#       in ffmpeg.  this is because the video code in linphone is old
+#       and uses the old interface.  solution: fix linphone's video
+#       code.  workaround: build ffmpeg w/out --enable-swscaler.
+
+inherit eutils
+
+DESCRIPTION="Voice Over IP phone (internet phone which uses SIP)"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/stable/sources/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa arts console gsm gtk ilbc ipv6 novideo xv"
+
+RDEPEND="dev-libs/glib
+	dev-perl/XML-Parser
+	net-dns/bind-tools
+	>=net-libs/libosip-3.0.3
+	>=net-libs/libeXosip-3.0.3
+	>=media-libs/speex-1.1.12
+	gsm? ( >=media-sound/gsm-1.0.12 )
+	x86? ( xv? ( dev-lang/nasm ) )
+	gtk? (
+		>=x11-libs/gtk+-2
+		gnome-base/libglade
+	)
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	!novideo? (
+		>=media-libs/libsdl-1.2.9
+		media-video/ffmpeg
+		>=media-libs/libtheora-1.0_alpha7
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+# use the bundled ortp until newer versions leave package.mask
+#	>=net-libs/ortp-0.9.0
+#	portaudio? ( >=media-libs/portaudio-19_pre )"
+# media-libs/gsm-1.0.12 fails on amd64 due to bug #192736
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/linphone-1.6.0-call.patch
+	epatch "${FILESDIR}"/linphone-1.99.0-core-amd64.patch
+	epatch "${FILESDIR}"/linphone-2.0.1-configure-gsm.patch
+	epatch "${FILESDIR}"/linphone-2.0.1-mediastreamer-deps.patch
+}
+
+src_compile() {
+	econf \
+		--disable-strict \
+		--libdir=/usr/$(get_libdir)/linphone \
+		--libexecdir=/usr/$(get_libdir)/linphone/exec \
+		$(use_enable console console_ui) \
+		$(use_enable gtk gtk_ui) \
+		$(use_with ilbc) \
+		$(use_enable ipv6) \
+		$(use_enable alsa) \
+		$(use_enable arts artsc) \
+		$(use_enable gsm) \
+		$(use_enable !novideo video) \
+		--disable-portaudio \
+		$(use_enable x86 truespeech) \
+		|| die "Unable to configure"
+		#--enable-external-ortp \
+		#$(use_enable portaudio)
+	emake || die "Unable to make"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "Failed to install"
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README README.arm TODO
+
+	# don't install mediastreamer/ortp includes, docs and pkgconfig files
+	# to avoid conflicts with net-libs/ortp
+	rm -r "${D}"/usr/include/{mediastreamer2,ortp} || die
+	rm -r "${D}"/usr/$(get_libdir)/linphone/pkgconfig/{mediastreamer,ortp}.pc || die
+	rm -r "${D}"/usr/share/doc/ortp || die
+	mv "${D}"/usr/$(get_libdir)/{linphone/,}pkgconfig || die
+}