Bring back fix for bug 283675, fixing now bug 327731.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

2 files changed, 282 insertions, 1 deletions

diff --git a/net-libs/ptlib/ChangeLog b/net-libs/ptlib/ChangeLog
index 8ba0185e0727..51b2b163bc09 100644
--- a/net-libs/ptlib/ChangeLog
+++ b/net-libs/ptlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/ptlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.17 2010/08/19 17:02:28 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.18 2010/10/28 00:06:15 volkmar Exp $
+
+*ptlib-2.6.7-r1 (28 Oct 2010)
+
+  28 Oct 2010; <volkmar@gentoo.org> +ptlib-2.6.7-r1.ebuild:
+  Bring back fix for bug 283675, fixing now bug 327731.
 
 *ptlib-2.6.7 (19 Aug 2010)
 
diff --git a/net-libs/ptlib/ptlib-2.6.7-r1.ebuild b/net-libs/ptlib/ptlib-2.6.7-r1.ebuild
new file mode 100644
index 000000000000..7ec184362627
--- /dev/null
+++ b/net-libs/ptlib/ptlib-2.6.7-r1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.7-r1.ebuild,v 1.1 2010/10/28 00:06:15 volkmar Exp $
+
+EAPI="2"
+
+inherit eutils
+
+HTMLV="2.6.6" # There no 2.6.7 release of htmldoc
+DESCRIPTION="Network focused portable C++ class library providing high level functions"
+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"
+# default enabled are features from 'minsize', the most used according to ptlib
+IUSE="alsa +asn +audio debug doc dtmf esd examples ffmpeg ftp http ieee1394 ipv6
+jabber ldap mail odbc oss pch qos remote sasl sdl serial shmvideo snmp soap
+socks ssl +stun telnet tts v4l v4l2 +video vxml wav xml xmlrpc"
+
+CDEPEND="
+	audio? ( alsa? ( media-libs/alsa-lib )
+		esd? ( media-sound/esound ) )
+	ldap? ( net-nds/openldap )
+	odbc? ( dev-db/unixODBC )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	video? ( ieee1394? ( media-libs/libdc1394:1
+				media-libs/libdv
+				sys-libs/libavc1394
+				sys-libs/libraw1394 )
+		v4l2? ( media-libs/libv4l ) )
+	xml? ( dev-libs/expat )"
+RDEPEND="${CDEPEND}
+	ffmpeg? ( media-video/ffmpeg )"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	video? ( v4l? ( sys-kernel/linux-headers )
+		v4l2? ( sys-kernel/linux-headers ) )
+	!!dev-libs/pwlib"
+
+# NOTES:
+# media-libs/libdc1394:2 should be supported but headers location have changed
+# tools/ directory is ignored
+# looks to have an auto-magic dep with medialibs, but not in the tree so...
+#	upstream bug 2794736
+# avc plugin is disabled to fix bug 276514, see upstream bug 2821744
+
+# TODO:
+# manage in a better way the conditional use flags (with eapi-3 ?)
+# libv4l is an automagic dep for v4l2 plugin, see upstream bug 2867383
+
+conditional_use_warn_msg() {
+	ewarn "To enable ${1} USE flag, you need ${2} USE flag to be enabled"
+	ewarn "Please, enable ${2} or disable ${1}"
+}
+
+pkg_setup() {
+	local use_warn=false
+
+	if use sdl && ! use video; then
+		conditional_use_warn_msg "sdl" "video"
+		use_warn=true
+	fi
+
+	if use jabber && ! use xml; then
+		conditional_use_warn_msg "jabber" "xml"
+		use_warn=true
+	fi
+
+	if use vxml; then
+		if ! use xml; then
+			conditional_use_warn_msg "vxml" "xml"
+			use_warn=true
+		fi
+		if ! use http; then
+			conditional_use_warn_msg "vxml" "http"
+			use_warn=true
+		fi
+	fi
+
+	if use xmlrpc; then
+		if ! use xml; then
+			conditional_use_warn_msg "xmlrpc" "xml"
+			use_warn=true
+		fi
+		# configure script tells it needs http but it fails, see bug 277385
+		# the bug has been reported at upstream bug 2820814
+		if ! use http; then
+			conditional_use_warn_msg "xmlrpc" "http"
+			use_warn=true
+		fi
+	fi
+
+	if use soap; then
+		if ! use xml; then
+			conditional_use_warn_msg "soap" "xml"
+			use_warn=true
+		fi
+		# fix bug 280850, see upstream bug 2844915
+		if ! use http; then
+			conditional_use_warn_msg "soap" "http"
+			use_warn=true
+		fi
+	fi
+
+	if ${use_warn}; then
+		echo
+		ewarn "Please look at previous messages and re-emerge accordingly if needed."
+		ebeep
+		epause 5
+	fi
+}
+
+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
+
+	# bug 283675, upstream bug 2857750
+	if use vxml && ! use dtmf; then
+		epatch "${FILESDIR}"/${PN}-2.6.4-vxml-ptones.patch
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	# plugins are disabled only if ! audio and ! video
+	if ! use audio && ! use video; then
+		myconf="${myconf} --disable-plugins"
+	else
+		myconf="${myconf} --enable-plugins"
+	fi
+
+	# minsize, openh323, opal: presets of features (overwritten by use flags)
+	# ansi-bool, atomicity: there is no reason to disable those features
+	# internalregex: we want to use system one
+	# sunaudio and bsdvideo are respectively for SunOS and BSD's
+	# appshare, vfw: only for windows
+	# samples: no need to build samples
+	# avc: disabled, bug 276514, upstream bug 2821744
+	# pipechan, configfile, resolver, url: force enabling
+	econf ${myconf} \
+		--disable-minsize \
+		--disable-openh323 \
+		--disable-opal \
+		--enable-ansi-bool \
+		--enable-atomicity \
+		--disable-internalregex \
+		--disable-sunaudio \
+		--disable-bsdvideo \
+		--disable-appshare \
+		--disable-vfw \
+		--disable-samples \
+		--disable-avc \
+		--enable-configfile \
+		--enable-pipechan \
+		--enable-resolver \
+		--enable-url \
+		$(use_enable audio) \
+		$(use_enable alsa) \
+		$(use_enable asn) \
+		$(use_enable debug exceptions) \
+		$(use_enable debug memcheck) \
+		$(use_enable debug tracing) \
+		$(use_enable dtmf) \
+		$(use_enable esd) \
+		$(use_enable ffmpeg ffvdev) \
+		$(use_enable ftp) \
+		$(use_enable http) \
+		$(use_enable http httpforms) \
+		$(use_enable http httpsvc) \
+		$(use_enable ieee1394 dc) \
+		$(use_enable ipv6) \
+		$(use_enable jabber) \
+		$(use_enable ldap openldap) \
+		$(use_enable mail pop3smtp) \
+		$(use_enable odbc) \
+		$(use_enable oss) \
+		$(use_enable pch) \
+		$(use_enable qos) \
+		$(use_enable remote remconn) \
+		$(use_enable sasl) \
+		$(use_enable sdl) \
+		$(use_enable serial) \
+		$(use_enable shmvideo) \
+		$(use_enable snmp) \
+		$(use_enable soap) \
+		$(use_enable socks) \
+		$(use_enable ssl openssl) \
+		$(use_enable stun) \
+		$(use_enable telnet) \
+		$(use_enable tts) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable video) $(use_enable video vidfile) \
+		$(use_enable vxml) \
+		$(use_enable wav wavfile) \
+		$(use_enable xml expat) \
+		$(use_enable xmlrpc)
+}
+
+src_compile() {
+	local makeopts=""
+
+	use debug && makeopts="debug"
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	local makeopts=""
+
+	use debug && makeopts="DEBUG=1"
+
+	emake DESTDIR="${D}" ${makeopts} install || die "emake install failed"
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/* || die "dohtml failed"
+	fi
+
+	dodoc History.txt ReadMe.txt ReadMe_QOS.txt || die "dodoc failed"
+
+	# ChangeLog is not standard
+	# This version (2.6.7) doesn't have a ChangeLog file.
+	#dodoc ChangeLog-${PN}-v${PV//./_}.txt || die "dodoc failed"
+
+	if use audio || use video; then
+		newdoc plugins/ReadMe.txt ReadMe-Plugins.txt || die "newdoc failed"
+	fi
+
+	if use examples; then
+		local exampledir="/usr/share/doc/${PF}/examples"
+		local basedir="samples"
+		local sampledirs="`ls samples --hide=Makefile`"
+
+		# first, install Makefile
+		insinto ${exampledir}/
+		doins ${basedir}/Makefile || die "doins failed"
+
+		# now, all examples
+		for x in ${sampledirs}; do
+			insinto ${exampledir}/${x}/
+			doins ${basedir}/${x}/* || die "doins failed"
+		done
+	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."
+		ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
+	fi
+
+	if ! use audio || ! use video; then
+		ewarn "You have disabled audio or video USE flags."
+		ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
+		ewarn "Having a feature enabled via use flag but disabled can lead to issues."
+	fi
+
+	ewarn "If you've just removed pwlib to install ptlib, some packages will be broken."
+	ewarn "Please use 'revdep-rebuild' from app-portage/gentoolkit to check."
+	ewarn "If some packages need pwlib, consider removing ptlib and re-installing pwlib"
+	ewarn "or help us to make them live together."
+}