diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2009-05-16 10:36:14 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2009-05-16 10:36:14 +0000 |
| commit | d0d6d008e11474171c295265435b8e1a8ad579d7 (patch) | |
| tree | e49afbd57059aa898c15fc87dfac98302c52e7bf /media-gfx/gphoto2 | |
| parent | Initial import. Dependency for dev-ruby/twitter. (diff) | |
| download | gentoo-2-d0d6d008e11474171c295265435b8e1a8ad579d7.tar.gz gentoo-2-d0d6d008e11474171c295265435b8e1a8ad579d7.tar.bz2 gentoo-2-d0d6d008e11474171c295265435b8e1a8ad579d7.zip | |
gphoto: take virtual/libusb dep from 2.4.4-r1 ebuild
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/gphoto2')
| -rw-r--r-- | media-gfx/gphoto2/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/gphoto2/gphoto2-2.4.5.ebuild | 21 |
2 files changed, 19 insertions, 7 deletions
diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog index f714772ed87c..18a8619bc6d2 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.80 2009/05/16 08:59:45 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.81 2009/05/16 10:36:14 hanno Exp $ + + 16 May 2009; Hanno Boeck <hanno@gentoo.org> gphoto2-2.4.5.ebuild: + Take virtual/libusb dependency from 2.4.4-r1 ebuild. *gphoto2-2.4.5 (16 May 2009) diff --git a/media-gfx/gphoto2/gphoto2-2.4.5.ebuild b/media-gfx/gphoto2/gphoto2-2.4.5.ebuild index dd6ff2044842..e1ccd3063bc0 100644 --- a/media-gfx/gphoto2/gphoto2-2.4.5.ebuild +++ b/media-gfx/gphoto2/gphoto2-2.4.5.ebuild @@ -1,8 +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.1 2009/05/16 08:59:45 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.4.5.ebuild,v 1.2 2009/05/16 10:36:14 hanno Exp $ -EAPI="2" +inherit eutils DESCRIPTION="free, redistributable digital camera software application" HOMEPAGE="http://www.gphoto.org/" @@ -14,9 +14,10 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="aalib exif ncurses nls readline" # aalib -> needs libjpeg -RDEPEND=">=dev-libs/libusb-0.1.8 +# raise libgphoto to get a proper .pc +RDEPEND="=virtual/libusb-0* dev-libs/popt - >=media-libs/libgphoto2-2.4.4[exif?] + >=media-libs/libgphoto2-2.4.4 ncurses? ( dev-libs/cdk ) aalib? ( media-libs/aalib @@ -27,15 +28,23 @@ DEPEND="${RDEPEND} dev-util/pkgconfig nls? ( >=sys-devel/gettext-0.14 )" -src_configure() { +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() { econf \ --docdir=/usr/share/doc/${PF} \ $(use_with aalib) \ $(use_with aalib jpeg) \ - $(use_with exif libexif) \ + $(use_with exif) \ $(use_with ncurses cdk) \ $(use_enable nls) \ $(use_with readline) + emake || die "compilation failed" } src_install() { |