remove old, remove ocaml from stable due to ocaml-4 being ~, add libgcrypt to DEPEND and remove antiquated CDEPEND thanks to dev steev

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

5 files changed, 23 insertions, 402 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index aa6229a29a76..e9e1ca4ecfd2 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.193 2013/08/23 13:03:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.194 2013/10/04 18:06:23 idella4 Exp $
+
+  04 Oct 2013; Ian Delaney <idella4@gentoo.org> -xen-tools-4.2.1-r5.ebuild,
+  xen-tools-4.2.2-r3.ebuild, xen-tools-4.2.2-r4.ebuild, xen-tools-4.3.0.ebuild:
+  remove old, remove ocaml from stable due to ocaml-4 being ~, add libgcrypt to
+  DEPEND and remove antiquated CDEPEND thanks to dev steev
 
   23 Aug 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.2.1-r5.ebuild,
   xen-tools-4.2.2-r3.ebuild, xen-tools-4.2.2-r4.ebuild, xen-tools-4.3.0.ebuild:
diff --git a/app-emulation/xen-tools/xen-tools-4.2.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.2.1-r5.ebuild
deleted file mode 100644
index 311d5a4aa451..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.2.1-r5.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r5.ebuild,v 1.3 2013/08/23 13:03:29 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE='xml,threads'
-
-IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz"
-XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2"
-XSAPATCHES="http://dev.gentoo.org/~idella4/"
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	REPO="xen-unstable.hg"
-	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
-	S="${WORKDIR}/${REPO}"
-	live_eclass="mercurial"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
-	$IPXE_TARBALL_URL
-	$XEN_SEABIOS_URL
-	$XSAPATCHES/patches/XSA-55patches.tar.gz"
-	S="${WORKDIR}/xen-${PV}"
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend"
-
-REQUIRED_USE="hvm? ( qemu )"
-
-CDEPEND="dev-libs/yajl
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pypam[${PYTHON_USEDEP}]
-	sys-libs/zlib
-	sys-power/iasl
-	ocaml? ( dev-ml/findlib )
-	hvm? ( media-libs/libsdl )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	${PYTHON_DEPS}
-	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )"
-DEPEND="${CDEPEND}
-	sys-devel/bin86
-	sys-devel/dev86
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-doc/doxygen
-		dev-tex/latex2html[png,gif]
-		media-gfx/transfig
-		media-gfx/graphviz
-		dev-tex/xcolor
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? (  x11-proto/xproto )"
-RDEPEND="${CDEPEND}
-	sys-apps/iproute2
-	net-misc/bridge-utils
-	ocaml? ( >=dev-lang/ocaml-3.12.0 )
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	if has_version dev-libs/libgcrypt; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if use qemu; then
-		export "CONFIG_IOEMU=y"
-	else
-		export "CONFIG_IOEMU=n"
-	fi
-
-	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-		eerror "to build xen-tools on your current profile."
-		die "USE=hvm is unsupported on this system."
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	use api     && export "LIBXENAPI_BINDINGS=y"
-	use flask   && export "FLASK_ENABLE=y"
-}
-
-src_prepare() {
-	# Drop .config, fixes to gcc-4.6
-	epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch
-
-	# Xend
-	if ! use xend; then
-		sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
-			-i tools/misc/Makefile || die "Disabling xend failed"
-		sed -e 's:^XEND_INITD:#XEND_INITD:' \
-			-i tools/examples/Makefile || die "Disabling xend failed"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
-	fi
-
-	# Disable hvm support on systems that don't support x86_32 binaries.
-	if ! use hvm; then
-		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	fi
-
-	# Don't bother with qemu, only needed for fully virtualised guests
-	if ! use qemu; then
-		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
-		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	epatch "${FILESDIR}"/${PN}-4-docfix.patch \
-		"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
-
-	# Fix network broadcast on bridged networks
-	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
-
-	# Prevent the downloading of ipxe, seabios
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-anti-download.patch
-	cp "${DISTDIR}"/ipxe.tar.gz tools/firmware/etherboot/ || die
-	mv ../seabios-dir-remote tools/firmware/ || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Fix bridge by idella4, bug #362575
-	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
-
-	# Don't build ipxe with pie on hardened, Bug #360805
-	if gcc-specs-pie; then
-		epatch "${FILESDIR}"/ipxe-nopie.patch
-	fi
-
-	# Prevent double stripping of files at install
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
-
-	# fix jobserver in Makefile
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch
-
-	# add missing typedef
-	epatch "${FILESDIR}"/xen-4-ulong.patch \
-		"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
-
-	# Set dom0-min-mem to kb; Bug #472982
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
-
-	#Sec patches currently valid
-	epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \
-		"${FILESDIR}"/xen-4-CVE-2013-0215-XSA-38.patch \
-		"${FILESDIR}"/xen-4-CVE-2013-1919-XSA-46.patch \
-		"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \
-		"${FILESDIR}"/xen-4-CVE-2013-1952-XSA_49.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-1-XSA-55.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-2-XSA-55.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-3-XSA-55.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-4-XSA-55.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-5to7-XSA-55.patch \
-                "${WORKDIR}"/files/xen-4.2-CVE-2013-8-XSA-55.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-9to10-XSA-55.patch \
-                "${WORKDIR}"/files/xen-4.2-CVE-2013-11-XSA-55.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-12to13-XSA-55.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-14-XSA-55.patch \
-                "${WORKDIR}"/files/xen-4.2-CVE-2013-15-XSA-55.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-16-XSA-55.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-17-XSA-55.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-18to19-XSA-55.patch \
-                "${FILESDIR}"/xen-4.2-CVE-2013-20to23-XSA-55.patch \
-		"${FILESDIR}"/xen-4-CVE-2013-2072-XSA-56.patch \
-		"${FILESDIR}"/xen-4.2-CVE-XSA-57.patch
-
-		epatch_user
-
-	# Bug 472438
-	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
-		-i Config.mk || die
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	unset LDFLAGS
-	unset CFLAGS
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${ED}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${ED}"tmp || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=1:autoballoon=1:' \
-		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
-		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
-		-i tools/examples/xl.conf  || die
-
-	# Reset bash completion dir; Bug 472438
-	mv "${D}"bash-completion "${D}"usr/share/ || die
-
-	if use doc; then
-		emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	if use xend; then
-		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
-	fi
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	if use qemu; then
-		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
-		mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${ED}"usr/$(get_libdir)/*.a "${ED}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# xend expects these to exist
-	keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Temp QA workaround
-	dodir "$(udev_get_udevdir)"
-	mv "${ED}"/etc/udev/* "${ED}/$(udev_get_udevdir)"
-	rm -rf "${ED}"/etc/udev
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${ED}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "http://www.gentoo.org/doc/en/xen-guide.xml"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-
-	if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
-		echo
-		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
-		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
-		ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
-	fi
-
-	# TODO: we need to have the current Python slot here.
-	if ! has_version "dev-lang/python[ncurses]"; then
-		echo
-		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
-		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
-	fi
-
-	if has_version "sys-apps/iproute2[minimal]"; then
-		echo
-		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
-		ewarn "will not work until you rebuild iproute2 without USE=minimal."
-	fi
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 multilib system is required to build HVM support."
-		echo
-		elog "The qemu use flag has been removed and replaced with hvm."
-	fi
-
-	if use xend; then
-		echo
-		elog "xend capability has been enabled and installed"
-	fi
-
-	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
-		echo
-		elog "xensv is broken upstream (Gentoo bug #142011)."
-		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.2.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2-r3.ebuild
index 0f5f0976fcc3..dada8b956f42 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.2-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r3.ebuild,v 1.6 2013/08/23 13:03:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r3.ebuild,v 1.7 2013/10/04 18:06:23 idella4 Exp $
 
 EAPI=5
 
@@ -33,24 +33,23 @@ DOCS=( README docs/README.xen-bugtool )
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend"
+IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen static-libs xend"
 
 REQUIRED_USE="hvm? ( qemu )"
 
-CDEPEND="dev-libs/lzo:2
+DEPEND="dev-libs/lzo:2
 	dev-libs/yajl
+	dev-libs/libgcrypt
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pypam[${PYTHON_USEDEP}]
 	sys-libs/zlib
 	sys-power/iasl
 	dev-ml/findlib
 	hvm? ( media-libs/libsdl )
-	${PYTHON_DEPS}
 	api? ( dev-libs/libxml2
 		net-misc/curl )
 	${PYTHON_DEPS}
-	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )"
-DEPEND="${CDEPEND}
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
 	sys-devel/bin86
 	sys-devel/dev86
 	dev-lang/perl
@@ -69,10 +68,8 @@ DEPEND="${CDEPEND}
 		dev-texlive/texlive-latexrecommended
 	)
 	hvm? (  x11-proto/xproto )"
-RDEPEND="${CDEPEND}
-	sys-apps/iproute2
+RDEPEND="sys-apps/iproute2
 	net-misc/bridge-utils
-	ocaml? ( >=dev-lang/ocaml-4 )
 	screen? (
 		app-misc/screen
 		app-admin/logrotate
diff --git a/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
index 73b4f8d0e7e1..cdcc8f269498 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild,v 1.6 2013/08/23 13:03:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild,v 1.7 2013/10/04 18:06:23 idella4 Exp $
 
 EAPI=5
 
@@ -37,8 +37,9 @@ IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs
 
 REQUIRED_USE="hvm? ( qemu )"
 
-CDEPEND="dev-libs/lzo:2
+DEPEND="dev-libs/lzo:2
 	dev-libs/yajl
+	dev-libs/libgcrypt
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pypam[${PYTHON_USEDEP}]
 	sys-libs/zlib
@@ -49,8 +50,7 @@ CDEPEND="dev-libs/lzo:2
 	api? ( dev-libs/libxml2
 		net-misc/curl )
 	${PYTHON_DEPS}
-	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )"
-DEPEND="${CDEPEND}
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
 	sys-devel/bin86
 	sys-devel/dev86
 	dev-lang/perl
@@ -70,8 +70,7 @@ DEPEND="${CDEPEND}
 	)
 	hvm? (  x11-proto/xproto
 		!net-libs/libiscsi )"
-RDEPEND="${CDEPEND}
-	sys-apps/iproute2
+RDEPEND="sys-apps/iproute2
 	net-misc/bridge-utils
 	ocaml? ( >=dev-lang/ocaml-4 )
 	screen? (
diff --git a/app-emulation/xen-tools/xen-tools-4.3.0.ebuild b/app-emulation/xen-tools/xen-tools-4.3.0.ebuild
index bfb7d2239a27..121b9a20d3ba 100644
--- a/app-emulation/xen-tools/xen-tools-4.3.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild,v 1.19 2013/08/23 13:03:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild,v 1.20 2013/10/04 18:06:23 idella4 Exp $
 
 EAPI=5
 
@@ -36,8 +36,9 @@ IUSE="api custom-cflags debug doc flask hvm qemu ocaml python pygrub screen stat
 
 REQUIRED_USE="hvm? ( qemu )"
 
-CDEPEND="dev-libs/lzo:2
+DEPEND="dev-libs/lzo:2
 	dev-libs/yajl
+	dev-libs/libgcrypt
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pypam[${PYTHON_USEDEP}]
 	sys-libs/zlib
@@ -47,8 +48,7 @@ CDEPEND="dev-libs/lzo:2
 	${PYTHON_DEPS}
 	api? ( dev-libs/libxml2
 		net-misc/curl )
-	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )"
-DEPEND="${CDEPEND}
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
 	sys-devel/bin86
 	sys-devel/dev86
 	dev-lang/perl
@@ -70,11 +70,9 @@ DEPEND="${CDEPEND}
 	hvm? ( x11-proto/xproto
 		!net-libs/libiscsi )
 	qemu? ( x11-libs/pixman )"
-RDEPEND="${CDEPEND}
-	sys-apps/iproute2
+RDEPEND="sys-apps/iproute2
 	net-misc/bridge-utils
-	ocaml? ( >=dev-lang/ocaml-4
-		dev-ml/findlib )
+	ocaml? ( >=dev-lang/ocaml-4 )
 	screen? (
 		app-misc/screen
 		app-admin/logrotate