Bug #132450, various cleanups.

Package-Manager: portage-2.1_pre10-r5

7 files changed, 133 insertions, 19 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/Manifest b/dev-util/wiggle/Manifest
index 86beefa9cdbf..2f072ff55125 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -1,18 +1,41 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8e9860c487a5152518eb83081acd0e4a ChangeLog 1400
-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
+DIST wiggle-0.6-patches-20030611.tar.bz2 3049 RMD160 cad410a381fa138f71f351e715c9a2b840ab090e SHA256 1f3a624375600238fc067e08e31a7288efc52dbf621b3298e640fed4c5e5c8ca size 3049
+DIST wiggle-0.6-patches-20040627.tar.bz2 4808 RMD160 035c9237b2f9f7e8380059be34cac44307dc4cab SHA256 f76ceb6a266c8f863d0747eae865f7b33822c5d0728632d90763e2c129ed15b9 size 4808
+DIST wiggle-0.6-patches-20051211.tar.bz2 9462 RMD160 754ed977d5b40a58f34a8c3e15a606f3d342109f SHA256 7277079046c64145fc9627c895c4c0b202499d93277716973c2a95081e2147d0 size 9462
+DIST wiggle-0.6-patches-20060513.tar.bz2 11850 RMD160 f9a267dd57ffb45ed8c4c24cb1aa0f8fb5fa15a1 SHA256 1477859efaa4a999c545e1ca6875f90feeb0c41231b5b1888a24485a215cddf3 size 11850
+DIST wiggle-0.6.tar.gz 514638 RMD160 7e2686b4887f17c6bdc0e13f3a4e45e62f30805a SHA256 639f8bd48c58b1fa4f24a65bc8aa3e53219e7d48726e63e7c40f0701d1d89b9c size 514638
+EBUILD wiggle-0.6-r1.ebuild 1404 RMD160 cfc2835174efff33cdc54b43be64a8f9c0138437 SHA1 11e105ddb00f242d6aae81ce4a0fbefd135ad9ba SHA256 be456d7f4a2424d17c1109a9ed0c3e755a42410a55881b7ec3af75a9a0aee9e0 size 1404
 MD5 7d858e6b3532661799f056b31b00ede3 wiggle-0.6-r1.ebuild 1404
+RMD160 cfc2835174efff33cdc54b43be64a8f9c0138437 wiggle-0.6-r1.ebuild 1404
+SHA256 be456d7f4a2424d17c1109a9ed0c3e755a42410a55881b7ec3af75a9a0aee9e0 wiggle-0.6-r1.ebuild 1404
+EBUILD wiggle-0.6-r2.ebuild 1456 RMD160 551a1f0f0b701f4d72db551010e4f3e46b857181 SHA1 0482f48b0420f70e9595168860692429d9446f65 SHA256 b8a76b20542817ad3579922b15f3c4ec394f8c8a5668fff2a34f1bf8b03a8f05 size 1456
 MD5 1bd6832685aae7c0bf3373d3f7079a8c wiggle-0.6-r2.ebuild 1456
+RMD160 551a1f0f0b701f4d72db551010e4f3e46b857181 wiggle-0.6-r2.ebuild 1456
+SHA256 b8a76b20542817ad3579922b15f3c4ec394f8c8a5668fff2a34f1bf8b03a8f05 wiggle-0.6-r2.ebuild 1456
+EBUILD wiggle-0.6-r3.ebuild 1783 RMD160 34974e5a5544289064970ea09d29f038c8302b02 SHA1 46dbc22b3391d812874e8f759ace6fbcb6527f05 SHA256 088622c9f6dd5375340fad63e3b98ce854919407bfb5b08dfbfa866c284ba9b7 size 1783
+MD5 6f7d9f8a3e2d4db16c7b6b3cbbe11c5a wiggle-0.6-r3.ebuild 1783
+RMD160 34974e5a5544289064970ea09d29f038c8302b02 wiggle-0.6-r3.ebuild 1783
+SHA256 088622c9f6dd5375340fad63e3b98ce854919407bfb5b08dfbfa866c284ba9b7 wiggle-0.6-r3.ebuild 1783
+EBUILD wiggle-0.6.ebuild 1369 RMD160 ccf71e2f9be140863646ac8e4272775b851ac61b SHA1 55099d7c83a0ed28adeb7ec9fecc0c560fb505fa SHA256 5b3ae086dee79a6d93c3d1a7c027a33c1723df0e70200c4cbc925d84b4850fc4 size 1369
 MD5 07d51946b916f872c3f63c3a36ea67ac wiggle-0.6.ebuild 1369
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDtCFzomPajV0RnrERAlB2AJ0Sw+59vLhxTBr5M2LAY3hCwI16dwCeISSx
-7TY53UfX0g7raP3KYbgBHSI=
-=gzDX
------END PGP SIGNATURE-----
+RMD160 ccf71e2f9be140863646ac8e4272775b851ac61b wiggle-0.6.ebuild 1369
+SHA256 5b3ae086dee79a6d93c3d1a7c027a33c1723df0e70200c4cbc925d84b4850fc4 wiggle-0.6.ebuild 1369
+MISC ChangeLog 1543 RMD160 347ef055487b425df3923c4dc2634edfd409147e SHA1 f5b6aeeca2386abca006ea5f2fae2bf3c212302a SHA256 c298b5cf5665c22abcb5776c563947b82ae520f0cee495bad96c3fb86ddfc4b4 size 1543
+MD5 143cad8b0725cd53331357b2f24eb9e6 ChangeLog 1543
+RMD160 347ef055487b425df3923c4dc2634edfd409147e ChangeLog 1543
+SHA256 c298b5cf5665c22abcb5776c563947b82ae520f0cee495bad96c3fb86ddfc4b4 ChangeLog 1543
+MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543 size 279
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f metadata.xml 279
+SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543 metadata.xml 279
+MD5 8f3320be3704d989926a19eab87d51f8 files/digest-wiggle-0.6 512
+RMD160 e8c6c47e77112d6299710b47990ebc96738b2da0 files/digest-wiggle-0.6 512
+SHA256 defaff2f993f12e0bb98abb9bb62cc45e1b2593e1616f76bcf5b471441835bd9 files/digest-wiggle-0.6 512
+MD5 0b03c1b1b1a927d90d9894533a59be9e files/digest-wiggle-0.6-r1 512
+RMD160 5063146e4c64a790dab153324e176a759baa438b files/digest-wiggle-0.6-r1 512
+SHA256 7c9bd8dc152ea25378ce1aca3405b3cc390e53b0898b0ba42239109e9c149df6 files/digest-wiggle-0.6-r1 512
+MD5 7e57da53361f2aea7c99c64ff1b00521 files/digest-wiggle-0.6-r2 512
+RMD160 5cbeb4966904535b29fff8a181fc0c7400f9bd6a files/digest-wiggle-0.6-r2 512
+SHA256 dd7a200c8fe63ed5b8f9d2299a127f6749abd89434febcf77bf63164e382618e files/digest-wiggle-0.6-r2 512
+MD5 035c313f894fd671f4028a174c289042 files/digest-wiggle-0.6-r3 515
+RMD160 18540fef963f11e900af89ca19a59bf55aca2299 files/digest-wiggle-0.6-r3 515
+SHA256 5ed2efffc500fcee46e2fa9c899d84be8761e50c5035092e51a9b05e03e77545 files/digest-wiggle-0.6-r3 515
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
+}