fixed so that it works with kde-libs

5 files changed, 19 insertions, 31 deletions

diff --git a/dev-libs/libxml2/files/digest-libxml2-2.4.10 b/dev-libs/libxml2/files/digest-libxml2-2.4.10-r1
index c150eb1642d0..c150eb1642d0 100644
--- a/dev-libs/libxml2/files/digest-libxml2-2.4.10
+++ b/dev-libs/libxml2/files/digest-libxml2-2.4.10-r1
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.4.9 b/dev-libs/libxml2/files/digest-libxml2-2.4.9
deleted file mode 100644
index 346c94180581..000000000000
--- a/dev-libs/libxml2/files/digest-libxml2-2.4.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9b9adae878c2d851804cc403da085ea libxml2-2.4.9.tar.gz 1556480
diff --git a/dev-libs/libxml2/files/libxml2-2.4.10.gentoo.diff b/dev-libs/libxml2/files/libxml2-2.4.10.gentoo.diff
new file mode 100644
index 000000000000..43b38da2870c
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.4.10.gentoo.diff
@@ -0,0 +1,12 @@
+--- include/libxml/xmlerror.h.orig	Mon Nov 12 23:55:40 2001
++++ include/libxml/xmlerror.h	Mon Nov 12 23:55:48 2001
+@@ -1,7 +1,7 @@
++#include <libxml/parser.h>
++
+ #ifndef __XML_ERROR_H__
+ #define __XML_ERROR_H__
+-
+-#include <libxml/parser.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/dev-libs/libxml2/libxml2-2.4.10.ebuild b/dev-libs/libxml2/libxml2-2.4.10-r1.ebuild
index 26fcc8d8dd79..9ca8a4604af5 100644
--- a/dev-libs/libxml2/libxml2-2.4.10.ebuild
+++ b/dev-libs/libxml2/libxml2-2.4.10-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.4.10.ebuild,v 1.1 2001/11/11 11:28:17 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.4.10-r1.ebuild,v 1.1 2001/11/13 00:10:32 hallski Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -14,6 +14,12 @@ DEPEND="virtual/glibc
         >=sys-libs/readline-4.1
 	>=sys-libs/zlib-1.1.3" 
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p0 < ${FILESDIR}/libxml2-2.4.10.gentoo.diff
+}
+
 src_compile() {
 	./configure --host=${CHOST} 					\
 		    --prefix=/usr 					\
diff --git a/dev-libs/libxml2/libxml2-2.4.9.ebuild b/dev-libs/libxml2/libxml2-2.4.9.ebuild
deleted file mode 100644
index cbc0acab8be3..000000000000
--- a/dev-libs/libxml2/libxml2-2.4.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.4.9.ebuild,v 1.2 2001/11/10 12:05:20 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="libxml"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2
-        >=sys-libs/readline-4.1
-	>=sys-libs/zlib-1.1.3" 
-
-src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr 					\
-		    --sysconfdir=/etc 					\
-		    --with-zlib  || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING* ChangeLog NEWS README
-}