Fix opal.

12 files changed, 504 insertions, 67 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 5a7394d..618c389 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,53 @@
 # 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.80 2012/06/17 16:26:12 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.87 2013/03/05 19:02:23 chithanh Exp $
+
+*opal-3.10.10 (05 Mar 2013)
+
+  05 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +opal-3.10.10.ebuild:
+  Version bump.
+
+  08 Feb 2013; Alexis Ballier <aballier@gentoo.org> opal-3.10.9.ebuild,
+  +files/opal-3.10.9-ffmpeg.patch:
+  backport upstream fix to build with recent ffmpeg versions, part of bug
+  #443206
+
+  16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due retirement, #260683
+
+*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)
+
+  24 Oct 2012; Jesus Rivero <neurogeek@gentoo.org> -opal-3.10.8.ebuild,
+  +opal-3.10.8-r1.ebuild, +files/opal-3.10.8-avoid_cflags_mixup.patch:
+  Revbump. New patches to fix bug #439464 and fix C and CXX flags mixup in
+  plugins
+
+*opal-3.10.8 (23 Oct 2012)
+
+  23 Oct 2012; Jesus Rivero <neurogeek@gentoo.org> opal-3.6.8-r2.ebuild,
+  +opal-3.10.8.ebuild, +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, metadata.xml:
+  Version bump, fixing several bugs. Adjusted opal-3.6.8 dep on ptlib  <
+  2.10.8. Added myself as maintainer
+
+  30 Sep 2012; Raúl Porcel <armin76@gentoo.org> opal-3.6.8-r2.ebuild:
+  alpha stable wrt #397617
 
   17 Jun 2012; Raúl Porcel <armin76@gentoo.org> opal-3.6.8-r2.ebuild:
   ia64/sparc stable wrt #397617
@@ -307,4 +354,3 @@
   20 Mar 2006; Stefan Schweizer <genstef@gentoo.org>
   +files/opal-2.1.1-notrace.diff, +metadata.xml, +opal-2.2.1.ebuild:
   New ebuild for ekiga, bug 119611
-
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index feb0536..0efd778 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -1,11 +1,19 @@
 AUX opal-2.1.1-notrace.diff 263 SHA256 3abf99ab2a7bde2e1a2380e22a9c5e15240439bdf7766b4715c78cacd46961c0 SHA512 279ebd4821af25ba1ef795aad66d1ae20489337ab2d78c174b4caa4dbbf02b4f8c7f6fdc5e2822e1c6441e2850d0924f108dcaf06beaf238be58b44daee91b71 WHIRLPOOL b71b6bf51eda7d9a5c24a9bcff85c41c3017e92c6be4f1fed5022ccbfac0ea0f3b66a4cc9b501810b5e342b8f8cf8110c698deca9ed71661a3f5fe40184040da
+AUX opal-3.10.10-ffmpeg-header.patch 484 SHA256 5a1b9e556e484b682d420f4409f96cc3eb051ed40a3c91ba3d356de8c532d823 SHA512 6b08353ec15a46c42dc2a0429eea9e64814e90a593661a7aea4e916872ffcd0d4623b931053c85493b40501f74fa59e2946347bd00962ffcd538b5474066af4c WHIRLPOOL 01faf94af445d600dba0c10495ad110dab388b3039ee40aa1d4abc181c43e48f1026d05835be87343dab5c6b3ff6b8019b5110c83a615e0e74b6eac068334844
+AUX opal-3.10.10-vsnprintf.patch 441 SHA256 627e13bb767c09a3b314fe309b2b2a132f1b34a731fa3cde5d9c2e21554df674 SHA512 2c7cbf6f4227bb2bf7d70ae54b3c24628518c31f9f361a757fc16d3a8d63e0fbf5a98ed6767c6989bab139a488122eed64a59304b6c16ba2efed5d53901ec826 WHIRLPOOL 32e53d92321c652ef3de65475bbf3d9144d8280562536b4d895b3efc1a3f60cf0ccf3c1ac52e81e1353ada92c561e95b13917f55bc493fbfb41562369cb0e6b1
+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-ffmpeg.patch 7084 SHA256 194a95dbb0905f37c6778f628baddc962249c6cbc0b000197ebd8233b1d9c6ad SHA512 109c41fd92793bafdbbf066d5f7e33175be4034fe2a1ce2bd1df8f569e86101d04617151df851025da17c7b46bb345022200990c36bbb47f940afcea306a6701 WHIRLPOOL adb1f24df323f85ea9be1349ce238705cfa656137f96fcd7a45278e4aebfd774f70c8b38e9efa05576fb6be460e32af90ec7e5666ab2050986c959c75b6551fb
+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-gcc-4.7.patch 484 SHA256 dccbe36e7835b30424f0c2dc115dfd8db37ff4fdfe751e98b7cea45738d18295 SHA512 12ec7a7fe6d00b0c9ed9a96e3dd45552bcbccf6a79c6611fe34e59edbe85b9334ad57bea144ba8e77e979c7c65a44acdf4f00d1a952a1d7f0af07e62ce07b05e WHIRLPOOL efaa9f00b6beca866c3cbd9a04ab1b3145a04f73a844e9a70ab10f99cfb86824e0a7bce7a1ff1ef8897f0ce0c85c59c9b0b0ace2b81e17a38abc63beae5ce76c
 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-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-3.6.8-r3.ebuild 8646 SHA256 3f400820ec1813760be64f4a67b608324cf5484cc0334cc76a01ac4cc24c0673 SHA512 00bca4e80beca59b1a74e5d582f625e2fa11bf78b0b915e7c2514bfb94a5ed056bb4be63ac2ae4d5b7a72fb1cab2921d74ab6bad5d4c5aa299383f5e12864d35 WHIRLPOOL 0053b7304470a8563f5817e5ee24a6273fb2a97fd3e476e2d5af8ce3824a291845732a9ac215da84daf61fb64b9abbf8b9f3874a4f21accff6569ea3fda22ffe
-MISC ChangeLog 11213 SHA256 ca601220b7e7abd49e598acd10c76c23f036e7496e17b6305c83fa758986b781 SHA512 6f0a0fd3b4fdae0facf8b86e75c336f23f6b87df40737b045b7bc36f3c43756752d4c540edfda7d5f2dff1c5815fb1e6d24d617e70b9ef2ffaefae0ba1d40585 WHIRLPOOL 52d1c524ca171941e19e93c7ec77252818929900dde171bec03ee4a5c654c15715c0c27bcc3b76c7a35d3329561e9b6fa5d0ced1606f6a4ccab2c702a740b1dd
-MISC metadata.xml 2175 SHA256 0ae23e62c739d189d3d148ede7661b86bf84f8068e094f0c81b123b5672b39fb SHA512 54c60403a04193e65ef78048f6efe79ef8ef35afff7434347b35231820e7764a958ddeda033e4d8b27e7a8c01200046e34e2ae33d595b7996e4882eafd3699b8 WHIRLPOOL 6394482ad71d3324c9e7250072458a2b71402803bd8f6476aecacf71e2db74ebca6f3f705ff02ae12f18df1c3dbdd8889ad661bf5450abde5453805ed949fb3d
+DIST opal-3.10.10-htmldoc.tar.bz2 3164570 SHA256 3f535ced87022e2ef53598d79611b3ab1a95f8336b36f8529d0aa9a960e37a62 SHA512 ac39b6ef3228b0b27ffce54a72c0af37612ff9e28c0a6e80ab78decadc7192360cb91793b9397dbbc5553343352856ffc85d8607990654369fbebd40ad8113b8 WHIRLPOOL efec7a3ad777d6e0ab49fbdc2cdf936d019298f144546bf7e17a694276c7b1466177c314f722112ab1573634377bdb3bc0cb4a966184f0a13c6992ae853dc41b
+DIST opal-3.10.10.tar.bz2 8592083 SHA256 95f1ad3a823d58b3fa945f40b2a50cc5f2ccd5c376bf2a1e624f4013f2473801 SHA512 b279c78dc8c88d113f0a146013c3a57c13d9d01c511ed3df7496f296b88157a59178cd72b8ed61d61198685ebd74dafa139f1c3952cf5aca47f4dec9a52ceddb WHIRLPOOL 12ee687263156eb3151a91bf36a3b0c0acb7ac7c4cc04eddf8fc9fb60c6121433727d007bb78beaa7bda3285c3384ee8f9de9e36c6c354c0decca1d6263342dd
+EBUILD opal-3.10.10-r1.ebuild 7667 SHA256 a0e5dff9f3c75b019ca0e360e2bcaa82b68b2d3e3313223ad566a1fafeea9091 SHA512 3f347e489756538cd6f80c7420b92da9bd9cf5d72b8c19869e217f8f40db93b95ffd8075fe5d4f79c17dbc53a6e2ac13c1738ed3447f516407c6de927fb88f7b WHIRLPOOL 0e0ab8bd7f6b25aa8f347cf510cef1509000e8e7a132788a0f9e873ad2452b0304253b9cfb6cafdb859f9ae4cca32c3e5ea6c2a9261cb23b4c6a9ad8c0259a6c
+MISC ChangeLog 13005 SHA256 f8e51d495e5059e8caa070f8023c4e7ef5c9efebf676a57e11f7db884d0998b1 SHA512 034495c26cb781d7e3acc23da3586795c8c4e8ffbed18a3417365c931b439f48c30c939b4639d1f6f2a229b91c836e5d5d1ea93984637d4464ee0b2fe07954e2 WHIRLPOOL fef1516e968f258adf947fdf6ba212fff79595f30e899b4be1632fa4cca6a1a27deceea5fca5fcbedb10248ce807486f54da89540c88638e0ec70086b69dccbe
+MISC metadata.xml 2175 SHA256 e3d7c35d326798477da494de953c9fcf81bc61663a32571c665d0b83905bd195 SHA512 e5288f68dbac4331d9d7ccfa37539c75daa44ccaea27d421d88c9093c7d3071a0d8941bfe98aaf879b57c01d5c0ea1c62deef77df8893c55b90dfde9ee393440 WHIRLPOOL f153469f1e7a9a0c08433e716628d31be74d5a1fea61a6d20215631e375fcccb6b48ca66067457abbaea19a21593bad4d11e02a2454c417a94391247d0831651
diff --git a/net-libs/opal/files/opal-3.10.10-ffmpeg-header.patch b/net-libs/opal/files/opal-3.10.10-ffmpeg-header.patch
new file mode 100644
index 0000000..dc27954
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.10-ffmpeg-header.patch
@@ -0,0 +1,11 @@
+diff -ru opal-3.10.10-old-p/plugins/video/H.264/h264-x264.cxx opal-3.10.10/plugins/video/H.264/h264-x264.cxx
+--- opal-3.10.10-old-p/plugins/video/H.264/h264-x264.cxx	2013-03-18 19:27:45.454835731 +0100
++++ opal-3.10.10/plugins/video/H.264/h264-x264.cxx	2013-03-18 19:32:21.747823413 +0100
+@@ -44,6 +44,7 @@
+ 
+ #include "../common/ffmpeg.h"
+ #include "../common/dyna.h"
++#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000
+ 
+ #include "shared/h264frame.h"
+ #include "shared/x264wrap.h"
diff --git a/net-libs/opal/files/opal-3.10.10-vsnprintf.patch b/net-libs/opal/files/opal-3.10.10-vsnprintf.patch
new file mode 100644
index 0000000..fd41e87
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.10-vsnprintf.patch
@@ -0,0 +1,13 @@
+diff -ru opal-3.10.10-old/plugins/video/common/dyna.h opal-3.10.10/plugins/video/common/dyna.h
+--- opal-3.10.10-old/plugins/video/common/dyna.h	2013-02-20 03:18:05.000000000 +0100
++++ opal-3.10.10/plugins/video/common/dyna.h	2013-03-18 19:16:14.846866521 +0100
+@@ -40,7 +40,8 @@
+ 
+ #ifndef __DYNA_H__
+ #define __DYNA_H__ 1
+-
++#include <cstdio>
++#include <cstdarg>
+ #include "ffmpeg.h"
+ #include "critsect.h"
+ #include <codec/opalplugin.hpp>
diff --git a/net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch b/net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch
new file mode 100644
index 0000000..7f9a3b5
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch
@@ -0,0 +1,131 @@
+diff -uNr opal-3.10.8.orig/plugins/plugin-inc.mak.in opal-3.10.8/plugins/plugin-inc.mak.in
+--- opal-3.10.8.orig/plugins/plugin-inc.mak.in	2012-10-24 12:07:31.000000000 -0400
++++ opal-3.10.8/plugins/plugin-inc.mak.in	2012-10-24 12:09:22.000000000 -0400
+@@ -31,11 +31,13 @@
+ CC            := @CC@
+ CXX           := @CXX@
+ CFLAGS        += @CFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
++CXXFLAGS      += @CXXFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
+ LDFLAGS       += @LDFLAGS@ @LDSO@
+ PLUGINEXT     :=@PLUGINEXT@
+ 
+ ifneq ($(DEBUG),)
+ CFLAGS        += -g
++CXXFLAGS      += -g
+ endif
+ 
+ OBJDIR := $(PLUGINDIR)/../lib_@OSTYPE@_@MACHTYPE@/plugins/$(BASENAME)
+@@ -64,11 +66,11 @@
+ 
+ $(OBJDIR)/%.o : %.cxx
+ 	@mkdir -p $(OBJDIR) >/dev/null 2>&1
+-	$(Q_CC)$(CXX) -c $(CXXFLAGS) $(CFLAGS) -o $@ $<
++	$(Q_CC)$(CXX) -c $(CXXFLAGS) -o $@ $<
+ 
+ $(OBJDIR)/%.o : %.cpp
+ 	@mkdir -p $(OBJDIR) >/dev/null 2>&1
+-	$(Q_CC)$(CXX) -c $(CXXFLAGS) $(CFLAGS) -o $@ $<
++	$(Q_CC)$(CXX) -c $(CXXFLAGS) -o $@ $<
+ 
+ OBJECTS	= $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(notdir $(SRCS))))))
+ 
+diff -uNr opal-3.10.8.orig/plugins/video/H.261-vic/Makefile.in opal-3.10.8/plugins/video/H.261-vic/Makefile.in
+--- opal-3.10.8.orig/plugins/video/H.261-vic/Makefile.in	2012-10-24 12:07:46.000000000 -0400
++++ opal-3.10.8/plugins/video/H.261-vic/Makefile.in	2012-10-24 12:04:10.000000000 -0400
+@@ -39,7 +39,7 @@
+              $(SRCDIR)/bv.c \
+ 
+ 
+-CFLAGS += -I$(COMMONDIR)
++CXXFLAGS += -I$(COMMONDIR)
+ 
+ INSTALL_DIR := @VC_PLUGIN_DIR@
+ PLUGINDIR   := @PLUGINDIR@
+diff -uNr opal-3.10.8.orig/plugins/video/H.263-1998/Makefile.in opal-3.10.8/plugins/video/H.263-1998/Makefile.in
+--- opal-3.10.8.orig/plugins/video/H.263-1998/Makefile.in	2012-10-24 12:08:02.000000000 -0400
++++ opal-3.10.8/plugins/video/H.263-1998/Makefile.in	2012-10-24 12:04:00.000000000 -0400
+@@ -34,12 +34,12 @@
+              $(COMMONDIR)/mpi.cxx \
+              $(COMMONDIR)/dyna.cxx
+ 
+-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+ LIBS   += @DL_LIBS@
+ 
+ HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
+ ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
+-CFLAGS += -DLIBAVCODEC_RTP_MODE=1
++CXXFLAGS += -DLIBAVCODEC_RTP_MODE=1
+ endif
+ 
+ vpath   %.cxx $(COMMONDIR)
+diff -uNr opal-3.10.8.orig/plugins/video/H.264/gpl/Makefile.in opal-3.10.8/plugins/video/H.264/gpl/Makefile.in
+--- opal-3.10.8.orig/plugins/video/H.264/gpl/Makefile.in	2012-10-24 12:06:15.000000000 -0400
++++ opal-3.10.8/plugins/video/H.264/gpl/Makefile.in	2012-10-24 12:11:11.000000000 -0400
+@@ -47,6 +47,7 @@
+ CC	 	=@CC@
+ CXX	 	=@CXX@
+ CFLAGS  =@X264_CFLAGS@ -I.. -I$(PLUGINDIR) -I$(OPALDIR)/include -DGPL_HELPER_APP -DPLUGINCODEC_TRACING
++CXXFLAGS  =@X264_CFLAGS@ -I.. -I$(PLUGINDIR) -I$(OPALDIR)/include -DGPL_HELPER_APP -DPLUGINCODEC_TRACING
+ LDFLAGS =@LDFLAGS@ @X264_LIBS@
+ 
+ 
+@@ -59,7 +60,7 @@
+ 
+ $(OBJDIR)/%.o : %.cxx
+ 	@mkdir -p $(OBJDIR) >/dev/null 2>&1
+-	$(Q_CC)$(CXX) $(CFLAGS) -c $< -o $@
++	$(Q_CC)$(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+ $(OBJDIR)/%.o : %.c
+ 	@mkdir -p $(OBJDIR) >/dev/null 2>&1
+diff -uNr opal-3.10.8.orig/plugins/video/H.264/Makefile.in opal-3.10.8/plugins/video/H.264/Makefile.in
+--- opal-3.10.8.orig/plugins/video/H.264/Makefile.in	2012-10-24 12:08:17.000000000 -0400
++++ opal-3.10.8/plugins/video/H.264/Makefile.in	2012-10-24 12:04:29.000000000 -0400
+@@ -34,12 +34,12 @@
+            $(SHAREDDIR)/x264wrap.cxx \
+            $(COMMONDIR)/dyna.cxx \
+ 
+-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"'
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"'
+ LIBS   += @DL_LIBS@
+ 
+ IS_H264_LICENSED:=@IS_H264_LICENSED@
+ ifeq ($(IS_H264_LICENSED),yes)
+-  CFLAGS += @X264_CFLAGS@ -DX264_LICENSED
++  CXXFLAGS += @X264_CFLAGS@ -DX264_LICENSED
+   LIBS   += @X264_LIBS@
+ else
+   SUBDIRS := gpl
+diff -uNr opal-3.10.8.orig/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.8/plugins/video/MPEG4-ffmpeg/Makefile.in
+--- opal-3.10.8.orig/plugins/video/MPEG4-ffmpeg/Makefile.in	2012-10-24 12:08:36.000000000 -0400
++++ opal-3.10.8/plugins/video/MPEG4-ffmpeg/Makefile.in	2012-10-24 12:04:45.000000000 -0400
+@@ -30,14 +30,14 @@
+ SRCDIR    := .
+ SRCS      := mpeg4.cxx $(COMMONDIR)/dyna.cxx
+ 
+-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+ LIBS   += @DL_LIBS@
+ 
+ # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
+ # Also add libavutil, so ffmpeg headers can #include "log.h".
+ LIBAVCODEC_SOURCE_DIR := @LIBAVCODEC_SOURCE_DIR@
+ ifneq (,$(LIBAVCODEC_SOURCE_DIR))
+-CFLAGS += -I$(LIBAVCODEC_SOURCE_DIR) -I$(LIBAVCODEC_SOURCE_DIR)/libavutil
++CXXFLAGS += -I$(LIBAVCODEC_SOURCE_DIR) -I$(LIBAVCODEC_SOURCE_DIR)/libavutil
+ endif
+ 
+ vpath   %.cxx $(COMMONDIR)
+diff -uNr opal-3.10.8.orig/plugins/video/THEORA/Makefile.in opal-3.10.8/plugins/video/THEORA/Makefile.in
+--- opal-3.10.8.orig/plugins/video/THEORA/Makefile.in	2012-10-24 12:08:47.000000000 -0400
++++ opal-3.10.8/plugins/video/THEORA/Makefile.in	2012-10-24 12:05:00.000000000 -0400
+@@ -30,7 +30,7 @@
+ SRCDIR    := .
+ SRCS      := theora_frame.cxx theora_plugin.cxx
+ 
+-CFLAGS += @THEORA_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @THEORA_CFLAGS@ -I$(COMMONDIR)
+ LIBS   += @THEORA_LIBS@
+ 
+ INSTALL_DIR := @VC_PLUGIN_DIR@
diff --git a/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch b/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch
new file mode 100644
index 0000000..3d17615
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch
@@ -0,0 +1,13 @@
+# Sent to upstream on 2012-10-23
+# By Jesus Rivero <neurogeek@gentoo.org>
+diff -uNr opal-3.10.8.orig/include/h323/h323.h opal-3.10.8/include/h323/h323.h
+--- opal-3.10.8.orig/include/h323/h323.h        2012-10-22 07:50:37.000000000 -0400
++++ opal-3.10.8/include/h323/h323.h     2012-10-23 14:10:37.000000000 -0400
+@@ -40,6 +40,7 @@
+ #include <h323/h323con.h>
+ #include <h323/gkclient.h>
+ #include <opal/buildopts.h>
++#include <ptlib.h>
+ 
+ PString  OpalGetVersion();
+ unsigned OpalGetMajorVersion();
diff --git a/net-libs/opal/files/opal-3.10.9-ffmpeg.patch b/net-libs/opal/files/opal-3.10.9-ffmpeg.patch
new file mode 100644
index 0000000..1860865
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-ffmpeg.patch
@@ -0,0 +1,189 @@
+Note: This is not optimal but is backported from what is in the 3.12 branch.
+
+
+r28871 | rjongbloed | 2013-01-13 02:18:43 -0300 (Sun, 13 Jan 2013) | 2 lines
+
+Fixed compile against latest FFMPEG, specifically Mac OS-X "port" version. Have no idea what all the deprecated symbols are replaced by!
+
+Index: opal-3.10.9/plugins/video/H.263-1998/h263-1998.cxx
+===================================================================
+--- opal-3.10.9.orig/plugins/video/H.263-1998/h263-1998.cxx
++++ opal-3.10.9/plugins/video/H.263-1998/h263-1998.cxx
+@@ -312,6 +312,7 @@ void H263_Base_EncoderContext::SetOption
+     return;
+   }
+ 
++#ifdef CODEC_FLAG_H263P_UMV
+   if (STRCMPI(option, H263_ANNEX_D) == 0) {
+     // Annex D: Unrestructed Motion Vectors
+     // Level 2+ 
+@@ -322,7 +323,9 @@ void H263_Base_EncoderContext::SetOption
+       m_context->flags &= ~CODEC_FLAG_H263P_UMV; 
+     return;
+   }
++#endif
+ 
++#ifdef CODEC_FLAG_OBMC
+ #if 0 // DO NOT ENABLE THIS FLAG. FFMPEG IS NOT THREAD_SAFE WHEN THIS FLAG IS SET
+   if (STRCMPI(option, H263_ANNEX_F) == 0) {
+     // Annex F: Advanced Prediction Mode
+@@ -334,7 +337,9 @@ void H263_Base_EncoderContext::SetOption
+     return;
+   }
+ #endif
++#endif
+ 
++#ifdef CODEC_FLAG_AC_PRED
+   if (STRCMPI(option, H263_ANNEX_I) == 0) {
+     // Annex I: Advanced Intra Coding
+     // Level 3+
+@@ -345,7 +350,9 @@ void H263_Base_EncoderContext::SetOption
+       m_context->flags &= ~CODEC_FLAG_AC_PRED; 
+     return;
+   }
++#endif
+ 
++#ifdef CODEC_FLAG_LOOP_FILTER
+   if (STRCMPI(option, H263_ANNEX_J) == 0) {
+     // Annex J: Deblocking Filter
+     // works with eyeBeam
+@@ -355,7 +362,9 @@ void H263_Base_EncoderContext::SetOption
+       m_context->flags &= ~CODEC_FLAG_LOOP_FILTER; 
+     return;
+   }
++#endif
+ 
++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT
+   if (STRCMPI(option, H263_ANNEX_K) == 0) {
+     // Annex K: Slice Structure
+     // does not work with eyeBeam
+@@ -365,7 +374,9 @@ void H263_Base_EncoderContext::SetOption
+       m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; 
+     return;
+   }
++#endif
+ 
++#ifdef CODEC_FLAG_H263P_AIV
+   if (STRCMPI(option, H263_ANNEX_S) == 0) {
+     // Annex S: Alternative INTER VLC mode
+     // does not work with eyeBeam
+@@ -375,6 +386,7 @@ void H263_Base_EncoderContext::SetOption
+       m_context->flags &= ~CODEC_FLAG_H263P_AIV; 
+     return;
+   }
++#endif
+ 
+   if (STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATION) == 0 ||
+       STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATIONS) == 0) {
+@@ -452,12 +464,24 @@ bool H263_Base_EncoderContext::OpenCodec
+ 
+   #define CODEC_TRACER_FLAG(tracer, flag) \
+     PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
++#ifdef CODEC_FLAG_H263P_UMV
+   CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
++#endif
++#ifdef CODEC_FLAG_OBMC
+   CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
++#endif
++#ifdef CODEC_FLAG_AC_PRED
+   CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
++#endif
++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT
+   CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
++#endif
++#ifdef CODEC_FLAG_LOOP_FILTER
+   CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
++#endif
++#ifdef CODEC_FLAG_H263P_AIV
+   CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
++#endif
+ 
+   return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
+ }
+@@ -521,7 +545,7 @@ bool H263_Base_EncoderContext::EncodeFra
+ 
+     // Need to copy to local buffer to guarantee 16 byte alignment
+     memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
+-    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
++    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
+ 
+     /*
+     m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
+@@ -603,13 +627,21 @@ bool H263_RFC2190_EncoderContext::Init()
+   m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
+   m_context->opaque = this; // used to separate out packets from different encode threads
+ 
++#ifdef CODEC_FLAG_H263P_UMV
+   m_context->flags &= ~CODEC_FLAG_H263P_UMV;
++#endif
++#ifdef CODEC_FLAG_4MV
+   m_context->flags &= ~CODEC_FLAG_4MV;
+-#if LIBAVCODEC_RTP_MODE
++#endif
++#if LIBAVCODEC_RTP_MODE && defined(CODEC_FLAG_H263P_AIC)
+   m_context->flags &= ~CODEC_FLAG_H263P_AIC;
+ #endif
++#ifdef CODEC_FLAG_H263P_AIV
+   m_context->flags &= ~CODEC_FLAG_H263P_AIV;
++#endif
++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT
+   m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
++#endif
+ 
+   return true;
+ }
+Index: opal-3.10.9/plugins/video/H.264/h264-x264.cxx
+===================================================================
+--- opal-3.10.9.orig/plugins/video/H.264/h264-x264.cxx
++++ opal-3.10.9/plugins/video/H.264/h264-x264.cxx
+@@ -1071,13 +1071,13 @@ class MyDecoder : public PluginCodec<MY_
+         return false;
+ 
+       m_context->workaround_bugs = FF_BUG_AUTODETECT;
++#ifdef FF_ER_AGGRESSIVE
+       m_context->error_recognition = FF_ER_AGGRESSIVE;
++#endif
+       m_context->idct_algo = FF_IDCT_H264;
+       m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
+       m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
+-      m_context->flags2 = CODEC_FLAG2_BRDO |
+-                          CODEC_FLAG2_MEMC_ONLY |
+-                          CODEC_FLAG2_DROP_FRAME_TIMECODE |
++      m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
+                           CODEC_FLAG2_SKIP_RD |
+                           CODEC_FLAG2_CHUNKS;
+ 
+Index: opal-3.10.9/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+===================================================================
+--- opal-3.10.9.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
++++ opal-3.10.9/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+@@ -594,12 +594,10 @@ void MPEG4EncoderContext::SetStaticEncod
+ #else
+     m_avcontext->max_b_frames=0; /*don't use b frames*/
+     m_avcontext->flags|=CODEC_FLAG_AC_PRED;
+-    m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
+     /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
+     m_avcontext->flags|=CODEC_FLAG_4MV;
+     m_avcontext->flags|=CODEC_FLAG_GMC;
+     m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
+-    m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
+ #endif
+     m_avcontext->opaque = this;              // for use in RTP callback
+ }
+@@ -804,7 +802,7 @@ int MPEG4EncoderContext::EncodeFrames(co
+         // Should the next frame be an I-Frame?
+         if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
+         {
+-            m_avpicture->pict_type = FF_I_TYPE;
++            m_avpicture->pict_type = AV_PICTURE_TYPE_I;
+         }
+         else // No IFrame requested, let avcodec decide what to do
+         {
+@@ -1325,7 +1323,6 @@ void MPEG4DecoderContext::SetFrameHeight
+ 
+ void MPEG4DecoderContext::SetStaticDecodingParams() {
+     m_avcontext->flags |= CODEC_FLAG_4MV; 
+-    m_avcontext->flags |= CODEC_FLAG_PART;
+     m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
+ }
+ 
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 0000000..6570863
--- /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.9-labs_is_in_stdlib.patch b/net-libs/opal/files/opal-3.10.9-labs_is_in_stdlib.patch
new file mode 100644
index 0000000..ac8a7ef
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-labs_is_in_stdlib.patch
@@ -0,0 +1,11 @@
+diff -uNr opal-3.10.8.orig/plugins/audio/G.722.2/AMR-WB/dec_lpc.c opal-3.10.8/plugins/audio/G.722.2/AMR-WB/dec_lpc.c
+--- opal-3.10.8.orig/plugins/audio/G.722.2/AMR-WB/dec_lpc.c	2012-10-22 07:50:37.000000000 -0400
++++ opal-3.10.8/plugins/audio/G.722.2/AMR-WB/dec_lpc.c	2012-10-22 10:20:49.000000000 -0400
+@@ -3,6 +3,7 @@
+  *  3GPP AMR Wideband Floating-point Speech Codec
+  *===================================================================
+  */
++#include <stdlib.h>
+ #include <math.h>
+ #include "typedef.h"
+ #include "dec_util.h"
diff --git a/net-libs/opal/files/opal-3.10.9-svn_revision_override.patch b/net-libs/opal/files/opal-3.10.9-svn_revision_override.patch
new file mode 100644
index 0000000..c2a15b1
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-svn_revision_override.patch
@@ -0,0 +1,15 @@
+diff -uNr opal-3.10.8.orig/src/opal/manager.cxx opal-3.10.8/src/opal/manager.cxx
+--- opal-3.10.8.orig/src/opal/manager.cxx	2012-10-22 07:50:36.000000000 -0400
++++ opal-3.10.8/src/opal/manager.cxx	2012-10-22 08:30:45.000000000 -0400
+@@ -56,7 +56,10 @@
+ #include <ptclib/url.h>
+ 
+ #include "../../version.h"
+-#include "../../revision.h"
++
++# define SVN_REVISION 0
++//#include "../../revision.h"
++
+ 
+ 
+ static const char * const DefaultMediaFormatOrder[] = {
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
index bc24125..9fd8c05 100644
--- a/net-libs/opal/metadata.xml
+++ b/net-libs/opal/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>voip</herd>
 <maintainer>
-        <email>volkmar@gentoo.org</email>
-        <name>Mounir Lamouri</name>
+        <email>neurogeek@gentoo.org</email>
+        <name>Jesus Rivero</name>
 	<description>Assign to herd and CC me</description>
 </maintainer>
 	<use> 
diff --git a/net-libs/opal/opal-3.6.8-r3.ebuild b/net-libs/opal/opal-3.10.10-r1.ebuild
index 2bdb3ae..b959473 100644
--- a/net-libs/opal/opal-3.6.8-r3.ebuild
+++ b/net-libs/opal/opal-3.10.10-r1.ebuild
@@ -1,28 +1,28 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.8-r2.ebuild,v 1.8 2012/06/17 16:26:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.10.ebuild,v 1.1 2013/03/05 19:02:23 chithanh Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit eutils autotools toolchain-funcs java-pkg-opt-2 flag-o-matic
 
-HTMLV="3.6.7" # There is no 3.6.8 release of htmldoc
 DESCRIPTION="C++ class library normalising numerous telephony protocols"
 HOMEPAGE="http://www.opalvoip.org/"
 SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
-	doc? ( mirror://sourceforge/opalvoip/${PN}-${HTMLV}-htmldoc.tar.bz2 )"
+	doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
 
 LICENSE="MPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="+audio capi celt debug doc dtmf examples fax ffmpeg h224 h281 h323 iax
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+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.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+RDEPEND=">=net-libs/ptlib-2.10.10:=[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] )
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 
 # NOTES:
 # ffmpeg[encode] is for h263 and mpeg4
-# ssl, xml, vxml, ipv6, dtmf, ldap, audio, wav, and video are use flags
+# ssl, xml, vxml, ipv6, ldap, audio, wav, and video are use flags
 #   herited from ptlib: feature is enabled if ptlib has enabled it
 #   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
 #   forcing ptlib to disable it for opal is not a solution too
@@ -59,11 +59,8 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	# workaround for bug 282838
-	append-flags "-fno-visibility-inlines-hidden"
-
-	# Upstream fixed this in trunk
-	# http://opalvoip.svn.sourceforge.net/viewvc/opalvoip?view=revision&revision=25165
-	append-flags -D__STDC_CONSTANT_MACROS #324323
+	append-cxxflags "-fno-visibility-inlines-hidden"
+	append-cxxflags "-fno-strict-aliasing"
 
 	# need >=gcc-3
 	if [[ $(gcc-major-version) -lt 3 ]]; then
@@ -84,18 +81,21 @@ src_prepare() {
 		rm -f samples/*/*.dsw
 	fi
 
-	# upstream patch 2808915
-	epatch "${FILESDIR}"/${PN}-3.6.4-jdkroot.patch
-
-	epatch "${FILESDIR}"/${P}-build-fix.patch #343041
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-lid-plugins-ldflags.patch #397681
+	epatch "${FILESDIR}/${PN}-3.10.9-svn_revision_override.patch"
+	epatch "${FILESDIR}/${PN}-3.10.9-labs_is_in_stdlib.patch"
+	epatch "${FILESDIR}/${PN}-3.10.9-avoid_cflags_mixup.patch"
+	epatch "${FILESDIR}/${PN}-3.10.9-ffmpeg.patch"
+	epatch "${FILESDIR}/${PN}-3.10.10-vsnprintf.patch"
+	epatch "${FILESDIR}/${PN}-3.10.10-ffmpeg-header.patch"
+
+	if ! use h323; then
+		# Without this patch, ekiga wont compile, even with
+		# USE=-h323.
+		epatch "${FILESDIR}/${PN}-3.10.9-disable-h323-workaround.patch"
+	fi
 
-	# build on gcc 4.7 (bug #422635)
-	epatch "${FILESDIR}"/${PN}-3.6.8-gcc-4.7.patch
+	epatch "${FILESDIR}/${PN}-3.10.9-java-ruby-swig-fix.patch"
 
-	# h224 really needs h323 ?
-	# TODO: get a confirmation in ml
 	sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \
 		|| die "sed failed"
 
@@ -108,29 +108,6 @@ src_prepare() {
 	eautoconf
 	cd ..
 
-	# disable srtp if srtp is not enabled (prevent auto magic dep)
-	# upstream bug 2686485 (fixed in 3.7)
-	if ! use srtp; then
-		sed -i -e "s/OPAL_SRTP=yes/OPAL_SRTP=no/" configure \
-			|| die "patching configure failed"
-	fi
-
-	# disable theora if theora is not enabled (prevent auto magic dep)
-	# upstream bug 2686488 (fixed in 3.7)
-	if ! use theora; then
-		sed -i -e "s/HAVE_THEORA=yes/HAVE_THEORA=no/" plugins/configure \
-			|| die "patching plugins/configure failed"
-	fi
-
-	# disable mpeg4 and h263p if ffmpeg is not enabled (prevent auto magic dep)
-	# upstream bug 2686495 (fixed in 3.7)
-	if ! use ffmpeg; then
-		sed -i -e "s/HAVE_H263P=yes/HAVE_H263P=no/" plugins/configure \
-			|| die "patching plugins/configure failed"
-		sed -i -e "s/HAVE_MPEG4=yes/HAVE_MPEG4=no/" plugins/configure \
-			|| die "patching plugins/configure failed"
-	fi
-
 	# disable celt if celt is not enabled (prevent auto magic dep)
 	# already in repository
 	if ! use celt; then
@@ -138,16 +115,10 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 
-	# fix gsm wav49 support check, upstream bug 2686500 (fixed in 3.7)
-	if use plugins; then
-		sed -i -e "s:gsm\.h:gsm/gsm.h:" plugins/configure \
-			|| die "patching plugins/configure failed"
-	fi
-
 	# fix automatic swig detection, upstream bug 2712521 (upstream reject it)
 	if ! use swig; then
 		sed -i -e "/^SWIG=/d" configure || die "patching configure failed"
-	fi	
+	fi
 
 	use ilbc || { rm -r plugins/audio/iLBC/ || die "removing iLBC failed"; }
 
@@ -242,8 +213,8 @@ src_install() {
 		dohtml -r "${WORKDIR}"/html/* docs/* || die "dohtml failed"
 	fi
 
-	# ChangeLog is not standard
-	dodoc ChangeLog-${PN}-v${PV//./_}.txt || die "dodoc failed"
+	# ChangeLog is not standard and does not exist on 3.10.10
+#	dodoc ChangeLog-${PN}-v${PV//./_}.txt || die "dodoc failed"
 
 	if use examples; then
 		local exampledir="/usr/share/doc/${PF}/examples"