diff --git a/app-admin/genmenu/genmenu-9999.ebuild b/app-admin/genmenu/genmenu-9999.ebuild
index 458282e57..904a78dfc 100644
--- a/app-admin/genmenu/genmenu-9999.ebuild
+++ b/app-admin/genmenu/genmenu-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -14,8 +14,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-DEPEND=">=dev-python/lxml-1.3.6
-	gnome-base/gnome-menus"
+#gnome-base/gnome-menus"
+DEPEND=">=dev-python/lxml-1.3.6"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
deleted file mode 100644
index 9a2f9389c..000000000
--- a/dev-python/lxml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxml-2.3.2.tar.gz 3134325 SHA256 32bf688a03d18caa74840764727e8fa29bb29950f7a190a0b969150a3869a6a1 SHA512 ea5721647e1a9dd68908a3cd033ca9718dd97996f4c42605083cc7a2675bb79116cbcfce476223a4eb995876fa4e3c0d5721eb4fd96ca842c33630eb3d9bdc5b WHIRLPOOL f29e845a0f027684faddbcc49842550bfc0bef16c0a828d550f3ff47078f8093c38d278aec370cad5fdbc5f3f4bda41a0feb3f2a6f38e36af2b8f89b44db83a5
diff --git a/dev-python/lxml/lxml-2.3.2.ebuild b/dev-python/lxml/lxml-2.3.2.ebuild
deleted file mode 100644
index 22f959a89..000000000
--- a/dev-python/lxml/lxml-2.3.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-2.3.4.ebuild,v 1.12 2012/12/27 10:48:42 armin76 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*::3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.3 *-jython 2.7-pypy-*"
-
-inherit distutils
-
-MY_P="${PN}-${PV/_/}"
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://codespeak.net/lxml/ http://pypi.python.org/pypi/lxml"
-SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples +threads"
-
-RDEPEND=">=dev-libs/libxml2-2.7.2
-	>=dev-libs/libxslt-1.1.15
-	>=dev-python/beautifulsoup-3.0.8"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-# lxml tarball contains files pregenerated by Cython.
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-# Compiler warnings are suppressed without --warnings option.
-DISTUTILS_GLOBAL_OPTIONS=("--warnings")
-
-src_compile() {
-	distutils_src_compile $(use threads || echo --without-threading)
-}
-
-src_test() {
-	testing() {
-		# Tests broken with Python 3.
-		[[ "${PYTHON_ABI}" == 3.* ]] && return
-
-		local module
-		for module in lxml/etree lxml/objectify; do
-			ln -fs "../../$(ls -d build-${PYTHON_ABI}/lib.*)/${module}.so" "src/${module}.so" || die "ln -fs src/${module} failed"
-		done
-
-		local exit_status="0" test
-		for test in test.py selftest.py selftest2.py; do
-			einfo "Running ${test}"
-			if ! PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}"; then
-				eerror "${test} failed with $(python_get_implementation) $(python_get_version)"
-				exit_status="1"
-			fi
-		done
-
-		return "${exit_status}"
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc/html/* || die "Installation of documentation failed"
-		dodoc *.txt || die "Installation of documentation failed"
-		docinto doc
-		dodoc doc/*.txt || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r samples/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/lxml/metadata.xml b/dev-python/lxml/metadata.xml
deleted file mode 100644
index ed9a2f8c7..000000000
--- a/dev-python/lxml/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>python</herd>
-  <use>
-    <flag name="beautifulsoup3">Enable support for Beautiful Soup 3</flag>
-  </use>
-</pkgmetadata>