Version bump to 3.12.4 to build with libav9. Fixes bug#443206.

Package-Manager: portage-2.2.0_alpha184/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

5 files changed, 424 insertions, 17 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index a0f3be0a91fc..796fe78cfd15 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/opal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.93 2013/04/05 18:12:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.94 2013/06/22 19:28:34 scarabeus Exp $
+
+*opal-3.12.4 (22 Jun 2013)
+
+  22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/opal-3.12.4-avoid_cflags_mixup.patch,
+  +files/opal-3.12.4-java-ruby-swig-fix.patch, +opal-3.12.4.ebuild:
+  Version bump to 3.12.4 to build with libav9. Fixes bug#443206.
 
   05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> opal-3.10.10.ebuild:
   Stable for ppc64, wrt bug #461842
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 985726020b84..e6835c331fac 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX opal-2.1.1-notrace.diff 263 SHA256 3abf99ab2a7bde2e1a2380e22a9c5e15240439bdf7766b4715c78cacd46961c0 SHA512 279ebd4821af25ba1ef795aad66d1ae20489337ab2d78c174b4caa4dbbf02b4f8c7f6fdc5e2822e1c6441e2850d0924f108dcaf06beaf238be58b44daee91b71 WHIRLPOOL b71b6bf51eda7d9a5c24a9bcff85c41c3017e92c6be4f1fed5022ccbfac0ea0f3b66a4cc9b501810b5e342b8f8cf8110c698deca9ed71661a3f5fe40184040da
 AUX opal-3.10.9-avoid_cflags_mixup.patch 5378 SHA256 80a41d81a1caeaee31c43c7b71bac9943692eed3e6a5f7f5c4a1bf837cd391e7 SHA512 fdc6b52db3bd299d2235ebdb917921d3c9d01a03ffed65e8e4b833e66da21bde4c1497740a38a41f3d7393a6c65969a64587612a11c9590904b66c9fb86e1e7e WHIRLPOOL fc1d97a7180d50748b521cb345b58487e2183506b68d5d952f004d3f382cd77171b222187fa4bd92510026781012d601c23ec23f5df8023ad3e9ec73c5e98b0c
@@ -8,6 +8,8 @@ AUX opal-3.10.9-ffmpeg.patch 7084 SHA256 194a95dbb0905f37c6778f628baddc962249c6c
 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.12.4-avoid_cflags_mixup.patch 5534 SHA256 13fe54e9d3a4175edcfba8b797c3e320910c52cf6fe8583b0a587c7ea62db6c2 SHA512 a335dbf7363a185627a489f4bf67bc7d08aba45c450ba110f0fb6073df147c7e5e86543d45acf0cfc6f6f5682c283220727356b93b756c59406734ad0c2ba490 WHIRLPOOL 63fcd73d71d2417b48052a4d90cc22c8784c456010905ac8853b2c348aa99a224a3bdd7d759917ae64628d77d4930e89eaf0f56021d8491be124184622bcce9c
+AUX opal-3.12.4-java-ruby-swig-fix.patch 828 SHA256 9b85c31d9b7e776b0ade6a7c51be8993ce6945493d3293567800fb5a6aaee7a4 SHA512 4a02b4f23923c689b2b9a4f44fe6e3f01fa5e2fb871ff7bf5e1f4dfe8123db52fc1e7a4939c7383c89535c9b8e3aaf5bf66afd4a5720837c715079230061977f WHIRLPOOL 15707a039007c1d235fd7290ce8b0c4d4fc35eb04c1dd18ffda6408302416984390eebf283343a5c1f953aaa05394ed48b6b2f28cbaa8896decccbe9eaf5bcae
 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
@@ -17,28 +19,31 @@ DIST opal-3.10.10-htmldoc.tar.bz2 3164570 SHA256 3f535ced87022e2ef53598d79611b3a
 DIST opal-3.10.10.tar.bz2 8592083 SHA256 95f1ad3a823d58b3fa945f40b2a50cc5f2ccd5c376bf2a1e624f4013f2473801 SHA512 b279c78dc8c88d113f0a146013c3a57c13d9d01c511ed3df7496f296b88157a59178cd72b8ed61d61198685ebd74dafa139f1c3952cf5aca47f4dec9a52ceddb WHIRLPOOL 12ee687263156eb3151a91bf36a3b0c0acb7ac7c4cc04eddf8fc9fb60c6121433727d007bb78beaa7bda3285c3384ee8f9de9e36c6c354c0decca1d6263342dd
 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.12.4-htmldoc.tar.bz2 3094840 SHA256 858cd14bf2de54a6aeb5397d8627a7e50ea6b63e18b0f47c057386d079b07fbc SHA512 c80ed1b0df9fffbfc07ea590a0e80afd9b985ed2971deb640e92776723f12e6a544eaf3441261d34df0ad0bbca6b03a983f7a7b0b92fbf333f1a8688d2ca735d WHIRLPOOL e2d5ba8e4429c60003dd995add2aea12b22a2f23da8dd3ed0025fa451752412805d4f25160809542dd8d61684edca35d73174037650b3546cedc97495faa29b9
+DIST opal-3.12.4.tar.bz2 9694052 SHA256 2786bc27f83c59d74165e318656ada230164ebcba61f0d8cb1b55bfcd13b2d82 SHA512 83c44dbd077e45a5bf63963b8a5348c24c65e9ab8b25afccacbf4632aa55fce26b6133c8c40f06da90fe73865165509c67b19286e868eada0270adefd3e38733 WHIRLPOOL 3063d5b9d64e690898d60e5e26f3936b28b954ce7fb2a2dc2f78cfde05932efc63ec7874dd73c87561d1a3c3f564837855559ca031121e7d9fe18c25508042d7
 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.10.ebuild 7548 SHA256 53edeffea8813587723c009df3bd0f6fe46fd6962b05eef6b4c06a6902c5ee15 SHA512 61af5ba83dd1baf5fbef18647615822b2661f8e90ed97fbbcd6cd8477a18818d3e3759ee682547f4b94f22f21a79ee1da57601b1b882d71af90642767271db57 WHIRLPOOL 70e72b0285299af87caf16830e65abceabf1eeb93729418f3bc9fe8d483bdd49da4b3e205fc0e525bf994dd458770e39862c0f8027f5511318532f588e7ee71f
 EBUILD opal-3.10.9.ebuild 7476 SHA256 00e4214bfaaaae1e92c485a22ed83b685f54f1b1a6070345282b17c24edca471 SHA512 56e895ad3811fed06626eb837c1c54e57d701c256a2db781a4ddead5f2b09f8e706d725597905cd56e455723d15d4ef4cd9fee857a13712aa86b2acf5e8b51f6 WHIRLPOOL 3f0374448e490d2bd95ebcb691549de53ec94ee813ab1a5bded97cd596b14019c462ec5b090cca077952c8e5950bfc8af9d9a565265cde015cc277af5a503fd9
+EBUILD opal-3.12.4.ebuild 7009 SHA256 bc522eec18a2f8e093f69af14e43d94dfffe45df1c4eda12c7dfab7a97421e3d SHA512 07a34e2a354079d96ab297b9baa9338ad9d48d8ce8b6e1ae011a1a44288c0ccb808ba04e91196ab23dc2cb3da3b0b713ec3289e6d11e194eea6ecd93786199fd WHIRLPOOL 77b08599c6dea4b4904453cf2147c1fc6d2f59304a9865e22a16d4b6b738f5474092b83d4bb4a3a60af6bac2dc29c31b7fbb135070ccc0a103dbc6384edc312d
 EBUILD opal-3.6.8-r2.ebuild 8564 SHA256 163e8a0de3af0b0fc998b4f5f44175e961471c0e2def8d0fafcd450eaa30ee84 SHA512 41ec6c5205fd04d8408ccaac83588222eeb969d6db5af412f1f29a174fd58114dfc6b954e366b5afe443b682e707c9682517722cb79fb90a5e8951718d471622 WHIRLPOOL a7d9f3af5448d546919ee56bcc5da31d1b576e184f290fe71f37ee39265369668f5aebc5b8c01ab45ebad3e94a8f1c17df43f809ce7df722b72d7b119c4b796d
-MISC ChangeLog 13637 SHA256 20adf8011a97e9c0e0356f4a92aa9f6064a5aeb6e775cb35dedfd9324cebeca8 SHA512 04eceac073630cb7e4a923258dddfe019560a32dc24ae59e733751efc279118541bcbafd840e0db6a39897b7a59eb0605f65c127cb20261e45292dfea9c3250b WHIRLPOOL 438803b44524c04532ff3f9540087756a21126b1c27d2251830e422021d0f8fa55ede8b7faac7c097a18ae725886fe9502a82f66464b5bba53aebe5d2e99f3f2
+MISC ChangeLog 13907 SHA256 706fc8fdb9ed052e3e3bc6a678f01977642c6bc858cf1d4d147e7ea8f02549f2 SHA512 0330a4f94adfd843a9eab525b43b0b183f4e6cc0d34f354be2fa31553bab39a2cfa0a90e11efae3fce2cd3778edd399490de110d1eeb5da5ae827d708e59066c WHIRLPOOL a9c345ca9c1989bc1ad5032f301ad993656f3c7d69fb13d982643c1534b0ccafd8c7c0465927730a89a33dee31190b7825811ede5d7605794a46f9fd74796bff
 MISC metadata.xml 2175 SHA256 e3d7c35d326798477da494de953c9fcf81bc61663a32571c665d0b83905bd195 SHA512 e5288f68dbac4331d9d7ccfa37539c75daa44ccaea27d421d88c9093c7d3071a0d8941bfe98aaf879b57c01d5c0ea1c62deef77df8893c55b90dfde9ee393440 WHIRLPOOL f153469f1e7a9a0c08433e716628d31be74d5a1fea61a6d20215631e375fcccb6b48ca66067457abbaea19a21593bad4d11e02a2454c417a94391247d0831651
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRXxNmAAoJELp701BxlEWfUf8P/Ry8ri26koZ+GF/TQFqbA633
-onJZZT2ARTentraB5z6iEpQbLHYfsNL85XFeGYKRxLt/V9YTalCmE+BIXzvKYPQC
-VO4PnTRdhAeaUrUY/AvRllsFage1CC9bZwSUxqehYB6wyufMuL/InDCOM87e+Zql
-0FzRVsZIaeCGQG1k6RLGO+q87narcQnxZvWNo1z4pnPWZDjgku7qyscyMmHIa/at
-TLZ67a7vHm+Jw62SExL+G4OJQgTx/ixgBy3n3sYlHbiaMCvEW9U4UddOyrmTxxVE
-8+qAynp9f+cEq+3CYRjmyBxj4tEbd7WhxZZdy1TlNqJml0h5riFPb9BV2FvnFaJH
-tE71YpJcS1Mv6IaJ7WpvCrnFydhYOmJT5wbm+zJsglihWRBmeVwPI+QxU9KWsH+S
-M2tjTwj0eMmVoJow8YEqDpdQ3iWdIrib9uWJHwe01KZHXYk8LjIQSFJL1CI5UFA1
-VouNCZOfqnJx4Nn7QrU6yX4NQmc1syKs7JC4mGgVG0EkFeJ7rPPV51zTGWlZvBQ+
-JH9RLUPCjmDCd/u94byRMkytiIkRw5YexLQqZrlOgGlPxVQNbPqjU5Q1GqIKyJPc
-rDrSOA0cLnPuLbp5ufsAeUs3pea5FjCjrFCOB89ww9mGNFqyKAHYYh+oFneZreNK
-N9rPuiYwBIhYqc5D615L
-=QH7S
+iQIcBAEBCAAGBQJRxfrXAAoJEOSiRoyO7jvoCEUP/3P3q4uMh+HzGiWDVv+3vGPR
+WwQYKlNayhiEGYaJVUYhH340JVi4XOdfGEbowt6S7XaqJWKiijeCTdXgaBxgsQzN
+lWwweA7QbVRarcg7Tl5McrNkv6E9nQ5AYZMa2iuw1n1kpYQqmr/dDCtbArKJywYe
+THJpkc4zDjStff0mnVRy2n1vAg2wfJRiJ9Z4xtg/5Zih7YNCOe6RIfemVOMTG7ny
+g/+CIZDsTw9HpfB14wN+R2RbwRI1xcmBJRXcBJRHvalVYIhQobHFjLF5iGZslMe9
+sHznhiM8lvh0z5n4McCRyGb+3woIUavyL3QrQ7hd7/jIIS6xU4fg3O6VbVGScpS8
+oLJ0rD02CjIpIq7/I3cwEGk6D4IX92vFxHD4q57tP/XwwZ+mY6FatWXQy4dJIsIN
+TH1w7WpIENCk8w4aeYoNRiSZhxnVz9Vfy4IzzIBpQvYuntycenTMbJ4NFT//uF19
+e6Et7UDAoLZeJwahJZx9PphBsMPaB5689j9NpJvsuCVZrCyHAGMxVhKU0kgwWm2U
+8D9qbFYlmULCi8U3KpRS8I5jGfujZcGVPHUDE+SDaRWkeBt7fQ7ftj8S+nr4ZZS2
+Vxc3++acogzca7Es5YF7m5s6Pg5NWhmScyxRzbBWppTR41YfvxMJQGG6wmABHcE8
+TS3QcNUiEnubrdjtQ0SH
+=rWwh
 -----END PGP SIGNATURE-----
diff --git a/net-libs/opal/files/opal-3.12.4-avoid_cflags_mixup.patch b/net-libs/opal/files/opal-3.12.4-avoid_cflags_mixup.patch
new file mode 100644
index 000000000000..24686110a42e
--- /dev/null
+++ b/net-libs/opal/files/opal-3.12.4-avoid_cflags_mixup.patch
@@ -0,0 +1,132 @@
+diff -urN opal-3.12.4.old/plugins/plugin-inc.mak.in opal-3.12.4/plugins/plugin-inc.mak.in
+--- opal-3.12.4.old/plugins/plugin-inc.mak.in	2013-06-22 21:14:01.528580888 +0200
++++ opal-3.12.4/plugins/plugin-inc.mak.in	2013-06-22 21:14:42.652579425 +0200
+@@ -32,11 +32,13 @@
+ CXX           := @CXX@
+ INSTALL       := @INSTALL@
+ 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_@target@/plugins/$(BASENAME)
+@@ -65,11 +67,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 -urN opal-3.12.4.old/plugins/video/H.261-vic/Makefile.in opal-3.12.4/plugins/video/H.261-vic/Makefile.in
+--- opal-3.12.4.old/plugins/video/H.261-vic/Makefile.in	2013-06-22 21:14:01.503580889 +0200
++++ opal-3.12.4/plugins/video/H.261-vic/Makefile.in	2013-06-22 21:14:42.652579425 +0200
+@@ -39,7 +39,7 @@
+              $(SRCDIR)/bv.c \
+ 
+ 
+-CFLAGS += -I$(COMMONDIR)
++CXXFLAGS += -I$(COMMONDIR)
+ 
+ INSTALL_DIR := @VC_PLUGIN_DIR@
+ PLUGINDIR   := @PLUGINDIR@
+diff -urN opal-3.12.4.old/plugins/video/H.263-1998/Makefile.in opal-3.12.4/plugins/video/H.263-1998/Makefile.in
+--- opal-3.12.4.old/plugins/video/H.263-1998/Makefile.in	2013-06-22 21:14:01.499580889 +0200
++++ opal-3.12.4/plugins/video/H.263-1998/Makefile.in	2013-06-22 21:16:18.196576026 +0200
+@@ -34,12 +34,12 @@
+              $(COMMONDIR)/ffmpeg.cxx \
+              $(COMMONDIR)/dyna.cxx
+ 
+-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+ LIBS   += @LIBAVCODEC_LIBS@ @LIBAVUTIL_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 -urN opal-3.12.4.old/plugins/video/H.264/gpl/Makefile.in opal-3.12.4/plugins/video/H.264/gpl/Makefile.in
+--- opal-3.12.4.old/plugins/video/H.264/gpl/Makefile.in	2013-06-22 21:14:01.500580889 +0200
++++ opal-3.12.4/plugins/video/H.264/gpl/Makefile.in	2013-06-22 21:16:35.515575410 +0200
+@@ -48,7 +48,7 @@
+ 
+ CC	 	=@CC@
+ CXX	 	=@CXX@
+-CFLAGS  =@X264_CFLAGS@ @LIBAVCODEC_CFLAGS@ -I.. -I$(PLUGINDIR) -I$(OPALDIR)/include -DGPL_HELPER_APP -DPLUGINCODEC_TRACING
++CXXFLAGS  =@X264_CFLAGS@ @LIBAVCODEC_CFLAGS@ -I.. -I$(PLUGINDIR) -I$(OPALDIR)/include -DGPL_HELPER_APP -DPLUGINCODEC_TRACING
+ LDFLAGS = @X264_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@ @DL_LIBS@ @LDFLAGS@
+ 
+ 
+@@ -61,7 +61,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 -urN opal-3.12.4.old/plugins/video/H.264/Makefile.in opal-3.12.4/plugins/video/H.264/Makefile.in
+--- opal-3.12.4.old/plugins/video/H.264/Makefile.in	2013-06-22 21:14:01.500580889 +0200
++++ opal-3.12.4/plugins/video/H.264/Makefile.in	2013-06-22 21:16:52.874574792 +0200
+@@ -35,12 +35,12 @@
+            $(COMMONDIR)/ffmpeg.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   += @LIBAVCODEC_LIBS@ @LIBAVUTIL_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 -urN opal-3.12.4.old/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.12.4/plugins/video/MPEG4-ffmpeg/Makefile.in
+--- opal-3.12.4.old/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-06-22 21:14:01.499580889 +0200
++++ opal-3.12.4/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-06-22 21:15:53.183576916 +0200
+@@ -32,14 +32,14 @@
+              $(COMMONDIR)/ffmpeg.cxx \
+              $(COMMONDIR)/dyna.cxx
+ 
+-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+ LIBS   += @LIBAVCODEC_LIBS@ @LIBAVUTIL_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 -urN opal-3.12.4.old/plugins/video/THEORA/Makefile.in opal-3.12.4/plugins/video/THEORA/Makefile.in
+--- opal-3.12.4.old/plugins/video/THEORA/Makefile.in	2013-06-22 21:14:01.503580889 +0200
++++ opal-3.12.4/plugins/video/THEORA/Makefile.in	2013-06-22 21:14:42.654579425 +0200
+@@ -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.12.4-java-ruby-swig-fix.patch b/net-libs/opal/files/opal-3.12.4-java-ruby-swig-fix.patch
new file mode 100644
index 000000000000..616468ea5772
--- /dev/null
+++ b/net-libs/opal/files/opal-3.12.4-java-ruby-swig-fix.patch
@@ -0,0 +1,28 @@
+--- opal-3.12.4.old/make/toplevel.mak.in	2013-06-22 21:14:01.536580887 +0200
++++ opal-3.12.4/make/toplevel.mak.in	2013-06-22 21:21:08.342565703 +0200
+@@ -407,9 +407,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
+@@ -420,10 +420,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/opal-3.12.4.ebuild b/net-libs/opal/opal-3.12.4.ebuild
new file mode 100644
index 000000000000..b4a214f6404a
--- /dev/null
+++ b/net-libs/opal/opal-3.12.4.ebuild
@@ -0,0 +1,235 @@
+# 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.12.4.ebuild,v 1.1 2013/06/22 19:28:34 scarabeus Exp $
+
+EAPI=5
+
+inherit eutils autotools toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+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/${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
+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 )
+	sip? ( sipim )"
+
+RDEPEND=">=net-libs/ptlib-2.12.4:=[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] )
+	ivr? ( net-libs/ptlib[http,xml,vxml] )
+	java? ( >=virtual/jre-1.4 )
+	plugins? (
+		media-sound/gsm
+		capi? ( net-dialup/capi4k-utils )
+		celt? ( media-libs/celt )
+		ffmpeg? ( virtual/ffmpeg[encode] )
+		ixj? ( sys-kernel/linux-headers )
+		ilbc? ( dev-libs/ilbc-rfc3951 )
+		sbc? ( media-libs/libsamplerate )
+		theora? ( media-libs/libtheora )
+		x264? (	virtual/ffmpeg
+			media-libs/x264 ) )
+	srtp? ( net-libs/libsrtp )
+	vxml? ( net-libs/ptlib[http,vxml] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/gcc-3
+	java? ( swig? ( dev-lang/swig )
+		>=virtual/jdk-1.4 )"
+
+# NOTES:
+# ffmpeg[encode] is for h263 and mpeg4
+# 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
+#   atm, accepting the "auto-feature" looks like a good solution
+#   (asn is used for fax and config _only_ for examples)
+# OPALDIR should not be used anymore but if a package still need it, create it
+
+pkg_setup() {
+	# workaround for bug 282838
+	append-cxxflags "-fno-visibility-inlines-hidden"
+	append-cxxflags "-fno-strict-aliasing"
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	# remove visual studio related files from samples/
+	if use examples; then
+		rm -f samples/*/*.vcproj
+		rm -f samples/*/*.sln
+		rm -f samples/*/*.dsp
+		rm -f samples/*/*.dsw
+	fi
+
+	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.12.4-avoid_cflags_mixup.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
+
+	epatch "${FILESDIR}/${PN}-3.12.4-java-ruby-swig-fix.patch"
+
+	sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \
+		|| die "sed failed"
+
+	eaclocal
+	eautoconf
+
+	# in plugins
+	cd plugins/
+	eaclocal
+	eautoconf
+	cd ..
+
+	# disable celt if celt is not enabled (prevent auto magic dep)
+	# already in repository
+	if ! use celt; then
+		sed -i -e "s/HAVE_CELT=yes/HAVE_CELT=no/" plugins/configure \
+			|| die "sed 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
+
+	use ilbc || { rm -r plugins/audio/iLBC/ || die "removing iLBC failed"; }
+
+	java-pkg-opt-2_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
+	# localspeex, localspeexdsp, localgsm, localilbc: never use bundled libs
+	# samples: only build some samples, useless
+	# libavcodec-stackalign-hack: prevent hack (default disable by upstream)
+	# default-to-full-capabilties: default enable by upstream
+	# aec: atm, only used when bundled speex, so it's painless for us
+	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+	# 	http://zfoneproject.com/ wich is not in portage
+	# msrp: highly experimental
+	# spandsp: doesn't work with newest spandsp, upstream bug 2796047
+	# g711plc: force enable
+	# rfc4103: not really used, upstream bug 2795831
+	# t38, spandsp: merged in fax
+	# h450, h460, h501: merged in h323 (they are additional features of h323)
+	econf \
+		--enable-versioncheck \
+		--enable-shared \
+		--disable-zrtp \
+		--disable-localspeex \
+		--disable-localspeexdsp \
+		--disable-localgsm \
+		--disable-localilbc \
+		--disable-samples \
+		--disable-libavcodec-stackalign-hack \
+		--enable-default-to-full-capabilties \
+		--enable-aec \
+		--disable-msrp \
+		--disable-spandsp \
+		--enable-g711plc \
+		--enable-rfc4103 \
+		$(use_enable debug) \
+		$(use_enable capi) \
+		$(use_enable fax) \
+		$(use_enable fax t38) \
+		$(use_enable h224) \
+		$(use_enable h281) \
+		$(use_enable h323) \
+		$(use_enable h323 h450) \
+		$(use_enable h323 h460) \
+		$(use_enable h323 h501) \
+		$(use_enable iax) \
+		$(use_enable ivr) \
+		$(use_enable ixj) \
+		$(use_enable java) \
+		$(use_enable lid) \
+		$(use_enable plugins) \
+		$(use_enable sbc) \
+		$(use_enable sip) \
+		$(use_enable sipim) \
+		$(use_enable stats statistics) \
+		$(use_enable video) $(use_enable video rfc4175) \
+		$(use_enable vpb) \
+		$(use_enable x264 h264) \
+		$(use_enable x264-static x264-link-static)
+}
+
+src_compile() {
+	local makeopts=""
+
+	use debug && makeopts="debug"
+
+	emake ${makeopts}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Get rid of static libraries if not requested
+	# There seems to be no easy way to disable this in the build system
+	if ! use static-libs; then
+		rm -v "${D}"/usr/lib*/*.a || die
+	fi
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/* docs/*
+	fi
+
+	# 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"
+		local basedir="samples"
+		local sampledirs="`ls ${basedir} --hide=configure* \
+			--hide=opal_samples.mak.in`"
+
+		# first, install files
+		insinto ${exampledir}/
+		doins ${basedir}/{configure*,opal_samples*}
+
+		# now, all examples
+		for x in ${sampledirs}; do
+			insinto ${exampledir}/${x}/
+			doins ${basedir}/${x}/*
+		done
+
+		# some examples need version.h
+		insinto "/usr/share/doc/${PF}/"
+		doins version.h
+	fi
+}
+
+pkg_postinst() {
+	if use examples; then
+		ewarn "All examples have been installed, some of them will not work on your system"
+		ewarn "it will depend of the enabled USE flags in ptlib and opal"
+	fi
+
+	if ! use plugins || ! use audio || ! use video; then
+		ewarn "You have disabled audio, video or plugins USE flags."
+		ewarn "Most audio/video features or plugins have been disabled silently"
+		ewarn "even if enabled via USE flags."
+		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
+	fi
+}