small fix0rs

3 files changed, 24 insertions, 16 deletions

diff --git a/dev-util/wiggle/ChangeLog b/dev-util/wiggle/ChangeLog
index e8231d8ea528..0ef4c18520bc 100644
--- a/dev-util/wiggle/ChangeLog
+++ b/dev-util/wiggle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/wiggle
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.1 2003/06/11 23:28:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.2 2003/06/14 11:26:46 seemant Exp $
+
+  14 Jun 2003; Seemant Kulleen <seemant@gentoo.org> wiggle-0.6.ebuild:
+  sandbox violation fix, epatch for patching
 
 *wiggle-0.6 (11 Jun 2003)
 
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index e4c9392ac5a1..52416d6bbf73 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -1,3 +1,3 @@
-MD5 8778a6e843bcdaa562e639ee8edc4789 wiggle-0.6.ebuild 1506
-MD5 909d7602cadb8e71f9d07e9b8c322efd ChangeLog 407
+MD5 f78af5c63e42e21c28761bba9b8a8218 wiggle-0.6.ebuild 1467
+MD5 da98669c09725628f426a6e22031779c ChangeLog 524
 MD5 097781a88abb09af012392ea63343a56 files/digest-wiggle-0.6 140
diff --git a/dev-util/wiggle/wiggle-0.6.ebuild b/dev-util/wiggle/wiggle-0.6.ebuild
index 07a3b5e17155..701ddccc76f0 100644
--- a/dev-util/wiggle/wiggle-0.6.ebuild
+++ b/dev-util/wiggle/wiggle-0.6.ebuild
@@ -1,17 +1,23 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/wiggle-0.6.ebuild,v 1.1 2003/06/11 23:28:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/wiggle-0.6.ebuild,v 1.2 2003/06/14 11:26:46 seemant Exp $
+
+IUSE=""
+
+S=${WORKDIR}/${P}
+
+PATCHDATE=20030611
+PATCHBALL=${P}-patches-${PATCHDATE}
 
 DESCRIPTION="Wiggle is a program for applying patches that patch cannot apply because of conflicting changes"
 HOMEPAGE="http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/"
-LICENSE="GPL-2"
+SRC_URI="http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/${P}.tar.gz
+	mirror://gentoo/${PATCHBALL}.tar.bz2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="~x86"
-IUSE=""
 
-PATCHDATE=20030611
-PATCHBALL=${P}-patches-${PATCHDATE}
-SRC_URI="http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/${P}.tar.gz mirror://gentoo/${PATCHBALL}.tar.bz2"
 
 # The 'p' tool does support bitkeeper, but I'm against just dumping it in here due to it's size.
 # I've explictly listed every other dependancy here due to the nature of the shell program 'p'
@@ -27,21 +33,20 @@ RDEPEND="dev-util/diffstat
 		sys-apps/sh-utils
 		sys-apps/textutils
 		sys-devel/patch"
+
 DEPEND="${RDEPEND}
 		sys-apps/groff
 		sys-apps/time"
 
-S=${WORKDIR}/${P}
 
 PATCHLIST="001NoQuietTime 002SpecFile 003Recommit"
 
 src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	unpack ${PATCHBALL}.tar.bz2
+	unpack ${A}
+
 	cd ${S}
 	for i in ${PATCHLIST}; do
-		patch <${WORKDIR}/${PATCHBALL}/${i}
+		epatch ${WORKDIR}/${PATCHBALL}/${i}
 	done;
 }
 
@@ -50,9 +55,9 @@ src_compile() {
 }
 
 src_install() {
+	make DESTDIR=${D} install || die
+
 	into /usr
-	einstall || die
 	dobin p
 	dodoc ANNOUNCE COPYING INSTALL TODO DOC/diff.ps p.help notes
-	prepalldocs
 }