Clean up patches. Fix phases, remove ebegin/eend, make sed die().

Package-Manager: portage-2.2.0_alpha19/cvs/Linux i686

5 files changed, 40 insertions, 40 deletions

diff --git a/app-text/an/ChangeLog b/app-text/an/ChangeLog
index c6cc6f11be7c..5a6a61ef8709 100644
--- a/app-text/an/ChangeLog
+++ b/app-text/an/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/an
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/an/ChangeLog,v 1.27 2010/06/27 20:34:25 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/an/ChangeLog,v 1.28 2011/01/25 02:50:58 jer Exp $
+
+  25 Jan 2011; Jeroen Roovers <jer@gentoo.org> an-0.95.3.ebuild,
+  files/an-0.95-make.patch, files/an_0.95-3.diff:
+  Clean up patches. Fix phases, remove ebegin/eend, make sed die().
 
 *an-0.95.3.2 (27 Jun 2010)
 
diff --git a/app-text/an/Manifest b/app-text/an/Manifest
index 9d312ee8c39e..bad379557841 100644
--- a/app-text/an/Manifest
+++ b/app-text/an/Manifest
@@ -1,8 +1,8 @@
-AUX an-0.95-make.patch 807 RMD160 dca29995e857aee472777afd6f31ed1e25663488 SHA1 fcbdb01095bbac1b75fb52ca806f8195a680f654 SHA256 a964b39f30e1d5f6263968f24c603acb0525e6a152703ce32c534fc50ebf0580
-AUX an_0.95-3.diff 9803 RMD160 cc567e20cce82dd7e45cbb741a07bad8d95c2e96 SHA1 ce1d798aac40edef804fee77e33a356ac879a655 SHA256 fbb795b791b423e0d9b1b4a68255e57dec3db8926687b942df77f6166ba0bbd3
+AUX an-0.95-make.patch 661 RMD160 86c355eb57d5ca1b945056d6dd4abc72cbc88054 SHA1 223ea2e5dd46784ab4bc0cf8c5bc1fd5e05b5c04 SHA256 530edfa7dc335c2e18424a9a86dae1648a2faa9d1e43e5da7a93f78dd375ef84
+AUX an_0.95-3.diff 9793 RMD160 895c2eb2ca4d2336872c37e313dd4435f5f2d3be SHA1 e3ade3cd93f29132dcfeb6aab74cb434ffda0fd0 SHA256 ba9751e7a43d543515cf0f182f029aea127163ec3ed0c2934cc673aa0fb21816
 DIST an_0.95-3.2.diff.gz 5530 RMD160 213fa4a424fec5039af18d82b76311b10ff0bc38 SHA1 c7de943fb51376dd477b4283138a6f04e4c336ea SHA256 6b0b7a42f39abac072e5a20aa1f13e616b46e97a37dc3d6baa6af5416e1ab009
 DIST an_0.95.orig.tar.gz 47829 RMD160 eec61214eaf3f3ab0666cec4a146ed37e7e96263 SHA1 930ce6f737da315597f01b46f74c60b2bb6639bf SHA256 11266dd1e347594d98f8dfd1e141d8b4fbe067752542d0e93c422c4789f9295c
 EBUILD an-0.95.3.2.ebuild 1824 RMD160 9564e4cbf2b67836eb88c55109e171b27df62557 SHA1 83c69d7c7acb760462b5d2ae765c5c40ea336e82 SHA256 7ac069d6b5ea6278e9abd7b6edba0b6dda780a40cdf552396f2f9759b8629af9
-EBUILD an-0.95.3.ebuild 1586 RMD160 a6007ec360cd6473ea6556fb1ac272cba969e7b6 SHA1 8d0c5cfd36bb51b439ef01d467c83d391ef02e06 SHA256 a3369999bcc0e514fbc9a8391a07e6eae898bab1972243e1d1d5fd6f1498a875
-MISC ChangeLog 3661 RMD160 1217f9e9b81fda05074755bb1cf633b83fff075b SHA1 72d84f26891e914ebb8f582607b4e16c1086cb91 SHA256 909d4f02386485810c6e128a7faa3dc604d4eca547c7f875f461442d7c24182d
+EBUILD an-0.95.3.ebuild 1537 RMD160 1d480ee089222472769d3f1a84ac8fe3f82a1c94 SHA1 827be113b0076c3d3a0923e2407606adac9748e1 SHA256 979056fd62a675c6f60d056578e081879a1ad2d1a75f45b9de0f46213e71e085
+MISC ChangeLog 3845 RMD160 56e087dee9bc9c6cdaa479b77eb0b61a34cb8d2d SHA1 a836d68d6e5eb12fd701730047b24ad5247db6e4 SHA256 69ce37f2f0276e713c72481b0e890be1801bd7e353897e41d88bfa682331252c
 MISC metadata.xml 360 RMD160 22be39fe77465ec8805ee3e6fc9218f75ae8089b SHA1 08b31da7c491295e9c5c7d6062c888f7db7d84d1 SHA256 1adab811286ade1a38f27e34473bea71fbf07e62c9ba10663f8fd8651bb72ddc
diff --git a/app-text/an/an-0.95.3.ebuild b/app-text/an/an-0.95.3.ebuild
index d20437f53a4a..ed6bd824e09f 100644
--- a/app-text/an/an-0.95.3.ebuild
+++ b/app-text/an/an-0.95.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/an/an-0.95.3.ebuild,v 1.17 2009/03/07 14:11:06 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/an/an-0.95.3.ebuild,v 1.18 2011/01/25 02:50:58 jer Exp $
 
 EAPI="2"
+
 inherit eutils toolchain-funcs versionator
 
 DESCRIPTION="Very fast anagram generator with dictionary lookup"
@@ -20,24 +21,19 @@ RDEPEND="sys-apps/miscfiles[-minimal]"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
+src_prepare() {
 	# Patching to -r3:
 	MY_PL="$(replace_version_separator 2 -)"
 	epatch "${FILESDIR}"/${PN}_${MY_PL}.diff
 
-	ebegin "Patching an to use toolchain and custom CFLAGS"
 	sed -e "s:gcc:$(tc-getCC):" \
 		-e "s:-O2.*:${CFLAGS}:" \
-		-i Makefile lib/Makefile
-	eend ${?}
+		-i Makefile lib/Makefile || die "sed Makefile lib/Makefile"
 
 	# sys-apps/miscfiles doesn't have /usr/dict/words:
 	sed \
 		-e 's:/usr/dict/words:/usr/share/dict/words:' \
-		-i README || die
+		-i README || die "sed README"
 }
 
 src_install() {
diff --git a/app-text/an/files/an-0.95-make.patch b/app-text/an/files/an-0.95-make.patch
index 652dcbca9670..9c5b0a509278 100644
--- a/app-text/an/files/an-0.95-make.patch
+++ b/app-text/an/files/an-0.95-make.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-03-18 20:52:41.000000000 +0100
-+++ Makefile	2009-03-18 20:54:06.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -27,14 +27,14 @@
  
  
@@ -17,8 +17,8 @@
  CINCLUDES=-I $(LIBDIR) $(DEFS)
  
  # Nothing should need changing below here
---- lib/Makefile.orig	2009-03-18 20:52:41.000000000 +0100
-+++ lib/Makefile	2009-03-18 20:53:37.000000000 +0100
+--- a/lib/Makefile
++++ b/lib/Makefile
 @@ -22,7 +22,7 @@
  #Note may need to change this for your system, the only reason this Makefile
  #exists is because the non-gnu make on suns is brain dead.
diff --git a/app-text/an/files/an_0.95-3.diff b/app-text/an/files/an_0.95-3.diff
index 9879211cca6a..fa63e15e0eed 100644
--- a/app-text/an/files/an_0.95-3.diff
+++ b/app-text/an/files/an_0.95-3.diff
@@ -1,5 +1,5 @@
---- an-0.95.orig/an.c
-+++ an-0.95/an.c
+--- a/an-0.95/an.c
++++ b/an-0.95/an.c
 @@ -863,7 +863,7 @@
  
        /* If letter is punctuation go to next letter */
@@ -138,8 +138,8 @@
  	 continue;
  
        /* Add 1 to LENGTH */
---- an-0.95.orig/Makefile
-+++ an-0.95/Makefile
+--- a/an-0.95/Makefile
++++ b/an-0.95/Makefile
 @@ -34,7 +34,8 @@
  
  #DEFS=-DFORCE_ANSI
@@ -168,8 +168,8 @@
  
  install: $(BIN) $(INSTALLDIR)/$(BIN) $(MANDIR)/$(MAN)
  
---- an-0.95.orig/an.6
-+++ an-0.95/an.6
+--- a/an-0.95/an.6
++++ b/an-0.95/an.6
 @@ -1,5 +1,4 @@
 -.\" "%W% %G%"
 -.TH AN\ 0.93 6
@@ -197,8 +197,8 @@
 -
 -
 -
---- an-0.95.orig/COPYRIGHT
-+++ an-0.95/COPYRIGHT
+--- a/an-0.95/COPYRIGHT
++++ b/an-0.95/COPYRIGHT
 @@ -1,7 +1,7 @@
      an v0.94 - Anagram generator
      Copyright (C) 1996 Free Software Foundation.
@@ -208,8 +208,8 @@
  
      This program is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
---- an-0.95.orig/debian/changelog
-+++ an-0.95/debian/changelog
+--- a/an-0.95/debian/changelog
++++ b/an-0.95/debian/changelog
 @@ -1,3 +1,21 @@
 +an (0.95-3) unstable; urgency=low
 +
@@ -232,8 +232,8 @@
  an (0.95-1) unstable; urgency=low
  
    * Bugfixes: (Closes: #145848)
---- an-0.95.orig/debian/copyright
-+++ an-0.95/debian/copyright
+--- a/an-0.95/debian/copyright
++++ b/an-0.95/debian/copyright
 @@ -2,7 +2,8 @@
  on Mon, 13 Nov 2000 17:53:04 +0000.
  
@@ -253,8 +253,8 @@
  
  
    This program is free software; you can redistribute it and/or modify
---- an-0.95.orig/debian/README.Debian
-+++ an-0.95/debian/README.Debian
+--- a/an-0.95/debian/README.Debian
++++ b/an-0.95/debian/README.Debian
 @@ -4,7 +4,11 @@
  The original author has become unreachable, so I've taken over this
  package in his absence.
@@ -270,8 +270,8 @@
 +alphabets of up to 64 letters.
 +
 + -- Paul Martin <pm@debian.org>, Wed, 19 May 2004 17:17:25 +0100
---- an-0.95.orig/debian/control
-+++ an-0.95/debian/control
+--- a/an-0.95/debian/control
++++ b/an-0.95/debian/control
 @@ -2,14 +2,14 @@
  Section: games
  Priority: optional
@@ -291,8 +291,8 @@
   Generates anagrams for a phrase supplied by the user, the words used in the
   anagram are taken from a specified dictionary which should contain one word
   per line (default:/usr/share/dict/words).  Appears to be up to 10 times 
---- an-0.95.orig/debian/rules
-+++ an-0.95/debian/rules
+--- a/an-0.95/debian/rules
++++ b/an-0.95/debian/rules
 @@ -5,11 +5,25 @@
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
@@ -351,7 +351,7 @@
  #	dh_installinfo
  #	dh_undocumented
  	dh_installchangelogs 
---- an-0.95.orig/debian/compat
-+++ an-0.95/debian/compat
+--- a/an-0.95/debian/compat
++++ b/an-0.95/debian/compat
 @@ -0,0 +1 @@
 +4