Fix blockers on libav, drop old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 19 insertions, 270 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 16d800bce1de..7ea9d8bda021 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/opal
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.104 2014/06/04 17:26:01 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.105 2014/07/24 13:07:23 pacho Exp $
+
+  24 Jul 2014; Pacho Ramos <pacho@gentoo.org> -opal-3.10.9.ebuild,
+  opal-3.10.10.ebuild, opal-3.10.11.ebuild, opal-3.6.8-r2.ebuild:
+  Fix blockers on libav, drop old
 
   04 Jun 2014; <neurogeek@gentoo.org> metadata.xml:
   Dropped myself from maintainer.
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 43255aa6bfd9..44b924f4671f 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -19,23 +19,20 @@ 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.11-htmldoc.tar.bz2 2944338 SHA256 66708e69f1bea6a1160f3aa904643f49b2e2679822c1446d5aeb1f29dd973cea SHA512 6075487344d4cfa5c2e2219376e3eccd98028475eac6f89d20d24d611a8806a27eb354ce8e77e16c620c8cb3d398b9502082f3fe8f67763d3f67feea835819b5 WHIRLPOOL a23aafd7da85d00db2c285641ab75f1c0850c6eaaaa649c8278891282d86312d062be7ac4d89ec3955eac11eb91c018c7b05a89282b35f1b129af90f36e34033
 DIST opal-3.10.11.tar.bz2 8590616 SHA256 f38e7969e88a28dd9a10a6051315aceecde79d0bbd1a35676868dc5787aed706 SHA512 970745375e7ebb29178ce9d0bc29254e69dd952e5f754038979a8613489a26f0fb68d63ec2709ffa1964e50fe9cfde874489f683a451d83e7a075d62d9228fa1 WHIRLPOOL b4387f8a664c2763f1e62dc16772ce869dee6d5aaac271ef0013d1e7f207d19c5e3578c26215ce246c278bc4de9aa538dabae8a3b6a794b250a5f30f9be7d206
-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 SHA512 83cefcbf098c1c1232fb63817b2a3f9647b78cd1ab0e5410576d882d9334197580bec032f1a2e5cee4b06251ad88cd7b197be0247f4845329301ee0fe44471a3 WHIRLPOOL 37cde59d7d80e7ae46a3a4bfee90b0d5fe29e17ed708b73bbc72f309c4a61aba368e4c0e60fd2e2600b3aeceaa00e4f80fc97ad834e277d33eb58f1c1e731b9b
 DIST opal-3.6.8.tar.bz2 6837993 SHA256 8cbfabb33e5c5563fdafacf1adde536c78638d6d020fae496a52e19e2be6a90c SHA512 bc9ce66af9fc7a82fc33403139f138d732b4f3e013b91b711533572036f0d965b19961aa1dcec63efb0ed906e7525eebc972cd106e6011e40d80ae0a0b7e8a51 WHIRLPOOL 031a98a0e0e6c6b51271898cf836dc805a7341b04f018a6604560572054e00402f1cf092d2a8828ba476ba1bb0331cbd34e7bd2b078ecd3cd0a3b51b7adbd5d5
-EBUILD opal-3.10.10.ebuild 7573 SHA256 00cf9f8101384c8fc840ef862af72d22f939e5a8b254db951030f8713c001244 SHA512 fa2ab0d71a775a3da93bb06c71a3a90d92dc738785eae863360f8b945d3e1fd7a5533e99df8b4382c8ca0e4c1c81ca456694deb3abad161f032966f9c2217452 WHIRLPOOL 7c828e360cf209964922f7ab07cd3170c28cb94705a9d22301af8199a63ca51ef0d0cb5ca736a4f49a8b0b7895a4d111ffccb7255a74476d90baa851156a5a57
-EBUILD opal-3.10.11.ebuild 7617 SHA256 0ea50cc700a9370158d85937180b5585f1623449954eff50dc36fd5a84e99950 SHA512 9c72521218c58336e75d125ff14f20754ea51e0ae9b3f0c2a2b8b4a87448cd1e09bc781c4302f4be279e8f3e170b249662e16c8f6060667187e9bb6bb959ac5c WHIRLPOOL d677c6b3fd11174308eec30fd712b5940ee58402cfd2d153968e123854d9defe1263b3850cf783514d070b4c9b5613501765e7e0f39b088cad6a90d34da7186a
-EBUILD opal-3.10.9.ebuild 7494 SHA256 1c3344e9475c7662d93c49b56db861a65f66b429638178cecb8a0726a97b7027 SHA512 373723bcecb85d6cf856d56f712ff68fb3417b7ae8d6be290c2c7f91944f252c507cbffa7d9d093442f3e4d7dd519c7ef70071c177c27f56a854ceccf876fe4f WHIRLPOOL d398c7f8463d2da45fcd2ab42df61a3155427aa97d7268148ec63ca627b0bc06bf2e7eb9e5f4bb609507298769bc34a1ed938a4b6c9408334d08d8c4024160a9
+EBUILD opal-3.10.10.ebuild 7576 SHA256 54fcc109c39e555219c5ff2066f1870e5482948e4aef02a91400d21b2512b2dd SHA512 4fcbfdb7e136fc85c0956e824093a3370affc2e61746fb7516c6b26d9ca107da291b229c3964045494d01f8dd776665a8b8a38fc2d2018e4614e75695fa8ed1a WHIRLPOOL afa8301cef2c0c2c5f89cc9391f340263a1b0bac5a8257ade81fa0032998202dc9cb1cb82bbed45a919760eaaf536c616f998cc0ba65cd29137cac5351db24ed
+EBUILD opal-3.10.11.ebuild 7596 SHA256 8407d3344a19be342b034018730907e049fafeee25fe1dc6b16fa14fe36f2d5d SHA512 41c84f87ba83d3d8a633e4918fdfd120346118cec23f0c56c6b44a87e5acb024f73f51dceefb6403f75da631ff6daca456530edd931a9174292484384c00561a WHIRLPOOL 77a7b77c9c7b1654efbebae654e3e55549ba93af8747b235b63b8146df16658b14cacfc0547bbfde66e7fb915afa026c04d836dff766e19c5f090804e5a4b693
 EBUILD opal-3.12.4.ebuild 7032 SHA256 51517a11a1e4aed1bd1dcc768d15cd1b4ec22b76210bacca580f79b6781efc34 SHA512 bd9253592b42c169df578a0b4d31e07b7fb6b7b96642792a8242294ae89f896665411c694336db77511f0be66f5eb1479905e68070c4ff5f0c10d9dfe44b8e06 WHIRLPOOL 91924dfb2354eb2ca86f178fce890503b5e3eaaddc355f601518a80a1eb4e6385a27e219e218829b787929254d8a26a677253bfd188d2056ab6cb659bb7c4c09
-EBUILD opal-3.6.8-r2.ebuild 8582 SHA256 5cc44a330efe3652770d65af355250f58b13e7b5bbcc5b41303f9fa04730ec7f SHA512 e28376a527907f381e08e8f6e6b5f2c30395a4558902d524f89c17c7a640c86a9324bde5dd901a76e97547019de30b94709bc4591635f4e1553560fa442908e0 WHIRLPOOL 10075f1285f8fed51c02fc201a3b1f03c90de8fffcada8134efaf611c510b07a21a567cb9d188f7f5e55e4cd7027183dcb8ebb4dd78c0ace7df109e591a71d86
-MISC ChangeLog 15442 SHA256 ed0def26dce61c2ce259875cdf92f864c1ec298c9a5574541c626cbcc98b35ac SHA512 05d119b25527b9343687181d5e1a6280214ab509a8e639abad4a8cf4b1708e2cd88b959c16bf0e3206fb4d5b7f4488c6af69bd6391f5bbd6f69706a60713152f WHIRLPOOL 910d5e3dc76bcc50699b98d503e71a1e504719d32eaa0a5c7ee914a922f9a4bc7a653df45d93097b6acca699b7ffedd87f1dbab9dc03ad615f3c72c72e7d21c5
+EBUILD opal-3.6.8-r2.ebuild 8585 SHA256 e1d90dde6155bd917435d77b0167f1de2a4b45845cfd39d46fb3c182d49be6a8 SHA512 29b704d0ff956085c96d667d868c4d3e94fe912432a054e3e89d196581d33f35d5fae988fde9a3b9783db7c96318e23d3d919935cd47dbb16ef78ebae85690ff WHIRLPOOL ccb817e66a1f272c7e322c5a9b0ddbf97836f946fa838a463bddeb498ae261c79e622942cd01b100a82cea69e8bdbf18656c8d722ac96a630cf8dc7904148aa4
+MISC ChangeLog 15606 SHA256 b8074ec5fb173521262b635d27a1e7cb8c172cf81982d7828d0056900d5728f6 SHA512 9ab61cd0b02f371504bcab681719d20d1208d0d7c88815174899a1ce3b8e2a860af633cf88f451a5b692ece95e70605cc881793e1cdd79bf9bf41f2641f0c4d9 WHIRLPOOL de7d997a17cd3eeb1adf9c8e86a07b86906c59c025a7d64907794d9854bfdc236a1608e533d43669ea6153e094a49a1a958da8d7cc5b5d8b8abc3790ac736962
 MISC metadata.xml 1908 SHA256 02a9a3197806b5c247a4c6a5b8796d673f241980cbad43761b0dcbba8d42a0fe SHA512 2fe95495d79d4ccb9c82fa6bbae21ba56e4b6a41f94d32b1b5fa4ca39182f273b990380794661de6da278d7022de96efb954558fdeda9d7fa92a269ee5cc8640 WHIRLPOOL 22ed34353beb4e88d814da8b3da340043857b87eafa2bec14fae36517c300106127d0114686fe49a661b272e15bfc62c5e17056692ccc601732ad542e23e41df
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOPGNEACgkQdIssYB9vBoNiSwCfV+EoMv6U9w60+CSB8pvZfB7a
-yG8An3sNASQaT0TpqJaonMOGR1UcV2HW
-=qXJV
+iEYEAREIAAYFAlPRBRUACgkQCaWpQKGI+9Qk5QCdHfXAecxlSlnMUmXjeeOtKO3U
+x3gAnA787lEixeZ0ev2sSEh+BM1wOzBc
+=ZxbZ
 -----END PGP SIGNATURE-----
diff --git a/net-libs/opal/opal-3.10.10.ebuild b/net-libs/opal/opal-3.10.10.ebuild
index 6636bb3c5b64..8a4e26310fff 100644
--- a/net-libs/opal/opal-3.10.10.ebuild
+++ b/net-libs/opal/opal-3.10.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.10.ebuild,v 1.10 2014/05/15 12:05:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.10.ebuild,v 1.11 2014/07/24 13:07:23 pacho Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ RDEPEND=">=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl
 		media-sound/gsm
 		capi? ( net-dialup/capi4k-utils )
 		celt? ( media-libs/celt )
-		ffmpeg? ( virtual/ffmpeg[encode] !!>=media-libs/libav-9 )
+		ffmpeg? ( virtual/ffmpeg[encode] !!>=media-video/libav-9 )
 		ixj? ( sys-kernel/linux-headers )
 		ilbc? ( dev-libs/ilbc-rfc3951 )
 		sbc? ( media-libs/libsamplerate )
diff --git a/net-libs/opal/opal-3.10.11.ebuild b/net-libs/opal/opal-3.10.11.ebuild
index 39376ff1e80f..01b46b800478 100644
--- a/net-libs/opal/opal-3.10.11.ebuild
+++ b/net-libs/opal/opal-3.10.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.11.ebuild,v 1.2 2014/05/15 12:05:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.11.ebuild,v 1.3 2014/07/24 13:07:23 pacho Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ RDEPEND=">=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl
 		media-sound/gsm
 		capi? ( net-dialup/capi4k-utils )
 		celt? ( media-libs/celt )
-		ffmpeg? ( virtual/ffmpeg[encode] !!>=media-libs/libav-9 )
+		ffmpeg? ( virtual/ffmpeg[encode] )
 		ixj? ( sys-kernel/linux-headers )
 		ilbc? ( dev-libs/ilbc-rfc3951 )
 		sbc? ( media-libs/libsamplerate )
diff --git a/net-libs/opal/opal-3.10.9.ebuild b/net-libs/opal/opal-3.10.9.ebuild
deleted file mode 100644
index 9fa014e613af..000000000000
--- a/net-libs/opal/opal-3.10.9.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.9.ebuild,v 1.4 2014/05/15 12:05:02 ulm Exp $
-
-EAPI=4
-
-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="capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
-ipv6 ivr ixj java ldap lid +plugins sbc sip sipim +sound 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.10.9[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,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] !!>=media-libs/libav-9 )
-		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, sound, 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"
-
-	# need >=gcc-3
-	if [[ $(gcc-major-version) -lt 3 ]]; then
-		eerror "You need to use gcc-3 at least."
-		eerror "Please change gcc version with 'gcc-config'."
-		die "You need to use gcc-3 at least."
-	fi
-
-	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}/${P}-svn_revision_override.patch"
-	epatch "${FILESDIR}/${P}-labs_is_in_stdlib.patch"
-	epatch "${FILESDIR}/${P}-avoid_cflags_mixup.patch"
-	epatch "${FILESDIR}/${P}-ffmpeg.patch"
-
-	if ! use h323; then
-		# Without this patch, ekiga wont compile, even with
-		# USE=-h323.
-		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"
-
-	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() {
-	local forcedconf=""
-
-	# fix bug 277233, upstream bug 2820939
-	if use fax; then
-		forcedconf="${forcedconf} --enable-statistics"
-	fi
-
-	# --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) \
-		${forcedconf}
-}
-
-src_compile() {
-	local makeopts=""
-
-	use debug && makeopts="debug"
-
-	emake ${makeopts} || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# 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/* || die "dohtml failed"
-	fi
-
-	# ChangeLog is not standard
-	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*} \
-			|| die "doins failed"
-
-		# now, all examples
-		for x in ${sampledirs}; do
-			insinto ${exampledir}/${x}/
-			doins ${basedir}/${x}/* || die "doins failed"
-		done
-
-		# some examples need version.h
-		insinto "/usr/share/doc/${PF}/"
-		doins version.h || die "doins failed"
-	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 sound || ! use video; then
-		ewarn "You have disabled sound, 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
-}
diff --git a/net-libs/opal/opal-3.6.8-r2.ebuild b/net-libs/opal/opal-3.6.8-r2.ebuild
index 5dfd07966ed3..3665f43fbdd5 100644
--- a/net-libs/opal/opal-3.6.8-r2.ebuild
+++ b/net-libs/opal/opal-3.6.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.13 2014/05/15 12:05:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.8-r2.ebuild,v 1.14 2014/07/24 13:07:23 pacho Exp $
 
 EAPI="4"
 
@@ -32,7 +32,7 @@ RDEPEND="<net-libs/ptlib-2.10.8[stun,debug=,dtmf?,ipv6?,ldap?,sound?,ssl?,video?
 		media-sound/gsm
 		capi? ( net-dialup/capi4k-utils )
 		celt? ( media-libs/celt )
-		ffmpeg? ( virtual/ffmpeg[encode] !!>=media-libs/libav-9 )
+		ffmpeg? ( virtual/ffmpeg[encode] !!>=media-video/libav-9 )
 		ixj? ( sys-kernel/linux-headers )
 		ilbc? ( dev-libs/ilbc-rfc3951 )
 		sbc? ( media-libs/libsamplerate )