summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2009-08-16 10:01:09 +0000
committerMarkus Meier <maekke@gentoo.org>2009-08-16 10:01:09 +0000
commit55a707d047d809bbdaf9b587899e4dbf16ecc965 (patch)
tree11f65395fb89e1ebdd4f8df1d64e37cf41daae17 /media-gfx/gphoto2
parentstable x86, bug 281598 (diff)
downloadgentoo-2-55a707d047d809bbdaf9b587899e4dbf16ecc965.tar.gz
gentoo-2-55a707d047d809bbdaf9b587899e4dbf16ecc965.tar.bz2
gentoo-2-55a707d047d809bbdaf9b587899e4dbf16ecc965.zip
migrate to EAPI=2
(Portage version: 2.2_rc38/cvs/Linux i686)
Diffstat (limited to 'media-gfx/gphoto2')
-rw-r--r--media-gfx/gphoto2/ChangeLog5
-rw-r--r--media-gfx/gphoto2/gphoto2-2.4.5.ebuild16
2 files changed, 9 insertions, 12 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() {