More cleanup

Package-Manager: portage-2.2_rc67_p630/cvs/Linux x86_64

3 files changed, 6 insertions, 110 deletions

diff --git a/app-editors/xmlcopyeditor/ChangeLog b/app-editors/xmlcopyeditor/ChangeLog
index 24a004b6660a..cb3b938c1dfa 100644
--- a/app-editors/xmlcopyeditor/ChangeLog
+++ b/app-editors/xmlcopyeditor/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for app-editors/xmlcopyeditor
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/ChangeLog,v 1.17 2010/08/23 07:03:21 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/ChangeLog,v 1.18 2010/08/23 07:05:19 tove Exp $
 
   23 Aug 2010; Torsten Veller <tove@gentoo.org>
   -xmlcopyeditor-1.2.0.1.ebuild, -xmlcopyeditor-1.2.0.2-r1.ebuild,
-  -xmlcopyeditor-1.2.0.2-r2.ebuild:
+  -xmlcopyeditor-1.2.0.2-r2.ebuild, -files/xmlcopyeditor-1.2.0.2-gcc44.patch:
   Cleanup
 
   23 Aug 2010; Torsten Veller <tove@gentoo.org>
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index e67ac3cfc7b0..b4ec090881d1 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX xmlcopyeditor-1.2.0.2-gcc44.patch 2540 RMD160 60e0b45a8f867a6ec89cea02b5be4b07daa56e19 SHA1 e898ab53b0de688de6ad372c9f08b57f47246a8a SHA256 065ea01c407de936a2f18114052a22ba20013e660d445322f1b8c48d688cba62
 DIST GuideXML-templates.tar.gz 884 RMD160 0f4cbdf795a65fb1006fe5a43cb5ca18d594cf1a SHA1 c23e3540350129403e28298def1b171d082d6f0e SHA256 3ede041b74a64a3f262455728486a616ffb496fa0d6f3c50610387d9de0d742e
 DIST xmlcopyeditor-1.2.0.6-2.tar.gz 1526457 RMD160 6f26201164a744ec7fe935f9ce20522a5e417444 SHA1 44734c1a24642aa97c7ad642ac91309ca1be367c SHA256 9a4ba41d67604d303b1728877768f9e3ef85d56e6f580b0eeef840e12b84f02c
 EBUILD xmlcopyeditor-1.2.0.6.ebuild 1107 RMD160 acdf35bff7aa94e156e3aea01b01601f2c4a552b SHA1 acce28d98a2a8cddda61aecc77d117f0007cba5c SHA256 4c89a88e789599a49fc97327e8513eb2c800022cdd09b28d13fb193c6a67bfa3
-MISC ChangeLog 3971 RMD160 fb7f305e21ccf6f13af18cdc497df9921c7477f9 SHA1 89bc9f446db772ddccde99675da11d0d6f4004a1 SHA256 0e42f5b97390fc39f727912273edad76da20b939be3128d36676414ad42717d3
+MISC ChangeLog 4013 RMD160 dd294b36387bc4699054911124318210377bf551 SHA1 b75d5f350006768d2e54133f3be6fa95e0433b89 SHA256 de4517fb5d5111cc856b83cd04e7f0bd7af1532927d810151ad30d69d0a568eb
 MISC metadata.xml 459 RMD160 eebcf7345985fe797c5cc510c998eba7f279651c SHA1 693fb7110ff19bb0084ef9d2ff357e2e58809e6f SHA256 479d2e43d532cc1339e9e1cdade126de263c902e85a868e989817a93e8b82e7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxyHT4ACgkQV3J2n04EauwOdwCgjLxUTEQ7uxadI9XKtaErpHX4
-EvcAoNEWB9xHzgCd+q5x2CSs3oq9FETs
-=wT5f
+iEYEARECAAYFAkxyHbQACgkQV3J2n04Eauzk3QCfRo8/+6t2Yl9VuTRtKtrUVGeX
+7fEAoNFkWOnXAYss+gXSSfMQec7uLggx
+=L/pN
 -----END PGP SIGNATURE-----
diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.2-gcc44.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.2-gcc44.patch
deleted file mode 100644
index dd7c8836796f..000000000000
--- a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.2-gcc44.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- xmlcopyeditor-1.2.0.4.orig/src/replace.cpp
-+++ xmlcopyeditor-1.2.0.4/src/replace.cpp
-@@ -18,6 +18,7 @@
-  */
- 
- #include <cstring>
-+#include <cstdio>
- #include "replace.h"
- 
- int Replace::run (
---- xmlcopyeditor-1.2.0.4.orig/src/stringset.h
-+++ xmlcopyeditor-1.2.0.4/src/stringset.h
-@@ -25,6 +25,7 @@
- #include <cmath>
- #include <climits>
- #include <cstring>
-+#include <stdint.h>
- #ifdef __WXMSW__
- #include <mem.h>
- #endif
---- xmlcopyeditor-1.2.0.4.orig/src/wrapaspell.cpp
-+++ xmlcopyeditor-1.2.0.4/src/wrapaspell.cpp
-@@ -19,6 +19,7 @@
- 
- #include <iostream>
- #include <stdexcept>
-+#include <cstdio>
- #include "wrapaspell.h"
- #include "aspell.h"
- #include "casehandler.h"
---- xmlcopyeditor-1.2.0.4.orig/src/xmlassociatedtd.h
-+++ xmlcopyeditor-1.2.0.4/src/xmlassociatedtd.h
-@@ -24,6 +24,7 @@
- #include <expat.h>
- #include <string>
- #include <memory>
-+#include <cstdio>
- #include "wrapexpat.h"
- 
- struct DtdData : public ParserData
---- xmlcopyeditor-1.2.0.4.orig/src/xmlassociatexsd.h
-+++ xmlcopyeditor-1.2.0.4/src/xmlassociatexsd.h
-@@ -25,6 +25,7 @@
- #include <string>
- #include <map>
- #include <memory>
-+#include <cstdio>
- #include "wrapexpat.h"
- 
- struct AssociateXsdData : public ParserData
---- xmlcopyeditor-1.2.0.4.orig/src/xmlassociatexsl.h
-+++ xmlcopyeditor-1.2.0.4/src/xmlassociatexsl.h
-@@ -24,6 +24,7 @@
- #include <expat.h>
- #include <string>
- #include <memory>
-+#include <cstdio>
- #include "wrapexpat.h"
- 
- struct XslData : public ParserData
---- xmlcopyeditor-1.2.0.4.orig/src/xmlpromptgenerator.cpp
-+++ xmlcopyeditor-1.2.0.4/src/xmlpromptgenerator.cpp
-@@ -31,7 +31,7 @@
- #include "catalogresolver.h"
- 
- // Xerces-C req'd for Schema parsing
--#define XERCES_TMPLSINC
-+// #define XERCES_TMPLSINC
- 
- #include <xercesc/util/NameIdPool.hpp>
- #include <xercesc/util/PlatformUtils.hpp>
---- xmlcopyeditor-1.2.0.4.orig/src/xmlutf8reader.cpp
-+++ xmlcopyeditor-1.2.0.4/src/xmlutf8reader.cpp
-@@ -20,6 +20,7 @@
- #include <string>
- #include <vector>
- #include <stdexcept>
-+#include <cstdio>
- #include <expat.h>
- #include "xmlutf8reader.h"
- 
---- xmlcopyeditor-1.2.0.4.orig/src/xsllocator.cpp
-+++ xmlcopyeditor-1.2.0.4/src/xsllocator.cpp
-@@ -46,7 +46,7 @@
- 		return;
- 
- 	char *value, *iterator;
--	value = strstr ( ( const char * ) data, "href=" );
-+	value = strstr ( ( char * ) data, "href=" );
- 	if ( !value || strlen ( value ) < 7 )
- 		return;
- 	value += 6;
-@@ -55,7 +55,7 @@
- 	{
- 		if ( *iterator == '"' || *iterator == '\'' )
- 		{
--			*iterator = '\0';
-+			*iterator = '\0'; //Danger, changing const char *data
- 			break;
- 		}
- 	}
-
-