Version bump to 2.6.4.

Bug 281170.
Thanks to Colin Macdonald.
(Portage version: 14113-svn/cvs/Linux i686)

3 files changed, 15 insertions, 29 deletions

diff --git a/net-libs/ptlib/ChangeLog b/net-libs/ptlib/ChangeLog
index d94ac328ec63..783d5def9690 100644
--- a/net-libs/ptlib/ChangeLog
+++ b/net-libs/ptlib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/ptlib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.7 2009/08/03 21:31:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.8 2009/08/25 13:52:05 volkmar Exp $
+
+*ptlib-2.6.4 (25 Aug 2009)
+
+  25 Aug 2009; Mounir Lamouri <volkmar@gentoo.org>
+  -files/ptlib-2.6.2-gcc-allocator.patch, -ptlib-2.6.2.ebuild,
+  +ptlib-2.6.4.ebuild:
+  Version bump to 2.6.4. Bug 281170.
+	Thanks to Colin MacDonald.
 
   03 Aug 2009; Markus Meier <maekke@gentoo.org> ptlib-2.6.2.ebuild:
   add ~amd64, bug #276355
diff --git a/net-libs/ptlib/files/ptlib-2.6.2-gcc-allocator.patch b/net-libs/ptlib/files/ptlib-2.6.2-gcc-allocator.patch
deleted file mode 100644
index f80c3a186a59..000000000000
--- a/net-libs/ptlib/files/ptlib-2.6.2-gcc-allocator.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/ptlib/common/contain.cxx.old	2009-05-21 08:24:13.000000000 +0200
-+++ src/ptlib/common/contain.cxx	2009-05-21 08:24:24.000000000 +0200
-@@ -56,13 +56,6 @@
- #define __CLASS__ GetClass()
- 
- 
--#ifdef __GNUC__
--
--#include <ext/pool_allocator.h>
--#include <ext/mt_allocator.h>
--
--#endif
--
- ///////////////////////////////////////////////////////////////////////////////
- //
- //  Use a custom allocator for PContainer references
diff --git a/net-libs/ptlib/ptlib-2.6.2.ebuild b/net-libs/ptlib/ptlib-2.6.4.ebuild
index c21378039574..5cba1efbfda1 100644
--- a/net-libs/ptlib/ptlib-2.6.2.ebuild
+++ b/net-libs/ptlib/ptlib-2.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.2.ebuild,v 1.7 2009/08/03 21:31:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.4.ebuild,v 1.1 2009/08/25 13:52:05 volkmar Exp $
 
 EAPI="2"
 
@@ -161,11 +161,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# move files from doc tarball into ${S}
-	if use doc; then
-		mv ../html . || die "moving doc files failed"
-	fi
-
 	# remove visual studio related files from samples/
 	if use examples; then
 		rm -f samples/*/*.vcproj
@@ -173,9 +168,6 @@ src_prepare() {
 		rm -f samples/*/*.dsp
 		rm -f samples/*/*.dsw
 	fi
-
-	# workaround for a compilation issue in contain.cxx, upstream bug 2794741
-	epatch "${FILESDIR}"/${P}-gcc-allocator.patch
 }
 
 src_configure() {
@@ -193,7 +185,6 @@ src_configure() {
 	# internalregex: we want to use system one
 	# sunaudio and bsdvideo are respectively for SunOS and BSD's
 	# appshare, vfw: only for windows
-	# sockagg: not used anymore, upstream bug 2794755
 	# samples: no need to build samples
 	# avc: disabled, bug 276514, upstream bug 2821744
 	econf ${myconf} \
@@ -207,7 +198,6 @@ src_configure() {
 		--disable-bsdvideo \
 		--disable-appshare \
 		--disable-vfw \
-		--disable-sockagg \
 		--disable-samples \
 		--disable-avc \
 		$(use_enable audio) \
@@ -274,7 +264,7 @@ src_install() {
 	emake DESTDIR="${D}" ${makeopts} install || die "emake install failed"
 
 	if use doc; then
-		dohtml -r html/* || die "dohtml failed"
+		dohtml -r "${WORKDIR}"/html/* || die "dohtml failed"
 	fi
 
 	dodoc History.txt ReadMe.txt ReadMe_QOS.txt || die "dodoc failed"
@@ -282,6 +272,10 @@ src_install() {
 	# 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"