Ungzipped and renamed gcc4 patch

Package-Manager: portage-2.0.51.22-r2

5 files changed, 66 insertions, 26 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 6d32b0a898c5..de69bf5567b3 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.88 2005/09/06 13:42:09 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.89 2005/09/07 20:48:49 stkn Exp $
+
+  07 Sep 2005; Stefan Knoblich <stkn@gentoo.org> +files/pwlib-1.8.4-gcc4.diff,
+  -files/pwlib-gcc4.gz, pwlib-1.8.4.ebuild:
+  Ungzipped and renamed gcc4 patch (origin unknown -> .diff).
 
   06 Sep 2005; Hanno Boeck <hanno@gentoo.org> +files/pwlib-gcc4.gz,
   pwlib-1.8.4.ebuild:
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index 1b5c0a5f0e13..8af8f4976345 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,32 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c8a652c7a9221a17930fb8d1c4d4eacb ChangeLog 13894
+MD5 ae4e2d28a1696afcf545ed158be25bd7 pwlib-1.6.3-r3.ebuild 4338
+MD5 8a3df2068f3fa7e096c3dc77cc28e7ea pwlib-1.5.2-r3.ebuild 2993
 MD5 e7e31f6f265883cdf48d812f42a9f856 metadata.xml 235
-MD5 7b71ebcce6d852f0dc6738ee8b77ea49 pwlib-1.5.0-r1.ebuild 2403
+MD5 3388c080fbadf8243c3b82186a78a24c ChangeLog 14079
 MD5 4690d9e7395046ed1c573e68a47bd053 pwlib-1.5.0.ebuild 2304
-MD5 8a3df2068f3fa7e096c3dc77cc28e7ea pwlib-1.5.2-r3.ebuild 2993
-MD5 ae4e2d28a1696afcf545ed158be25bd7 pwlib-1.6.3-r3.ebuild 4338
 MD5 233dc6b0601309ce4da5385aa36e5bdc pwlib-1.6.6-r2.ebuild 4546
 MD5 00ce2a439ee24cd57f8c947d8fcadea1 pwlib-1.8.3-r1.ebuild 4465
-MD5 6dfc2cfc74a8cfbaa68d5599f3932f41 pwlib-1.8.4.ebuild 4334
-MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0 64
-MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0-r1 64
-MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2-r3 64
+MD5 f3f2917729a298410ce6db1d11c31d14 pwlib-1.8.4.ebuild 4341
+MD5 7b71ebcce6d852f0dc6738ee8b77ea49 pwlib-1.5.0-r1.ebuild 2403
+MD5 ef62669acbbbc63a30d475ca9865adb6 files/pwlib-1.6.6-ieee1394dc-fix.diff 7207
 MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3-r3 64
+MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2-r3 64
+MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0-r1 64
+MD5 0a9a8c5a1417127269e2e0f24ded1b2c files/pwlib-1.5.0-r1-gentoo.diff 391
 MD5 3057a7e05b6e701041865f26fd1fb8c3 files/digest-pwlib-1.6.6-r2 69
-MD5 66bc7e154effc3454029566adff8a2f7 files/digest-pwlib-1.8.3-r1 69
 MD5 7727b16f2fbed2161f1bc6c38aacaa36 files/digest-pwlib-1.8.4 64
-MD5 0a9a8c5a1417127269e2e0f24ded1b2c files/pwlib-1.5.0-r1-gentoo.diff 391
+MD5 94fe183a68413eaeb8242cd30532d963 files/pwlib-1.6.3-dyn-esd.patch 366
+MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0 64
+MD5 66bc7e154effc3454029566adff8a2f7 files/digest-pwlib-1.8.3-r1 69
+MD5 6aa40def4f33c78a2c05f91aeda058c1 files/pwlib-1.8.4-gcc4.diff 1574
 MD5 8c6469f000dea2a13869631fcedbe0ff files/pwlib-1.5.2-asnparser-secfix.diff 1299
 MD5 0fbee42a70e13b6fe530a1f1ca8086ac files/pwlib-1.6.6-alsa_dmix.diff 7450
-MD5 ef62669acbbbc63a30d475ca9865adb6 files/pwlib-1.6.6-ieee1394dc-fix.diff 7207
-MD5 94fe183a68413eaeb8242cd30532d963 files/pwlib-1.6.3-dyn-esd.patch 366
-MD5 d7d3f4de89af7e6616939f8c95eb7911 files/pwlib-gcc4.gz 612
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDHZ1tr2QksT29OyARAm3mAJ9Ae+DuOynBHd64Z7fosfkSqrTjtACeKmOn
-omjVgJs1CMuK0fiaX1zFNXc=
-=yZbJ
------END PGP SIGNATURE-----
diff --git a/dev-libs/pwlib/files/pwlib-1.8.4-gcc4.diff b/dev-libs/pwlib/files/pwlib-1.8.4-gcc4.diff
new file mode 100644
index 000000000000..e15465854342
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.8.4-gcc4.diff
@@ -0,0 +1,46 @@
+diff -Naur pwlib-1.8.4/include/ptlib/pprocess.h pwlib-1.8.4-gcc4/include/ptlib/pprocess.h
+--- pwlib-1.8.4/include/ptlib/pprocess.h	2004-06-30 14:17:04.000000000 +0200
++++ pwlib-1.8.4-gcc4/include/ptlib/pprocess.h	2005-09-06 15:06:16.032949750 +0200
+@@ -249,6 +249,7 @@
+ #include <ptlib/syncpoint.h>
+ #include <ptlib/pfactory.h>
+ 
++class PHouseKeepingThread;
+ 
+ /**Create a process.
+    This macro is used to create the components necessary for a user PWLib
+@@ -752,10 +753,10 @@
+ 
+     PArgList arguments;
+     // The list of arguments
+-
++  public:
+     PTimerList timers;
+     // List of active timers in system
+-
++  private:
+     PTime programStartTime;
+     // time at which process was intantiated, i.e. started
+ 
+diff -Naur pwlib-1.8.4/include/ptlib/timer.h pwlib-1.8.4-gcc4/include/ptlib/timer.h
+--- pwlib-1.8.4/include/ptlib/timer.h	2003-09-17 11:01:00.000000000 +0200
++++ pwlib-1.8.4-gcc4/include/ptlib/timer.h	2005-09-06 15:06:16.036950000 +0200
+@@ -123,6 +123,7 @@
+ #endif
+ 
+ class PThread;
++class PTimerList;
+ 
+ #include <ptlib/notifier.h>
+ 
+diff -Naur pwlib-1.8.4/include/ptlib/unix/ptlib/pprocess.h pwlib-1.8.4-gcc4/include/ptlib/unix/ptlib/pprocess.h
+--- pwlib-1.8.4/include/ptlib/unix/ptlib/pprocess.h	2004-05-23 23:11:39.000000000 +0200
++++ pwlib-1.8.4-gcc4/include/ptlib/unix/ptlib/pprocess.h	2005-09-06 15:06:16.036950000 +0200
+@@ -171,6 +171,7 @@
+     PDICTIONARY(ThreadDict, POrdinalKey, PThread);
+     ThreadDict activeThreads;
+     PMutex     threadMutex;
++  public:
+     int        timerChangePipe[2];
+     PHouseKeepingThread * housekeepingThread;
+ 
diff --git a/dev-libs/pwlib/files/pwlib-gcc4.gz b/dev-libs/pwlib/files/pwlib-gcc4.gz
deleted file mode 100644
index a8e3807bef46..000000000000
--- a/dev-libs/pwlib/files/pwlib-gcc4.gz
+++ /dev/null
diff --git a/dev-libs/pwlib/pwlib-1.8.4.ebuild b/dev-libs/pwlib/pwlib-1.8.4.ebuild
index 1e6c3efb93b1..a07d58a1b3ac 100644
--- a/dev-libs/pwlib/pwlib-1.8.4.ebuild
+++ b/dev-libs/pwlib/pwlib-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.4.ebuild,v 1.6 2005/09/06 13:42:09 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.4.ebuild,v 1.7 2005/09/07 20:48:49 stkn Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -31,7 +31,7 @@ DEPEND=">=sys-devel/bison-1.28
 src_unpack() {
 	unpack ${A}
 
-	epatch ${FILESDIR}/pwlib-gcc4.gz
+	epatch ${FILESDIR}/pwlib-1.8.4-gcc4.diff
 
 	cd ${S}/make