Transition to eapi 2 use deps

2 files changed, 9 insertions, 22 deletions

diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.12.2-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.12.2-r1.ebuild
index 36d4b6851e93..8bdd74a3b326 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.12.2-r1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.12.2-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.12.2-r1.ebuild,v 1.11 2009/01/26 23:00:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.12.2-r1.ebuild,v 1.12 2009/03/07 14:40:24 gentoofan23 Exp $
 
+EAPI="2"
 inherit autotools eutils python gnome2
 
 DESCRIPTION="A collection of documentation utilities for the Gnome project"
@@ -12,7 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-libs/libxml2-2.6.12
+RDEPEND=">=dev-libs/libxml2-2.6.12[python]
 	 >=dev-libs/libxslt-1.1.8
 	 >=dev-lang/python-2"
 DEPEND="${RDEPEND}
@@ -23,6 +24,7 @@ DEPEND="${RDEPEND}
 	~app-text/docbook-xml-dtd-4.4"
 
 DOCS="AUTHORS ChangeLog NEWS README"
+G2CONF="--disable-scrollkeeper"
 
 src_unpack() {
 	gnome2_src_unpack
@@ -37,14 +39,6 @@ src_unpack() {
 	AT_M4DIR="tools" eautomake
 }
 
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper"
-
-	if ! built_with_use dev-libs/libxml2 python; then
-		eerror "Please re-emerge dev-libs/libxml2 with the python use flag set"
-		die "dev-libs/libxml2 needs python use flag"
-	fi
-}
 
 pkg_postinst() {
 	python_version
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.14.1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.14.1.ebuild
index 349de20569d6..465792fefcda 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.14.1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.14.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.14.1.ebuild,v 1.1 2008/12/21 15:48:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.14.1.ebuild,v 1.2 2009/03/07 14:40:24 gentoofan23 Exp $
 
+EAPI="2"
 inherit eutils python gnome2
 
 DESCRIPTION="A collection of documentation utilities for the Gnome project"
@@ -12,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-libs/libxml2-2.6.12
+RDEPEND=">=dev-libs/libxml2-2.6.12[python]
 	 >=dev-libs/libxslt-1.1.8
 	 >=dev-lang/python-2"
 DEPEND="${RDEPEND}
@@ -22,6 +23,7 @@ DEPEND="${RDEPEND}
 	~app-text/docbook-xml-dtd-4.4"
 
 DOCS="AUTHORS ChangeLog NEWS README"
+G2CONF="--disable-scrollkeeper"
 
 src_unpack() {
 	gnome2_src_unpack
@@ -33,15 +35,6 @@ src_unpack() {
 	# to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
 }
 
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper"
-
-	if ! built_with_use dev-libs/libxml2 python; then
-		eerror "Please re-emerge dev-libs/libxml2 with the python use flag set"
-		die "dev-libs/libxml2 needs python use flag"
-	fi
-}
-
 pkg_postinst() {
 	python_version
 	python_mod_optimize /usr/lib/python${PYVER}/site-packages/xml2po