new augmented patch allows pwlib to be compiled successfully again.

5 files changed, 34 insertions, 19 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 2bfca3679a5d..b75b84ffe312 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.1 2002/03/29 04:02:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.2 2002/03/29 05:00:16 seemant Exp $
 
 *pwlib-1.2.13 (28 Mar 2002)
 
   28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> pwlib-1.2.13.ebuild :
 
-  Version bump, but it is masked for now, anyway.
+  Version bump, and the patch has been renamed to allow it to work with
+  both pacakge versions, and the patch has been augmented to include the 
+  <stdio.h> lib.  This fix, provided by vikingo <gabriel@elvikingo.com.ar>
+  on the gentoo-user list, allows for successful compilation of pwlib again.
diff --git a/dev-libs/pwlib/files/pwlib-1.2.12-gentoo.diff b/dev-libs/pwlib/files/pwlib-1.2.12-gentoo.diff
deleted file mode 100644
index a6db0b1c271c..000000000000
--- a/dev-libs/pwlib/files/pwlib-1.2.12-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- unix.mak.orig	Thu Feb 28 22:30:39 2002
-+++ unix.mak	Thu Feb 28 22:32:47 2002
-@@ -556,7 +556,7 @@
- STDCCFLAGS	+= -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -malign-functions=0 
- STDCCFLAGS      += -malign-jumps=0 -malign-loops=0
- else
--STDCCFLAGS	+= -mcpu=$(CPUTYPE)
-+#STDCCFLAGS	+= -mcpu=$(CPUTYPE)
- endif
- endif
- endif
diff --git a/dev-libs/pwlib/files/pwlib-gentoo.diff b/dev-libs/pwlib/files/pwlib-gentoo.diff
new file mode 100644
index 000000000000..fb3df2d12e0a
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-gentoo.diff
@@ -0,0 +1,23 @@
+--- make/unix.mak.orig	Thu Feb 28 22:30:39 2002
++++ make/unix.mak	Thu Feb 28 22:32:47 2002
+@@ -556,7 +556,7 @@
+ STDCCFLAGS	+= -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -malign-functions=0 
+ STDCCFLAGS      += -malign-jumps=0 -malign-loops=0
+ else
+-STDCCFLAGS	+= -mcpu=$(CPUTYPE)
++#STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+ endif
+ endif
+ endif
+
+--- src/ptlib/common/getdate.y.orig      Thu Mar 28 20:30:06 2002
++++ src/ptlib/common/getdate.y   Thu Mar 28 20:30:21 2002
+@@ -18,6 +18,7 @@
+ /* SUPPRESS 288 on yyerrlab *//* Label unused */
+ 
+ 
++#include <stdio.h>
+ #include <time.h>
+ #include <string.h>
+ #include <ctype.h>
+
diff --git a/dev-libs/pwlib/pwlib-1.2.12-r2.ebuild b/dev-libs/pwlib/pwlib-1.2.12-r2.ebuild
index 79979b6adce2..e2fece5ca24e 100644
--- a/dev-libs/pwlib/pwlib-1.2.12-r2.ebuild
+++ b/dev-libs/pwlib/pwlib-1.2.12-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.2.12-r2.ebuild,v 1.1 2002/03/02 23:51:06 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.2.12-r2.ebuild,v 1.2 2002/03/29 05:00:16 seemant Exp $
 
 S="${WORKDIR}/pwlib"
 SRC_URI="http://www.gnomemeeting.org/downloads/latest/sources/pwlib_1.2.12.tar.gz"
@@ -14,8 +14,8 @@ DEPEND="virtual/glibc
 src_unpack() {
 
 	unpack pwlib_1.2.12.tar.gz
-	cd ${S}/make
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${PN}-gentoo.diff
 
 }
 
diff --git a/dev-libs/pwlib/pwlib-1.2.13.ebuild b/dev-libs/pwlib/pwlib-1.2.13.ebuild
index 267f3016ef8a..5e2c45f9fb85 100644
--- a/dev-libs/pwlib/pwlib-1.2.13.ebuild
+++ b/dev-libs/pwlib/pwlib-1.2.13.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.2.13.ebuild,v 1.1 2002/03/29 04:02:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.2.13.ebuild,v 1.2 2002/03/29 05:00:16 seemant Exp $
 
 S="${WORKDIR}/pwlib"
 SRC_URI="http://www.gnomemeeting.org/downloads/latest/sources/pwlib_1.2.12.tar.gz"
@@ -14,8 +14,8 @@ DEPEND="virtual/glibc
 src_unpack() {
 
 	unpack pwlib_1.2.12.tar.gz
-	cd ${S}/make
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${PN}-gentoo.diff
 
 }