From a09693555be5e0ffdd34fffc24b84e69e55e175f Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Fri, 27 Feb 2015 12:13:05 +0000 Subject: [PATCH] add gettext ot RDEPEND (bug 531546, thanks Nikoli), adjust jpeg dep and use valid python2 slot. Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0x62EEF090 --- media-gfx/zbar/ChangeLog | 9 +++- media-gfx/zbar/Manifest | 27 ++++-------- media-gfx/zbar/zbar-0.10-r3.ebuild | 8 ++-- media-gfx/zbar/zbar-0.10-r4.ebuild | 67 ------------------------------ media-gfx/zbar/zbar-0.10-r5.ebuild | 9 ++-- 5 files changed, 24 insertions(+), 96 deletions(-) delete mode 100644 media-gfx/zbar/zbar-0.10-r4.ebuild diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog index 76cb3962a18c..22af41b3de76 100644 --- a/media-gfx/zbar/ChangeLog +++ b/media-gfx/zbar/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/zbar -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.17 2014/12/03 12:18:37 mgorny Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.18 2015/02/27 12:12:58 xmw Exp $ + + 27 Feb 2015; Michael Weber -zbar-0.10-r4.ebuild, + zbar-0.10-r3.ebuild, zbar-0.10-r5.ebuild: + add gettext ot RDEPEND (bug 531546, thanks Nikoli), adjust jpeg dep and use + valid python2 slot. 03 Dec 2014; Michał Górny zbar-0.10-r5.ebuild: Call python_fix_shebang conditionally to USE=python, bug #531240. diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index 4ecc789eb6c3..d0b5735abdb5 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -5,27 +5,16 @@ AUX zbar-0.10-errors.patch 178 SHA256 664434317c666147927fa23af138122c7248b06f37 AUX zbar-0.10-no-v4l1-check.patch 2270 SHA256 fe41b3855be44d0f61e6e21dfd3fd90fc56b6f01b1e6633e3d2ab9ed9617f5c8 SHA512 f2f66476769469d701206bf1efae16d384cfbaa138c877a0ea32bedcd39b5abfd6dae630e7d729b009ab50052db0166198949f49ddfb66d708792000808da74d WHIRLPOOL 3e2c65812ada05197085a6823b0c063f6264d72c55a91383d25c8b8576a4cb50ff707ad655993723fcae87f42f366f6ea637640db21ba6d15544443e07269db6 AUX zbar-0.10-python-crash.patch 604 SHA256 a8f27e03a58be705ea9f7a4b139f5c831171a44bd15d775fb5477c406f3e321c SHA512 56e1848466b2178fb25a1f88f1a35113c01d370927b5778af96f1b96bcdaa8349308ac7ef14fb247bc5ec4165b2f7daa717159f3f7786ced9c043428afd641ba WHIRLPOOL f135563cbe4742412e6c2c41fabec6725d034bacbc9ee6d71aa315ce708a17e19807d06798c452089237b8a214c06f7d340c22f6985575b17d7118a448b394bd DIST zbar-0.10.tar.bz2 592602 SHA256 234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6 SHA512 76cb8a469e3ac9ea7932a95c500cf933501249cdb8dce4df558bf5681bd44c62111327b494e6e887079a5fd30b32154887dcc12962e6d27b1453f55457483db4 WHIRLPOOL b4d8f6b2f6deb52fc7a60721888c3bbec2f4a94d5e29488167908e8a448ca698d64db7f78fb22408d4e3360eda44fd82195a0d762b71d203ca87d549461cde7f -EBUILD zbar-0.10-r3.ebuild 1697 SHA256 e44f7d279ccf7586ce96ed2a88cfb936e114a57c1614799e25a0dada5de5e63c SHA512 ae384bcd7d19b3979826c13c206df3e2a816b9eb19c4bf16352663e8fe1c636c5dbf3e128fbdf73b280479e28de6e51f4fde7ec189735691bfcf568c9c3964ff WHIRLPOOL dde0c659661c0ec1ff958d2930a7891cee2232f79c82370f32eff91d9b043ff158b1e01655382bc6d2d974be22f9bd0189fb4831745404eae54f17807328c557 -EBUILD zbar-0.10-r4.ebuild 1755 SHA256 f75a1e7ef7449d9ddd46e3b768ab9cacfa1aaa2df9262db1baa08eff762aca09 SHA512 1a24e3d5089f706823b7b04821c61423572b50c324ba6328e4e56ef5911aee8a1d64c7f873973654615f95f05fe6f95e9b16fadb7be3c0145aa8ce960cbcfc67 WHIRLPOOL dcd68fb4dc28b6c5fecf979fffac76d2494fc41d9bc97dac76bf40c7b2fbace023490ec0289ffc772085c5b45c431fb4c3c4917444ef4a03a721129b7763e137 -EBUILD zbar-0.10-r5.ebuild 1825 SHA256 22a518d9a9ac5e9af6280d7f521520282037148bb0537476d897d1a4684bc7dc SHA512 4af33818ffcb5debb84ed7cb272396b398e24c9bb851b5f7f1698663b5822b7b02465dd4e3911d98d3fe731763dc9cd643f64eeedbc1b45cb24c235a44563fd8 WHIRLPOOL 99704e4e8426b4885a74509bc9bd66c33ccdf0f685d80aef785dcfa8fa0dfbdc3b25ca57ac7cb89a99099ba1883a587eff77e52d91a955cbe9935802a2bb4ae3 -MISC ChangeLog 2673 SHA256 7e31a1978f997f3cfc17ae2fba5a368cf2fdd76ffcdfe11fde8c7aa52abba2e8 SHA512 40e8c603cd41edf469c7330f5c1f8d1415c1cea520945beb49ba43fb7bd548765d08bb105a9f88882e5c67cb2cd216f519693f325768b2f4a3c5eae83db6f598 WHIRLPOOL 71f8fd829606c014bde0c0b86a1d1d3067b5275665a8bfd0982aa30f5c126fed092ee564ee272b10d64302a93149ce44fc342420cddcbbd09daa38ab44932931 +EBUILD zbar-0.10-r3.ebuild 1699 SHA256 7007ee174acc706ba167faa0943e29521c0ad97213312badf9d0e2c4d71d8fb4 SHA512 14852d1adb6cc2c9c23bbc6fd1606497cee36352311bffec92e00e24bbf9fa804441ff8925b64a5639b946ce938562f82066d475f03535ec9c404635a5905bee WHIRLPOOL f9979295d7f5c3aba8fc532efa076ad8eced9fd555c3994f5a57d6c7aad9d6e52d4c86145f5dfea368c6e539134eae42d245f593a4090dfd2390435974b713cc +EBUILD zbar-0.10-r5.ebuild 1843 SHA256 9e55851dff79aba247301e9bfd3d005f07a136a6c63e0c5e34a3ac67157fb324 SHA512 a444fa75b7f2dc72f5f98867f58006979b969a70a1b5e96064c0bc8477f00f19627288404cbe7402d60575c0b3f3fdf7ca935f232ca2069d9255e1aab72e392c WHIRLPOOL 08c1723d79b77336304f182d53bb97d6cdc72e18f5c315325508abbd8ce1c36b96104264af3abb085da59e90b99d4c5a824e3749794fb3fad73fae12a7ea3fe0 +MISC ChangeLog 2883 SHA256 3b6b1b81ecc868a5ade380766127bc472431522cbc450e8e8ea159fda47da57d SHA512 a6511af29eda33d8f1f0cde9aaa6b5a9c17a641c9b50118ef3fb6afe6b76fbc3aa659a31c2ead616f0f85c8a429a40e60ea65f0446c40989947d50f6ba3f9020 WHIRLPOOL 80f47129093dcb22810d9adbf008985083f2859d4f7f797a5da0f212e3761d6357a873d6a8489bc1aaeb1a9f4701231eedb5947e222a3f751b55d9b909624226 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJUfv+jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOatgP/3OksX1pajEv/jRgiAFFuneR -NwowwY8WGEW5i+8edbQyenZB3BwVLrQJj3slI0RVTecCajIBmiqQzamj4nYfcwjU -8i6f4hsJQL+74cmSwpUr71CRXDWrV7VF0JN0XwN8Kr6699ylcu/uMpCKs7CeMFpp -KYWjzP14bb2P1p0LtUWt9CYwcysZJQATx6RjEsrEbJp7saCPgC7sQFCZJWrho26g -bFTfYzdeHnG2uvKEgDp7GFthTxGCtUCGWNIcCBjZ6XHtoZvG/TPfWpcwBRDisdDI -knvg5pQnQNxyd7ySWwO7MxRdkXqfQSAoEdKoJAowgOrHhTYNPSBWIfRCQl4JXpvY -5HoBW3C3f2Vs2gaOxQM3pdWAXXTcCVLwlRhEkBLKqMkoCm12r2qaLDwYAdxgg261 -670rIDEyT6HeTidzwbjjZ3tu7eBkfI863LOr5BXmjejRRP4E1PWZwkVMoRKQpt5w -ZcTgfgewHJEsZa15nLERl9N5k4jmYA2Z9DdPP1i+d+znsL3Yz6xvENM3ySZIZ/t6 -0VstFNol6SKp9CQ/7HXEvKOlI5zN4qgfj6hFvvWAGUXNUpaQU0zcnEgWSP/zzSjo -2lLwArBwaEVJj8yuK/FIjM2dfEcF+xJHLdxrQOyvUMAAnkolIXeldPB5LA4VpgY4 -5h1tFE+Qa68tfsgf3Qn/ -=+Ln+ +iL4EAREIAGYFAlTwX1BfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl +bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky +N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JD/ugD8DBWPmV1KM9zLyIJNrhJX7H3U +6ADWduD0IJ/aHDJolKgBAIEDsbRxb7RtpMSKaQZlTlYlN+HvjcE06YeeDbhOHbLs +=GQjY -----END PGP SIGNATURE----- diff --git a/media-gfx/zbar/zbar-0.10-r3.ebuild b/media-gfx/zbar/zbar-0.10-r3.ebuild index 5efd8ef50b41..b5c25307bff0 100644 --- a/media-gfx/zbar/zbar-0.10-r3.ebuild +++ b/media-gfx/zbar/zbar-0.10-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild,v 1.4 2013/06/29 09:37:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild,v 1.5 2015/02/27 12:12:58 xmw Exp $ EAPI=5 -PYTHON_DEPEND="2:2.6" +PYTHON_DEPEND="2:2.7" inherit autotools eutils flag-o-matic python @@ -20,7 +20,7 @@ RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:0 ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext diff --git a/media-gfx/zbar/zbar-0.10-r4.ebuild b/media-gfx/zbar/zbar-0.10-r4.ebuild deleted file mode 100644 index 0838330ca674..000000000000 --- a/media-gfx/zbar/zbar-0.10-r4.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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-r4.ebuild,v 1.1 2013/11/27 23:11:55 vapier Exp $ - -EAPI=5 -PYTHON_DEPEND="2:2.6" - -inherit autotools eutils flag-o-matic python - -DESCRIPTION="Library and tools for reading barcodes from images or video" -HOMEPAGE="http://zbar.sourceforge.net/" -SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~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] ) ) - jpeg? ( virtual/jpeg ) - python? ( gtk? ( >=dev-python/pygtk-2 ) ) - qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) - X? ( x11-libs/libXext - xv? ( x11-libs/libXv ) )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-no-v4l1-check.patch - epatch "${FILESDIR}"/${P}-errors.patch - epatch "${FILESDIR}"/${P}-python-crash.patch - - python_convert_shebangs 2 examples/upcrpc.py test/{barcodetest,test_pygtk}.py - - sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581 - eautoreconf -} - -src_configure() { - append-cppflags -DNDEBUG - econf \ - $(use_with jpeg) \ - $(use_with gtk) \ - $(use_with imagemagick) \ - $(use_with python) \ - $(use_with qt4 qt) \ - $(use_enable static-libs static) \ - $(use_enable threads pthread) \ - $(use_with X x) \ - $(use_with xv xv) \ - $(use_enable v4l video) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc HACKING NEWS README TODO - rm -r "${ED}"/usr/share/doc/${PN} - prune_libtool_files --all -} diff --git a/media-gfx/zbar/zbar-0.10-r5.ebuild b/media-gfx/zbar/zbar-0.10-r5.ebuild index 1d6cc9430520..478aa8f170b2 100644 --- a/media-gfx/zbar/zbar-0.10-r5.ebuild +++ b/media-gfx/zbar/zbar-0.10-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild,v 1.3 2014/12/03 12:18:37 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild,v 1.4 2015/02/27 12:12:58 xmw Exp $ EAPI=5 @@ -17,11 +17,12 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv" -RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) +RDEPEND="sys-devel/gettext + gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:0 ) python? ( ${PYTHON_DEPS} gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) -- 2.26.2