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

(Portage version: 2.2.0_alpha19/cvs/Linux i686)

2 files changed, 24 insertions, 24 deletions

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