removed older ebuilds and use epatch in the remaining

8 files changed, 26 insertions, 213 deletions

diff --git a/sys-apps/sharutils/ChangeLog b/sys-apps/sharutils/ChangeLog
index b9ab0ffc80b5..0993d985671e 100644
--- a/sys-apps/sharutils/ChangeLog
+++ b/sys-apps/sharutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/sharutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/ChangeLog,v 1.9 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/ChangeLog,v 1.10 2003/03/11 06:25:41 seemant Exp $
+
+*sharutils-4.2.1-r6 (10 Mar 2003)
+
+  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> sharutils-4.2.1-r4.ebuild,
+  sharutils-4.2.1-r4.ebuild, sharutils-4.2.1-r5.ebuild,
+  sharutils-4.2.1-r5.ebuild, sharutils-4.2.1-r6.ebuild:
+  use epatch instead
 
   20 Feb 2003; Zach Welch <zwelch@gentoo.org> sharutuls-4.2.1-r6.ebuild :
   Added arm to keywords.
diff --git a/sys-apps/sharutils/files/digest-sharutils-4.2.1-r4 b/sys-apps/sharutils/files/digest-sharutils-4.2.1-r4
deleted file mode 100644
index afb942300ec9..000000000000
--- a/sys-apps/sharutils/files/digest-sharutils-4.2.1-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b8ba1d409f07edcb335ff72a27bd9828 sharutils-4.2.1.tar.gz 306022
diff --git a/sys-apps/sharutils/files/digest-sharutils-4.2.1-r5 b/sys-apps/sharutils/files/digest-sharutils-4.2.1-r5
deleted file mode 100644
index afb942300ec9..000000000000
--- a/sys-apps/sharutils/files/digest-sharutils-4.2.1-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b8ba1d409f07edcb335ff72a27bd9828 sharutils-4.2.1.tar.gz 306022
diff --git a/sys-apps/sharutils/files/sharutils-4.2.1-r4-gentoo.diff b/sys-apps/sharutils/files/sharutils-4.2.1-r4-gentoo.diff
deleted file mode 100644
index 8b504f587015..000000000000
--- a/sys-apps/sharutils/files/sharutils-4.2.1-r4-gentoo.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -r -C2 sharutils-4.2.1.orig/doc/remsync.texi sharutils-4.2.1/doc/remsync.texi
-*** sharutils-4.2.1.orig/doc/remsync.texi	Thu Nov 30 18:15:37 1995
---- sharutils-4.2.1/doc/remsync.texi	Fri Aug  3 18:57:02 2001
-***************
-*** 8,11 ****
---- 8,15 ----
-  
-  @ifinfo
-+ 
-+ @direntry
-+ * remsync: (remsync).       Synchronize remote files (sharutils).
-+ @end direntry
-  This file documents the @code{remsync} command and friends, which have
-  the purpose of synchronizing remote directory trees using email.
-diff -r -C2 sharutils-4.2.1.orig/doc/sharutils.texi sharutils-4.2.1/doc/sharutils.texi
-*** sharutils-4.2.1.orig/doc/sharutils.texi	Fri Nov 24 21:42:52 1995
---- sharutils-4.2.1/doc/sharutils.texi	Fri Aug  3 18:29:43 2001
-***************
-*** 16,31 ****
-  
-  @ifinfo
-! @format
-! START-INFO-DIR-ENTRY
-  * Shar utilities: (sharutils).          GNU shar utilities.
-! * mail-files: (sharutils)mail-files invocation. Send files to remote site.
-! * mailshar: (sharutils)mailshar invocation.     Make and send a shell archive.
-! * remsync: (sharutils)remsync invocation.       Synchronize remote files.
-! * shar: (sharutils)shar invocation.             Make a shell archive.
-! * unshar: (sharutils)unshar invocation.         Explode a shell archive.
-! * uudecode: (sharutils)uudecode invocation.     Restore file from 7-bits.
-! * uuencode: (sharutils)uuencode invocation.     Force binary file to 7-bits.
-! END-INFO-DIR-ENTRY
-! @end format
-  @end ifinfo
-  
---- 16,22 ----
-  
-  @ifinfo
-! @direntry
-  * Shar utilities: (sharutils).          GNU shar utilities.
-! @end direntry
-  @end ifinfo
-  
diff --git a/sys-apps/sharutils/files/sharutils-4.2.1-r5-gentoo.diff b/sys-apps/sharutils/files/sharutils-4.2.1-r5-gentoo.diff
deleted file mode 100644
index 8b504f587015..000000000000
--- a/sys-apps/sharutils/files/sharutils-4.2.1-r5-gentoo.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -r -C2 sharutils-4.2.1.orig/doc/remsync.texi sharutils-4.2.1/doc/remsync.texi
-*** sharutils-4.2.1.orig/doc/remsync.texi	Thu Nov 30 18:15:37 1995
---- sharutils-4.2.1/doc/remsync.texi	Fri Aug  3 18:57:02 2001
-***************
-*** 8,11 ****
---- 8,15 ----
-  
-  @ifinfo
-+ 
-+ @direntry
-+ * remsync: (remsync).       Synchronize remote files (sharutils).
-+ @end direntry
-  This file documents the @code{remsync} command and friends, which have
-  the purpose of synchronizing remote directory trees using email.
-diff -r -C2 sharutils-4.2.1.orig/doc/sharutils.texi sharutils-4.2.1/doc/sharutils.texi
-*** sharutils-4.2.1.orig/doc/sharutils.texi	Fri Nov 24 21:42:52 1995
---- sharutils-4.2.1/doc/sharutils.texi	Fri Aug  3 18:29:43 2001
-***************
-*** 16,31 ****
-  
-  @ifinfo
-! @format
-! START-INFO-DIR-ENTRY
-  * Shar utilities: (sharutils).          GNU shar utilities.
-! * mail-files: (sharutils)mail-files invocation. Send files to remote site.
-! * mailshar: (sharutils)mailshar invocation.     Make and send a shell archive.
-! * remsync: (sharutils)remsync invocation.       Synchronize remote files.
-! * shar: (sharutils)shar invocation.             Make a shell archive.
-! * unshar: (sharutils)unshar invocation.         Explode a shell archive.
-! * uudecode: (sharutils)uudecode invocation.     Restore file from 7-bits.
-! * uuencode: (sharutils)uuencode invocation.     Force binary file to 7-bits.
-! END-INFO-DIR-ENTRY
-! @end format
-  @end ifinfo
-  
---- 16,22 ----
-  
-  @ifinfo
-! @direntry
-  * Shar utilities: (sharutils).          GNU shar utilities.
-! @end direntry
-  @end ifinfo
-  
diff --git a/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild b/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild
deleted file mode 100644
index 298228e8731a..000000000000
--- a/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild,v 1.10 2003/02/13 16:14:48 vapier Exp $
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Tools to deal with shar archives"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/sharutils/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/sharutils/"
-KEYWORDS="x86"
-SLOT="0"
-LICENSE="GPL-2"
-DEPEND="virtual/glibc sys-apps/texinfo >=sys-devel/gettext-0.10.35"
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-	cd ${S}/po
-	mv nl.po nl.po.orig
-	sed -e 's/aangemaakt/aangemaakt\\n/' nl.po.orig > nl.po
-	mv pt.po pt.po.orig
-	sed -e 's/de %dk/de %dk\\n/' pt.po.orig > pt.po
-}
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/usr || die
-	make ${MAKEOPTS} localedir=/usr/share/locale || die
-}
-
-src_install() {
-	make prefix=${D}/usr localedir=${D}/usr/share/locale \
-		infodir=${D}/usr/share/info install || die
-
-	doman doc/*.[15]
-        #Remove some strange locals
-	cd ${D}/usr/share/locale
-	for i in *.
-	do
-		rm -rf ${i}
-	done
-	rm -rf ${D}/usr/lib
-
-	cd ${S}
-	dodoc AUTHORS BACKLOG COPYING ChangeLog ChangeLog.OLD \
-	      NEWS README README.OLD THANKS TODO
-}
diff --git a/sys-apps/sharutils/sharutils-4.2.1-r5.ebuild b/sys-apps/sharutils/sharutils-4.2.1-r5.ebuild
deleted file mode 100644
index 4286926bf5ff..000000000000
--- a/sys-apps/sharutils/sharutils-4.2.1-r5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/sharutils-4.2.1-r5.ebuild,v 1.11 2003/02/13 16:14:54 vapier Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Tools to deal with shar archives"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/sharutils/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/sharutils/"
-KEYWORDS="x86 ppc sparc alpha"
-SLOT="0"
-LICENSE="GPL-2"
-DEPEND="virtual/glibc sys-apps/texinfo
-		nls? ( >=sys-devel/gettext-0.10.35 )"
-RDEPEND="virtual/glibc"
-
-
-src_unpack() {
-
-	 unpack ${A}
-	 cd ${WORKDIR}
-	 patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-	 cd ${S}/po
-	 mv nl.po nl.po.orig
-	 sed -e 's/aangemaakt/aangemaakt\\n/' nl.po.orig > nl.po
-	 mv pt.po pt.po.orig
-	 sed -e 's/de %dk/de %dk\\n/' pt.po.orig > pt.po
-
-}
-
-src_compile() {
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure --host=${CHOST} --prefix=/usr ${myconf} || die
-	make ${MAKEOPTS} localedir=/usr/share/locale || die
-}
-
-src_install() {
-
-	make \
-		prefix=${D}/usr \
-		localedir=${D}/usr/share/locale \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	doman doc/*.[15]
-	#Remove some strange locals
-	cd ${D}/usr/share/locale
-	for i in *.
-	do
-	   rm -rf ${i}
-	done
-	rm -rf ${D}/usr/lib
-
-	cd ${S}
-	dodoc AUTHORS BACKLOG COPYING ChangeLog ChangeLog.OLD \
-		NEWS README README.OLD THANKS TODO
-}
-
-
diff --git a/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild b/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild
index 1ae2f57f70ce..cc15b5cae58d 100644
--- a/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild
+++ b/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild
@@ -1,31 +1,34 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild,v 1.6 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/sharutils-4.2.1-r6.ebuild,v 1.7 2003/03/11 06:25:41 seemant Exp $
+
+inherit eutils
 
 IUSE="nls"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Tools to deal with shar archives"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/sharutils/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/sharutils/"
-KEYWORDS="x86 ppc sparc alpha hppa arm"
+SRC_URI="ftp://prep.ai.mit.edu/gnu/sharutils/${P}.tar.gz"
+
 SLOT="0"
 LICENSE="GPL-2"
-DEPEND="virtual/glibc 
-	sys-apps/texinfo
+KEYWORDS="x86 ppc sparc alpha hppa arm"
+
+DEPEND="sys-apps/texinfo
 	nls? ( >=sys-devel/gettext-0.10.35 )"
-RDEPEND="virtual/glibc"
 
 
 src_unpack() {
-	 unpack ${A}
-	 cd ${WORKDIR}
-	 patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-	 cd ${S}/po
-	 mv nl.po nl.po.orig
-	 sed -e 's/aangemaakt/aangemaakt\\n/' nl.po.orig > nl.po
-	 mv pt.po pt.po.orig
-	 sed -e 's/de %dk/de %dk\\n/' pt.po.orig > pt.po
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+
+	cd ${S}/po
+	mv nl.po nl.po.orig
+	sed -e 's/aangemaakt/aangemaakt\\n/' nl.po.orig > nl.po
+	mv pt.po pt.po.orig
+	sed -e 's/de %dk/de %dk\\n/' pt.po.orig > pt.po
 }
 
 src_compile() {
@@ -48,7 +51,7 @@ src_install() {
 	cd ${D}/usr/share/locale
 	for i in *.
 	do
-	   rm -rf ${i}
+	  rm -rf ${i}
 	done
 	rm -rf ${D}/usr/lib