--- libxml2-2.9.8.ebuild
+++ libxml2-2.9.8-r1.ebuild
@@ -12,8 +12,8 @@
 
 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"
+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="catalogless 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"
@@ -44,9 +44,12 @@
 
 S="${WORKDIR}/${PN}-${PV%_rc*}"
 
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/xml2-config
+		$(usex catalogless /usr/bin/xml2-catalogless-config "")
+	)
+}
 
 src_unpack() {
 	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
@@ -73,10 +76,6 @@
 
 	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
@@ -86,6 +85,10 @@
 		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
 	fi
 
+	if use catalogless; then
+		cp -pr "${S}" "${S}-catalogless" || 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.
@@ -93,6 +96,14 @@
 #	epunt_cxx # if we don't eautoreconf
 
 	eautoreconf
+
+	if use catalogless; then
+		pushd "${S}-catalogless" > /dev/null || die
+		eapply "${FILESDIR}"/${P}-catalogless.patch
+		eapply "${FILESDIR}"/${P}-catalogless-generated.patch
+		eautoreconf
+		popd > /dev/null || die
+	fi
 }
 
 multilib_src_configure() {
@@ -109,7 +120,7 @@
 	# --with-mem-debug causes unusual segmentation faults (bug #105120).
 
 	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
+		ECONF_SOURCE="${ECONF_SOURCE-${S}}" econf \
 			--with-html-subdir=${PF}/html \
 			$(use_with debug run-debug) \
 			$(use_with icu) \
@@ -128,6 +139,13 @@
 
 	libxml2_configure --without-python # build python bindings separately
 
+	if use catalogless; then
+		mkdir -p "$(pwd)-catalogless" || die
+		pushd "$(pwd)-catalogless" > /dev/null || die
+		ECONF_SOURCE="${S}-catalogless" libxml2_configure --without-python
+		popd > /dev/null || die
+	fi
+
 	if multilib_is_native_abi && use python; then
 		python_foreach_impl libxml2_py_configure
 	fi
@@ -135,6 +153,13 @@
 
 multilib_src_compile() {
 	default
+
+	if use catalogless; then
+		pushd "$(pwd)-catalogless" > /dev/null || die
+		default
+		popd > /dev/null || die
+	fi
+
 	if multilib_is_native_abi && use python; then
 		local native_builddir=${BUILD_DIR}
 		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
@@ -143,6 +168,13 @@
 
 multilib_src_test() {
 	emake check
+
+	if use catalogless; then
+		pushd "$(pwd)-catalogless" > /dev/null || die
+		emake check
+		popd > /dev/null || die
+	fi
+
 	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
 }
 
@@ -150,6 +182,13 @@
 	emake DESTDIR="${D}" \
 		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
 
+	if use catalogless; then
+		pushd "$(pwd)-catalogless" > /dev/null || die
+		emake DESTDIR="${D}" \
+			EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
+		popd > /dev/null || die
+	fi
+
 	if multilib_is_native_abi && use python; then
 		python_foreach_impl libxml2_py_emake \
 			DESTDIR="${D}" \