migrate to EAPI=2

Package-Manager: portage-2.2_rc38/cvs/Linux i686

4 files changed, 22 insertions, 27 deletions

diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog
index 6fae34a08dfb..e4958087cd24 100644
--- a/media-gfx/gphoto2/ChangeLog
+++ b/media-gfx/gphoto2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/gphoto2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.82 2009/07/26 13:29:33 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.83 2009/08/16 10:01:09 maekke Exp $
+
+  16 Aug 2009; Markus Meier <maekke@gentoo.org> gphoto2-2.4.5.ebuild:
+  migrate to EAPI=2
 
   26 Jul 2009; Arun Raghavan <ford_prefect@gentoo.org> gphoto2-2.4.5.ebuild:
   Bump libgphoto2 dependency to 2.4.5 as per configure.ac (bug #279033).
diff --git a/media-gfx/gphoto2/gphoto2-2.4.5.ebuild b/media-gfx/gphoto2/gphoto2-2.4.5.ebuild
index 3ba4c62222ab..db01f74bf616 100644
--- a/media-gfx/gphoto2/gphoto2-2.4.5.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.4.5.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/media-gfx/gphoto2/gphoto2-2.4.5.ebuild,v 1.3 2009/07/26 13:29:33 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.4.5.ebuild,v 1.4 2009/08/16 10:01:09 maekke Exp $
+
+EAPI=2
 
 inherit eutils
 
@@ -17,7 +19,7 @@ IUSE="aalib exif ncurses nls readline"
 # raise libgphoto to get a proper .pc
 RDEPEND="=virtual/libusb-0*
 	dev-libs/popt
-	>=media-libs/libgphoto2-2.4.5
+	>=media-libs/libgphoto2-2.4.5[exif]
 	ncurses? ( dev-libs/cdk )
 	aalib? (
 		media-libs/aalib
@@ -28,14 +30,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( >=sys-devel/gettext-0.14 )"
 
-pkg_setup() {
-	if use exif && ! built_with_use media-libs/libgphoto2 exif; then
-		eerror "exif support required but libgphoto2 does not have it."
-		die "rebuild media-libs/libgphoto2 with USE=\"exif\"."
-	fi
-}
-
-src_compile() {
+src_configure() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_with aalib) \
@@ -44,7 +39,6 @@ src_compile() {
 		$(use_with ncurses cdk) \
 		$(use_enable nls) \
 		$(use_with readline)
-	emake || die "compilation failed"
 }
 
 src_install() {
diff --git a/media-gfx/xsvg/ChangeLog b/media-gfx/xsvg/ChangeLog
index 415670bdec55..bbb86d075b1a 100644
--- a/media-gfx/xsvg/ChangeLog
+++ b/media-gfx/xsvg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/xsvg
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsvg/ChangeLog,v 1.24 2008/06/25 18:00:48 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsvg/ChangeLog,v 1.25 2009/08/16 10:05:58 maekke Exp $
+
+  16 Aug 2009; Markus Meier <maekke@gentoo.org> xsvg-0.2.1.ebuild:
+  migrate to EAPI=2
 
   25 Jun 2008; Markus Meier <maekke@gentoo.org> xsvg-0.2.1.ebuild:
   x11-libs/cairo must be built with USE="X", bug #225223
diff --git a/media-gfx/xsvg/xsvg-0.2.1.ebuild b/media-gfx/xsvg/xsvg-0.2.1.ebuild
index 161a09338c01..be343f11dc12 100644
--- a/media-gfx/xsvg/xsvg-0.2.1.ebuild
+++ b/media-gfx/xsvg/xsvg-0.2.1.ebuild
@@ -1,6 +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/media-gfx/xsvg/xsvg-0.2.1.ebuild,v 1.12 2008/06/25 18:00:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsvg/xsvg-0.2.1.ebuild,v 1.13 2009/08/16 10:05:58 maekke Exp $
+
+EAPI=2
 
 inherit autotools eutils
 
@@ -13,21 +15,14 @@ SLOT="0"
 KEYWORDS="amd64 hppa ppc ~sparc x86"
 IUSE=""
 
-RDEPEND="x11-libs/libsvg-cairo"
+RDEPEND="
+	x11-libs/cairo[X]
+	x11-libs/libsvg-cairo"
 DEPEND="${RDEPEND}
 	x11-libs/libXt
 	x11-libs/libXcursor"
 
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X ; then
-		eerror "x11-libs/cairo needs to be built with USE=\"X\""
-		die "remerge x11-libs/cairo with USE=\"X\""
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-asneeded.patch
 	eautoreconf
 }