Version bump.

(Portage version: 2.0.53)

4 files changed, 71 insertions, 4 deletions

diff --git a/dev-util/wiggle/ChangeLog b/dev-util/wiggle/ChangeLog
index 67295ae4fd66..e036ee9e59e7 100644
--- a/dev-util/wiggle/ChangeLog
+++ b/dev-util/wiggle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/wiggle
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.9 2005/05/07 20:52:25 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.10 2005/12/12 05:14:14 robbat2 Exp $
+
+*wiggle-0.6-r2 (12 Dec 2005)
+
+  12 Dec 2005; Robin H. Johnson <robbat2@gentoo.org> +wiggle-0.6-r2.ebuild:
+  Version bump.
 
   07 May 2005; David Holm <dholm@gentoo.org> wiggle-0.6-r1.ebuild:
   Added to ~ppc.
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index 83c865238da9..e62462e32455 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -1,6 +1,8 @@
 MD5 3f3c62e977c5ece83b3b1386a12486d1 ChangeLog 1189
-MD5 07d51946b916f872c3f63c3a36ea67ac wiggle-0.6.ebuild 1369
-MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
-MD5 7d858e6b3532661799f056b31b00ede3 wiggle-0.6-r1.ebuild 1404
 MD5 097781a88abb09af012392ea63343a56 files/digest-wiggle-0.6 140
 MD5 e63e88bd529fc22cd865bb73590bf043 files/digest-wiggle-0.6-r1 140
+MD5 385d714fdddb8d48d27122d60f13ed1f files/digest-wiggle-0.6-r2 140
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+MD5 7d858e6b3532661799f056b31b00ede3 wiggle-0.6-r1.ebuild 1404
+MD5 ecbebef8019a01d58ee3e43c21c00b31 wiggle-0.6-r2.ebuild 1426
+MD5 07d51946b916f872c3f63c3a36ea67ac wiggle-0.6.ebuild 1369
diff --git a/dev-util/wiggle/files/digest-wiggle-0.6-r2 b/dev-util/wiggle/files/digest-wiggle-0.6-r2
new file mode 100644
index 000000000000..24e063d48fa4
--- /dev/null
+++ b/dev-util/wiggle/files/digest-wiggle-0.6-r2
@@ -0,0 +1,2 @@
+MD5 b968453864315da4608a733299d992f1 wiggle-0.6-patches-20051211.tar.bz2 9462
+MD5 1884607cdebaf730737cb99b2909219b wiggle-0.6.tar.gz 514638
diff --git a/dev-util/wiggle/wiggle-0.6-r2.ebuild b/dev-util/wiggle/wiggle-0.6-r2.ebuild
new file mode 100644
index 000000000000..da8ddeda1239
--- /dev/null
+++ b/dev-util/wiggle/wiggle-0.6-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/wiggle-0.6-r2.ebuild,v 1.1 2005/12/12 05:14:14 robbat2 Exp $
+
+inherit eutils
+
+PATCHDATE=20051211
+PATCHBALL=${P}-patches-${PATCHDATE}
+DESCRIPTION="program for applying patches that patch cannot apply because of conflicting changes"
+HOMEPAGE="http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/"
+SRC_URI="http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/${P}.tar.gz
+	mirror://gentoo/${PATCHBALL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+# 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'
+RDEPEND="dev-util/diffstat
+	dev-util/patchutils
+	sys-apps/diffutils
+	sys-apps/findutils
+	sys-apps/gawk
+	sys-apps/grep
+	sys-apps/less
+	sys-apps/sed
+	sys-apps/coreutils
+	sys-devel/patch"
+DEPEND="${RDEPEND}
+	sys-apps/groff
+	sys-process/time"
+
+PATCHLIST="001NoQuietTime 002SpecFile 003Recommit 004ExtractFix 005Pchanges
+007Stuff" 
+# excluded: 006NoDebug 008NewMerge2
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	for i in ${PATCHLIST}; do
+		epatch ${WORKDIR}/${PATCHBALL}/${i}
+	done;
+}
+
+src_compile() {
+	emake OptDbg="${CFLAGS}" || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dobin p
+	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps p.help notes
+}