Version bump, alerted to it by upstream author.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

3 files changed, 70 insertions, 12 deletions

diff --git a/dev-util/wiggle/ChangeLog b/dev-util/wiggle/ChangeLog
index c78b7694cd32..8ad1550eac76 100644
--- a/dev-util/wiggle/ChangeLog
+++ b/dev-util/wiggle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/wiggle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.19 2010/01/10 22:30:18 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.20 2010/03/24 18:15:28 robbat2 Exp $
+
+*wiggle-0.8 (24 Mar 2010)
+
+  24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +wiggle-0.8.ebuild:
+  Version bump, alerted to it by upstream author.
 
   10 Jan 2010; Jonathan Callen <abcd@gentoo.org> wiggle-0.6-r3.ebuild:
   QA: die on failure, spelling fix; add prefix keywords
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index e570c14c8bf9..8aa3633c2ae6 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST wiggle-0.6-patches-20060513.tar.bz2 11850 RMD160 f9a267dd57ffb45ed8c4c24cb1aa0f8fb5fa15a1 SHA1 9c7ca333087b84fd831833cb262d153844acfb4e SHA256 1477859efaa4a999c545e1ca6875f90feeb0c41231b5b1888a24485a215cddf3
 DIST wiggle-0.6.tar.gz 514638 RMD160 7e2686b4887f17c6bdc0e13f3a4e45e62f30805a SHA1 2ed54a1d462f3e80029df83aebe3f0054c5aa4c9 SHA256 639f8bd48c58b1fa4f24a65bc8aa3e53219e7d48726e63e7c40f0701d1d89b9c
+DIST wiggle-0.8.tar.gz 2097175 RMD160 1dfa3a9b35c8b54b796964318ae06a8cded7ff35 SHA1 1aaa44677daeefe085c4398473e617a366d8a779 SHA256 f8bf7981f5e5811dcf6c519c5e335031a1c9b7833c919a2c5707ac8d5524b94a
 EBUILD wiggle-0.6-r3.ebuild 2182 RMD160 2ea6fcb3cce9157c7e4bcfd1572b2457f448aba0 SHA1 3d3cfb50662951fee503b4ac46277232e8806c88 SHA256 02339c358346d78059c0d70a62815b24a57eb59d8f0496187b8b4315ba28da80
-MISC ChangeLog 2317 RMD160 0fd53e2b30916c07fe7da92783296b50c2956058 SHA1 0dbb11b8bd42c3437045e7dabd5a31b7b433087a SHA256 a76908633b8e1f68fa6aaeecdb6d4b3b5029a7934f083f9700389a87284a1b3a
+EBUILD wiggle-0.8.ebuild 1870 RMD160 1e73b9d72abfdb5f043ee111317324e827f236a9 SHA1 8f5000c627b18894fe6fe34e3625ce1bfa5b587a SHA256 fb06861cfcb781cdd2464b0bd8aa01ba36635399e6db7c0187d63d420dbf71b6
+MISC ChangeLog 2471 RMD160 27f1e9406e2139a4714deb7d1fffb6a848ab757e SHA1 637cf9d83f67a1f812c7bd2a6c08be9fe2fc4da4 SHA256 299d77665d13a269dfffdaf2033b6faad82b6ca83efd0f50eec37bf74220cbd9
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktKVQQACgkQOypDUo0oQOr/pQCcCB3D6jogy/U5I5k7N7SyHIPQ
-+0sAn17b0B+rgGt16oI3KtL+pxhurZDR
-=TnSz
------END PGP SIGNATURE-----
diff --git a/dev-util/wiggle/wiggle-0.8.ebuild b/dev-util/wiggle/wiggle-0.8.ebuild
new file mode 100644
index 000000000000..5f87bb974847
--- /dev/null
+++ b/dev-util/wiggle/wiggle-0.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/wiggle-0.8.ebuild,v 1.1 2010/03/24 18:15:28 robbat2 Exp $
+
+inherit eutils fixheadtails toolchain-funcs
+
+DESCRIPTION="program for applying patches that patch cannot apply because of conflicting changes"
+HOMEPAGE="http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle"
+SRC_URI="http://neil.brown.name/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# 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
+	test? ( sys-process/time )"
+
+src_unpack() {
+	use prefix || EPREFIX=
+	unpack ${A}
+	cd "${S}"
+
+	# Fix the reference to the help file so `p help' works
+	sed -i "s:\$0.help:${EPREFIX}/usr/share/wiggle/p.help:" p || die "sed failed on p"
+
+	# Don't add Neil Brown's default sign off line to every patch
+	sed -i '/$CERT/,+4s,^,#,' p || die "sed failed on p"
+
+	# Use prefixed time binary
+	sed -i "s:/usr/bin/time:${EPREFIX}/usr/bin/time:" dotest || die "sed failed on dotest"
+
+	ht_fix_file p
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" \
+		wiggle || die "emake wiggle failed."
+}
+
+src_install() {
+	dobin wiggle p || die "failed to install binaries"
+	doman wiggle.1 || die "failed to install man page"
+	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes || die "failed to install docs"
+	insinto /usr/share/wiggle
+	doins p.help || die "failed to install help file"
+}