Version bump to 2.6.4.

Bug 281170.
Thanks to Colin Macdonald.
Package-Manager: portage-14113-svn/cvs/Linux i686

4 files changed, 19 insertions, 44 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/Manifest b/net-libs/ptlib/Manifest
index 6b057d652bbb..c1593e2864d2 100644
--- a/net-libs/ptlib/Manifest
+++ b/net-libs/ptlib/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX ptlib-2.6.2-gcc-allocator.patch 429 RMD160 ca2fcdb5cd239d3159e1283ef27338a5264b46de SHA1 4dedb61240c5f88a600003988058630202e1f1f4 SHA256 24d009a49ec7aa2a93a5896346957e1bd9a1b60c52d80edba2bc0159139eea1e
-DIST ptlib-2.6.2-htmldoc.tar.bz2 2102488 RMD160 1001d75b7fdbe148338c68432d9e53bcb27030d0 SHA1 99be5fd1497be42eed7a662038eed08c641c55bb SHA256 41fa3dc92a033de021a40d0e47b9f2e60181fbdf607ec323639846aee501693e
-DIST ptlib-2.6.2.tar.bz2 3309489 RMD160 9606dbf59954138a112b07b6d50ad63d56fbf2e0 SHA1 95ce321c4fec47b7274fde3b65fea0e7699216df SHA256 941ead5179f5bab8dd6e81806b6e52120dc5b98c6ced8128df24639af1eabedd
-EBUILD ptlib-2.6.2.ebuild 8482 RMD160 b9157dedc129ea9524215536f29bc43e36020785 SHA1 3671c99b4e40a998df3db124d17af3ac1a299086 SHA256 fe9452b8393fc449da952e9333eeba8ace47158ae3781997b0656697b6261281
-MISC ChangeLog 1139 RMD160 4d3958299c2f9f1a86d7b5a8d39716e1c109fbb8 SHA1 8198a75c4b2143e54372484b58838208bd04849e SHA256 6749464810b8c111aa26519e35e4085b5f62f9c0badafd622d6299977c46a21a
+DIST ptlib-2.6.4-htmldoc.tar.bz2 2089282 RMD160 67113ef082fa05ed10874c438d007fccf4aa864b SHA1 f2d53729a7cbf1e2e909fc62ed30e220a10b2fcc SHA256 588ee9c090e6d5f082cca7c11a51d29b563a6d46ed259f13c398820a89f78d8c
+DIST ptlib-2.6.4.tar.bz2 3302374 RMD160 53d0ea4b67438f61f86fd0d8b68959ef0aa18342 SHA1 2808a7546c354c1b6c140667a91da6f79a98f5c9 SHA256 22eae4f6c72247f8ac79c57ce4469797ad3df67614758c5096b7ce9290bd10b4
+EBUILD ptlib-2.6.4.ebuild 8296 RMD160 5e72259b575bdf12157833782b444d689dce5a0f SHA1 e00dec502b40db107cd8bd69ae55cf5926f983f2 SHA256 9e8d6bd33bb16c09c5c174bc0c4c2ee9c169b9bc7ed6941656de78d392d2c269
+MISC ChangeLog 1371 RMD160 ba9c0214a67c099db412490f3e3b3f6f69bfd496 SHA1 0e7d23b85c9c8b3289a7d731d4d89b75b3cb0290 SHA256 d6d15c9d970f5331b579741ed64ffc274b2d652e29610d3ef79a46640deb71dd
 MISC metadata.xml 1557 RMD160 9fc3acd33e65c9c538f6f82540e29ad2c80e4ea3 SHA1 6e2c60a62ad7d5a343b4d77ffb23b27c55aa9461 SHA256 f37e4390595b04980d5e22d31c549dfac57979b0b2bb63f7c2d4125d9015e92c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp3V0wACgkQkKaRLQcq0GLsZQCfVSTZjEAr+5QJ33cMhYKE1GMW
-mwsAoKbM4sFKC5yzM5PKf0XYrMl1GYHU
-=xypU
------END PGP SIGNATURE-----
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"