diff options
author | Hanno Boeck <hanno@gentoo.org> | 2009-05-16 10:36:14 +0000 |
---|---|---|
committer | Hanno Boeck <hanno@gentoo.org> | 2009-05-16 10:36:14 +0000 |
commit | 4dd054ddc284167ad24c81f6b1b622eb724982ef (patch) | |
tree | 46ddc9c99d9507c8362824e82adee355fb3313d8 /media-gfx/gphoto2 | |
parent | Initial import. Dependency for dev-ruby/twitter. (diff) | |
download | historical-4dd054ddc284167ad24c81f6b1b622eb724982ef.tar.gz historical-4dd054ddc284167ad24c81f6b1b622eb724982ef.tar.bz2 historical-4dd054ddc284167ad24c81f6b1b622eb724982ef.zip |
gphoto: take virtual/libusb dep from 2.4.4-r1 ebuild
Package-Manager: portage-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/Manifest | 10 | ||||
-rw-r--r-- | media-gfx/gphoto2/gphoto2-2.4.5.ebuild | 21 |
3 files changed, 24 insertions, 12 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/Manifest b/media-gfx/gphoto2/Manifest index 042672ef3bda..ab5a1802ba4d 100644 --- a/media-gfx/gphoto2/Manifest +++ b/media-gfx/gphoto2/Manifest @@ -7,13 +7,13 @@ DIST gphoto2-2.4.5.tar.gz 887503 RMD160 6fc289f5e1e2d025af980aa74dd879f1ed58b550 EBUILD gphoto2-2.4.3.ebuild 1541 RMD160 ef704677a04aef2828320beb4b2f1a2e32978056 SHA1 236bd116e885895b04d8dafac7fb22f92169bafe SHA256 813f62ae0c4e42c2e357a682cdfb8762f5a9bef6c24a7c562938a75da911ab7e EBUILD gphoto2-2.4.4-r1.ebuild 1285 RMD160 7533cb100a91df157e23bcec85d59d2334764807 SHA1 2a2e5d97ae71d53ab49c274482648b127749ebb9 SHA256 9cad0d14c38b87565f8fcaf798952a0c0ece113ca7545af581b8a8a2bcc2d79b EBUILD gphoto2-2.4.4.ebuild 1554 RMD160 50d98fbc0f4c2d535aec6907e8ffeab4f97805e0 SHA1 9c88a1754016303ff6ac415ec989c918d31ecf87 SHA256 83addb5c1401692e4a18e360bd82c63e563e3865743457a73b9bf50692e3855a -EBUILD gphoto2-2.4.5.ebuild 1285 RMD160 436f02e259510174772d74ddd83d1e3b562c7911 SHA1 0ad0486866612ce74afce6d390725f0c02e2fe26 SHA256 98459f02678aca6e832a0ab8146e5ab0d999af3079cc95a94dd1edd685491629 -MISC ChangeLog 10641 RMD160 76c385954e7c3811d618d6d8db4c4102468439aa SHA1 ebfd138df5bedf00119099d3be56e25babef68c4 SHA256 c1fe913647ddf287c770a226be299676596ef0ade2e4b9e70479c176831cbbea +EBUILD gphoto2-2.4.5.ebuild 1552 RMD160 2129d4cccc94675069014db9bea516a84fcbc6c0 SHA1 6e8274d9a1e4299be7d92687af31dc9076fc25d1 SHA256 eab659383fcb0cb7439df4f4a4b4dafaddde5e6f26e511b1bd0149d542197236 +MISC ChangeLog 10765 RMD160 3c96afc35efe934fbe2bf819abf78a1c3eaf0732 SHA1 9b76dc8ce16cf9d4edbd6d732bc60f351cc4e516 SHA256 23f64bf41444328adf988b2473281259c81ef49ab87b9284303977ddc27d4f2e MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkoOgIYACgkQr2QksT29OyDNiwCcDiEA1qQuU/Hd/RT5N12KRamV -m50AnAq9Cp9FSbixKE708diPfycUZdjn -=L0H7 +iEYEARECAAYFAkoOlyMACgkQr2QksT29OyA6nACfTege62kDtsN1zi9do4WGxw5P +0eoAoJ70B0gofD2FbqzT72ni/1fQ1W11 +=Lz0L -----END PGP SIGNATURE----- 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() { |