Revbump. New patches to fix bug #439464 and fix C and CXX flags mixup in plugins

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

4 files changed, 148 insertions, 8 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 9be9ab2934bf..6f7326cbbbf2 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,13 @@
 # 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.82 2012/10/23 22:48:38 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.83 2012/10/24 21:28:10 neurogeek Exp $
+
+*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)
 
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 7b06e12efc32..f84ba9d9b9de 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -2,6 +2,7 @@
 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
@@ -15,14 +16,14 @@ DIST opal-3.10.8.tar.bz2 8600132 SHA256 b417af8311b9ff22b6eb70a82c06d4005e0693ed
 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.ebuild 7335 SHA256 69a7b606ecfc68bee606e1de2c8356999c4d20d8a0a592742579dfe88d75c936 SHA512 6069fc8788af324d95cfbee3e6be435a50574637d45c744278109abf7d51b921a37c4b9dbb5353ddf38de333217ace40fc1a3694112986f42fe359fe1d61016b WHIRLPOOL 6ad9e5baf8ba275c28fb6eeade13a162b8db27601d326aecb17646b8351b059739e2c78766571b41f914700b6e21d4d2a0d85fec66ff42eb9c51be1178cb5f5d
+EBUILD opal-3.10.8-r1.ebuild 7395 SHA256 9ea45af5348c7a25f3b36d43fe1de1724f9b2fb0bfaa464be62bca23a7cf43e4 SHA512 c53a96e63666d62d4bea27107fc36826dfbc8d260e3c52e1859424bef290ec4aa9f37f1c5a09ce659c29d5e3fc123ac8440b8d8c58850ef589ba2c5ff88709ea WHIRLPOOL 4573f7ac3d45c8dd865c9fd263f40b160d790e845bc5a0fc4c6b6e3bdd18edffa0f2db7fa9343f2239dc178feed3b14dfca8c6aa2dcaadf8f3b4da8aabd35eda
 EBUILD opal-3.6.8-r2.ebuild 8564 SHA256 163e8a0de3af0b0fc998b4f5f44175e961471c0e2def8d0fafcd450eaa30ee84 SHA512 41ec6c5205fd04d8408ccaac83588222eeb969d6db5af412f1f29a174fd58114dfc6b954e366b5afe443b682e707c9682517722cb79fb90a5e8951718d471622 WHIRLPOOL a7d9f3af5448d546919ee56bcc5da31d1b576e184f290fe71f37ee39265369668f5aebc5b8c01ab45ebad3e94a8f1c17df43f809ce7df722b72d7b119c4b796d
-MISC ChangeLog 11709 SHA256 41478850571a039faa714a4db759f80f110e0bf287d983f4a9b6eee1a8dc2e6e SHA512 1fb313321f198fd5f8e01548da94bf41cc7181232d656d71638924790a4c9c1de18e4b41a82e08599eb6843e92115ab2ee56b770b5f23654da70358f644842f6 WHIRLPOOL f5d7b46d59af62543d82d751756574c3b036a100f9e3b0f8e097e34a5d30a3d28d0d950b265b8daf206a0a4a5c2f52c16d80d8ed9ce4b6615b05c3207e30db38
+MISC ChangeLog 11969 SHA256 74f53afb576ea36b4307d74c4e1af887c9e897bafbd11bdfd9292648f102ed2b SHA512 4d6c81e7939638974c590de514fac8609a5d95544a99f887844441fec892f1cae4821384b713076280bf3c23f614e1668a3e30f5284c1ae7c6fbe13d24cd0ac2 WHIRLPOOL caef671dec566420b232954c4cc1dd9d8b565a8f08d4a131ec7b4828005c005fcdfb8f8ab3954815aec9e21a45831b6137398b6be88980cc5b027893e7efa823
 MISC metadata.xml 2333 SHA256 fa93221111af337da2ed45b72bd76e68021a2b8b1196f296027f97e1ed32304b SHA512 d592572d85210c2fc28abb0ba884b5e5bf416efe889670544d9041ed0e468c590eb6341b4995067e3cddb03386d7f752a90093825edfcc6cf2b0b4fb3708eb6c WHIRLPOOL b2d8e62d3c46a6dbc19359f4fdda5ed524d74d65b4781f1f543f93efb0fc3fcabeefa4857b2dc8609ba36a008b60170dae8829b37164f41ebce2a011393b07d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAlCG5nEACgkQdIssYB9vBoPG5QCfTKwIo0+AHqdwi+fSpWsFlMTA
-CasAn2VVffXehU5I1p+HU362+XZVcl9w
-=VYFM
+iEYEAREIAAYFAlCIJXQACgkQdIssYB9vBoOtTgCfQYpX+KNPbsB+RCIP0zh1Pm0h
+GUkAn0hYpi5Oj6ZFWoRy5licGBg1yvbp
+=lBIR
 -----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.8-avoid_cflags_mixup.patch
new file mode 100644
index 000000000000..7f9a3b5c0766
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.8-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/opal-3.10.8.ebuild b/net-libs/opal/opal-3.10.8-r1.ebuild
index de75da59e5d5..63aa90749b82 100644
--- a/net-libs/opal/opal-3.10.8.ebuild
+++ b/net-libs/opal/opal-3.10.8-r1.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.ebuild,v 1.1 2012/10/23 22:48:38 neurogeek Exp $
+# $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 $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ stats swig theora +video vpb vxml wav x264 x264-static xml"
 REQUIRED_USE="x264-static? ( x264 )
 	h281? ( h224 )"
 
-RDEPEND=">=net-libs/ptlib-2.10.0[stun,debug=,audio?,dtmf,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+RDEPEND=">=net-libs/ptlib-2.10.8[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] )
@@ -83,6 +83,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${P}-svn_revision_override.patch"
 	epatch "${FILESDIR}/${P}-labs_is_in_stdlib.patch"
+	epatch "${FILESDIR}/${P}-avoid_cflags_mixup.patch"
 
 	if ! use h323; then
 		# Without this patch, ekiga wont compile, even with