3 files changed, 40 insertions, 1 deletions
diff --git a/libxml/libxml2_2.6.10.oe b/libxml/libxml2_2.6.10.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libxml/libxml2_2.6.10.oe
diff --git a/libxml/libxml2_2.6.7.oe b/libxml/libxml2_2.6.7.oe
index 4d14784513..d9b3f42a34 100644
--- a/libxml/libxml2_2.6.7.oe
+++ b/libxml/libxml2_2.6.7.oe
@@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN}-dev += "${bindir}/xml-config"
 FILES_${PN}-utils += "${bindir}"
 
-SRC_URI = "${GNOME_MIRROR}/libxml2/2.6/libxml2-${PV}.tar.bz2"
+SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz"
 
 inherit autotools pkgconfig 
 
diff --git a/libxml/libxml2_2.6.9.oe b/libxml/libxml2_2.6.9.oe
index e69de29bb2..587da04a35 100644
--- a/libxml/libxml2_2.6.9.oe
+++ b/libxml/libxml2_2.6.9.oe
@@ -0,0 +1,39 @@
+PR = "r0"
+DESCRIPTION = "GNOME XML library"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xml-config"
+FILES_${PN}-utils += "${bindir}"
+
+SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n"
+
+headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
+
+do_stage () {
+	oe_libinstall -so libxml2 ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/libxml2/libxml
+	for i in ${headers}; do
+		install -m 0644 include/libxml/$i ${STAGING_INCDIR}/libxml2/libxml/$i
+	done
+
+	cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
+		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
+			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
+			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xml2-config
+	chmod a+rx ${STAGING_BINDIR}/xml2-config
+}
+
+python populate_packages_prepend () {
+	# autonamer would call this libxml2-2, but we don't want that
+	if oe.data.getVar('DEBIAN_NAMES', d, 1):
+		oe.data.setVar('PKG_libxml2', 'libxml2', d)
+}