summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/libxml/libxml2_2.6.10.bb40
-rw-r--r--packages/libxml/libxml2_2.6.22.bb31
-rw-r--r--packages/libxml/libxml2_2.6.7.bb40
-rw-r--r--packages/libxml/libxml2_2.6.9.bb40
-rw-r--r--packages/libxslt/libxslt_1.1.12.bb (renamed from packages/libxslt/libxslt_1.1.8.bb)13
-rw-r--r--packages/libxslt/libxslt_1.1.7.bb45
-rw-r--r--packages/meta/task-python-everything_20060425.bb3
-rw-r--r--packages/meta/task-python-sharprom_20060425.bb3
-rw-r--r--packages/python/python-lxml_1.0.2.bb12
9 files changed, 32 insertions, 195 deletions
diff --git a/packages/libxml/libxml2_2.6.10.bb b/packages/libxml/libxml2_2.6.10.bb
deleted file mode 100644
index 9f789a499e..0000000000
--- a/packages/libxml/libxml2_2.6.10.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-PR = "r0"
-DESCRIPTION = "GNOME XML library"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "MIT"
-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/old/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
- install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-python populate_packages_prepend () {
- # autonamer would call this libxml2-2, but we don't want that
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bb.data.setVar('PKG_libxml2', 'libxml2', d)
-}
diff --git a/packages/libxml/libxml2_2.6.22.bb b/packages/libxml/libxml2_2.6.22.bb
index fae00a6063..92f3dca661 100644
--- a/packages/libxml/libxml2_2.6.22.bb
+++ b/packages/libxml/libxml2_2.6.22.bb
@@ -1,34 +1,18 @@
-PR = "r1"
DESCRIPTION = "GNOME XML library"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "MIT"
-PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xml-config"
-FILES_${PN}-utils += "${bindir}"
+PR = "r2"
SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz \
file://no-testapi.patch;patch=1"
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--without-python --without-debug --without-legacy --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}
+inherit autotools pkgconfig binconfig
- mkdir -p ${STAGING_INCDIR}/libxml2/libxml
- for i in ${headers}; do
- install -m 0644 include/libxml/$i ${STAGING_INCDIR}/libxml2/libxml/$i
- done
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n"
- 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
+do_stage() {
+ autotools_stage_all
install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
}
@@ -37,3 +21,8 @@ python populate_packages_prepend () {
if bb.data.getVar('DEBIAN_NAMES', d, 1):
bb.data.setVar('PKG_libxml2', 'libxml2', d)
}
+
+PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN}-utils += "${bindir}"
diff --git a/packages/libxml/libxml2_2.6.7.bb b/packages/libxml/libxml2_2.6.7.bb
deleted file mode 100644
index b204351b7b..0000000000
--- a/packages/libxml/libxml2_2.6.7.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-PR = "r1"
-DESCRIPTION = "GNOME XML library"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "MIT"
-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/old/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
- install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-python populate_packages_prepend () {
- # autonamer would call this libxml2-2, but we don't want that
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bb.data.setVar('PKG_libxml2', 'libxml2', d)
-}
diff --git a/packages/libxml/libxml2_2.6.9.bb b/packages/libxml/libxml2_2.6.9.bb
deleted file mode 100644
index 9f789a499e..0000000000
--- a/packages/libxml/libxml2_2.6.9.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-PR = "r0"
-DESCRIPTION = "GNOME XML library"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "MIT"
-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/old/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
- install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-python populate_packages_prepend () {
- # autonamer would call this libxml2-2, but we don't want that
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bb.data.setVar('PKG_libxml2', 'libxml2', d)
-}
diff --git a/packages/libxslt/libxslt_1.1.8.bb b/packages/libxslt/libxslt_1.1.12.bb
index fd81cba5d2..b98a3c54e8 100644
--- a/packages/libxslt/libxslt_1.1.8.bb
+++ b/packages/libxslt/libxslt_1.1.12.bb
@@ -1,16 +1,10 @@
-PR = "r1"
DESCRIPTION = "GNOME XSLT library"
SECTION = "libs"
PRIORITY = "optional"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
DEPENDS = "libxml2"
LICENSE = "MIT"
-PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-FILES_${PN}-dev += "${bindir}/xslt-config"
-FILES_${PN}-utils += "${bindir}"
-
-SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxslt-${PV}.tar.gz"
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
S = "${WORKDIR}/libxslt-${PV}"
inherit autotools pkgconfig
@@ -43,3 +37,8 @@ do_stage () {
chmod a+rx ${STAGING_BINDIR}/xslt-config
install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
}
+
+PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xslt-config"
+FILES_${PN}-utils += "${bindir}"
diff --git a/packages/libxslt/libxslt_1.1.7.bb b/packages/libxslt/libxslt_1.1.7.bb
deleted file mode 100644
index fd81cba5d2..0000000000
--- a/packages/libxslt/libxslt_1.1.7.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-PR = "r1"
-DESCRIPTION = "GNOME XSLT library"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "libxml2"
-LICENSE = "MIT"
-PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xslt-config"
-FILES_${PN}-utils += "${bindir}"
-
-SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxslt-${PV}.tar.gz"
-S = "${WORKDIR}/libxslt-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--without-python --without-debug --without-mem-debug"
-
-xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \
- keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \
- templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \
- xsltexports.h xsltutils.h"
-exsltheaders = "exslt.h exsltconfig.h exsltexports.h"
-
-do_stage () {
- oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR}
- oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR}
-
- mkdir -p ${STAGING_INCDIR}/libxslt
- for i in ${xsltheaders}; do
- install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i
- done
- mkdir -p ${STAGING_INCDIR}/libexslt
- for i in ${exsltheaders}; do
- install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
- done
-
- cat xslt-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}/xslt-config
- chmod a+rx ${STAGING_BINDIR}/xslt-config
- install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/meta/task-python-everything_20060425.bb b/packages/meta/task-python-everything_20060425.bb
index ebcb80b007..7fd4c8f286 100644
--- a/packages/meta/task-python-everything_20060425.bb
+++ b/packages/meta/task-python-everything_20060425.bb
@@ -2,7 +2,7 @@ DESCRIPTION= "Everything Python"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml9"
+PR = "ml10"
BROKEN_BECAUSE_GCC4 = "\
python-egenix-mx-base"
@@ -25,6 +25,7 @@ RDEPENDS = "\
python-itools \
python-logilab \
python-libgmail \
+ python-lxml \
python-mad \
python-native \
python-numeric \
diff --git a/packages/meta/task-python-sharprom_20060425.bb b/packages/meta/task-python-sharprom_20060425.bb
index a8fcca2df6..bb62a15472 100644
--- a/packages/meta/task-python-sharprom_20060425.bb
+++ b/packages/meta/task-python-sharprom_20060425.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Everything Python for SharpROM"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml5"
+PR = "ml6"
NONWORKING = "\
python-codes \
@@ -30,6 +30,7 @@ RDEPENDS = "\
python-itools \
python-libgmail \
python-logilab \
+ python-lxml \
python-mad \
python-native \
python-numeric \
diff --git a/packages/python/python-lxml_1.0.2.bb b/packages/python/python-lxml_1.0.2.bb
new file mode 100644
index 0000000000..4d5198b2d5
--- /dev/null
+++ b/packages/python/python-lxml_1.0.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Python Bindings to the XML libraries libxml2 and libxslt"
+HOMEPAGE = "http://codespeak.net/lxml/"
+AUTHOR = "http://codespeak.net/mailman/listinfo/lxml-dev"
+LICENSE = "BSD"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "ml0"
+
+SRC_URI = "http://codespeak.net/lxml/lxml-${PV}.tgz"
+S = "${WORKDIR}/lxml-${PV}"
+
+inherit distutils
+