7 files changed, 51 insertions, 6 deletions
diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 6f7326cbbbf2..c4439104a32d 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-libs/opal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.83 2012/10/24 21:28:10 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.84 2012/12/03 23:25:27 neurogeek Exp $
+
+*opal-3.10.9 (03 Dec 2012)
+
+  03 Dec 2012; Jesus Rivero <neurogeek@gentoo.org> -opal-3.10.8-r1.ebuild,
+  -files/opal-3.10.8-avoid_cflags_mixup.patch,
+  -files/opal-3.10.8-disable-h323-workaround.patch,
+  -files/opal-3.10.8-labs_is_in_stdlib.patch,
+  -files/opal-3.10.8-svn_revision_override.patch, +opal-3.10.9.ebuild,
+  +files/opal-3.10.9-avoid_cflags_mixup.patch,
+  +files/opal-3.10.9-disable-h323-workaround.patch,
+  +files/opal-3.10.9-java-ruby-swig-fix.patch,
+  +files/opal-3.10.9-labs_is_in_stdlib.patch,
+  +files/opal-3.10.9-svn_revision_override.patch:
+  Version bump. Fixes to bugs #439498 and #440184
 
 *opal-3.10.8-r1 (24 Oct 2012)
 
diff --git a/net-libs/opal/files/opal-3.10.8-avoid_cflags_mixup.patch b/net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch
index 7f9a3b5c0766..7f9a3b5c0766 100644
--- a/net-libs/opal/files/opal-3.10.8-avoid_cflags_mixup.patch
+++ b/net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch
diff --git a/net-libs/opal/files/opal-3.10.8-disable-h323-workaround.patch b/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch
index 3d1761566ed1..3d1761566ed1 100644
--- a/net-libs/opal/files/opal-3.10.8-disable-h323-workaround.patch
+++ b/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch
diff --git a/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch b/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch
new file mode 100644
index 000000000000..65708635a34d
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch
@@ -0,0 +1,29 @@
+diff -uNr opal-3.10.9.orig/Makefile.in opal-3.10.9/Makefile.in
+--- opal-3.10.9.orig/Makefile.in	2012-12-03 11:09:17.000000000 -0500
++++ opal-3.10.9/Makefile.in	2012-12-03 11:09:35.000000000 -0500
+@@ -371,9 +371,9 @@
+ ifeq ($(OPAL_JAVA), yes)
+ 
+ JAVA_SRCDIR      = $(OPAL_SRCDIR)/java
+-JAVA_WRAPPER     = $(JAVA_SRCDIR)/java_swig_wrapper.c
++JAVA_WRAPPER     = $(JAVA_SRCDIR)/java_swig_wrapper.cxx
+ 
+-VPATH_C         += $(JAVA_SRCDIR)
++VPATH_CXX       += $(JAVA_SRCDIR)
+ SOURCES         += $(JAVA_WRAPPER)
+ 
+ endif
+@@ -384,10 +384,10 @@
+ 
+ ifeq ($(OPAL_RUBY), yes)
+ 
+-RUBY_SRCDIR      = $(OPAL_SRCDIR)/ruby
+-RUBY_WRAPPER     = $(JAVA_SRCDIR)/ruby_swig_wrapper.c
++RUBY_SRCDIR      = $(OPAL_SRCDIR)/Ruby
++RUBY_WRAPPER     = $(JAVA_SRCDIR)/ruby_swig_wrapper.cxx
+ 
+-VPATH_C         += $(RUBY_SRCDIR)
++VPATH_CXX       += $(RUBY_SRCDIR)
+ SOURCES         += $(RUBY_WRAPPER)
+ 
+ endif
diff --git a/net-libs/opal/files/opal-3.10.8-labs_is_in_stdlib.patch b/net-libs/opal/files/opal-3.10.9-labs_is_in_stdlib.patch
index ac8a7ef2000f..ac8a7ef2000f 100644
--- a/net-libs/opal/files/opal-3.10.8-labs_is_in_stdlib.patch
+++ b/net-libs/opal/files/opal-3.10.9-labs_is_in_stdlib.patch
diff --git a/net-libs/opal/files/opal-3.10.8-svn_revision_override.patch b/net-libs/opal/files/opal-3.10.9-svn_revision_override.patch
index c2a15b16ef82..c2a15b16ef82 100644
--- a/net-libs/opal/files/opal-3.10.8-svn_revision_override.patch
+++ b/net-libs/opal/files/opal-3.10.9-svn_revision_override.patch
diff --git a/net-libs/opal/opal-3.10.8-r1.ebuild b/net-libs/opal/opal-3.10.9.ebuild
index 63aa90749b82..15b566ebbd3b 100644
--- a/net-libs/opal/opal-3.10.8-r1.ebuild
+++ b/net-libs/opal/opal-3.10.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.8-r1.ebuild,v 1.1 2012/10/24 21:28:10 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.9.ebuild,v 1.1 2012/12/03 23:25:27 neurogeek Exp $
 
 EAPI=4
 
@@ -14,14 +14,15 @@ SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
 LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+audio capi celt debug doc examples fax ffmpeg h224 h281 h323 iax
+IUSE="+audio capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax
 ilbc ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl static-libs
 stats swig theora +video vpb vxml wav x264 x264-static xml"
 
 REQUIRED_USE="x264-static? ( x264 )
-	h281? ( h224 )"
+	h281? ( h224 )
+	sip? ( sipim )"
 
-RDEPEND=">=net-libs/ptlib-2.10.8[stun,debug=,audio?,dtmf,http,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+RDEPEND=">=net-libs/ptlib-2.10.9[stun,debug=,audio?,dtmf,http,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
 	>=media-libs/speex-1.2_beta
 	fax? ( net-libs/ptlib[asn] )
 	h323? ( net-libs/ptlib[asn] )
@@ -46,7 +47,6 @@ DEPEND="${RDEPEND}
 	java? ( swig? ( dev-lang/swig )
 		>=virtual/jdk-1.4 )"
 
-REQUIRED_USE="sip? ( sipim )"
 # NOTES:
 # ffmpeg[encode] is for h263 and mpeg4
 # ssl, xml, vxml, ipv6, ldap, audio, wav, and video are use flags
@@ -91,6 +91,8 @@ src_prepare() {
 		epatch "${FILESDIR}/${P}-disable-h323-workaround.patch"
 	fi
 
+	epatch "${FILESDIR}/${P}-java-ruby-swig-fix.patch"
+
 	sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \
 		|| die "sed failed"