Version bump, bug #326469 thank Vladimir for report.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 280 insertions, 2 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index c082c2e2bd3d..d7f7437d1a5b 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/opal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.65 2010/07/24 16:47:03 pchrist Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.66 2010/08/19 17:07:27 pva Exp $
+
+*opal-3.6.8 (19 Aug 2010)
+
+  19 Aug 2010; Peter Volkov <pva@gentoo.org> +opal-3.6.8.ebuild:
+  Version bump, bug #326469 thank Vladimir for report.
 
   24 Jul 2010; Panagiotis Christopoulos <pchrist@gentoo.org>
   opal-3.6.4.ebuild, opal-3.6.4-r1.ebuild, opal-3.6.6.ebuild,
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 8ed444fd29be..d1983814913a 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -8,10 +8,12 @@ DIST opal-3.6.6-htmldoc.tar.bz2 5840662 RMD160 44daf0cceac02a7dd04f74ed97c03eb0f
 DIST opal-3.6.6.tar.bz2 7062422 RMD160 b639709f7e28ce607478bddc41d171e0e54bee9f SHA1 bd5e3907faf96db884a64dacdedb2259aca30cd3 SHA256 60c9d75703bedfeca7140cb76b23fae7179ce1f86e7e8b0026b72d66acd75c82
 DIST opal-3.6.7-htmldoc.tar.bz2 5842269 RMD160 039b138991334e0ecdc243d73a8dbca6d13c4df4 SHA1 cb2c5ee78f8461a2e027f0142c96c0c5a70a55c1 SHA256 d6c11b162b4b26cfc3df2c2c12b5d8a0e1b2dfa5c6869995b0fafa2f2a716e7b
 DIST opal-3.6.7.tar.bz2 6874118 RMD160 bd0bf514f36a50b9eae2aedb150b868ea248fe62 SHA1 7da368a5b8464a1e71156d8076e76e006bcc6b1d SHA256 34cb1989c7b8b9e9b34b43f85384399403dabd9348e602651859c384b4cea03a
+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.4-r1.ebuild 8109 RMD160 e793814a8bb4a7c4f7ae281ab1049abe60b770ce SHA1 fe03fbd302b48b9596fabae7c65ce47eb609d966 SHA256 cf99ea743fe1a17f679f2dd9f27f2925c703898a9eef6bf88cec47a80dad2fd8
 EBUILD opal-3.6.4.ebuild 8146 RMD160 a6f09de2fed809700e351885a8c6635a9d1d95fe SHA1 e42c23a37d352ccbd2afca1cf2f0e22d84990ffe SHA256 2ff4bdc8be33e8aae8f9b69a0c2fff72d4891fb89086364abb016a612ee4bad5
 EBUILD opal-3.6.6.ebuild 8164 RMD160 884212975100305bdbc361e62dfe4431e2ce9ede SHA1 5c7e58d115b92bf6116e46b1d137c06be75d96e4 SHA256 3b18f866b58409111f1fe1c7ff3bb82f2478cd13454d571157d57df98f033558
 EBUILD opal-3.6.7.ebuild 8262 RMD160 2f958ac588fff29f37dacf8ba290930f74c25e71 SHA1 ebb7388135c7494ff7b8de469de09957ff00ad2a SHA256 b16e11d13c8fe45ee0139f5a877d893f9a8324a5d1e5a316d41a60f8b55805ec
-MISC ChangeLog 8842 RMD160 4fbb845f67ca536fc73c124285300159178e8750 SHA1 8c92d37bc71c3d62b5b054d9baeb78acbaea16d0 SHA256 e93f0e269e78dfdf9aed09c83739f9830f41a260c0c208a46178841d30718acb
+EBUILD opal-3.6.8.ebuild 8271 RMD160 dc3f2ad20ee4b0f7759aa5f40cc33a8b01c88bd5 SHA1 63c0440e0078e460f6f608ca40f679b4a50db67d SHA256 7f68602cda8cb16f2539aad5a4ffa4cc3585515dc4ee86f01079a63ebfdbe8e4
+MISC ChangeLog 8986 RMD160 8ed771309b360b90ed1ad86c9c23ae52b531d8f5 SHA1 96c282b70881e6435d08a93e908c53b82f1832e7 SHA256 ecfec0b59d711ffdd1928a9051b1a04863cdb9ef5f736802fa8be8fa72455d2e
 MISC metadata.xml 2065 RMD160 72f5b31577c61334a802fa85c51b4163c81aced1 SHA1 d1b558b04691f19a9eccc648708487c8d169db82 SHA256 065bbfbad937a4e217f16a4d2f410f4ff282ca5f869ca9387986d85a99add8b4
diff --git a/net-libs/opal/opal-3.6.8.ebuild b/net-libs/opal/opal-3.6.8.ebuild
new file mode 100644
index 000000000000..6f6a72ea3984
--- /dev/null
+++ b/net-libs/opal/opal-3.6.8.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2010 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.1 2010/08/19 17:07:27 pva 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 ~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-0.5.0 )
+		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}
+	dev-util/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
+}