Revert patch changed by mistake.

Package-Manager: portage-2.1_pre6-r3

3 files changed, 23 insertions, 44 deletions

diff --git a/dev-lang/wml/ChangeLog b/dev-lang/wml/ChangeLog
index 2665bc2958a6..b698989db7b3 100644
--- a/dev-lang/wml/ChangeLog
+++ b/dev-lang/wml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/wml
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.22 2006/03/15 02:43:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.23 2006/03/16 23:04:24 flameeyes Exp $
+
+  16 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/wml-2.0.9-autotools-update.patch:
+  Revert patch changed by mistake.
 
   15 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/wml-2.0.9-autotools-update.patch, +files/wml-2.0.9-gcc41.patch,
diff --git a/dev-lang/wml/Manifest b/dev-lang/wml/Manifest
index a85e55a52795..44835cdeb3ee 100644
--- a/dev-lang/wml/Manifest
+++ b/dev-lang/wml/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 00be029177d86642594fdfd1bc6fff79 ChangeLog 2641
-RMD160 2b3d3c964131454889cd0fe86e98c201ee075427 ChangeLog 2641
-SHA256 3427fa7fd750b06dcbbfbb31a66c229327dd8e58c12adf865ae541d46ed338d2 ChangeLog 2641
+MD5 79576b79dcdad46ca409c7059bdbb734 ChangeLog 2772
+RMD160 4d6623ffa8be175dd55e58a288c1774693c8127e ChangeLog 2772
+SHA256 ec761a5489aa278ee71895eebaa7daba00a9b70691252595cb289e107bca48e9 ChangeLog 2772
 MD5 aefa456b69c01c50eca3fe8b497c1f59 files/2.0.9-fix-configure.in.patch 1411
 RMD160 54aa0b173fd0dc1fdc5f7f652682cec078f78a25 files/2.0.9-fix-configure.in.patch 1411
 SHA256 e59dee3fd10b2cc9603f15fbff1ccdf466d5c9fd919c09c058a0aaa3b7064286 files/2.0.9-fix-configure.in.patch 1411
@@ -13,9 +13,9 @@ SHA256 fd15b146e5c256edcb38458bf92c9f9ab5d93e165b4af09644ab6c2624c56db1 files/di
 MD5 ea584f051a470445242165526961b55d files/digest-wml-2.0.9-r1 62
 RMD160 1941f61a0f5ebb4dd9ad08e1f2dcf56f08f42d0d files/digest-wml-2.0.9-r1 62
 SHA256 fd15b146e5c256edcb38458bf92c9f9ab5d93e165b4af09644ab6c2624c56db1 files/digest-wml-2.0.9-r1 62
-MD5 aa98943ede07c2aebbd988153c882e74 files/wml-2.0.9-autotools-update.patch 3796
-RMD160 3a6f361805783317c81646e89493df04fe6e3b22 files/wml-2.0.9-autotools-update.patch 3796
-SHA256 f8ad37c0efec2e2f3bd4b93b94dcd0b5e945d3fde3fcb8a76b2b9a1ebd52001a files/wml-2.0.9-autotools-update.patch 3796
+MD5 1c8fd4b14d99dba1c258a4424b632024 files/wml-2.0.9-autotools-update.patch 2720
+RMD160 b1b7c2304660506a02cf74fc147a40f8de8c8e8f files/wml-2.0.9-autotools-update.patch 2720
+SHA256 09cfc157fb4e4a06070375161b0cd38eeed7154701f729196ed2753ea5c0a9c6 files/wml-2.0.9-autotools-update.patch 2720
 MD5 22515a540cc3133e7da6990a68abf261 files/wml-2.0.9-gcc41.patch 361
 RMD160 7801e31d2e2d379c148902a697c46bec15cde831 files/wml-2.0.9-gcc41.patch 361
 SHA256 7c983ec6d7f659eb1b152f03b98764df40d51b6b5d1ceb7fbee4a79b695c5e33 files/wml-2.0.9-gcc41.patch 361
@@ -31,7 +31,7 @@ SHA256 798d843a4ef74be4ece571e32ecd3e91090363246d708f69a0b531eeceec7f0a wml-2.0.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEF39PAiZjviIA2XgRAnwcAJ9zgq9HjwKzVY5lPc0Og5sc6ROgTQCg9D1f
-rekPbhjtMRJ7sOnhXqrBKLI=
-=ps7S
+iD8DBQFEGe8XAiZjviIA2XgRAnt7AJ49PalIbw3rGNO9akmrlQJwxeLhDwCg8JtR
+Wr9FjhYvVAhFFgtQrhuplrg=
+=OcFi
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/wml/files/wml-2.0.9-autotools-update.patch b/dev-lang/wml/files/wml-2.0.9-autotools-update.patch
index aa56579dc637..4939e1de9849 100644
--- a/dev-lang/wml/files/wml-2.0.9-autotools-update.patch
+++ b/dev-lang/wml/files/wml-2.0.9-autotools-update.patch
@@ -1,8 +1,6 @@
 Use system libpcre and make iselect not blow up
 
-Index: wml_backend/p2_mp4h/Makefile.am
-===================================================================
---- wml_backend/p2_mp4h/Makefile.am.orig
+--- wml_backend/p2_mp4h/Makefile.am
 +++ wml_backend/p2_mp4h/Makefile.am
 @@ -1,15 +1,15 @@
  
@@ -24,9 +22,7 @@ Index: wml_backend/p2_mp4h/Makefile.am
  
  deb:
  	if test -f ../mp4h_$(VERSION).orig.tar.gz; then \
-Index: wml_backend/p2_mp4h/configure.ac
-===================================================================
---- wml_backend/p2_mp4h/configure.ac.orig
+--- wml_backend/p2_mp4h/configure.ac
 +++ wml_backend/p2_mp4h/configure.ac
 @@ -179,7 +179,6 @@ AC_SUBST(CFLAGS)
  AC_CONFIG_FILES([
@@ -36,9 +32,7 @@ Index: wml_backend/p2_mp4h/configure.ac
     lib/Makefile
     src/Makefile
     po/Makefile.in
-Index: wml_backend/p2_mp4h/src/Makefile.am
-===================================================================
---- wml_backend/p2_mp4h/src/Makefile.am.orig
+--- wml_backend/p2_mp4h/src/Makefile.am
 +++ wml_backend/p2_mp4h/src/Makefile.am
 @@ -1,5 +1,5 @@
  
@@ -56,19 +50,17 @@ Index: wml_backend/p2_mp4h/src/Makefile.am
  
  include_HEADERS = mp4h.h
  noinst_HEADERS  = builtin.h ltdl.h
-Index: wml_aux/iselect/configure.in
-===================================================================
---- wml_aux/iselect/configure.in.orig
+--- wml_aux/iselect/configure.in
 +++ wml_aux/iselect/configure.in
-@@ -3,6 +3,7 @@ dnl ##  configure.in -- GNU autoconf con
+@@ -3,6 +3,7 @@
  dnl ##  Copyright (c) Ralf S. Engelschall, <rse@engelschall.com>
  dnl ##
  
 +AC_INIT(README)
  AC_PREREQ(2.10)dnl
- AC_REVISION($Revision: 1.2 $)
+ AC_REVISION($Revision: 1.3 $)
  SHTOOL="./etc/shtool"
-@@ -11,7 +12,6 @@ T_ME=`$SHTOOL echo -e %b 2>/dev/null`
+@@ -11,7 +12,6 @@
  echo "${T_MD}Configuring for iSelect `./etc/shtool version -l c -d long iselect_version.c`${T_ME}"
  echo "Copyright (c) 1996-1999 Ralf S. Engelschall, All Rights Reserved."
  
@@ -76,11 +68,9 @@ Index: wml_aux/iselect/configure.in
  AC_CONFIG_HEADER(config_ac.h)dnl
  AC_PREFIX_DEFAULT(/usr/local)
  
-Index: wml_aux/iselect/aclocal.m4
-===================================================================
---- wml_aux/iselect/aclocal.m4.orig
+--- wml_aux/iselect/aclocal.m4
 +++ wml_aux/iselect/aclocal.m4
-@@ -186,24 +186,6 @@ dnl ##  taken from shar-4.0's aclocal.m4
+@@ -186,24 +186,6 @@
  dnl ##
  dnl ##########################################################
  dnl
@@ -105,18 +95,3 @@ Index: wml_aux/iselect/aclocal.m4
  dnl
  dnl
  dnl ##########################################################
-Index: wml_backend/p3_eperl/configure.in
-===================================================================
---- wml_backend/p3_eperl/configure.in.orig
-+++ wml_backend/p3_eperl/configure.in
-@@ -9,9 +9,8 @@ dnl #
- dnl #   standard autoconf prolog
- dnl #
- 
--AC_PREREQ(2.10)dnl
- AC_REVISION($Revision: 1.2 $)
--AC_INIT(README)
-+AC_INIT
- AC_CONFIG_HEADER(config_ac.h)dnl
- AC_PREFIX_DEFAULT(/usr/local)
-