Version bump. Closes several bugs. Added myself as maintainer

(Portage version: 2.2.0_alpha138/cvs/Linux i686, signed Manifest commit with key 1F6F0683)

7 files changed, 308 insertions, 1 deletions

diff --git a/net-libs/ptlib/ChangeLog b/net-libs/ptlib/ChangeLog
index c969e1a3d771..e5625adc2808 100644
--- a/net-libs/ptlib/ChangeLog
+++ b/net-libs/ptlib/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for net-libs/ptlib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.36 2012/09/30 18:15:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.37 2012/10/23 22:41:15 neurogeek Exp $
+
+  23 Oct 2012; Jesus Rivero <neurogeek@gentoo.org> +ptlib-2.10.8.ebuild,
+  +files/ptlib-2.10.8-disable-telnet-symbols.patch,
+  +files/ptlib-2.10.8-pkgconfig_ldflags.patch,
+  +files/ptlib-2.10.8-respect_cxxflags.patch,
+  +files/ptlib-2.10.8-svn_revision_override.patch, metadata.xml:
+  Version bump. Closes several bugs. Added myself as maintainer
+
+  23 Oct 2012; Jesus Rivero <neurogeek@gentoo.org> +ptlib-2.10.8.ebuild,
+  +files/ptlib-2.10.8-disable-telnet-symbols.patch,
+  +files/ptlib-2.10.8-pkgconfig_ldflags.patch,
+  +files/ptlib-2.10.8-respect_cxxflags.patch,
+  +files/ptlib-2.10.8-svn_revision_override.patch, metadata.xml:
+  Version bump. Closes several bugs. Added myself as maintainer
+
+*ptlib-2.10.8 (22 Oct 2012)
+
+  22 Oct 2012; Jesus Rivero <neurogeek@gentoo.org> +ptlib-2.10.8.ebuild,
+  +files/ptlib-2.10.8-pkgconfig_ldflags.patch,
+  +files/ptlib-2.10.8-svn_revision_override.patch:
+  Version bump. Closes bug #338319 and some other related bugs
 
   30 Sep 2012; Raúl Porcel <armin76@gentoo.org> ptlib-2.6.7-r1.ebuild:
   alpha stable wrt #397617
diff --git a/net-libs/ptlib/files/ptlib-2.10.8-disable-telnet-symbols.patch b/net-libs/ptlib/files/ptlib-2.10.8-disable-telnet-symbols.patch
new file mode 100644
index 000000000000..0a3012c8510a
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.10.8-disable-telnet-symbols.patch
@@ -0,0 +1,19 @@
+diff -uNr ptlib-2.10.8.orig/src/ptclib/cli.cxx ptlib-2.10.8/src/ptclib/cli.cxx
+--- ptlib-2.10.8.orig/src/ptclib/cli.cxx	2012-10-19 13:45:35.000000000 -0400
++++ ptlib-2.10.8/src/ptclib/cli.cxx	2012-10-22 16:02:58.000000000 -0400
+@@ -858,6 +858,7 @@
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
++#ifdef HAS_TELNET
+ PCLITelnet::PCLITelnet(WORD port, const char * prompt, bool singleThreadForAll)
+   : PCLISocket(port, prompt, singleThreadForAll)
+ {
+@@ -868,6 +869,7 @@
+ {
+   return new PTelnetSocket();
+ }
++#endif
+ 
+ 
+ ///////////////////////////////////////////////////////////////////////////////
diff --git a/net-libs/ptlib/files/ptlib-2.10.8-pkgconfig_ldflags.patch b/net-libs/ptlib/files/ptlib-2.10.8-pkgconfig_ldflags.patch
new file mode 100644
index 000000000000..acd531977c3b
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.10.8-pkgconfig_ldflags.patch
@@ -0,0 +1,11 @@
+diff -uNr ptlib-2.10.8.orig/ptlib.pc.in ptlib-2.10.8/ptlib.pc.in
+--- ptlib-2.10.8.orig/ptlib.pc.in       2012-10-19 13:45:35.000000000 -0400
++++ ptlib-2.10.8/ptlib.pc.in    2012-10-19 14:03:26.000000000 -0400
+@@ -11,7 +11,7 @@
+ Name: ptlib
+ Description: PT Library
+ Version: @PTLIB_VERSION@
+-Libs: @LDFLAGS@ -L${libdir} -lpt${suffix}
++Libs: @ENDLDLIBS@ -L${libdir} -lpt${suffix}
+ Libs.private: @ENDLDLIBS@
+ Cflags: -I${includedir} @STDCCFLAGS@
diff --git a/net-libs/ptlib/files/ptlib-2.10.8-respect_cxxflags.patch b/net-libs/ptlib/files/ptlib-2.10.8-respect_cxxflags.patch
new file mode 100644
index 000000000000..dc09f960f05a
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.10.8-respect_cxxflags.patch
@@ -0,0 +1,10 @@
+diff -uNr ptlib-2.10.8.orig/configure.ac ptlib-2.10.8/configure.ac
+--- ptlib-2.10.8.orig/configure.ac	2012-10-19 13:45:35.000000000 -0400
++++ ptlib-2.10.8/configure.ac	2012-10-23 08:08:57.000000000 -0400
+@@ -538,7 +540,7 @@
+   AC_MSG_RESULT(yes)
+ else
+   AC_MSG_RESULT(no)
+-  STDCXXFLAGS="$STDCCFLAGS -frtti"
++  STDCXXFLAGS="$STDCXXFLAGS -frtti"
+ fi
diff --git a/net-libs/ptlib/files/ptlib-2.10.8-svn_revision_override.patch b/net-libs/ptlib/files/ptlib-2.10.8-svn_revision_override.patch
new file mode 100644
index 000000000000..5531fd9f6fcb
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.10.8-svn_revision_override.patch
@@ -0,0 +1,18 @@
+diff -uNr ptlib-2.10.8.orig/src/ptlib/common/osutils.cxx ptlib-2.10.8/src/ptlib/common/osutils.cxx
+--- ptlib-2.10.8.orig/src/ptlib/common/osutils.cxx      2012-10-19 13:45:35.000000000 -0400
++++ ptlib-2.10.8/src/ptlib/common/osutils.cxx   2012-10-19 13:52:50.000000000 -0400
+@@ -43,13 +43,13 @@
+ #include <ptlib/svcproc.h>
+ #include <ptlib/pluginmgr.h>
+ #include "../../../version.h"
+-#include "../../../revision.h"
++# define SVN_REVISION 0
++//#include "../../../revision.h"
+ 
+ #ifdef _WIN32
+ #include <ptlib/msos/ptlib/debstrm.h>
+ #endif
+ 
+-
+ static const char * const VersionStatus[PProcess::NumCodeStatuses] = { "alpha", "beta", "." };
+ static const char DefaultRollOverPattern[] = "_yyyy_MM_dd_hh_mm";
diff --git a/net-libs/ptlib/metadata.xml b/net-libs/ptlib/metadata.xml
index 7654cbdbf56e..f17bdd16e1ed 100644
--- a/net-libs/ptlib/metadata.xml
+++ b/net-libs/ptlib/metadata.xml
@@ -7,6 +7,11 @@
 		<name>Mounir Lamouri</name>
 		<description>Assign to herd and CC me</description>
 	</maintainer>
+	<maintainer>
+		<email>neurogeek@gentoo.org</email>
+		<name>Jesus Rivero</name>
+		<description>Assign to herd and CC me</description>
+	</maintainer>
 	<use>
 		<flag name="asn">Enable ASN decoding/encoding support</flag>
 		<flag name="audio">Enable audio support</flag>
diff --git a/net-libs/ptlib/ptlib-2.10.8.ebuild b/net-libs/ptlib/ptlib-2.10.8.ebuild
new file mode 100644
index 000000000000..ddfce5536676
--- /dev/null
+++ b/net-libs/ptlib/ptlib-2.10.8.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.10.8.ebuild,v 1.1 2012/10/23 22:41:15 neurogeek Exp $
+
+EAPI="4"
+
+inherit eutils
+
+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/${P}-htmldoc.tar.bz2 )"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# default enabled are features from 'minsize', the most used according to ptlib
+IUSE="alsa +asn +audio debug doc dtmf examples ffmpeg ftp http ipv6
+jabber ldap lua mail odbc oss pch qos remote sasl sdl serial shmvideo snmp soap
+socks ssl static-libs +stun telnet tts v4l +video vxml wav xml xmlrpc"
+
+CDEPEND="
+	audio? ( alsa? ( media-libs/alsa-lib ) )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua )
+	odbc? ( dev-db/unixODBC )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	video? ( v4l? ( media-libs/libv4l ) )
+	xml? ( dev-libs/expat )
+	!!dev-libs/pwlib"
+RDEPEND="${CDEPEND}
+	ffmpeg? ( virtual/ffmpeg )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	video? ( v4l? ( sys-kernel/linux-headers ) )"
+
+# NOTES:
+# media-libs/libdc1394:2 should be supported but headers location have changed
+# tools/ directory is ignored
+# avc plugin is disabled to fix bug 276514, see upstream bug 2821744
+
+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}"
+}
+
+REQUIRED_USE="sdl? ( video )
+	jabber? ( xml )
+	vxml? ( http tts xml )
+	xmlrpc? ( http xml )
+	soap? ( http xml )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-svn_revision_override.patch"
+	epatch "${FILESDIR}/${P}-pkgconfig_ldflags.patch"
+	epatch "${FILESDIR}/${P}-respect_cxxflags.patch"
+
+	if ! use telnet; then
+		epatch "${FILESDIR}/${P}-disable-telnet-symbols.patch"
+	fi
+
+	# 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
+}
+
+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: 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
+	# mlib: SUN mediaLibs. Not in tree.
+	# pipechan, configfile, resolver, url: force enabling
+	econf ${myconf} \
+		--disable-minsize \
+		--enable-ansi-bool \
+		--enable-atomicity \
+		--disable-internalregex \
+		--disable-sunaudio \
+		--disable-bsdvideo \
+		--disable-appshare \
+		--disable-vfw \
+		--disable-samples \
+		--disable-avc \
+		--disable-mlib \
+		--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) \
+		--disable-esd \
+		$(use_enable ffmpeg ffvdev) \
+		$(use_enable ftp) \
+		$(use_enable http) \
+		$(use_enable http httpforms) \
+		$(use_enable http httpsvc) \
+		--disable-dc \
+		$(use_enable ipv6) \
+		$(use_enable jabber) \
+		$(use_enable ldap openldap) \
+		$(use_enable lua) \
+		$(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) \
+		--disable-v4l \
+		$(use_enable v4l 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=""
+	tc-env_build
+
+	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"
+
+	# 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/* || die "dohtml failed"
+	fi
+
+	dodoc History.txt ReadMe.txt ReadMe_QOS.txt || die "dodoc failed"
+
+	# ChangeLog is not standard
+	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."
+}