net-libs/opal: removing msrp use flag wich was breaking the build

svn path=/trunk/; revision=825

4 files changed, 14 insertions, 8 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 561e097..f662e77 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
+  opal-3.6.1.ebuild:
+  Removing msrp use flag because it breaks the build
+
   30 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
   opal-3.6.1.ebuild:
   Fix build when h323 is enabled without ptlib[asn]
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 61dc546..908dc50 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -5,6 +5,6 @@ DIST opal-3.4.5.tar.bz2 8000318 RMD160 71125ff5237d3efd9c534ce23fcd814614b1fbfb
 DIST opal-3.6.1-htmldoc.tar.bz2 5863294 RMD160 2d90dda7a6cdbb4cb3743688fc32a3ff9b532511 SHA1 f33af480786d65c1cdb0db564f93c34f68eee9bd SHA256 41dfa29fa213eb65eff9d20c89befe4431979a45b97410d3ad2ed200071eae5d
 DIST opal-3.6.1.tar.bz2 6993734 RMD160 3a19a46d67957d26b3261804e1489ffd83ef1662 SHA1 989bad4d3bc35828da8198740eaabe249f4c30df SHA256 e6b48a294b35449c851c2a6ea6969041ed7f4148e92b3faa03a330b7bb5a59af
 EBUILD opal-3.4.5.ebuild 7816 RMD160 d513bf19ca565987b02b6d97ae4fda9335775196 SHA1 a203646872853d2c36fc340901609ed04b209c4f SHA256 d65720d9d096d720731c5f907ad2b0d561058a69c18a5637fdf90144ab491dae
-EBUILD opal-3.6.1.ebuild 8492 RMD160 cc499c57221bb47273482b2c1584b00de004f783 SHA1 2deaa60750b8e7add1ced38f2b1e0dd3a0157b8e SHA256 ba8c773e151fe6b53c69b87ced576167ede615ff193bc4bc9e219c1b94367d31
-MISC ChangeLog 1424 RMD160 d25cdf300a66f9568d4afedc5bba4f376fe465af SHA1 efb2c383000bdab8e404648101311fda26f956c9 SHA256 64f558e505dcfa4e33f007a36a0ca3071ab9cc35c9236e8ced8d99804d404439
-MISC metadata.xml 1779 RMD160 2e4f602cc35a529a6d740c6b7d14bb3c966a5170 SHA1 ce13e4db107373de5f03d50249a5fecffb1ec226 SHA256 0b6ca25d36bbb1e4d8c63acbd1bf34daabec8e500c5881cb1a1643dbcc2fa219
+EBUILD opal-3.6.1.ebuild 8602 RMD160 0a9bce5a9a4349101aab9a90469094367da463f8 SHA1 442b98fb04269086a3c501a9a876ca8fdfbe027e SHA256 34144f4663a3fc4e73bf706f0850b6c53ae271e6a899219c3875f182aed1a511
+MISC ChangeLog 1566 RMD160 cdc807ea73d8dd91e06c7baba90f8574df2220a5 SHA1 3a736fac120553faa07ee2f3e257c6a028c1ef84 SHA256 3fd5f17f468aa7c40d36d191cf7e6f37412d1bdc5384f5266631928ae0417e3e
+MISC metadata.xml 1786 RMD160 a379aedd7b939d7e016d3bdd3de80b1bd08c8715 SHA1 8f2438477b65459528a8aa065234db19f48137ff SHA256 03694b9b7fc4ebb5ce389b89693d564ae95c9facf0a9f3a4e89e78ccfd89a8a8
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
index 1317ca1..fdee85c 100644
--- a/net-libs/opal/metadata.xml
+++ b/net-libs/opal/metadata.xml
@@ -15,7 +15,7 @@
 		<flag name="ivr">Enable Interactive Voice Response</flag>
 		<flag name="ixj">Enable xJack cards support</flag>
 		<flag name="lid">Enable Line Interface Device</flag>
-		<flag name="msrp">Enable Message Session Relay Protocol</flag>
+<!--		<flag name="msrp">Enable Message Session Relay Protocol</flag>-->
 		<flag name="plugins">Enable plugins support</flag>
 		<flag name="rfc4103">Enable RTP Payload for Text Conversation</flag>
 		<flag name="rfc4175">Enable RTP Payload Format for Uncompressed Video
diff --git a/net-libs/opal/opal-3.6.1.ebuild b/net-libs/opal/opal-3.6.1.ebuild
index 71a3717..6244069 100644
--- a/net-libs/opal/opal-3.6.1.ebuild
+++ b/net-libs/opal/opal-3.6.1.ebuild
@@ -15,7 +15,7 @@ LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE="+audio capi debug dns doc dtmf examples fax ffmpeg g711plc h224 +h323 iax
-ipv6 ivr ixj java ldap lid msrp +plugins rfc4103 rfc4175 sbc +sip sipim srtp ssl
+ipv6 ivr ixj java ldap lid +plugins rfc4103 rfc4175 sbc +sip sipim srtp ssl
 stats swig theora +video vpb vxml wav x264 x264-static xml"
 
 RDEPEND=">=net-libs/ptlib-2.0.0[stun,url,debug=,audio?,dns?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
@@ -53,11 +53,12 @@ DEPEND="${RDEPEND}
 #   (asn is used for fax and config _only_ for examples)
 # OPALDIR should not be used anymore, if a package still need it, create it
 # TODO: merge some use-flags or force their values ?
-#	candidates are: msrp, sipim, rfc4103 and any other without a dep
+#	candidates are: sipim, rfc4103 and any other without a dep
 # TODO: celt use flag can't be set because celt is not in portage, add it
 # needs to have ptlib url use flag enabled, see bug 2715377 (upstream)
 # needs to have ptlib stun use flag enabled, see bug 2721404 (upstream)
 # h323 needs ptlib[asn] but not required by opal, see bug 2721707 (upstream)
+# TODO: msrp has been disabled because build breaks, see bug 2722818 (upstream)
 
 pkg_setup() {
 	local warning=false
@@ -162,6 +163,7 @@ src_prepare() {
 }
 
 src_configure() {
+	# --with-libavcodec-source-dir should _not_ be set, it's for trunk sources
 	# versioncheck: check for ptlib version
 	# shared: should always be enabled for a lib
 	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
@@ -172,7 +174,7 @@ src_configure() {
 	# default-to-full-capabilties: default enable by upstream
 	# aec: atm, only used when bundled speex, so it's painless for us
 	# celt: not in the portage tree nor in the voip overlay
-	# --with-libavcodec-source-dir should _not_ be set, it's for trunk sources
+	# msrp: disabled because breaking the build
 	econf \
 		--enable-versioncheck \
 		--enable-shared \
@@ -185,6 +187,7 @@ src_configure() {
 		--enable-default-to-full-capabilties \
 		--enable-aec \
 		--disable-celt \
+		--disable-msrp \
 		$(use_enable debug) \
 		$(use_enable capi) \
 		$(use_enable fax) \
@@ -203,7 +206,6 @@ src_configure() {
 		$(use_enable ixj) \
 		$(use_enable java) \
 		$(use_enable lid) \
-		$(use_enable msrp) \
 		$(use_enable plugins) \
 		$(use_enable rfc4103) \
 		$(use_enable rfc4175) \