Fixing stupid cvs breakage thanks to Chris Mayo. Fixes bug #183566

Package-Manager: portage-2.1.2.7

4 files changed, 15 insertions, 45 deletions

diff --git a/app-text/xmldiff/ChangeLog b/app-text/xmldiff/ChangeLog
index cfa1a005a228..b628d540e47c 100644
--- a/app-text/xmldiff/ChangeLog
+++ b/app-text/xmldiff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xmldiff
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmldiff/ChangeLog,v 1.1 2007/06/28 00:38:05 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmldiff/ChangeLog,v 1.2 2007/06/28 19:45:45 coldwind Exp $
+
+  28 Jun 2007; Santiago M. Mola <coldwind@gentoo.org>
+  -files/xmldiff-0.6.8-python2.5.patch:
+  Fixing stupid cvs breakage thanks to Chris Mayo. Fixes bug #183566
 
 *xmldiff-0.6.8 (28 Jun 2007)
 
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index efbb9eee1032..0dd82bf0b143 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,16 +1,12 @@
-AUX xmldiff-0.6.8-python2.5.patch 1162 RMD160 72dbedf79fc9b019a53c4ace4c6a7ec2beb25b3d SHA1 236031b19fcacf1fc4b7fc48fad4d843fd19b1bd SHA256 3f0895b01583c9756aa261d99b243c8680b14098ddc5dab03006e18276f9fd23
-MD5 30689b0b2675a21d01a71084d1a855ee files/xmldiff-0.6.8-python2.5.patch 1162
-RMD160 72dbedf79fc9b019a53c4ace4c6a7ec2beb25b3d files/xmldiff-0.6.8-python2.5.patch 1162
-SHA256 3f0895b01583c9756aa261d99b243c8680b14098ddc5dab03006e18276f9fd23 files/xmldiff-0.6.8-python2.5.patch 1162
 DIST xmldiff-0.6.8.tar.gz 55131 RMD160 0ce0e87293f4adc1d801e1bd8f40c32939d6f884 SHA1 eed3a15496df1e892c0363273da67f0532a716a7 SHA256 e633d55f264e8d83d18c5a463f1988066a137c01202b83cd6d92402babc3d972
-EBUILD xmldiff-0.6.8.ebuild 654 RMD160 71c60dac4ea4f68c4b3d78ff8454b94e1519dde5 SHA1 f8dc83a3f28e20e6c3bd7667eef1d5ae046fb02f SHA256 07d9c8e59022ffcfe14bf160a0e292b117090fa704ed999f1200424560cdd979
-MD5 5f71299ad6a8b951ef4da7c8a822ff4f xmldiff-0.6.8.ebuild 654
-RMD160 71c60dac4ea4f68c4b3d78ff8454b94e1519dde5 xmldiff-0.6.8.ebuild 654
-SHA256 07d9c8e59022ffcfe14bf160a0e292b117090fa704ed999f1200424560cdd979 xmldiff-0.6.8.ebuild 654
-MISC ChangeLog 408 RMD160 53173b2d639144e64aa3c26479549e1c43135a39 SHA1 20aa3486546ed5ddcb64625e69ae0c14a0597adf SHA256 c659a4693db9fc7e70e25465bcbeafb1790eaa9b9461c2e893ad88d61415fca7
-MD5 c08f85d6656818b4f4d32ff3b6040aef ChangeLog 408
-RMD160 53173b2d639144e64aa3c26479549e1c43135a39 ChangeLog 408
-SHA256 c659a4693db9fc7e70e25465bcbeafb1790eaa9b9461c2e893ad88d61415fca7 ChangeLog 408
+EBUILD xmldiff-0.6.8.ebuild 687 RMD160 36025a2227b4ea316c7425b423e2c28866ddf0d5 SHA1 9ca488ec54726de62aeba1dd1403953f1a40feb7 SHA256 865cf686e780a685aac91c973ad97231414ba26e76c702369ff8cb045d4af774
+MD5 8b4d9526c1626081ed260e787d85804c xmldiff-0.6.8.ebuild 687
+RMD160 36025a2227b4ea316c7425b423e2c28866ddf0d5 xmldiff-0.6.8.ebuild 687
+SHA256 865cf686e780a685aac91c973ad97231414ba26e76c702369ff8cb045d4af774 xmldiff-0.6.8.ebuild 687
+MISC ChangeLog 572 RMD160 6fea5c965e086b24e6ea25c0979dc997f855068e SHA1 18aafb7911f93302c54984e825e21c1a0cea9ac2 SHA256 3871ee701cafc08d209af0047a838ec79b71e4948d78e01b83f716d9011bb099
+MD5 6b57e6e4528d6e6f6f1cd6e7a2b4f1a7 ChangeLog 572
+RMD160 6fea5c965e086b24e6ea25c0979dc997f855068e ChangeLog 572
+SHA256 3871ee701cafc08d209af0047a838ec79b71e4948d78e01b83f716d9011bb099 ChangeLog 572
 MISC metadata.xml 595 RMD160 de43c16996fdaa592a16a2b93208ea0c7b76707a SHA1 ec32e7624e9cc595db871b98740f9ce9c30e21c6 SHA256 100738806f8262089bfa648f5956206d0975a9216a0e042e0c8e7fc77a68d133
 MD5 df513aaf910f5f208ae68f55c97703e0 metadata.xml 595
 RMD160 de43c16996fdaa592a16a2b93208ea0c7b76707a metadata.xml 595
diff --git a/app-text/xmldiff/files/xmldiff-0.6.8-python2.5.patch b/app-text/xmldiff/files/xmldiff-0.6.8-python2.5.patch
deleted file mode 100644
index fbdc774ee5ca..000000000000
--- a/app-text/xmldiff/files/xmldiff-0.6.8-python2.5.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur xmldiff-0.6.8.orig/setup.py xmldiff-0.6.8/setup.py
---- xmldiff-0.6.8.orig/setup.py	2007-06-07 23:55:05.000000000 +0200
-+++ xmldiff-0.6.8/setup.py	2007-06-07 23:55:21.000000000 +0200
-@@ -17,10 +17,10 @@
- # this program; if not, write to the Free Software Foundation, Inc.,
- # 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- """ Generic Setup script, takes package info from __pkginfo__.py file """
-+from __future__ import nested_scopes
- 
- __revision__ = '$Id: xmldiff-0.6.8-python2.5.patch,v 1.1 2007/06/28 00:38:05 coldwind Exp $'
- 
--from __future__ import nested_scopes
- import os
- import sys
- import shutil
-diff -ur xmldiff-0.6.8.orig/test/regrtest.py xmldiff-0.6.8/test/regrtest.py
---- xmldiff-0.6.8.orig/test/regrtest.py	2007-06-07 23:55:05.000000000 +0200
-+++ xmldiff-0.6.8/test/regrtest.py	2007-06-07 23:55:43.000000000 +0200
-@@ -1,9 +1,10 @@
- """
- xmldiff non regression test
- """
-+from __future__ import nested_scopes
-+
- __revision__ = "$Id: xmldiff-0.6.8-python2.5.patch,v 1.1 2007/06/28 00:38:05 coldwind Exp $"
- 
--from __future__ import nested_scopes
- from os.path import join, basename
- from cStringIO import StringIO
- import sys
diff --git a/app-text/xmldiff/xmldiff-0.6.8.ebuild b/app-text/xmldiff/xmldiff-0.6.8.ebuild
index a803094caef2..d4be98410e90 100644
--- a/app-text/xmldiff/xmldiff-0.6.8.ebuild
+++ b/app-text/xmldiff/xmldiff-0.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmldiff/xmldiff-0.6.8.ebuild,v 1.1 2007/06/28 00:38:05 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmldiff/xmldiff-0.6.8.ebuild,v 1.2 2007/06/28 19:45:45 coldwind Exp $
 
 inherit eutils distutils
 
@@ -22,5 +22,5 @@ DOCS="ChangeLog README README.xmlrev TODO"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-python2.5.patch"
+	sed -i -e "/^__revision__/d" setup.py test/regrtest.py || die "sed failed"
 }