Reduce versions using media-video/ffmpeg. Stable the version with virutal/ffmpeg on x86.

Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64

5 files changed, 30 insertions, 552 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 10c2bc22e834..40d09a92e458 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,11 @@
 # 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.77 2012/05/05 02:54:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.78 2012/05/16 12:25:56 scarabeus Exp $
+
+  16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -opal-3.6.8-r1.ebuild,
+  -opal-3.6.8.ebuild, opal-3.6.8-r2.ebuild:
+  Reduce versions using media-video/ffmpeg. Stable the version with
+  virutal/ffmpeg on x86.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> opal-3.6.8.ebuild,
   opal-3.6.8-r1.ebuild, opal-3.6.8-r2.ebuild:
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 31af69bb8178..63d729a425df 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX opal-2.1.1-notrace.diff 263 RMD160 17b6887acd196af52de8dfec8d5accfd654d1fc7 SHA1 079474507fe63a9019a293a5a529c23788221196 SHA256 3abf99ab2a7bde2e1a2380e22a9c5e15240439bdf7766b4715c78cacd46961c0
 AUX opal-3.6.4-jdkroot.patch 507 RMD160 eeda20caf4697efa51dd24527c619f3ec0e2d3ca SHA1 72c4d9ea9f5867567a24f5a92cd66d1394b58129 SHA256 c2e930565cd91a7ec75a1ed1657ba524dad810ec934ef854c39331388661f2f6
 AUX opal-3.6.8-build-fix.patch 992 RMD160 102a98bd4a255d6414f4adc4713eb8ffa9a08e67 SHA1 cd33c6524be1ee8d65e2f3929d6a9608c84a63eb SHA256 cbd011cf42b7d691f5b8d71e02f5b317d50ea8c51a7b03e38887119dc07b58c8
@@ -7,8 +10,23 @@ DIST opal-2.2.11.tar.gz 4165191 RMD160 7ef2d505cc52eca9136ca10a865c7b7f3a8dc2b5
 DIST opal-3.6.7-htmldoc.tar.bz2 5842269 RMD160 039b138991334e0ecdc243d73a8dbca6d13c4df4 SHA1 cb2c5ee78f8461a2e027f0142c96c0c5a70a55c1 SHA256 d6c11b162b4b26cfc3df2c2c12b5d8a0e1b2dfa5c6869995b0fafa2f2a716e7b
 DIST opal-3.6.8.tar.bz2 6837993 RMD160 3a1693de75cfe1e6d6c1f6f4635cb7447d43a2e9 SHA1 c43826bc3e273df048f47a77c4affb36614f2b7e SHA256 8cbfabb33e5c5563fdafacf1adde536c78638d6d020fae496a52e19e2be6a90c
 EBUILD opal-2.2.11.ebuild 2604 RMD160 2dadccb1206d340d3c33987aa1147a43ab622463 SHA1 b3b29f137eae3437cc19118ea59d6d8ee8adba3a SHA256 8595bd00d707830cfc52f7de3b8993c0658f50306ddef296dea97c74d0285ba7
-EBUILD opal-3.6.8-r1.ebuild 8367 RMD160 af9fcdbbcbd7b70f8d518432a6cd5ca421b44010 SHA1 d4ace5b7e5c3c5241622b8ff6ffd1948a52053aa SHA256 e7bb7a30ed8460bc3231f73c721fe7fdc986afe7f77616c0c8cc30fe630a4d6b
-EBUILD opal-3.6.8-r2.ebuild 8566 RMD160 325e9966291c1bcfb44e707064b7d916335f9213 SHA1 32b60b31554a9d1dad405e36e9ecbfe0a0f813e9 SHA256 ec0b7c7e6a269fce4aef9780580a7c5d087e6ed5bc79b86dfb4b98cbb3b7527b
-EBUILD opal-3.6.8.ebuild 8272 RMD160 2f955e83d8b4abb43688f7a69ab3c8b9a0fa449c SHA1 696c3b3eedbcc7e48d4ce5d3c4ff91edbabdd8a0 SHA256 62617fc43722bc7f6464e948d4087e76c05c8cc12c8468971c01b2ea01045503
-MISC ChangeLog 10785 RMD160 f30cf3abcf8151caa5c50ed4e3167fe4894d3fa8 SHA1 4ba40b485b952a1e5569368c3cd6735ed0d0a7f4 SHA256 7faf7dabc3a63d59a201bdfdd765daedc5fd60c6d73ba1a5d8e161e96d3d1fe6
+EBUILD opal-3.6.8-r2.ebuild 8568 RMD160 aa928acf9415a5565db8d3cc89818383bac10119 SHA1 8231cb0da295d7dc477f8db4cf00ac3044dd1f0d SHA256 5214291cdb67a6df08e03e023590efd054e1e74c249c38fd59acb80546d9b5cd
+MISC ChangeLog 11004 RMD160 aa1a91d4eb3e28a3dcc772d522dbe60fcc3b0ff7 SHA1 c98debffb9c43cac1ed0bb2d650b2b9b198f6817 SHA256 0b16704581bb28f2b708d7874f98b5deaa84401233638557238954385bd16863
 MISC metadata.xml 2175 RMD160 81ce4a7f191f5c62f448c4eec4eac1eb8f28e6e0 SHA1 9b49753c9f837db8036c3ff2267584cdddeede6c SHA256 0ae23e62c739d189d3d148ede7661b86bf84f8068e094f0c81b123b5672b39fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPs5zjAAoJEOSiRoyO7jvoqvsP/0m65xOXfWwINBy2R/g0FNZX
+A+dmgqB8OtexzIP0P1WivTskc1MlNNa448XpvT7h3ciuCX+sBrcFJZLGfBTdpiCP
+pSCqhxx91AYzMBi8sGz9NfGv7u+jVBtoXDDFgg1dz+k8CUweUT8YpRxgQQmQlEYN
+rJmIbGApbbFd+S+ftBLDNEfFr/0BmDg/l4KQ2mteKjWe7bcRuhReL0vJVEYaKlf2
+DB6ZG79C3CkkL0YZnoMaUuBKjVxYOupQnGpsB6WwW2ATT9XHlF1AfFgchHZwI0HL
+xr7trutSDNYkKRa/ZzC3JWdStHS/Ibd0iosiPhzVTX9kUG7JUcNTCP84EJE160G6
+Bu6LIr0PcbJCk5Hz+vDSyuAZwzIbo1XX3Ct9rdPKapNar2wAJAOjM6UmI2GpKvYl
+ia3kyB9Lcg0WBbyqrf8faKT1V7Ft6fK0/ORH9gSp6rPid4bitGUp921tpuRuuc07
+Jkszfe1fIw8cIOBiYRcDslcyzcd6je8M4VqeT1AK6ODNQpGAxER3b+004CJ+Ck3p
+JEKU8jnnBL2uu09KetzZ+nlxl3igvyEz7jQA3BC9hMJMcOgR9MlIG5bUKR5Nc3E8
+gILJIzwB9RflnnkdGpubwwWFlTkBqJYJKLIdJBtgFGFtbdX1eFazv1cZ/747Il/R
+CUi/IKf4yHlilRa+/c1i
+=gXrs
+-----END PGP SIGNATURE-----
diff --git a/net-libs/opal/opal-3.6.8-r1.ebuild b/net-libs/opal/opal-3.6.8-r1.ebuild
deleted file mode 100644
index 44e87dd3511e..000000000000
--- a/net-libs/opal/opal-3.6.8-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# 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.6.8-r1.ebuild,v 1.3 2012/05/05 02:54:24 jdhore Exp $
-
-EAPI="2"
-
-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 )"
-
-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
-ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl stats swig theora
-+video vpb vxml wav x264 x264-static xml"
-
-RDEPEND=">=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,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[xml,vxml] )
-	java? ( >=virtual/jre-1.4 )
-	plugins? ( dev-libs/ilbc-rfc3951
-		media-sound/gsm
-		capi? ( net-dialup/capi4k-utils )
-		celt? ( media-libs/celt )
-		ffmpeg? ( >=media-video/ffmpeg-0.5[encode] )
-		ixj? ( sys-kernel/linux-headers )
-		sbc? ( media-libs/libsamplerate )
-		theora? ( media-libs/libtheora )
-		x264? (	>=media-video/ffmpeg-0.4.7
-			media-libs/x264 ) )
-	srtp? ( net-libs/libsrtp )"
-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, dtmf, 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-flags "-fno-visibility-inlines-hidden"
-
-	append-flags -D__STDC_CONSTANT_MACROS #324323
-
-	# 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
-
-	if use h281 && ! use h224; then
-		ewarn "You have enabled h281 but h224 is disabled."
-		ewarn "H.281 is over H.224 so you should enable h224 if you want h281."
-	fi
-
-	if use x264-static && ! use x264; then
-		ewarn "You have enabled x264-static but x264 is disabled."
-		ewarn "x264-static is going to be useless if x264 is not enabled."
-	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
-
-	# upstream patch 2808915
-	epatch "${FILESDIR}"/${PN}-3.6.4-jdkroot.patch
-
-	epatch "${FILESDIR}"/${P}-build-fix.patch #343041
-	epatch "${FILESDIR}"/${P}-ldflags.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"
-
-	eaclocal
-	eautoconf
-
-	# in plugins
-	cd plugins/
-	eaclocal
-	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
-		sed -i -e "s/HAVE_CELT=yes/HAVE_CELT=no/" plugins/configure \
-			|| 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
-
-	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"
-
-	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 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
-}
diff --git a/net-libs/opal/opal-3.6.8-r2.ebuild b/net-libs/opal/opal-3.6.8-r2.ebuild
index 1ea17efbd2f2..da332dd82d96 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-2012 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.5 2012/05/05 02:54:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.8-r2.ebuild,v 1.6 2012/05/16 12:25:56 scarabeus Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
 
 LICENSE="MPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+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"
diff --git a/net-libs/opal/opal-3.6.8.ebuild b/net-libs/opal/opal-3.6.8.ebuild
deleted file mode 100644
index bcb01e620d99..000000000000
--- a/net-libs/opal/opal-3.6.8.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# 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.6.8.ebuild,v 1.4 2012/05/05 02:54:24 jdhore Exp $
-
-EAPI="2"
-
-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 )"
-
-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
-ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl stats swig theora
-+video vpb vxml wav x264 x264-static xml"
-
-RDEPEND=">=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,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[xml,vxml] )
-	java? ( >=virtual/jre-1.4 )
-	plugins? ( dev-libs/ilbc-rfc3951
-		media-sound/gsm
-		capi? ( net-dialup/capi4k-utils )
-		celt? ( media-libs/celt )
-		ffmpeg? ( >=media-video/ffmpeg-0.5[encode] )
-		ixj? ( sys-kernel/linux-headers )
-		sbc? ( media-libs/libsamplerate )
-		theora? ( media-libs/libtheora )
-		x264? (	>=media-video/ffmpeg-0.4.7
-			media-libs/x264 ) )
-	srtp? ( net-libs/libsrtp )"
-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, dtmf, 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-flags "-fno-visibility-inlines-hidden"
-
-	append-flags -D__STDC_CONSTANT_MACROS #324323
-
-	# 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
-
-	if use h281 && ! use h224; then
-		ewarn "You have enabled h281 but h224 is disabled."
-		ewarn "H.281 is over H.224 so you should enable h224 if you want h281."
-	fi
-
-	if use x264-static && ! use x264; then
-		ewarn "You have enabled x264-static but x264 is disabled."
-		ewarn "x264-static is going to be useless if x264 is not enabled."
-	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
-
-	# upstream patch 2808915
-	epatch "${FILESDIR}"/${PN}-3.6.4-jdkroot.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"
-
-	eaclocal
-	eautoconf
-
-	# in plugins
-	cd plugins/
-	eaclocal
-	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
-		sed -i -e "s/HAVE_CELT=yes/HAVE_CELT=no/" plugins/configure \
-			|| 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
-
-	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"
-
-	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 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
-}