Version bump. Fixes to bugs #439498 and #440184

Package-Manager: portage-2.2.0_alpha138/cvs/Linux i686
Manifest-Sign-Key: 0x748B2C601F6F0683

8 files changed, 63 insertions, 17 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/Manifest b/net-libs/opal/Manifest
index f84ba9d9b9de..00b0761b1ffb 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA256
 
 AUX opal-2.1.1-notrace.diff 263 SHA256 3abf99ab2a7bde2e1a2380e22a9c5e15240439bdf7766b4715c78cacd46961c0 SHA512 279ebd4821af25ba1ef795aad66d1ae20489337ab2d78c174b4caa4dbbf02b4f8c7f6fdc5e2822e1c6441e2850d0924f108dcaf06beaf238be58b44daee91b71 WHIRLPOOL b71b6bf51eda7d9a5c24a9bcff85c41c3017e92c6be4f1fed5022ccbfac0ea0f3b66a4cc9b501810b5e342b8f8cf8110c698deca9ed71661a3f5fe40184040da
-AUX opal-3.10.8-avoid_cflags_mixup.patch 5378 SHA256 80a41d81a1caeaee31c43c7b71bac9943692eed3e6a5f7f5c4a1bf837cd391e7 SHA512 fdc6b52db3bd299d2235ebdb917921d3c9d01a03ffed65e8e4b833e66da21bde4c1497740a38a41f3d7393a6c65969a64587612a11c9590904b66c9fb86e1e7e WHIRLPOOL fc1d97a7180d50748b521cb345b58487e2183506b68d5d952f004d3f382cd77171b222187fa4bd92510026781012d601c23ec23f5df8023ad3e9ec73c5e98b0c
-AUX opal-3.10.8-disable-h323-workaround.patch 498 SHA256 b1d943f7eb33c1828bf5a086abe1256dac55ce7f9a9cd16cbe9fa72b00d7ede2 SHA512 58e8ef12c39bce3a4d386b2b6033e1e242852bbf78371c58e91bd020cfcd95b40a9831db91fa76da431a9f8c4bb40c846b420e3a462dad77658a37c2281a9d39 WHIRLPOOL 6c590b837ebdcb11491aa3b9759d6c7e5930aa07d294bcfd473327f37866df97400bf1de588da853b6c807a233c23388359ac5a1e27c05ae1d4cc361585b98ae
-AUX opal-3.10.8-labs_is_in_stdlib.patch 532 SHA256 c6d7613fc79d7f1134a4ff9246591d96ab9c264f0c8250b1cf51a33cdafa1fc7 SHA512 f1342804fec2e6422d499f776a39dff2e36e5604e2d43084322c9fd0b4bf7d511852c3ca02dc072d133b9204b4984b4400f56846f58cc2edfc0446176cdbfcf5 WHIRLPOOL 271170a5a2adcffac9d49e146a9a3e947790b155d224cc64800eb773b31a11c34309bfa8c28083534f8e230cc3aa3ae83a6a912a266cbb681b3c120e8ae794aa
-AUX opal-3.10.8-svn_revision_override.patch 456 SHA256 78e84456c02f9a8c51f60dfff4882875c2fbefc2ac7953ed96a0dba30ed0e450 SHA512 b78843500d1d90ce11e8620fdad9f4a97184ee603a839828c39aad85d5f33bb08bd776f2faaf7c86e364cd4dc4d3166485d74dd66551ce508c9bee22a336d2ee WHIRLPOOL c82b0ffeba8315d1e0e3e7250dba1c3de17e095b68dcd110539920fb6f99ba9f4a4e5ccf3e97e785b15696c5703a546f08c999dda4d71614a0fdf13074e20197
+AUX opal-3.10.9-avoid_cflags_mixup.patch 5378 SHA256 80a41d81a1caeaee31c43c7b71bac9943692eed3e6a5f7f5c4a1bf837cd391e7 SHA512 fdc6b52db3bd299d2235ebdb917921d3c9d01a03ffed65e8e4b833e66da21bde4c1497740a38a41f3d7393a6c65969a64587612a11c9590904b66c9fb86e1e7e WHIRLPOOL fc1d97a7180d50748b521cb345b58487e2183506b68d5d952f004d3f382cd77171b222187fa4bd92510026781012d601c23ec23f5df8023ad3e9ec73c5e98b0c
+AUX opal-3.10.9-disable-h323-workaround.patch 498 SHA256 b1d943f7eb33c1828bf5a086abe1256dac55ce7f9a9cd16cbe9fa72b00d7ede2 SHA512 58e8ef12c39bce3a4d386b2b6033e1e242852bbf78371c58e91bd020cfcd95b40a9831db91fa76da431a9f8c4bb40c846b420e3a462dad77658a37c2281a9d39 WHIRLPOOL 6c590b837ebdcb11491aa3b9759d6c7e5930aa07d294bcfd473327f37866df97400bf1de588da853b6c807a233c23388359ac5a1e27c05ae1d4cc361585b98ae
+AUX opal-3.10.9-java-ruby-swig-fix.patch 874 SHA256 f813a831ac8d8c6c47f951125c1c8e971849d21a9cd7403e2bd72d39a5718930 SHA512 a7132cd6ad61d143cc11e00a048aaf66e1802890ac5fbde7ff964f99dc45a3abc79a081572cbdae5a84a50eee8af11266695a5de9c2691385c6f849e27105022 WHIRLPOOL ea85ac9c3603ff0a9eaf955f232c0197c35bb39ddce9a7d28c0f682e16e3660534eab0c5106bc8395ed2ac2445fb8f615d567e5ad607b5089331c116c4ae16db
+AUX opal-3.10.9-labs_is_in_stdlib.patch 532 SHA256 c6d7613fc79d7f1134a4ff9246591d96ab9c264f0c8250b1cf51a33cdafa1fc7 SHA512 f1342804fec2e6422d499f776a39dff2e36e5604e2d43084322c9fd0b4bf7d511852c3ca02dc072d133b9204b4984b4400f56846f58cc2edfc0446176cdbfcf5 WHIRLPOOL 271170a5a2adcffac9d49e146a9a3e947790b155d224cc64800eb773b31a11c34309bfa8c28083534f8e230cc3aa3ae83a6a912a266cbb681b3c120e8ae794aa
+AUX opal-3.10.9-svn_revision_override.patch 456 SHA256 78e84456c02f9a8c51f60dfff4882875c2fbefc2ac7953ed96a0dba30ed0e450 SHA512 b78843500d1d90ce11e8620fdad9f4a97184ee603a839828c39aad85d5f33bb08bd776f2faaf7c86e364cd4dc4d3166485d74dd66551ce508c9bee22a336d2ee WHIRLPOOL c82b0ffeba8315d1e0e3e7250dba1c3de17e095b68dcd110539920fb6f99ba9f4a4e5ccf3e97e785b15696c5703a546f08c999dda4d71614a0fdf13074e20197
 AUX opal-3.6.4-jdkroot.patch 507 SHA256 c2e930565cd91a7ec75a1ed1657ba524dad810ec934ef854c39331388661f2f6 SHA512 7de9d234f322e0e1e9d00ea598d668b37bc8c0a363b0f922e4fc8105eef1bd5b06913eda61166bdbc8d9d0b87beed823a3c4ad3f600e0fd89bec12c36f8b73a9 WHIRLPOOL 563c08a73e803d028e6b022ecf57e3eeeeea33ddcc07135489c4b18853cb1ee08387e9cc436cadcf28abca86283916a1c11f05b8bb497e1d6a48e4c843836d0f
 AUX opal-3.6.8-build-fix.patch 992 SHA256 cbd011cf42b7d691f5b8d71e02f5b317d50ea8c51a7b03e38887119dc07b58c8 SHA512 3e890d0133d5cac4bb2fb6616b65e8d92f56634f2f4f3ca44c39a464c3cc37e34c150eaac39541aba82637163e6a27e95744a5e20d6052e0df21a12b7e3262df WHIRLPOOL eba803a9d4c280ca519444d79b7a6bffa5b53b0eea02fb175a9cde2c3260cadd81836a579e51946c393acf4011bb549ae50f0aa1a21e4290ad39abeafd559740
 AUX opal-3.6.8-ldflags.patch 7345 SHA256 c7ecb726688eadbb24d09238c86de8874edc488d82503dbc64802d3d8878e411 SHA512 8008b35069cc8da56f958f27ddbe3fef38e157c9e0bd7498e4e5de0a4039f9a3d287ff053eb172296c7b1637d942365ec58214c2e2c3aa59bb098d306dc9d14e WHIRLPOOL 9e013301de6feec67b51f9f8bddd94a2eb0464dcab97fb2a680c3208f955e1e997ed9f5c4a237bdc9dccd59e01f55fb52f040207ba71237c9dfcda9d6a5f2cfb
 AUX opal-3.6.8-lid-plugins-ldflags.patch 1146 SHA256 d4c8662afa93b5651f132280edd56ab87253ce91b829cfeff6ac0f322dffbd9b SHA512 ac10efaaa1323ea6f0fdcf54f46fb1a7c6c0c5f3c3d2e7f96ce19a9fe37105d1799842b7dcee07d64b4dca96bc852b80acd6c4d6af380757ec128c1f9c288390 WHIRLPOOL 97fab41a4c5b1c5a36933f154d4aa1b2c6d16ed9d90a7e9bba23850df503164641540a118b2379718c0572ee187c4f4e331051f7fd75df3804c66dcc74824cb9
 DIST opal-2.2.11.tar.gz 4165191 SHA256 0990ead39728f23a1ce39997f41a8484c59809ccec0e770b9bc4f795a85a29c4 SHA512 7115fd82109458cb6d01e3232bfc414cc2bbdb2dae2efbb8f6f941e1a2979d81fdb800fe04d13707a17a02490555d5bc43ad5021d8bb8890b3d3e5f97b90b015 WHIRLPOOL 2abf3693199ea8e023b5ede444654de0c2bc3e2ddf2fd638f7272c2a2a3b7cc0e9c39ce508d702e7508dc0ae605019135306f03a9bf327cb65ac9d355bca801d
-DIST opal-3.10.8-htmldoc.tar.bz2 3164897 SHA256 b42aec75817fa1ee4579e30c9cd8f74956464a42d9a0f69784970bd0da36d73b SHA512 8e5c272e78d9b5864f25743d60691daf90f08f5653c9a77e31810d3297ecf9402aae362d9382d5803ec59efec6dcd93717de7925edcf96c5083b1e066aca185b WHIRLPOOL d6490c4040cecf670bfa76b64ced6053001e257854f034d7edb68e9d74e4286bbf9ea4f19284317dbe0fbf339d9b0705ae74b2c0f3f945275dbac67605bc6cfa
-DIST opal-3.10.8.tar.bz2 8600132 SHA256 b417af8311b9ff22b6eb70a82c06d4005e0693edd85bcd973993993bf1fe3cdf SHA512 290fd04c1a3fee943c7fb0c7ba021f78d9e91df336ed4beda19e54bcfac8acf68c370cb9b669106ad7d42d6ba1f8dfa7e0cccde41910bcdebc91cfff6c42bf21 WHIRLPOOL 74d87c01197fc4f9820431140b14dca03d0502e8c1f8f7f0552c4f27c3f5ea718094076fb61653c766b670a1d00819ee15d11d0e5fbd89a39239473483a6eb12
+DIST opal-3.10.9-htmldoc.tar.bz2 3163056 SHA256 c7d2b66415cdcc0544e92dfefdbe0cc03b37e498410e3ea524941f1b7080d6d8 SHA512 7c3f959dbf6b8622b4e36c050e6e66fbfd527d5ce852b441dc0325e74e0f622d025225dc0619d08d2bb3afafe434206a82b52dd52a1ae943dcc12efc8719292e WHIRLPOOL e5c7e7af60523935b255b578369231fe510a27137e58d894377728ff9e69230bbcde4d88cb0b60681480279087c1bf5fe4c69a5b947c387deb3a0b9f4f879da1
+DIST opal-3.10.9.tar.bz2 8591506 SHA256 f6a1c380df5c82c24ff6cc82c5c6a94868b112d5914395ad8265e30b0005bf2e SHA512 11e67bbbb7903aa176c0563d48c444d6c3df399dc9f1c7cf1ff9124a96fd719e5608d0e091346de3aa2087e04d28116b14c2c60bb92f2fc83584695e2e61ebcc WHIRLPOOL 5790274802f909f428950d3c249abcdfae03f5046381b631c25c7ccc23a34efd07bfd26d77de755741b786ed69cac8c411d7ec9e70286c828595eac4e00d8c4c
 DIST opal-3.6.7-htmldoc.tar.bz2 5842269 SHA256 d6c11b162b4b26cfc3df2c2c12b5d8a0e1b2dfa5c6869995b0fafa2f2a716e7b
 DIST opal-3.6.8.tar.bz2 6837993 SHA256 8cbfabb33e5c5563fdafacf1adde536c78638d6d020fae496a52e19e2be6a90c SHA512 bc9ce66af9fc7a82fc33403139f138d732b4f3e013b91b711533572036f0d965b19961aa1dcec63efb0ed906e7525eebc972cd106e6011e40d80ae0a0b7e8a51 WHIRLPOOL 031a98a0e0e6c6b51271898cf836dc805a7341b04f018a6604560572054e00402f1cf092d2a8828ba476ba1bb0331cbd34e7bd2b078ecd3cd0a3b51b7adbd5d5
 EBUILD opal-2.2.11.ebuild 2604 SHA256 8595bd00d707830cfc52f7de3b8993c0658f50306ddef296dea97c74d0285ba7 SHA512 11f89579a269aac28afadf7888d858718ff3852f00df949ee563ef2565ea92a34c2711c9a7cb598d4f23dddbb20a5ae64348a237664122be28931803065a3c54 WHIRLPOOL 28f015d31702f2193233cb9ad24627dc327f6e4798ae926fcc976231d468137e798a79e15fd42690578fd05c6c21f1f2100649ec49892b1c0ab0585f4515eb9e
-EBUILD opal-3.10.8-r1.ebuild 7395 SHA256 9ea45af5348c7a25f3b36d43fe1de1724f9b2fb0bfaa464be62bca23a7cf43e4 SHA512 c53a96e63666d62d4bea27107fc36826dfbc8d260e3c52e1859424bef290ec4aa9f37f1c5a09ce659c29d5e3fc123ac8440b8d8c58850ef589ba2c5ff88709ea WHIRLPOOL 4573f7ac3d45c8dd865c9fd263f40b160d790e845bc5a0fc4c6b6e3bdd18edffa0f2db7fa9343f2239dc178feed3b14dfca8c6aa2dcaadf8f3b4da8aabd35eda
+EBUILD opal-3.10.9.ebuild 7437 SHA256 c90a8690cac6823735192ffbbebcf84ddb9366566a0bc1f112773c0ac9b0393e SHA512 8828baceb146a776281367d7b10753b765deb39796e90199c0b9ea63af601819a34627d5c50be60c49fc28efcbaee9fad4dc40dcc33e26c0a6a756307c00b045 WHIRLPOOL 74a5ef0d0edf8bdfff29deada9ad7f5e5e1617a143b1bd2ec400c7e740595e44d3020f4b2939ea301badbeda51b3b0f73b24a05f574452fe903299bda964b082
 EBUILD opal-3.6.8-r2.ebuild 8564 SHA256 163e8a0de3af0b0fc998b4f5f44175e961471c0e2def8d0fafcd450eaa30ee84 SHA512 41ec6c5205fd04d8408ccaac83588222eeb969d6db5af412f1f29a174fd58114dfc6b954e366b5afe443b682e707c9682517722cb79fb90a5e8951718d471622 WHIRLPOOL a7d9f3af5448d546919ee56bcc5da31d1b576e184f290fe71f37ee39265369668f5aebc5b8c01ab45ebad3e94a8f1c17df43f809ce7df722b72d7b119c4b796d
-MISC ChangeLog 11969 SHA256 74f53afb576ea36b4307d74c4e1af887c9e897bafbd11bdfd9292648f102ed2b SHA512 4d6c81e7939638974c590de514fac8609a5d95544a99f887844441fec892f1cae4821384b713076280bf3c23f614e1668a3e30f5284c1ae7c6fbe13d24cd0ac2 WHIRLPOOL caef671dec566420b232954c4cc1dd9d8b565a8f08d4a131ec7b4828005c005fcdfb8f8ab3954815aec9e21a45831b6137398b6be88980cc5b027893e7efa823
+MISC ChangeLog 12581 SHA256 66bea48088443ada8a174bd42daef65c6de66781ce9dd54ab01bf9aa200aeaa2 SHA512 0425e6463ffe8f7d6caa0e796de3a9ce8632a8539c798e89c720efcf6eddf6ffff925c86526e44a1e1a73916aa7194b751f58f58d8952afac36779843bf79df5 WHIRLPOOL 3595a7f17495cb841be72703bc026f96c7ffc7d81287cda7242bf4e4808b7771414395283cf7b6462ff0f6c734df444897d5d92d344921a9e40013af7d35d996
 MISC metadata.xml 2333 SHA256 fa93221111af337da2ed45b72bd76e68021a2b8b1196f296027f97e1ed32304b SHA512 d592572d85210c2fc28abb0ba884b5e5bf416efe889670544d9041ed0e468c590eb6341b4995067e3cddb03386d7f752a90093825edfcc6cf2b0b4fb3708eb6c WHIRLPOOL b2d8e62d3c46a6dbc19359f4fdda5ed524d74d65b4781f1f543f93efb0fc3fcabeefa4857b2dc8609ba36a008b60170dae8829b37164f41ebce2a011393b07d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAlCIJXQACgkQdIssYB9vBoOtTgCfQYpX+KNPbsB+RCIP0zh1Pm0h
-GUkAn0hYpi5Oj6ZFWoRy5licGBg1yvbp
-=lBIR
+iEYEAREIAAYFAlC87osACgkQdIssYB9vBoOkCgCeKkMjterWI/Yqu4Pal0gP7ecY
+AyQAn2iQ5GIbDng5OudeGO1ZV9QUJs7r
+=ux+Y
 -----END PGP SIGNATURE-----
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"