apply patches using epatch from eutils

Package-Manager: portage-2.0.51.22-r2

6 files changed, 35 insertions, 24 deletions

diff --git a/net-dialup/diald/ChangeLog b/net-dialup/diald/ChangeLog
index 81512fb58bd2..bd742ea681e3 100644
--- a/net-dialup/diald/ChangeLog
+++ b/net-dialup/diald/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/diald
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/diald/ChangeLog,v 1.7 2005/08/29 05:35:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/diald/ChangeLog,v 1.8 2005/09/19 21:14:25 mrness Exp $
+
+  19 Sep 2005; Alin Nastac <mrness@gentoo.org>
+  files/diald-1.0-c-files.patch, files/diald-1.0-gentoo.patch,
+  diald-1.0-r1.ebuild:
+  Apply patches using epatch.
 
   29 Aug 2005; Alin Nastac <mrness@gentoo.org> diald-1.0-r1.ebuild:
   Fix cp -a usage for Gentoo BSD (#103487).
diff --git a/net-dialup/diald/Manifest b/net-dialup/diald/Manifest
index 16c34319c59f..e6f00be65a91 100644
--- a/net-dialup/diald/Manifest
+++ b/net-dialup/diald/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f3e426e83704b0d8909c371f8c2913e9 diald-1.0-r1.ebuild 1567
-MD5 f2e4610cab052f223677ca59a8b088b5 ChangeLog 717
+MD5 0dd3543daa089cf4f1dae19b894e70c2 diald-1.0-r1.ebuild 1550
+MD5 b3e558013086ba99f98c72a69fa42f07 ChangeLog 881
 MD5 3609884142a6835c4c2e032d8d0664eb metadata.xml 323
-MD5 a5410dd309151f9ee528b9409343ec1b files/diald-1.0-gentoo.patch 3066
-MD5 ae3f48bcca1dd04078341a2140be83b6 files/diald-1.0-c-files.patch 345
+MD5 da73a1bce6fab85994853324521c0d69 files/diald-1.0-gentoo.patch 3262
+MD5 52298aa6dc071ff73b8da0ec2d66fcaa files/diald-1.0-c-files.patch 442
 MD5 0c082c51f45b19f083013649003444f6 files/diald-init 718
 MD5 7249a39cdcf0e96f3886a162f5ef5fb0 files/diald.conf 997
 MD5 24b297f6cfd14147c48759fbadb36e6d files/digest-diald-1.0-r1 61
@@ -13,7 +13,7 @@ MD5 e60fcccdbfaa9afadd4f9f9d9982af4f files/diald.filter 4647
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDEp9nNSP4Vda7IdsRApztAJoCgbWf/5U2E5Zp+HCRNZMI3sJtLgCdGphO
-FNE2q8Jqyiz9AtH+O1ov/qo=
-=mrs/
+iD8DBQFDLyo/NSP4Vda7IdsRAvEsAJkBtbzIhwrKg9r38+Te1wGIHVt4XQCeJmYk
+1OGrMOJxzYbzpeikheHBzIg=
+=nrg9
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/diald/diald-1.0-r1.ebuild b/net-dialup/diald/diald-1.0-r1.ebuild
index 73ef88b8ea8f..9f0e48005200 100644
--- a/net-dialup/diald/diald-1.0-r1.ebuild
+++ b/net-dialup/diald/diald-1.0-r1.ebuild
@@ -1,26 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/diald/diald-1.0-r1.ebuild,v 1.8 2005/08/29 05:35:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/diald/diald-1.0-r1.ebuild,v 1.9 2005/09/19 21:14:25 mrness Exp $
 
 # You need SLIP in your kernel to run diald.
 
+inherit eutils
+
 DESCRIPTION="Daemon that provides on demand IP links via SLIP or PPP"
 HOMEPAGE="http://diald.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-DEPEND="sys-libs/pam
-	sys-apps/tcp-wrappers"
-RDEPEND="net-dialup/ppp"
-
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86"
 IUSE=""
 
+DEPEND="sys-libs/pam
+	sys-apps/tcp-wrappers"
+RDEPEND="net-dialup/ppp"
+
 src_unpack() {
-	unpack ${A} ; cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-c-files.patch || die
-	patch -p0 < ${FILESDIR}/${P}-gentoo.patch || die
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-c-files.patch
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
 src_compile() {
diff --git a/net-dialup/diald/files/diald-1.0-c-files.patch b/net-dialup/diald/files/diald-1.0-c-files.patch
index 6a7b276e24d2..0cdb7e642a1b 100644
--- a/net-dialup/diald/files/diald-1.0-c-files.patch
+++ b/net-dialup/diald/files/diald-1.0-c-files.patch
@@ -1,6 +1,7 @@
---- firewall.c	Fri Feb 25 18:03:53 2000
-+++ firewall.c-florin	Wed Mar 28 14:37:57 2001
-@@ -65,7 +65,7 @@
+diff -Nru diald-1.0.orig/firewall.c diald-1.0/firewall.c
+--- diald-1.0.orig/firewall.c	2001-06-16 22:51:39.000000000 +0300
++++ diald-1.0/firewall.c	2005-09-19 23:38:46.099172056 +0300
+@@ -69,7 +69,7 @@
  #if 0
      mon_syslog(LOG_DEBUG,"slot def: %d %d %x %x %x",
  	slot->start, slot->end, slot->wday, slot->mday, slot->month);
diff --git a/net-dialup/diald/files/diald-1.0-gentoo.patch b/net-dialup/diald/files/diald-1.0-gentoo.patch
index c4d78b788dfe..b4cbaa6138bd 100644
--- a/net-dialup/diald/files/diald-1.0-gentoo.patch
+++ b/net-dialup/diald/files/diald-1.0-gentoo.patch
@@ -1,5 +1,6 @@
---- diald.h.mdk	Wed Oct  3 16:46:54 2001
-+++ diald.h	Wed Oct  3 16:47:13 2001
+diff -Nru diald-1.0.orig/diald.h diald-1.0/diald.h
+--- diald-1.0.orig/diald.h	2001-06-16 19:01:25.000000000 +0300
++++ diald-1.0/diald.h	2005-09-19 23:40:47.840664536 +0300
 @@ -11,6 +11,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -8,8 +9,9 @@
  #if HAVE_UNISTD_H
  #  include <unistd.h>
  #endif
---- Makefile.in.mdk	Sat Jun 16 13:16:04 2001
-+++ Makefile.in	Wed Oct  3 18:36:43 2001
+diff -Nru diald-1.0.orig/Makefile.in diald-1.0/Makefile.in
+--- diald-1.0.orig/Makefile.in	2001-06-16 14:16:04.000000000 +0300
++++ diald-1.0/Makefile.in	2005-09-19 23:40:47.855662256 +0300
 @@ -21,9 +21,13 @@
  mandir          = @mandir@
  
diff --git a/net-dialup/fbgetty/Manifest b/net-dialup/fbgetty/Manifest
index 173796b59c4d..69d811c7cfac 100644
--- a/net-dialup/fbgetty/Manifest
+++ b/net-dialup/fbgetty/Manifest
@@ -1,4 +1,4 @@
+MD5 d9f9775b63ffcd8a4d05d43cd143c2e4 fbgetty-0.1.698.ebuild 535
 MD5 48b115691a60c104615be8cb5184802e ChangeLog 763
-MD5 a25fa70b16ca4dc163cf96c952245031 fbgetty-0.1.698.ebuild 510
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 203d43edfc815c963c728bb81ac45c55 files/digest-fbgetty-0.1.698 67