diff options
| author |   Michael Weber <xmw@gentoo.org> | 2013-03-01 08:00:24 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2013-03-01 08:00:24 +0000 |
| commit | d3bd3cb6a1f2ab4c1a0fe3fb1d9d841e5410edc0 (patch) | |
| tree | 176bcde11e4e1c6c22e420674fb6aff63c67caa4 /media-gfx | |
| parent | cleanup and fix building wrt bug 459654 (diff) | |
| download | historical-d3bd3cb6a1f2ab4c1a0fe3fb1d9d841e5410edc0.tar.gz historical-d3bd3cb6a1f2ab4c1a0fe3fb1d9d841e5410edc0.tar.bz2 historical-d3bd3cb6a1f2ab4c1a0fe3fb1d9d841e5410edc0.zip | |
Fix imagemagick dependency.
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/zbar/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/zbar/Manifest | 10 | ||||
| -rw-r--r-- | media-gfx/zbar/zbar-0.10-r2.ebuild | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog index df0085264b09..12921a518100 100644 --- a/media-gfx/zbar/ChangeLog +++ b/media-gfx/zbar/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/zbar # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.7 2013/02/28 11:02:42 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.8 2013/03/01 08:00:15 xmw Exp $ + + 01 Mar 2013; Michael Weber <xmw@gentoo.org> zbar-0.10-r2.ebuild: + Fix imagemagick dependency. *zbar-0.10-r2 (28 Feb 2013) diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index bf532e579335..65235828ba51 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -5,13 +5,13 @@ AUX zbar-0.10-errors.patch 178 SHA256 664434317c666147927fa23af138122c7248b06f37 AUX zbar-0.10-no-v4l1-check.patch 2270 SHA256 fe41b3855be44d0f61e6e21dfd3fd90fc56b6f01b1e6633e3d2ab9ed9617f5c8 SHA512 f2f66476769469d701206bf1efae16d384cfbaa138c877a0ea32bedcd39b5abfd6dae630e7d729b009ab50052db0166198949f49ddfb66d708792000808da74d WHIRLPOOL 3e2c65812ada05197085a6823b0c063f6264d72c55a91383d25c8b8576a4cb50ff707ad655993723fcae87f42f366f6ea637640db21ba6d15544443e07269db6 DIST zbar-0.10.tar.bz2 592602 SHA256 234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6 SHA512 76cb8a469e3ac9ea7932a95c500cf933501249cdb8dce4df558bf5681bd44c62111327b494e6e887079a5fd30b32154887dcc12962e6d27b1453f55457483db4 WHIRLPOOL b4d8f6b2f6deb52fc7a60721888c3bbec2f4a94d5e29488167908e8a448ca698d64db7f78fb22408d4e3360eda44fd82195a0d762b71d203ca87d549461cde7f EBUILD zbar-0.10-r1.ebuild 1592 SHA256 d1de1014aaed416622be2fe11e4de1f8e3e49b2b929615cd2050074fe3109bee SHA512 064fe4f025aab212adc446dfac5dfc625f47a655dd792bcacc13eae6881a273f560797ddf14aa372c72573e904cdbff9397598fe6d16b72d32fe1b4c281d1a26 WHIRLPOOL 08debb4136430dda4cf91c95e88015d3dacf8752925deb4b38d58a19a9096dfb321935ad060f40dd6ce3d77967a420fdfaab9635c0c11f26f1828930144f38a7 -EBUILD zbar-0.10-r2.ebuild 1696 SHA256 02199979a53c3192595632139ac5b7c7be6516ca7bb2e76ccb0b23a0fa5ce471 SHA512 1486c877d0678a45f08453d7f345d384e00d108c054882d4529343a4089d8cce2dc027afcc668fda0faf49db71bcb3206cfa9af1cb90d2dead850c9e3d556002 WHIRLPOOL 69f1a7565f7f0fa1a2afaee29601e8ed918cbed92154adf582028ad5e10edc32a16304e73b4c8c92e8335352d5e0dd203b724eeb63cf7f0d458f1effaea9eec5 -MISC ChangeLog 1365 SHA256 961d9dec433f8b9afa30bfec1ca2c44213940cb7aa32be20a6778b3e51e848fc SHA512 74724b1d9233b1f378b326139cff72eda62c00f7953ababc440536a213af8e03741ce768ea475b6540bf132bf4f6236042019bef1c2e657eebf3bcbf16ca808b WHIRLPOOL b2bd54dc63c66b822a9d47119b4a1dd01b7ad844a47e48aa3006e642121cb2ffe6803e830e21f1139ffee36d00ce796c6453c58e10e92e3d980929efba14bbc1 +EBUILD zbar-0.10-r2.ebuild 1709 SHA256 ea3dc71ef3f4db2cc6bf22497b7b6eccf3a05026dbb461a3768c8ce375edc596 SHA512 8040cb0b9dd9e788195b6d85e8a25877c76158d2acae3d3b6c0aa95299f7a790667a92d17bad8aaeee0bc2c9127669a84a4c41c9e4b42ceb1f75b0312f9ec382 WHIRLPOOL 8be668d6db498ad6ff128f12c8c5f1287d7f14a46418640c09159c9fceb2787533f25d9c5994026e86c2310b686e74aed9f8ba1d398d6bf09bbce7730c1e04c1 +MISC ChangeLog 1463 SHA256 b3efa2cb4736721ea7bcab3943854fe16fa39598720fc10f19bd3df4cc584bc8 SHA512 1d24a8bff1bc80f5829b52569aee7aa5763677c39d35eee03090533b8852af68d4cc8e035cc3ab68544b4df482b41d66b4c1e1f33b79becc347104df70fc2fd1 WHIRLPOOL 093c4f95c70dff27103f30f860ff7fd86c5c6985efa40c40c5af7317eb722806c7fdadf77e27ac7d4aadd10318d0549930e6daa56cf1b2fb7edd532335d17dce MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlEvOVcACgkQknrdDGLu8JC2bwEAgUJkksAVGvptLuIMuNcLZmcH -iOlpDDnllj5QxrgphK4A/393+ghi3Up5llcls46syyQq11Hrcv+buh2O9a6aeiWL -=R2pu +iF4EAREIAAYFAlEwYA0ACgkQknrdDGLu8JBgdAEAlJyvXoycfGhhtUwWKGcCh5AE +kQE4gXKREZW+L5KaPLMA/ivtN9opZcGPSNVCKt15hvPf7jeHqcIN3y06n9U5kUPe +=1+rM -----END PGP SIGNATURE----- diff --git a/media-gfx/zbar/zbar-0.10-r2.ebuild b/media-gfx/zbar/zbar-0.10-r2.ebuild index d6fdafb2120f..e05e7fda064b 100644 --- a/media-gfx/zbar/zbar-0.10-r2.ebuild +++ b/media-gfx/zbar/zbar-0.10-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild,v 1.1 2013/02/28 11:02:42 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r2.ebuild,v 1.2 2013/03/01 08:00:15 xmw Exp $ EAPI=5 PYTHON_DEPEND="2:2.6" @@ -17,7 +17,9 @@ KEYWORDS="~amd64 ~x86" IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv" RDEPEND="gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 ) - imagemagick? ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) + imagemagick? ( + || ( media-gfx/imagemagick + media-gfx/graphicsmagick[imagemagick] ) ) jpeg? ( virtual/jpeg ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) |