Bump to eapi2 for usedeps, fixing depends for use=doc, closes #199764

(Portage version: 2.2_rc31/cvs/Linux x86_64)

2 files changed, 11 insertions, 23 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 43bce105ea3b..a30e279ec66f 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.44 2009/04/26 13:14:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.45 2009/04/27 15:44:54 patrick Exp $
+
+  27 Apr 2009; Patrick Lauer <patrick@gentoo.org> xen-tools-3.3.1:
+  Bump to eapi2 for usedeps, fixing depends for use=doc, closes #199764
 
 *xen-tools-3.3.1 (26 Apr 2009)
 
diff --git a/app-emulation/xen-tools/xen-tools-3.3.1.ebuild b/app-emulation/xen-tools/xen-tools-3.3.1.ebuild
index 5b9223818b24..afd53547b22a 100644
--- a/app-emulation/xen-tools/xen-tools-3.3.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.3.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.3.1.ebuild,v 1.1 2009/04/26 13:14:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.3.1.ebuild,v 1.2 2009/04/27 15:44:54 patrick Exp $
+
+EAPI="2"
 
 inherit flag-o-matic eutils multilib python
 
@@ -17,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc debug screen custom-cflags pygrub hvm api acm flask"
 
-CDEPEND="dev-lang/python
+CDEPEND="dev-lang/python[ncurses,threads]
 	sys-libs/zlib
 	hvm? ( media-libs/libsdl )
 	acm? ( dev-libs/libxml2 )
@@ -27,10 +29,12 @@ CDEPEND="dev-lang/python
 DEPEND="${CDEPEND}
 	sys-devel/gcc
 	dev-lang/perl
+	dev-lang/python
 	app-misc/pax-utils
 	doc? (
 		app-doc/doxygen
-		dev-tex/latex2html
+		dev-tex/latex2html[png,gif]
+		dev-texlive/texlive-latexextra
 		media-gfx/transfig
 		media-gfx/graphviz
 	)
@@ -79,25 +83,6 @@ pkg_setup() {
 		fi
 	fi
 
-	if use doc && ! built_with_use -o dev-tex/latex2html png gif; then
-		# die early instead of later
-		eerror "USE=doc requires latex2html with image support. Please add"
-		eerror "'png' and/or 'gif' to your use flags and re-emerge latex2html"
-		die "latex2html missing both png and gif flags"
-	fi
-
-	if use pygrub && ! built_with_use dev-lang/python ncurses; then
-		eerror "USE=pygrub requires python to be built with ncurses support. Please add"
-		eerror "'ncurses' to your use flags and re-emerge python"
-		die "python is missing ncurses flags"
-	fi
-
-	if ! built_with_use dev-lang/python threads; then
-		eerror "Python is required to be built with threading support. Please add"
-		eerror "'threads' to your use flags and re-emerge python"
-		die "python is missing threads flags"
-	fi
-
 #	use vtpm    && export "VTPM_TOOLS=y"
 	use api     && export "LIBXENAPI_BINDINGS=y"
 	use acm     && export "ACM_SECURITY=y"