Bug #132450, various cleanups.

(Portage version: 2.1_pre10-r5)

6 files changed, 95 insertions, 4 deletions

diff --git a/dev-util/wiggle/ChangeLog b/dev-util/wiggle/ChangeLog
index 34d70bc3b06c..f050047c3903 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.11 2005/12/29 17:47:21 dang Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.12 2006/05/13 08:18:06 robbat2 Exp $
+
+*wiggle-0.6-r3 (13 May 2006)
+
+  13 May 2006; Robin H. Johnson <robbat2@gentoo.org> +wiggle-0.6-r3.ebuild:
+  Bug #132450, various cleanups.
 
   29 Dec 2005; <dang@gentoo.org> wiggle-0.6-r2.ebuild:
   Marked ~amd64 Per bug #116881
diff --git a/dev-util/wiggle/files/digest-wiggle-0.6 b/dev-util/wiggle/files/digest-wiggle-0.6
index 21fdf90e6e7e..f386a8be0124 100644
--- a/dev-util/wiggle/files/digest-wiggle-0.6
+++ b/dev-util/wiggle/files/digest-wiggle-0.6
@@ -1,2 +1,6 @@
-MD5 1884607cdebaf730737cb99b2909219b wiggle-0.6.tar.gz 514638
 MD5 dddaf6116baea2bdb6dc16a4963809e9 wiggle-0.6-patches-20030611.tar.bz2 3049
+RMD160 cad410a381fa138f71f351e715c9a2b840ab090e wiggle-0.6-patches-20030611.tar.bz2 3049
+SHA256 1f3a624375600238fc067e08e31a7288efc52dbf621b3298e640fed4c5e5c8ca wiggle-0.6-patches-20030611.tar.bz2 3049
+MD5 1884607cdebaf730737cb99b2909219b wiggle-0.6.tar.gz 514638
+RMD160 7e2686b4887f17c6bdc0e13f3a4e45e62f30805a wiggle-0.6.tar.gz 514638
+SHA256 639f8bd48c58b1fa4f24a65bc8aa3e53219e7d48726e63e7c40f0701d1d89b9c wiggle-0.6.tar.gz 514638
diff --git a/dev-util/wiggle/files/digest-wiggle-0.6-r1 b/dev-util/wiggle/files/digest-wiggle-0.6-r1
index 6b35f38daeab..a0efdf72575f 100644
--- a/dev-util/wiggle/files/digest-wiggle-0.6-r1
+++ b/dev-util/wiggle/files/digest-wiggle-0.6-r1
@@ -1,2 +1,6 @@
-MD5 1884607cdebaf730737cb99b2909219b wiggle-0.6.tar.gz 514638
 MD5 a1ea2ed602c26bd1aadf1d41a88c3608 wiggle-0.6-patches-20040627.tar.bz2 4808
+RMD160 035c9237b2f9f7e8380059be34cac44307dc4cab wiggle-0.6-patches-20040627.tar.bz2 4808
+SHA256 f76ceb6a266c8f863d0747eae865f7b33822c5d0728632d90763e2c129ed15b9 wiggle-0.6-patches-20040627.tar.bz2 4808
+MD5 1884607cdebaf730737cb99b2909219b wiggle-0.6.tar.gz 514638
+RMD160 7e2686b4887f17c6bdc0e13f3a4e45e62f30805a wiggle-0.6.tar.gz 514638
+SHA256 639f8bd48c58b1fa4f24a65bc8aa3e53219e7d48726e63e7c40f0701d1d89b9c wiggle-0.6.tar.gz 514638
diff --git a/dev-util/wiggle/files/digest-wiggle-0.6-r2 b/dev-util/wiggle/files/digest-wiggle-0.6-r2
index 24e063d48fa4..d9b7410f9960 100644
--- a/dev-util/wiggle/files/digest-wiggle-0.6-r2
+++ b/dev-util/wiggle/files/digest-wiggle-0.6-r2
@@ -1,2 +1,6 @@
 MD5 b968453864315da4608a733299d992f1 wiggle-0.6-patches-20051211.tar.bz2 9462
+RMD160 754ed977d5b40a58f34a8c3e15a606f3d342109f wiggle-0.6-patches-20051211.tar.bz2 9462
+SHA256 7277079046c64145fc9627c895c4c0b202499d93277716973c2a95081e2147d0 wiggle-0.6-patches-20051211.tar.bz2 9462
 MD5 1884607cdebaf730737cb99b2909219b wiggle-0.6.tar.gz 514638
+RMD160 7e2686b4887f17c6bdc0e13f3a4e45e62f30805a wiggle-0.6.tar.gz 514638
+SHA256 639f8bd48c58b1fa4f24a65bc8aa3e53219e7d48726e63e7c40f0701d1d89b9c wiggle-0.6.tar.gz 514638
diff --git a/dev-util/wiggle/files/digest-wiggle-0.6-r3 b/dev-util/wiggle/files/digest-wiggle-0.6-r3
new file mode 100644
index 000000000000..61508cbb2a4c
--- /dev/null
+++ b/dev-util/wiggle/files/digest-wiggle-0.6-r3
@@ -0,0 +1,6 @@
+MD5 c75f4c3771b2ab2d93927dc51c03b500 wiggle-0.6-patches-20060513.tar.bz2 11850
+RMD160 f9a267dd57ffb45ed8c4c24cb1aa0f8fb5fa15a1 wiggle-0.6-patches-20060513.tar.bz2 11850
+SHA256 1477859efaa4a999c545e1ca6875f90feeb0c41231b5b1888a24485a215cddf3 wiggle-0.6-patches-20060513.tar.bz2 11850
+MD5 1884607cdebaf730737cb99b2909219b wiggle-0.6.tar.gz 514638
+RMD160 7e2686b4887f17c6bdc0e13f3a4e45e62f30805a wiggle-0.6.tar.gz 514638
+SHA256 639f8bd48c58b1fa4f24a65bc8aa3e53219e7d48726e63e7c40f0701d1d89b9c wiggle-0.6.tar.gz 514638
diff --git a/dev-util/wiggle/wiggle-0.6-r3.ebuild b/dev-util/wiggle/wiggle-0.6-r3.ebuild
new file mode 100644
index 000000000000..9c7e77a755cd
--- /dev/null
+++ b/dev-util/wiggle/wiggle-0.6-r3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/wiggle-0.6-r3.ebuild,v 1.1 2006/05/13 08:18:06 robbat2 Exp $
+
+inherit eutils fixheadtails toolchain-funcs
+
+PATCHDATE=20060513
+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="~amd64 ~ppc ~x86"
+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 010BestBugFix"
+# excluded: 006NoDebug 008NewMerge2 009Stuff
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	for i in ${PATCHLIST}; do
+		epatch ${WORKDIR}/${PATCHBALL}/${i}
+	done;
+
+	# Fix the reference to the help file so `p help' works
+	sed -i 's,$0.help,/usr/share/wiggle/p.help,' p
+
+	# Don't add Neil Brown's default sign off lign to every patch
+	sed -i '/$CERT/,+4s,^,#,' p
+
+	ht_fix_file p
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" OptDbg="${CFLAGS}" wiggle || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dobin p
+	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes
+	insinto /usr/share/wiggle
+	doins p.help
+}