dev-util/wiggle: Version BUmp

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 26 insertions, 91 deletions

diff --git a/dev-util/wiggle/ChangeLog b/dev-util/wiggle/ChangeLog
index 3a45198887bf..ac9d6442c76f 100644
--- a/dev-util/wiggle/ChangeLog
+++ b/dev-util/wiggle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/wiggle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.24 2012/02/16 18:40:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.25 2012/06/09 15:49:18 jlec Exp $
+
+*wiggle-0.9 (09 Jun 2012)
+
+  09 Jun 2012; Justin Lecher <jlec@gentoo.org> -wiggle-0.6-r3.ebuild,
+  -wiggle-0.8.ebuild, +wiggle-0.9.ebuild, metadata.xml:
+  Version BUmp
 
   16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> wiggle-0.8-r1.ebuild:
   x86 stable wrt bug #397031
diff --git a/dev-util/wiggle/metadata.xml b/dev-util/wiggle/metadata.xml
index a732fd8b2f03..7d6a78bb042a 100644
--- a/dev-util/wiggle/metadata.xml
+++ b/dev-util/wiggle/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
-        <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/wiggle/wiggle-0.6-r3.ebuild b/dev-util/wiggle/wiggle-0.6-r3.ebuild
deleted file mode 100644
index 7b87cece6ebb..000000000000
--- a/dev-util/wiggle/wiggle-0.6-r3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.6-r3.ebuild,v 1.6 2010/01/10 22:30:18 abcd 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 ~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 )"
-
-PATCHLIST="001NoQuietTime 002SpecFile 003Recommit 004ExtractFix 005Pchanges
-007Stuff 010BestBugFix"
-# excluded: 006NoDebug 008NewMerge2 009Stuff
-
-src_unpack() {
-	use prefix || EPREFIX=
-	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:${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"
-}
diff --git a/dev-util/wiggle/wiggle-0.8.ebuild b/dev-util/wiggle/wiggle-0.9.ebuild
index 5f87bb974847..92777efe5aa0 100644
--- a/dev-util/wiggle/wiggle-0.8.ebuild
+++ b/dev-util/wiggle/wiggle-0.9.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/wiggle-0.9.ebuild,v 1.1 2012/06/09 15:49:18 jlec Exp $
 
-inherit eutils fixheadtails toolchain-funcs
+EAPI=4
+
+inherit eutils fixheadtails flag-o-matic 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"
@@ -16,7 +18,8 @@ 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
+RDEPEND="
+	dev-util/diffstat
 	dev-util/patchutils
 	sys-apps/diffutils
 	sys-apps/findutils
@@ -30,11 +33,7 @@ DEPEND="${RDEPEND}
 	sys-apps/groff
 	test? ( sys-process/time )"
 
-src_unpack() {
-	use prefix || EPREFIX=
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# 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"
 
@@ -45,17 +44,18 @@ src_unpack() {
 	sed -i "s:/usr/bin/time:${EPREFIX}/usr/bin/time:" dotest || die "sed failed on dotest"
 
 	ht_fix_file p
+
+	append-cppflags -I.
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" \
-		wiggle || die "emake wiggle failed."
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" ${PN}
 }
 
 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"
+	dobin wiggle p
+	doman wiggle.1
+	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes
 	insinto /usr/share/wiggle
-	doins p.help || die "failed to install help file"
+	doins p.help
 }