Transition to EAPI 2 usedeps

(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 28 insertions, 54 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 027f7f067188..3cfea88efcd1 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.58 2009/02/27 16:05:39 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.59 2009/03/08 19:38:18 gentoofan23 Exp $
+
+  08 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  awesome-2.3.4.ebuild, awesome-2.3.5.ebuild, awesome-3.0-r1.ebuild:
+  Transition to EAPI 2 usedeps
 
 *awesome-3.2_rc4 (27 Feb 2009)
 
diff --git a/x11-wm/awesome/awesome-2.3.4.ebuild b/x11-wm/awesome/awesome-2.3.4.ebuild
index 848d7e5a84b2..42d5aadab9a3 100644
--- a/x11-wm/awesome/awesome-2.3.4.ebuild
+++ b/x11-wm/awesome/awesome-2.3.4.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/x11-wm/awesome/awesome-2.3.4.ebuild,v 1.5 2009/02/01 15:16:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.4.ebuild,v 1.6 2009/03/08 19:38:18 gentoofan23 Exp $
 
+EAPI="2"
 inherit toolchain-funcs eutils
 
 DESCRIPTION="A dynamic floating and tiling window manager"
@@ -14,7 +15,7 @@ KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="doc gtk"
 
 RDEPEND=">=dev-libs/confuse-2.6
-	x11-libs/cairo
+	x11-libs/cairo[X]
 	x11-libs/pango
 	x11-libs/libX11
 	x11-libs/libXrandr
@@ -32,21 +33,14 @@ DEPEND="${RDEPEND}
 		media-gfx/graphviz
 	)"
 
-pkg_setup() {
-	if ! built_with_use --missing false x11-libs/cairo X ; then
-		eerror "Your x11-libs/cairo packagehas been built without X support,"
-		eerror "please enable the 'X' USE flag and re-emerge x11-libs/cairo."
-		elog "You can enable this USE flag either globally in /etc/make.conf,"
-		elog "or just for specific packages in /etc/portage/package.use."
-		die "x11-libs/cairo missing X support"
-	fi
+src_configure() {
+	econf \
+		$(use_with gtk) \
+		--docdir="/usr/share/doc/${PF}"
 }
 
 src_compile() {
-	econf \
-		$(use_with gtk) \
-		--docdir="/usr/share/doc/${PF}" || die
-	emake || die
+	default
 
 	if use doc; then
 		emake doc || die
diff --git a/x11-wm/awesome/awesome-2.3.5.ebuild b/x11-wm/awesome/awesome-2.3.5.ebuild
index 903be6f9302a..182ec4a72718 100644
--- a/x11-wm/awesome/awesome-2.3.5.ebuild
+++ b/x11-wm/awesome/awesome-2.3.5.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/x11-wm/awesome/awesome-2.3.5.ebuild,v 1.2 2009/02/01 15:16:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.5.ebuild,v 1.3 2009/03/08 19:38:18 gentoofan23 Exp $
 
+EAPI="2"
 inherit toolchain-funcs eutils
 
 DESCRIPTION="A dynamic floating and tiling window manager"
@@ -14,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc gtk"
 
 RDEPEND=">=dev-libs/confuse-2.6
-	x11-libs/cairo
+	x11-libs/cairo[X]
 	x11-libs/pango
 	x11-libs/libX11
 	x11-libs/libXrandr
@@ -32,21 +33,14 @@ DEPEND="${RDEPEND}
 		media-gfx/graphviz
 	)"
 
-pkg_setup() {
-	if ! built_with_use --missing false x11-libs/cairo X ; then
-		eerror "Your x11-libs/cairo packagehas been built without X support,"
-		eerror "please enable the 'X' USE flag and re-emerge x11-libs/cairo."
-		elog "You can enable this USE flag either globally in /etc/make.conf,"
-		elog "or just for specific packages in /etc/portage/package.use."
-		die "x11-libs/cairo missing X support"
-	fi
+src_configure() {
+	econf \
+		$(use_with gtk) \
+		--docdir="/usr/share/doc/${PF}"
 }
 
 src_compile() {
-	econf \
-		$(use_with gtk) \
-		--docdir="/usr/share/doc/${PF}" || die
-	emake || die
+	default
 
 	if use doc; then
 		emake doc || die
diff --git a/x11-wm/awesome/awesome-3.0-r1.ebuild b/x11-wm/awesome/awesome-3.0-r1.ebuild
index b283fa3cd077..8e154a5105e0 100644
--- a/x11-wm/awesome/awesome-3.0-r1.ebuild
+++ b/x11-wm/awesome/awesome-3.0-r1.ebuild
@@ -1,9 +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/x11-wm/awesome/awesome-3.0-r1.ebuild,v 1.1 2008/10/13 23:39:01 matsuu Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.0-r1.ebuild,v 1.2 2009/03/08 19:38:18 gentoofan23 Exp $
 
+EAPI="2"
 inherit cmake-utils eutils
 
 DESCRIPTION="A dynamic floating and tiling window manager"
@@ -21,8 +20,8 @@ RDEPEND=">=dev-lang/lua-5.1
 	dev-libs/libev
 	dev-util/gperf
 	sys-libs/ncurses
-	x11-libs/cairo
-	x11-libs/libX11
+	x11-libs/cairo[xcb]
+	x11-libs/libX11[xcb]
 	>=x11-libs/libxcb-1.1
 	x11-libs/pango
 	>=x11-libs/xcb-util-0.3
@@ -65,30 +64,13 @@ RDEPEND="${RDEPEND}
 
 DOCS="AUTHORS BUGS PATCHES README STYLE"
 
-pkg_setup() {
-	if ! built_with_use --missing false x11-libs/cairo xcb ; then
-		eerror "Your x11-libs/cairo packagehas been built without xcb support,"
-		eerror "please enable the 'xcb' USE flag and re-emerge x11-libs/cairo."
-		elog "You can enable this USE flag either globally in /etc/make.conf,"
-		elog "or just for specific packages in /etc/portage/package.use."
-		die "x11-libs/cairo missing xcb support"
-	fi
-	if ! built_with_use --missing false x11-libs/libX11 xcb ; then
-		eerror "Your x11-libs/libX11 packagehas been built without xcb support,"
-		eerror "please enable the 'xcb' USE flag and re-emerge x11-libs/libX11."
-		elog "You can enable this USE flag either globally in /etc/make.conf,"
-		elog "or just for specific packages in /etc/portage/package.use."
-		die "x11-libs/libX11 missing xcb support"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
-src_compile() {
+src_configure() {
 	local myargs="all"
 
 	mycmakeargs="${mycmakeargs}
@@ -101,7 +83,7 @@ src_compile() {
 	else
 		mycmakeargs="${mycmakeargs} -DGENERATE_LUADOC=OFF"
 	fi
-	cmake-utils_src_compile ${myargs}
+	cmake-utils_src_configure ${myargs}
 }
 
 src_install() {