old

(Portage version: 2.2_rc90/cvs/Linux x86_64)

4 files changed, 0 insertions, 746 deletions

diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 5d61abbaf217..40924c09f472 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX libxml2-2.7.3-CVE-2009-2414-CVE-2009-2416.patch 6356 RMD160 a8c9086e5f0c1816ae1f8de8e27ae828c05c6a04 SHA1 28c2219b8e3b3a693d7e2553d239863ad21b41d5 SHA256 03f26db3f24e7fb91c489208f992f327c767135949e8e25d180df8b76065e7ef
-AUX libxml2-2.7.3-printf-rename.patch 17280 RMD160 920065d543127026c526f00856e9a2a8fb41e42d SHA1 9a9515a1ea7c7313aa8e6bb607f987560504aaed SHA256 a7206cbd8a675e2d944f330255d648502d143472a2d96daa4753e422614b8520
-DIST libxml2-2.7.3.tar.gz 4789450 RMD160 14018347531fd135366cee9fd9d760a1988546e2 SHA1 fd4e427fb55c977876bc74c0e552ef7d3d794a07 SHA256 432464d8c9bd8060d9c1fdef1cfa75803c1a363ceac20b21f8c7e34e056e5a98
 DIST libxml2-2.7.6.tar.gz 4854591 RMD160 849ded7b61f88e75ef0dacf0e5647ce8ad951261 SHA1 b0f6bf8408e759ac4b8b9650005ee8adea911e1d SHA256 238c4f0203c012e5776522640c0fb3ac532c4064981c1ce3e74c00b75501d761
 DIST libxml2-2.7.7.tar.gz 4868502 RMD160 9f72c778c3e9e348a68eada0cf624c012658c085 SHA1 8592824a2788574a172cbddcdc72f734ff87abe3 SHA256 af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68
 DIST xsts-2002-01-16.tar.gz 6894439 RMD160 e8905fe1451a1c367b0104af24edca73bad1db08 SHA1 ca6344e6c47f8c28231f5b213d0c8deb0311a409 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914
 DIST xsts-2004-01-14.tar.gz 2761085 RMD160 faff2d7826e47ae9968564bc83dab1b54c5e4bf6 SHA1 5896c2aa2cda464246306c5cf0577ed506eefaab SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17
-EBUILD libxml2-2.7.3-r2.ebuild 4457 RMD160 a88ba8bf4844dee50a72ea5f1a0d6c6a5b55f8a4 SHA1 9e55595b368a863bd7cf4b96f272f1ed0da3faf7 SHA256 f7cf9157bfd0afe55edff5365980939edf5fa07c5a9fb72cff7b196f89b809ed
 EBUILD libxml2-2.7.6.ebuild 3984 RMD160 cd9e512741b12343f5af39a817d7d22a26d85384 SHA1 45415371d3c46b2968634829a0f91e80a2aa1317 SHA256 1814b1fe48e3af3ea254c5c6fe60fcf0427ec364f2ab6b849a1f99dcd9538854
 EBUILD libxml2-2.7.7.ebuild 4775 RMD160 23cce2d6c3baf5c21b6db91f300420fe1f7bce25 SHA1 703b0e98a0667fd4c54f1054017d06f75a830e7f SHA256 946a0773060989a2bfb68b3a270afbc614a547d8a408c00a167e1706a13a0d0e
 MISC ChangeLog 39685 RMD160 c4417c0acc7838c74962230cecb150dc8a948c89 SHA1 ca523e24c0835a143ada914850f7ad662a37a85e SHA256 f4168c440b5e0ef9639c2bedbde1e4a9bfd2a25d6ae1dc7d42408b8cbcce153f
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxffysACgkQ/ejvha5XGaORhQCg2O3tALTMnHv5CRrpbi9B8o9T
-0yMAoKwKzc9Si8PI7/oTW6XsKg9ZYxVb
-=tk4W
------END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/files/libxml2-2.7.3-CVE-2009-2414-CVE-2009-2416.patch b/dev-libs/libxml2/files/libxml2-2.7.3-CVE-2009-2414-CVE-2009-2416.patch
deleted file mode 100644
index 29c339f667ef..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.7.3-CVE-2009-2414-CVE-2009-2416.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 489f9671e71cc44a97b23111b3126ac8a1e21a59 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Mon, 10 Aug 2009 16:49:30 +0200
-Subject: [PATCH 1/1] Fix a couple of problems in the parser
-
-* parser.c: a couple of nasty bugs CVE-2009-2414 and CVE-2009-2416
----
- parser.c |   79 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------
- 1 files changed, 67 insertions(+), 12 deletions(-)
-
-diff --git a/parser.c b/parser.c
-index a476060..bd2be67 100644
---- a/parser.c
-+++ b/parser.c
-@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
- 	if (name == NULL) {
- 	    xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
- 			   "Name expected in NOTATION declaration\n");
--	    return(ret);
-+            xmlFreeEnumeration(ret);
-+	    return(NULL);
- 	}
- 	tmp = ret;
- 	while (tmp != NULL) {
-@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
- 	}
- 	if (tmp == NULL) {
- 	    cur = xmlCreateEnumeration(name);
--	    if (cur == NULL) return(ret);
-+	    if (cur == NULL) {
-+                xmlFreeEnumeration(ret);
-+                return(NULL);
-+            }
- 	    if (last == NULL) ret = last = cur;
- 	    else {
- 		last->next = cur;
-@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
-     } while (RAW == '|');
-     if (RAW != ')') {
- 	xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
--	if ((last != NULL) && (last != ret))
--	    xmlFreeEnumeration(last);
--	return(ret);
-+        xmlFreeEnumeration(ret);
-+	return(NULL);
-     }
-     NEXT;
-     return(ret);
-@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
- 	    cur = xmlCreateEnumeration(name);
- 	    if (!xmlDictOwns(ctxt->dict, name))
- 		xmlFree(name);
--	    if (cur == NULL) return(ret);
-+	    if (cur == NULL) {
-+                xmlFreeEnumeration(ret);
-+                return(NULL);
-+            }
- 	    if (last == NULL) ret = last = cur;
- 	    else {
- 		last->next = cur;
-@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
- }
- 
- /**
-- * xmlParseElementChildrenContentDecl:
-+ * xmlParseElementChildrenContentDeclPriv:
-  * @ctxt:  an XML parser context
-  * @inputchk:  the input used for the current entity, needed for boundary checks
-+ * @depth: the level of recursion
-  *
-  * parse the declaration for a Mixed Element content
-  * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
-@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
-  * Returns the tree of xmlElementContentPtr describing the element 
-  *          hierarchy.
-  */
--xmlElementContentPtr
--xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
-+static xmlElementContentPtr
-+xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
-+                                       int depth) {
-     xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL;
-     const xmlChar *elem;
-     xmlChar type = 0;
- 
-+    if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) ||
-+        (depth >  2048)) {
-+        xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
-+"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n",
-+                          depth);
-+	return(NULL);
-+    }
-     SKIP_BLANKS;
-     GROW;
-     if (RAW == '(') {
-@@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
-         /* Recurse on first child */
- 	NEXT;
- 	SKIP_BLANKS;
--        cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
-+        cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
-+                                                           depth + 1);
- 	SKIP_BLANKS;
- 	GROW;
-     } else {
-@@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
- 	    /* Recurse on second child */
- 	    NEXT;
- 	    SKIP_BLANKS;
--	    last = xmlParseElementChildrenContentDecl(ctxt, inputid);
-+	    last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
-+                                                          depth + 1);
- 	    SKIP_BLANKS;
- 	} else {
- 	    elem = xmlParseName(ctxt);
-@@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
- }
- 
- /**
-+ *
-+ * xmlParseElementChildrenContentDecl:
-+ * @ctxt:  an XML parser context
-+ * @inputchk:  the input used for the current entity, needed for boundary checks
-+ * @depth: the level of recursion
-+ *
-+ * parse the declaration for a Mixed Element content
-+ * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
-+ *
-+ * [47] children ::= (choice | seq) ('?' | '*' | '+')?
-+ *
-+ * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
-+ *
-+ * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
-+ *
-+ * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
-+ *
-+ * [ VC: Proper Group/PE Nesting ] applies to [49] and [50]
-+ * TODO Parameter-entity replacement text must be properly nested
-+ *	with parenthesized groups. That is to say, if either of the
-+ *	opening or closing parentheses in a choice, seq, or Mixed
-+ *	construct is contained in the replacement text for a parameter
-+ *	entity, both must be contained in the same replacement text. For
-+ *	interoperability, if a parameter-entity reference appears in a
-+ *	choice, seq, or Mixed construct, its replacement text should not
-+ *	be empty, and neither the first nor last non-blank character of
-+ *	the replacement text should be a connector (| or ,).
-+ *
-+ * Returns the tree of xmlElementContentPtr describing the element
-+ *          hierarchy.
-+ */
-+xmlElementContentPtr
-+xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
-+    /* stub left for API/ABI compat */
-+    return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1));
-+}
-+
-+/**
-  * xmlParseElementContentDecl:
-  * @ctxt:  an XML parser context
-  * @name:  the name of the element being defined.
-@@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name,
-         tree = xmlParseElementMixedContentDecl(ctxt, inputid);
- 	res = XML_ELEMENT_TYPE_MIXED;
-     } else {
--        tree = xmlParseElementChildrenContentDecl(ctxt, inputid);
-+        tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1);
- 	res = XML_ELEMENT_TYPE_ELEMENT;
-     }
-     SKIP_BLANKS;
--- 
-1.6.4
-
diff --git a/dev-libs/libxml2/files/libxml2-2.7.3-printf-rename.patch b/dev-libs/libxml2/files/libxml2-2.7.3-printf-rename.patch
deleted file mode 100644
index 2211a702d325..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.7.3-printf-rename.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-Author: Jose Luis Rivero <yoswink@gentoo.org>
-Source: patch extrated from libxml2 svn. Diff between 3826 .. 3827
-
-Description: the patch fix the problems between libxml2 and wxGTK 
-described in http://mail.gnome.org/archives/xml/2009-April/msg00021.html.
-It is basically a renaming of the macro function to avoid collisions
-with other libraries.
-
-This patch should only be applied to version 2.7.3
-
-Index: include/libxml/parser.h
-===================================================================
---- include/libxml/parser.h	(rev: 3826)
-+++ include/libxml/parser.h	(working copy)
-@@ -594,7 +594,7 @@
-  * Display and format a warning messages, callback.
-  */
- typedef void (XMLCDECL *warningSAXFunc) (void *ctx,
--				const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
-+				const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
- /**
-  * errorSAXFunc:
-  * @ctx:  an XML parser context
-@@ -604,7 +604,7 @@
-  * Display and format an error messages, callback.
-  */
- typedef void (XMLCDECL *errorSAXFunc) (void *ctx,
--				const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
-+				const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
- /**
-  * fatalErrorSAXFunc:
-  * @ctx:  an XML parser context
-@@ -616,7 +616,7 @@
-  *       get all the callbacks for errors.
-  */
- typedef void (XMLCDECL *fatalErrorSAXFunc) (void *ctx,
--				const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
-+				const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
- /**
-  * isStandaloneSAXFunc:
-  * @ctx:  the user data (XML parser context)
-Index: include/libxml/xmlwriter.h
-===================================================================
---- include/libxml/xmlwriter.h	(rev: 3826)
-+++ include/libxml/xmlwriter.h	(working copy)
-@@ -70,12 +70,12 @@
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteFormatComment(xmlTextWriterPtr writer,
-                                         const char *format, ...)
--					ATTRIBUTE_PRINTF(2,3);
-+					LIBXML_ATTR_FORMAT(2,3);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatComment(xmlTextWriterPtr writer,
-                                          const char *format,
-                                          va_list argptr)
--					 ATTRIBUTE_PRINTF(2,0);
-+					 LIBXML_ATTR_FORMAT(2,0);
-     XMLPUBFUN int XMLCALL xmlTextWriterWriteComment(xmlTextWriterPtr
-                                                     writer,
-                                                     const xmlChar *
-@@ -105,13 +105,13 @@
-         xmlTextWriterWriteFormatElement(xmlTextWriterPtr writer,
-                                         const xmlChar * namme,
-                                         const char *format, ...)
--					ATTRIBUTE_PRINTF(3,4);
-+					LIBXML_ATTR_FORMAT(3,4);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatElement(xmlTextWriterPtr writer,
-                                          const xmlChar * name,
-                                          const char *format,
-                                          va_list argptr)
--					 ATTRIBUTE_PRINTF(3,0);
-+					 LIBXML_ATTR_FORMAT(3,0);
-     XMLPUBFUN int XMLCALL xmlTextWriterWriteElement(xmlTextWriterPtr
-                                                     writer,
-                                                     const xmlChar * name,
-@@ -123,7 +123,7 @@
-                                           const xmlChar * name,
-                                           const xmlChar * namespaceURI,
-                                           const char *format, ...)
--					  ATTRIBUTE_PRINTF(5,6);
-+					  LIBXML_ATTR_FORMAT(5,6);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatElementNS(xmlTextWriterPtr writer,
-                                            const xmlChar * prefix,
-@@ -131,7 +131,7 @@
-                                            const xmlChar * namespaceURI,
-                                            const char *format,
-                                            va_list argptr)
--					   ATTRIBUTE_PRINTF(5,0);
-+					   LIBXML_ATTR_FORMAT(5,0);
-     XMLPUBFUN int XMLCALL xmlTextWriterWriteElementNS(xmlTextWriterPtr
-                                                       writer,
-                                                       const xmlChar *
-@@ -148,11 +148,11 @@
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteFormatRaw(xmlTextWriterPtr writer,
-                                     const char *format, ...)
--				    ATTRIBUTE_PRINTF(2,3);
-+				    LIBXML_ATTR_FORMAT(2,3);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatRaw(xmlTextWriterPtr writer,
-                                      const char *format, va_list argptr)
--				     ATTRIBUTE_PRINTF(2,0);
-+				     LIBXML_ATTR_FORMAT(2,0);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteRawLen(xmlTextWriterPtr writer,
-                                  const xmlChar * content, int len);
-@@ -163,13 +163,13 @@
-                                                          writer,
-                                                          const char
-                                                          *format, ...)
--							 ATTRIBUTE_PRINTF(2,3);
-+							 LIBXML_ATTR_FORMAT(2,3);
-     XMLPUBFUN int XMLCALL xmlTextWriterWriteVFormatString(xmlTextWriterPtr
-                                                           writer,
-                                                           const char
-                                                           *format,
-                                                           va_list argptr)
--							  ATTRIBUTE_PRINTF(2,0);
-+							  LIBXML_ATTR_FORMAT(2,0);
-     XMLPUBFUN int XMLCALL xmlTextWriterWriteString(xmlTextWriterPtr writer,
-                                                    const xmlChar *
-                                                    content);
-@@ -204,13 +204,13 @@
-         xmlTextWriterWriteFormatAttribute(xmlTextWriterPtr writer,
-                                           const xmlChar * name,
-                                           const char *format, ...)
--					  ATTRIBUTE_PRINTF(3,4);
-+					  LIBXML_ATTR_FORMAT(3,4);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatAttribute(xmlTextWriterPtr writer,
-                                            const xmlChar * name,
-                                            const char *format,
-                                            va_list argptr)
--					   ATTRIBUTE_PRINTF(3,0);
-+					   LIBXML_ATTR_FORMAT(3,0);
-     XMLPUBFUN int XMLCALL xmlTextWriterWriteAttribute(xmlTextWriterPtr
-                                                       writer,
-                                                       const xmlChar * name,
-@@ -222,7 +222,7 @@
-                                             const xmlChar * name,
-                                             const xmlChar * namespaceURI,
-                                             const char *format, ...)
--					    ATTRIBUTE_PRINTF(5,6);
-+					    LIBXML_ATTR_FORMAT(5,6);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatAttributeNS(xmlTextWriterPtr writer,
-                                              const xmlChar * prefix,
-@@ -230,7 +230,7 @@
-                                              const xmlChar * namespaceURI,
-                                              const char *format,
-                                              va_list argptr)
--					     ATTRIBUTE_PRINTF(5,0);
-+					     LIBXML_ATTR_FORMAT(5,0);
-     XMLPUBFUN int XMLCALL xmlTextWriterWriteAttributeNS(xmlTextWriterPtr
-                                                         writer,
-                                                         const xmlChar *
-@@ -257,12 +257,12 @@
-         xmlTextWriterWriteFormatPI(xmlTextWriterPtr writer,
-                                    const xmlChar * target,
-                                    const char *format, ...)
--				   ATTRIBUTE_PRINTF(3,4);
-+				   LIBXML_ATTR_FORMAT(3,4);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatPI(xmlTextWriterPtr writer,
-                                     const xmlChar * target,
-                                     const char *format, va_list argptr)
--				    ATTRIBUTE_PRINTF(3,0);
-+				    LIBXML_ATTR_FORMAT(3,0);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWritePI(xmlTextWriterPtr writer,
-                              const xmlChar * target,
-@@ -287,11 +287,11 @@
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteFormatCDATA(xmlTextWriterPtr writer,
-                                       const char *format, ...)
--				      ATTRIBUTE_PRINTF(2,3);
-+				      LIBXML_ATTR_FORMAT(2,3);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatCDATA(xmlTextWriterPtr writer,
-                                        const char *format, va_list argptr)
--				       ATTRIBUTE_PRINTF(2,0);
-+				       LIBXML_ATTR_FORMAT(2,0);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteCDATA(xmlTextWriterPtr writer,
-                                 const xmlChar * content);
-@@ -315,14 +315,14 @@
-                                     const xmlChar * pubid,
-                                     const xmlChar * sysid,
-                                     const char *format, ...)
--				    ATTRIBUTE_PRINTF(5,6);
-+				    LIBXML_ATTR_FORMAT(5,6);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatDTD(xmlTextWriterPtr writer,
-                                      const xmlChar * name,
-                                      const xmlChar * pubid,
-                                      const xmlChar * sysid,
-                                      const char *format, va_list argptr)
--				     ATTRIBUTE_PRINTF(5,0);
-+				     LIBXML_ATTR_FORMAT(5,0);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteDTD(xmlTextWriterPtr writer,
-                               const xmlChar * name,
-@@ -353,13 +353,13 @@
-         xmlTextWriterWriteFormatDTDElement(xmlTextWriterPtr writer,
-                                            const xmlChar * name,
-                                            const char *format, ...)
--					   ATTRIBUTE_PRINTF(3,4);
-+					   LIBXML_ATTR_FORMAT(3,4);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatDTDElement(xmlTextWriterPtr writer,
-                                             const xmlChar * name,
-                                             const char *format,
-                                             va_list argptr)
--					    ATTRIBUTE_PRINTF(3,0);
-+					    LIBXML_ATTR_FORMAT(3,0);
-     XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDElement(xmlTextWriterPtr
-                                                        writer,
-                                                        const xmlChar *
-@@ -383,13 +383,13 @@
-         xmlTextWriterWriteFormatDTDAttlist(xmlTextWriterPtr writer,
-                                            const xmlChar * name,
-                                            const char *format, ...)
--					   ATTRIBUTE_PRINTF(3,4);
-+					   LIBXML_ATTR_FORMAT(3,4);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriterPtr writer,
-                                             const xmlChar * name,
-                                             const char *format,
-                                             va_list argptr)
--					    ATTRIBUTE_PRINTF(3,0);
-+					    LIBXML_ATTR_FORMAT(3,0);
-     XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDAttlist(xmlTextWriterPtr
-                                                        writer,
-                                                        const xmlChar *
-@@ -414,14 +414,14 @@
-                                                   int pe,
-                                                   const xmlChar * name,
-                                                   const char *format, ...)
--						  ATTRIBUTE_PRINTF(4,5);
-+						  LIBXML_ATTR_FORMAT(4,5);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriterPtr writer,
-                                                    int pe,
-                                                    const xmlChar * name,
-                                                    const char *format,
-                                                    va_list argptr)
--						   ATTRIBUTE_PRINTF(4,0);
-+						   LIBXML_ATTR_FORMAT(4,0);
-     XMLPUBFUN int XMLCALL
-         xmlTextWriterWriteDTDInternalEntity(xmlTextWriterPtr writer,
-                                             int pe,
-Index: include/libxml/relaxng.h
-===================================================================
---- include/libxml/relaxng.h	(rev: 3826)
-+++ include/libxml/relaxng.h	(working copy)
-@@ -32,7 +32,7 @@
-  *
-  * Signature of an error callback from a Relax-NG validation
-  */
--typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
-+typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
- 
- /**
-  * xmlRelaxNGValidityWarningFunc:
-@@ -42,7 +42,7 @@
-  *
-  * Signature of a warning callback from a Relax-NG validation
-  */
--typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
-+typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
- 
- /**
-  * A schemas validation context
-Index: include/libxml/xmlversion.h.in
-===================================================================
---- include/libxml/xmlversion.h.in	(rev: 3826)
-+++ include/libxml/xmlversion.h.in	(working copy)
-@@ -414,19 +414,19 @@
- #endif
- 
- /**
-- * ATTRIBUTE_PRINTF:
-+ * LIBXML_ATTR_FORMAT:
-  *
-  * Macro used to indicate to GCC the parameter are printf like
-  */
- 
--#ifndef ATTRIBUTE_PRINTF
-+#ifndef LIBXML_ATTR_FORMAT
- # if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
--#  define ATTRIBUTE_PRINTF(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
-+#  define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
- # else
--#  define ATTRIBUTE_PRINTF(fmt,args)
-+#  define LIBXML_ATTR_FORMAT(fmt,args)
- # endif
- #else
--# define ATTRIBUTE_PRINTF(fmt,args)
-+# define LIBXML_ATTR_FORMAT(fmt,args)
- #endif
- 
- #else /* ! __GNUC__ */
-@@ -443,11 +443,11 @@
-  */
- #define ATTRIBUTE_ALLOC_SIZE(x)
- /**
-- * ATTRIBUTE_PRINTF:
-+ * LIBXML_ATTR_FORMAT:
-  *
-  * Macro used to indicate to GCC the parameter are printf like
-  */
--#define ATTRIBUTE_PRINTF(fmt,args)
-+#define LIBXML_ATTR_FORMAT(fmt,args)
- #endif /* __GNUC__ */
- 
- #ifdef __cplusplus
-
-Index: include/libxml/valid.h
-===================================================================
---- include/libxml/valid.h	(rev: 3826)
-+++ include/libxml/valid.h	(working copy)
-@@ -41,7 +41,7 @@
-  */
- typedef void (XMLCDECL *xmlValidityErrorFunc) (void *ctx,
- 			     const char *msg,
--			     ...) ATTRIBUTE_PRINTF(2,3);
-+			     ...) LIBXML_ATTR_FORMAT(2,3);
- 
- /**
-  * xmlValidityWarningFunc:
-@@ -56,7 +56,7 @@
-  */
- typedef void (XMLCDECL *xmlValidityWarningFunc) (void *ctx,
- 			       const char *msg,
--			       ...) ATTRIBUTE_PRINTF(2,3);
-+			       ...) LIBXML_ATTR_FORMAT(2,3);
- 
- #ifdef IN_LIBXML
- /**
-Index: include/libxml/xmlschemas.h
-===================================================================
---- include/libxml/xmlschemas.h	(rev: 3826)
-+++ include/libxml/xmlschemas.h	(working copy)
-@@ -92,7 +92,7 @@
-  *
-  * Signature of an error callback from an XSD validation
-  */
--typedef void (XMLCDECL *xmlSchemaValidityErrorFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
-+typedef void (XMLCDECL *xmlSchemaValidityErrorFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
- 
- /**
-  * xmlSchemaValidityWarningFunc:
-@@ -102,7 +102,7 @@
-  *
-  * Signature of a warning callback from an XSD validation
-  */
--typedef void (XMLCDECL *xmlSchemaValidityWarningFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
-+typedef void (XMLCDECL *xmlSchemaValidityWarningFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
- 
- /**
-  * A schemas validation context
-Index: include/libxml/xmlerror.h
-===================================================================
---- include/libxml/xmlerror.h	(rev: 3826)
-+++ include/libxml/xmlerror.h	(working copy)
-@@ -843,7 +843,7 @@
-  */
- typedef void (XMLCDECL *xmlGenericErrorFunc) (void *ctx,
- 				 const char *msg,
--				 ...) ATTRIBUTE_PRINTF(2,3);
-+				 ...) LIBXML_ATTR_FORMAT(2,3);
- /**
-  * xmlStructuredErrorFunc:
-  * @userData:  user provided data for the error callback
-@@ -874,19 +874,19 @@
- XMLPUBFUN void XMLCDECL
-     xmlParserError		(void *ctx,
- 				 const char *msg,
--				 ...) ATTRIBUTE_PRINTF(2,3);
-+				 ...) LIBXML_ATTR_FORMAT(2,3);
- XMLPUBFUN void XMLCDECL
-     xmlParserWarning		(void *ctx,
- 				 const char *msg,
--				 ...) ATTRIBUTE_PRINTF(2,3);
-+				 ...) LIBXML_ATTR_FORMAT(2,3);
- XMLPUBFUN void XMLCDECL
-     xmlParserValidityError	(void *ctx,
- 				 const char *msg,
--				 ...) ATTRIBUTE_PRINTF(2,3);
-+				 ...) LIBXML_ATTR_FORMAT(2,3);
- XMLPUBFUN void XMLCDECL
-     xmlParserValidityWarning	(void *ctx,
- 				 const char *msg,
--				 ...) ATTRIBUTE_PRINTF(2,3);
-+				 ...) LIBXML_ATTR_FORMAT(2,3);
- XMLPUBFUN void XMLCALL
-     xmlParserPrintFileInfo	(xmlParserInputPtr input);
- XMLPUBFUN void XMLCALL
-@@ -930,7 +930,7 @@
- 				 int int1,
- 				 int col,
- 				 const char *msg,
--				 ...) ATTRIBUTE_PRINTF(16,17);
-+				 ...) LIBXML_ATTR_FORMAT(16,17);
- XMLPUBFUN void XMLCALL
-     __xmlSimpleError		(int domain,
- 				 int code,
diff --git a/dev-libs/libxml2/libxml2-2.7.3-r2.ebuild b/dev-libs/libxml2/libxml2-2.7.3-r2.ebuild
deleted file mode 100644
index b47cb93824c7..000000000000
--- a/dev-libs/libxml2/libxml2-2.7.3-r2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3-r2.ebuild,v 1.8 2010/03/08 22:30:16 zmedico Exp $
-
-inherit libtool flag-o-matic eutils python
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug doc examples ipv6 python readline test"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )"
-
-RDEPEND="sys-libs/zlib
-	python?   ( <dev-lang/python-3 )
-	readline? ( sys-libs/readline )"
-
-DEPEND="${RDEPEND}
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )"
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P}.tar.gz
-	cd "${S}"
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-	fi
-
-	# Fix macro conflict with wxGTK, bug #266653
-	epatch "${FILESDIR}/${P}-printf-rename.patch"
-
-	# Fix multiple use-after-free, bug #280617
-	epatch "${FILESDIR}/${P}-CVE-2009-2414-CVE-2009-2416.patch"
-
-	epunt_cxx
-}
-
-src_compile() {
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	local myconf="--with-zlib \
-		--with-html-subdir=${PF}/html \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with debug run-debug)  \
-		$(use_with python)           \
-		$(use_with readline)         \
-		$(use_with readline history) \
-		$(use_enable ipv6)"
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	elibtoolize
-
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	econf $myconf
-
-	# Patching the Makefiles to respect get_libdir
-	# Fixes BUG #86766, please keep this.
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-	for x in $(find "${S}" -name "Makefile") ; do
-		sed \
-			-e "s|^\(PYTHON_SITE_PACKAGES\ =\ \/usr\/\).*\(\/python.*\)|\1$(get_libdir)\2|g" \
-			-i ${x} \
-			|| die "sed failed"
-	done
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR=/usr/share/doc/${PF}/examples \
-		docsdir=/usr/share/doc/${PF}/python \
-		exampledir=/usr/share/doc/${PF}/python/examples \
-		install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed"
-	rm "${D}"/usr/share/doc/${P}/Copyright
-	rm -rf "${D}"/usr/share/doc/${P}
-
-	if ! use python; then
-		rm -rf "${D}"/usr/share/doc/${PF}/python
-		rm -rf "${D}"/usr/share/doc/${PN}-python-${PV}
-	fi
-
-	if ! use doc; then
-		rm -rf "${D}"/usr/share/gtk-doc
-		rm -rf "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	if ! use examples; then
-		rm -rf "${D}/usr/share/doc/${PF}/examples"
-		rm -rf "${D}/usr/share/doc/${PF}/python/examples"
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize $(python_get_sitedir)
-	fi
-
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [ "${ROOT}" != "/" ]
-	then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${ROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [ ! -e ${CATALOG} ]; then
-			[ -d "${ROOT}etc/xml" ] || mkdir -p "${ROOT}etc/xml"
-			/usr/bin/xmlcatalog --create > ${CATALOG}
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages
-}