Added gcc4 compatibility patch, provided by Krzysiek Pawlik. Wiped out older version.

(Portage version: 2.1_pre4-r1)

7 files changed, 47 insertions, 35 deletions

diff --git a/net-mail/peephole/ChangeLog b/net-mail/peephole/ChangeLog
index 898e024a5e59..76372edcbef9 100644
--- a/net-mail/peephole/ChangeLog
+++ b/net-mail/peephole/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/peephole
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/peephole/ChangeLog,v 1.8 2005/04/20 21:31:13 hansmi Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/peephole/ChangeLog,v 1.9 2006/02/06 08:26:44 s4t4n Exp $
+
+  06 Feb 2006; Michele Noberasco <s4t4n@gentoo.org> peephole-1.4.ebuild:
+  Added gcc 4 compatibility patch, provided by Krzysiek Pawlik.
+  peephole-1.3.ebuild:
+  Wiped out older release.
 
   20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> peephole-1.4.ebuild:
   Stable on ppc.
diff --git a/net-mail/peephole/Manifest b/net-mail/peephole/Manifest
index 71b026cd2c23..17e5c35fb227 100644
--- a/net-mail/peephole/Manifest
+++ b/net-mail/peephole/Manifest
@@ -1,6 +1,15 @@
-MD5 5289f19c3c11312768b6e16fa57c2168 peephole-1.3.ebuild 794
+MD5 7489c23183d1390d7dafc23c5f7b7196 ChangeLog 1453
+RMD160 f496aee58b7350645b7b1ad66c6ebf144bdcc0d0 ChangeLog 1453
+SHA256 8319a9751e755f1e72294e04c99490d65c11a59e1e914c7b7247025b24cd738c ChangeLog 1453
+MD5 185fc3b863a0779f1ab59614f72295bd files/digest-peephole-1.4 238
+RMD160 f5fab34758f91466ac488ed0a4b62a5d5b21ca6d files/digest-peephole-1.4 238
+SHA256 139ced180f89d058cdfa81b0fa36a2f123e9175423579f915b10314b043e96c1 files/digest-peephole-1.4 238
+MD5 85221e2404c6188b9dcf700286779a1b files/peephole-1.4-gcc4.patch 627
+RMD160 0467bfd613e44a347f3773f30b7280e36b43d1d3 files/peephole-1.4-gcc4.patch 627
+SHA256 c38febc09c317705e702049bda04eddda82f39b1bc07f9be1cb1bd726bb9966d files/peephole-1.4-gcc4.patch 627
 MD5 e3b4cba7c3fac4c4e9672bc97d8bbca1 metadata.xml 255
-MD5 9d2e8e76d4c45784b8fa8c51ed5d20bd ChangeLog 1265
-MD5 29c3d4532860e48e5d73184e7652a899 peephole-1.4.ebuild 799
-MD5 c7677ae72547912e0a3e019897aed54d files/digest-peephole-1.4 64
-MD5 8c46074132490df724fb07c9bd2f5b2e files/digest-peephole-1.3 64
+RMD160 8b20beb31f23b834eb70ff368e55a6c31f388ad3 metadata.xml 255
+SHA256 296ef57ea8ef1012f6e926c29ac809b7876ab0762377bbde2d64ae46fbf16808 metadata.xml 255
+MD5 a5bf0b567d81c6b428de55943d0e4b23 peephole-1.4.ebuild 891
+RMD160 464e3eb41ede57ba9869a9b8d90f85ede90c4a3f peephole-1.4.ebuild 891
+SHA256 6179a374d4adc0c33ba60b4f0696a9de5dce8a63f4044e750fcd9d3794082688 peephole-1.4.ebuild 891
diff --git a/net-mail/peephole/files/digest-peephole-1.3 b/net-mail/peephole/files/digest-peephole-1.3
deleted file mode 100644
index c21dfc4377a2..000000000000
--- a/net-mail/peephole/files/digest-peephole-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bed5a0a199852a316282ca58edc5d348 peephole-1.3.tar.gz 242562
diff --git a/net-mail/peephole/files/digest-peephole-1.4 b/net-mail/peephole/files/digest-peephole-1.4
index 4e3b01d1c6e5..b24d3c8529cc 100644
--- a/net-mail/peephole/files/digest-peephole-1.4
+++ b/net-mail/peephole/files/digest-peephole-1.4
@@ -1 +1,3 @@
 MD5 f2bc6004776cd98195d94a630e2d3f4b peephole-1.4.tar.gz 325165
+RMD160 075ff0a44d0e2feddf51997e6152611552f36524 peephole-1.4.tar.gz 325165
+SHA256 b94ba3e77f4b5c80e3913e1571037493793673d539976a8875fd7b9555768393 peephole-1.4.tar.gz 325165
diff --git a/net-mail/peephole/files/peephole-1.4-gcc4.patch b/net-mail/peephole/files/peephole-1.4-gcc4.patch
new file mode 100644
index 000000000000..d73546da4b25
--- /dev/null
+++ b/net-mail/peephole/files/peephole-1.4-gcc4.patch
@@ -0,0 +1,14 @@
+diff --exclude='*.lo' --exclude=.libs --exclude=.deps --exclude=libtool --exclude=Makefile --exclude='*.o' --exclude='*.la' --exclude='config*' -Nru peephole-1.4.vanilla/src/grammar/local/local.c peephole-1.4/src/grammar/local/local.c
+--- peephole-1.4.vanilla/src/grammar/local/local.c	2006-02-03 14:23:46.000000000 +0100
++++ peephole-1.4/src/grammar/local/local.c	2006-02-03 14:25:13.000000000 +0100
+@@ -25,8 +25,8 @@
+ static struct wm_local *parse_local(char *path, char *name)
+ {
+   struct wm_config wmc = {
+-    .wml NULL,
+-    .path path
++    NULL,
++    path
+   };
+ 
+   char rc[80];  // FIXME: possible buffer overflow...
diff --git a/net-mail/peephole/peephole-1.3.ebuild b/net-mail/peephole/peephole-1.3.ebuild
deleted file mode 100644
index edd2fcf80306..000000000000
--- a/net-mail/peephole/peephole-1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/peephole/peephole-1.3.ebuild,v 1.5 2004/09/02 18:15:05 pvdabeel Exp $
-
-DESCRIPTION="A daemon that polls your POP servers, checking if there are messages from particular persons."
-HOMEPAGE="http://peephole.sourceforge.net/"
-SRC_URI="mirror://sourceforge/peephole/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND=">=dev-libs/openssl-0.9.7d-r1"
-
-src_install() {
-	einstall || die "Installation failed"
-	dodoc AUTHORS README
-}
-
-pkg_postinst() {
-	einfo "Before you can use peephole you must copy"
-	einfo "/etc/skel/.peephole.providers and /etc/skel/.peepholerc"
-	einfo "to your home dir and edit them to suit your needs."
-}
diff --git a/net-mail/peephole/peephole-1.4.ebuild b/net-mail/peephole/peephole-1.4.ebuild
index 5105466a47ec..accf985f5a9b 100644
--- a/net-mail/peephole/peephole-1.4.ebuild
+++ b/net-mail/peephole/peephole-1.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/peephole/peephole-1.4.ebuild,v 1.3 2005/04/20 21:31:13 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/peephole/peephole-1.4.ebuild,v 1.4 2006/02/06 08:26:44 s4t4n Exp $
+
+inherit eutils
 
 DESCRIPTION="A daemon that polls your POP servers, checking if there are messages from particular persons."
 HOMEPAGE="http://peephole.sourceforge.net/"
@@ -13,6 +15,12 @@ IUSE=""
 
 DEPEND=">=dev-libs/openssl-0.9.7d-r1"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
 src_install() {
 	einstall || die "Installation failed"
 	dodoc AUTHORS README