dev-libs/libxml2: remove old
authorMart Raudsepp <leio@gentoo.org>
Wed, 25 Jul 2018 13:17:56 +0000 (16:17 +0300)
committerMart Raudsepp <leio@gentoo.org>
Wed, 25 Jul 2018 16:47:08 +0000 (19:47 +0300)
Package-Manager: Portage-2.3.43, Repoman-2.3.10

dev-libs/libxml2/Manifest
dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch [deleted file]
dev-libs/libxml2/libxml2-2.9.6.ebuild [deleted file]
dev-libs/libxml2/libxml2-2.9.7.ebuild [deleted file]

index b8be3f373f7020457a8ec3f69c4408a865c95d9c..aed8b4f5a34e0b1bdcb3e9006173663cd3d976b8 100644 (file)
@@ -1,5 +1,3 @@
-DIST libxml2-2.9.6.tar.gz 5469624 BLAKE2B cb8fc74044876b2ddf9742a4a84d685ce6cd1e41a991ee79fd70a9175c54d2a9a3d3a2c3229a4ce177fcd4e30b0cee08c7cf3a36fef68b179db0ce521fbbf3b0 SHA512 5ef80f895374bd5dd3bcd5f00c715795f026bf45d998f8f762c0cdb739b8755e01de40cf853d98a3826eacef95c4adebe4777db11020e8d98d0bda921f55a0ed
-DIST libxml2-2.9.7.tar.gz 5467389 BLAKE2B e15082fb87fb41a7aab6f39120b1d1bbd0325af8009bb3b74c69a98bf7347a39f59055762df157dcf223a79ac84f17535cb40af0a9a461ee3d2c1d55f4832e1b SHA512 da06cb7c5032ef4b7c8e902fabb9d2c74634c42c161be07a7c66a00d53a68029f89b0d4de32a6b9d4ff338c2d1d9c4e53aefb9cf50cb1c2d6c6b06b442ef42d5
 DIST libxml2-2.9.8.tar.gz 5469097 BLAKE2B 0b7836db46edebf6e7108c28da4bb7e3fb5ddc695aaa3e456ba51a66c0294a741d7b60eb4c31c7040443bbd54712c019424078bd533856a9650b39a703a926d5 SHA512 28903282c7672206effa1362fd564cbe4cf5be44264b083a7d14e383f73bccd1b81bcafb5f4f2f56f5e7e05914c660e27668c9ce91b1b9f256ef5358d55ba917
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
diff --git a/dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch b/dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch
deleted file mode 100644 (file)
index cce3ecb..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-From 168e20836fe9614dd2dd4b42006c17a783f11c48 Mon Sep 17 00:00:00 2001
-From: Markus Duft <mduft@gentoo.org>
-Date: Thu, 20 Nov 2008 11:04:33 -0500
-Subject: [PATCH] Fix for ~x86-winnt
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: port to 2.8.0-rc1]
----
- dict.c                |    2 +-
- include/wsockcompat.h |    2 +-
- nanohttp.c            |    2 +-
- xmlIO.c               |    4 ++++
- 4 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/dict.c b/dict.c
-index 3579f64..71e7bc6 100644
---- a/dict.c
-+++ b/dict.c
-@@ -47,7 +47,7 @@
- #else
- #ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#elif defined(WIN32)
-+#elif defined(WIN32) || defined (__PARITY__)
- typedef unsigned __int32 uint32_t;
- #endif
- #endif
-diff --git a/include/wsockcompat.h b/include/wsockcompat.h
-index c762a64..1ed822b 100644
---- a/include/wsockcompat.h
-+++ b/include/wsockcompat.h
-@@ -27,7 +27,7 @@
- #endif
- #endif
--#if defined( __MINGW32__ ) || defined( _MSC_VER )
-+#if defined( __MINGW32__ ) || defined( _MSC_VER ) || defined(__PARITY__)
- /* Include <errno.h> here to ensure that it doesn't get included later
-  * (e.g. by iconv.h) and overwrites the definition of EWOULDBLOCK. */
- #include <errno.h>
-diff --git a/nanohttp.c b/nanohttp.c
-index 2437fed..dbe97a7 100644
---- a/nanohttp.c
-+++ b/nanohttp.c
-@@ -74,7 +74,7 @@
- #define XML_SOCKLEN_T unsigned int
- #endif
--#if defined(__MINGW32__) || defined(_WIN32_WCE)
-+#if defined(__MINGW32__) || defined(_WIN32_WCE) || defined(__PARITY__)
- #ifndef _WINSOCKAPI_
- #define _WINSOCKAPI_
- #endif
-diff --git a/xmlIO.c b/xmlIO.c
-index 73a995d..99562f6 100644
---- a/xmlIO.c
-+++ b/xmlIO.c
-@@ -47,6 +47,7 @@
- #include <winnls.h> /* for CP_UTF8 */
- #endif
-+#ifndef __PARITY__
- /* Figure a portable way to know if a file is a directory. */
- #ifndef HAVE_STAT
- #  ifdef HAVE__STAT
-@@ -82,6 +83,7 @@
- #    endif
- #  endif
- #endif
-+#endif /* __PARITY__ */
- #include <libxml/xmlmemory.h>
- #include <libxml/parser.h>
-@@ -657,6 +659,7 @@ xmlWrapStatUtf8(const char *path,struct stat *info)
- {
- #ifdef HAVE_STAT
-     int retval = -1;
-+#ifndef __PARITY__
-     wchar_t *wPath;
-     wPath = __xmlIOWin32UTF8ToWChar(path);
-@@ -665,6 +668,7 @@ xmlWrapStatUtf8(const char *path,struct stat *info)
-        retval = _wstat(wPath,info);
-        xmlFree(wPath);
-     }
-+#endif
-     /* maybe path in native encoding */
-     if(retval < 0)
-        retval = stat(path,info);
--- 
-1.7.8.6
-
diff --git a/dev-libs/libxml2/libxml2-2.9.6.ebuild b/dev-libs/libxml2/libxml2-2.9.6.ebuild
deleted file mode 100644 (file)
index e1b36ac..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-       test? (
-               ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-               ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-               http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-       >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-       icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-       lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-       python? ( ${PYTHON_DEPS} )
-       readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-       dev-util/gtk-doc-am
-       virtual/pkgconfig
-       hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/xml2-config
-)
-
-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/_rc/-rc}.tar.gz
-       cd "${S}" || die
-
-       if use test; then
-               cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-                       "${DISTDIR}/${XSTS_TARBALL_2}" \
-                       "${S}"/xstc/ \
-                       || die "Failed to install test tarballs"
-               unpack ${XMLCONF_TARBALL}
-       fi
-}
-
-src_prepare() {
-       default
-
-       DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-       # Patches needed for prefix support
-       eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-       eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-       # Fix build for Windows platform
-       # https://bugzilla.gnome.org/show_bug.cgi?id=760456
-       eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-       # Fix python detection, bug #567066
-       # https://bugzilla.gnome.org/show_bug.cgi?id=760458
-       eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-       # Avoid final linking arguments for python modules
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-       fi
-
-       # Please do not remove, as else we get references to PORTAGE_TMPDIR
-       # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-       # We now need to run eautoreconf at the end to prevent maintainer mode.
-#      elibtoolize
-#      epunt_cxx # if we don't eautoreconf
-
-       eautoreconf
-}
-
-multilib_src_configure() {
-       # filter seemingly problematic CFLAGS (#26320)
-       filter-flags -fprefetch-loop-arrays -funroll-loops
-
-       # 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).
-
-       libxml2_configure() {
-               ECONF_SOURCE="${S}" econf \
-                       --with-html-subdir=${PF}/html \
-                       $(use_with debug run-debug) \
-                       $(use_with icu) \
-                       $(use_with lzma) \
-                       $(use_enable ipv6) \
-                       $(use_enable static-libs static) \
-                       $(multilib_native_use_with readline) \
-                       $(multilib_native_use_with readline history) \
-                       "$@"
-       }
-
-       libxml2_py_configure() {
-               mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-               run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
-       }
-
-       libxml2_configure --without-python # build python bindings separately
-
-       if multilib_is_native_abi && use python; then
-               python_foreach_impl libxml2_py_configure
-       fi
-}
-
-multilib_src_compile() {
-       default
-       if multilib_is_native_abi && use python; then
-               local native_builddir=${BUILD_DIR}
-               python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-       fi
-}
-
-multilib_src_test() {
-       emake check
-       multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-       emake DESTDIR="${D}" \
-               EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-       if multilib_is_native_abi && use python; then
-               python_foreach_impl libxml2_py_emake \
-                       DESTDIR="${D}" \
-                       docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-                       exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-                       install
-               python_foreach_impl python_optimize
-       fi
-}
-
-multilib_src_install_all() {
-       # on windows, xmllint is installed by interix libxml2 in parent prefix.
-       # this is the version to use. the native winnt version does not support
-       # symlinks, which makes repoman fail if the portage tree is linked in
-       # from another location (which is my default). -- mduft
-       if [[ ${CHOST} == *-winnt* ]]; then
-               rm -rf "${ED}"/usr/bin/xmllint
-               rm -rf "${ED}"/usr/bin/xmlcatalog
-       fi
-
-       rm -rf "${ED}"/usr/share/doc/${P}
-       einstalldocs
-
-       if ! use examples; then
-               rm -rf "${ED}"/usr/share/doc/${PF}/examples
-               rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-       fi
-
-       prune_libtool_files --modules
-}
-
-pkg_postinst() {
-       # 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="${EROOT}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 "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-                       "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-                       einfo "Created XML catalog in ${CATALOG}"
-               fi
-       fi
-}
-
-libxml2_py_emake() {
-       pushd "${BUILD_DIR}/python" > /dev/null || die
-       emake "$@"
-       popd > /dev/null
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.7.ebuild b/dev-libs/libxml2/libxml2-2.9.7.ebuild
deleted file mode 100644 (file)
index bac5bf7..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-       test? (
-               ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-               ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-               http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-       >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-       icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-       lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-       python? ( ${PYTHON_DEPS} )
-       readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-       dev-util/gtk-doc-am
-       virtual/pkgconfig
-       hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/xml2-config
-)
-
-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/_rc/-rc}.tar.gz
-       cd "${S}" || die
-
-       if use test; then
-               cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-                       "${DISTDIR}/${XSTS_TARBALL_2}" \
-                       "${S}"/xstc/ \
-                       || die "Failed to install test tarballs"
-               unpack ${XMLCONF_TARBALL}
-       fi
-}
-
-src_prepare() {
-       default
-
-       DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-       # Patches needed for prefix support
-       eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-       eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-       # Fix build for Windows platform
-       # https://bugzilla.gnome.org/show_bug.cgi?id=760456
-       # eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-       # Fix python detection, bug #567066
-       # https://bugzilla.gnome.org/show_bug.cgi?id=760458
-       eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-       # Avoid final linking arguments for python modules
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-       fi
-
-       # Please do not remove, as else we get references to PORTAGE_TMPDIR
-       # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-       # We now need to run eautoreconf at the end to prevent maintainer mode.
-#      elibtoolize
-#      epunt_cxx # if we don't eautoreconf
-
-       eautoreconf
-}
-
-multilib_src_configure() {
-       # filter seemingly problematic CFLAGS (#26320)
-       filter-flags -fprefetch-loop-arrays -funroll-loops
-
-       # 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).
-
-       libxml2_configure() {
-               ECONF_SOURCE="${S}" econf \
-                       --with-html-subdir=${PF}/html \
-                       $(use_with debug run-debug) \
-                       $(use_with icu) \
-                       $(use_with lzma) \
-                       $(use_enable ipv6) \
-                       $(use_enable static-libs static) \
-                       $(multilib_native_use_with readline) \
-                       $(multilib_native_use_with readline history) \
-                       "$@"
-       }
-
-       libxml2_py_configure() {
-               mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-               run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
-       }
-
-       libxml2_configure --without-python # build python bindings separately
-
-       if multilib_is_native_abi && use python; then
-               python_foreach_impl libxml2_py_configure
-       fi
-}
-
-multilib_src_compile() {
-       default
-       if multilib_is_native_abi && use python; then
-               local native_builddir=${BUILD_DIR}
-               python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-       fi
-}
-
-multilib_src_test() {
-       emake check
-       multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-       emake DESTDIR="${D}" \
-               EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-       if multilib_is_native_abi && use python; then
-               python_foreach_impl libxml2_py_emake \
-                       DESTDIR="${D}" \
-                       docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-                       exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-                       install
-               python_foreach_impl python_optimize
-       fi
-}
-
-multilib_src_install_all() {
-       # on windows, xmllint is installed by interix libxml2 in parent prefix.
-       # this is the version to use. the native winnt version does not support
-       # symlinks, which makes repoman fail if the portage tree is linked in
-       # from another location (which is my default). -- mduft
-       if [[ ${CHOST} == *-winnt* ]]; then
-               rm -rf "${ED}"/usr/bin/xmllint
-               rm -rf "${ED}"/usr/bin/xmlcatalog
-       fi
-
-       rm -rf "${ED}"/usr/share/doc/${P}
-       einstalldocs
-
-       if ! use examples; then
-               rm -rf "${ED}"/usr/share/doc/${PF}/examples
-               rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-       fi
-
-       prune_libtool_files --modules
-}
-
-pkg_postinst() {
-       # 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="${EROOT}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 "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-                       "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-                       einfo "Created XML catalog in ${CATALOG}"
-               fi
-       fi
-}
-
-libxml2_py_emake() {
-       pushd "${BUILD_DIR}/python" > /dev/null || die
-       emake "$@"
-       popd > /dev/null
-}