Version bump to mercurial tip (thanks karl, bug 555918). Drop old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

3 files changed, 40 insertions, 30 deletions

diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog
index 45655d15a667..19391528aa8d 100644
--- a/media-gfx/zbar/ChangeLog
+++ b/media-gfx/zbar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/zbar
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.19 2015/07/06 11:59:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.20 2015/08/05 13:15:17 xmw Exp $
+
+*zbar-0.10_p20121015 (05 Aug 2015)
+
+  05 Aug 2015; Michael Weber <xmw@gentoo.org> +zbar-0.10_p20121015.ebuild,
+  -zbar-0.10-r3.ebuild:
+  Version bump to mercurial tip (thanks karl, bug 555918). Drop old.
 
   06 Jul 2015; Anthony G. Basile <blueness@gentoo.org> zbar-0.10-r5.ebuild:
   Stable for amd64 and x86.  Needed for electrum.  Bug #541538.
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 2088be08039e..8911c7e6d123 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -5,24 +5,15 @@ 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 1699 SHA256 7007ee174acc706ba167faa0943e29521c0ad97213312badf9d0e2c4d71d8fb4 SHA512 14852d1adb6cc2c9c23bbc6fd1606497cee36352311bffec92e00e24bbf9fa804441ff8925b64a5639b946ce938562f82066d475f03535ec9c404635a5905bee WHIRLPOOL f9979295d7f5c3aba8fc532efa076ad8eced9fd555c3994f5a57d6c7aad9d6e52d4c86145f5dfea368c6e539134eae42d245f593a4090dfd2390435974b713cc
+DIST zbar-0.10_p20121015.zip 991578 SHA256 1e2ba2a6f27bcc93b74e57ff46cc69c0f5c8d22ae277aa3d6c9da6892b892abe SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1 WHIRLPOOL be6307740b7e15c344c05c60a842d2ad01c6954ada71677cb8dbcbd0720a35f7f86d673a0f92a98d5968dc8394e9917c2a80880cb17a8d54bdc16827aa5d1eeb
 EBUILD zbar-0.10-r5.ebuild 1846 SHA256 a65354b08fc91b12ec00366e6a77cdad0c796cab6e2e87ac1596dd05fce81d13 SHA512 2195ce87549e32e3bbb04011c7656890600839ddf90d5b7be35c2d47e601b1dead95334713feadfa5641efa01f15f766d7db154b6ba7caf5870a58fd66da7130 WHIRLPOOL 9f1af1fa8736c1b31712b5196539d50b4023d3e5355b1f43ef4911f076eb19f1be983a62f6fd3a1e0006c635f2980ec6050825f63230e24bbbcd311da3703cd9
-MISC ChangeLog 3029 SHA256 dcbb67da89b6101430f435c74b1e34724e7fa25f1ccbb2bcc794d7aa288d32a1 SHA512 1bb5fffa4aa24b3acd9a820372c3a5380e0ff91b9e451e63a35d332c65213be5e9d6e3d432e2b60b7ef29dfb5605d593a9cf63b3856f6224a3637c80072edd32 WHIRLPOOL 4bd3a4361bcf632e6973824dd6bd52ba43128b5f0028ba4b4d63271b7e4d53b9551a63e3bd26fac66432ba8f290d8ffd51b4fe683089c09b0e98d23e8bcf4e44
+EBUILD zbar-0.10_p20121015.ebuild 2061 SHA256 db1c4880bdf54e08c31ab29e1e448cf6e36dd34d41579309c9ca422bbfcb7e5a SHA512 050740a4b10ad55c8f6e13c8c3ddf092458d7cbe6e48a1b3776a5eaef3833602d32fd5c2169030960c8a6b60028b675ec34f7a84f1d671d8dc3f1070b5f68113 WHIRLPOOL cbf80231cf5f67c0568509a67e3077ea408f354f8d7cb7dad7e46c38a79439b215cade934203b1796fd4b1d903bbb46789d0ff2e740d7938c90fe172f4a618e1
+MISC ChangeLog 3229 SHA256 25b3536e21ad9777d0a40a6dc793500c3b35965d8c59c3b4603ff1ebb9eba8d5 SHA512 10a0ff5401120aa2d35d761bc8c1ec5b0ee24e853ac9029488944c999f19f685e86c879f7503f05ff0eba894e3f498353f282d03099f14585b964964f43ecacf WHIRLPOOL 98c30fdfcda04d05675dea89fa9fe01403b0ce9c62568de9dae3c4651bac54fcc644c6d3409bfc049948be91b903f3577d3e4d34f1e292ed2fdbc0e0df3487fd
 MISC metadata.xml 303 SHA256 b163edb45c4f6bbe9b878c1ac257e1ff543d6d6230eece11f2a855263c36d8ac SHA512 2fac3237afdd44106dcd09758326eea49be2f5a719fec4ee5844f21c167b85082da679354cb3e00d5f9278fe9c23e2bfd72f75b051d89b0a72e591e41218f330 WHIRLPOOL 97a28852955aafaef746b2e1ef303710253581bc5666f12ed1533e6a47523cbfd32fdf08b5b5ddeaa2e0d3baf39de8dc919172fa03a5659c34eaf2a90c969378
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVmm5VAAoJEJOE+m71LUu6JUMP/0DQIBGjxMrLBDynhdH11v+5
-sHxtXMyKtSdEK5Za3yokhof3hTN6nW4LCr5a3P2sqyBzs21XZb3U6fRYBiZxotX7
-Io6Uo1CkZz3eA4vFn6diRTZqeecZMRWH2VqXfU2SWs4gabezXjk64fuCfG5UhZ1w
-TswfGV8cOLle+qBQmrIfVGnWWUTd51bvoyLEI3LjPP9YqOs3FfKtMkzFjgNAfvAx
-bbZyamW89VoLx04tGpC3PprnKq0M7JB5h3xNqTe92qQME4f6K+kH6kWk2T4rQtz7
-rLsWMGntMTaa7lGLESl1Sipk7qj4PwYf+tp1aDYlrbMArOgExEPUxdt6S27/xFRq
-XjB4YyQ1xrUi4iuMe9Dd4FbVn8Oy3Fd4Wopya1UHM04dazitysGwbJGXMBJC5r6w
-/7UFR0Uzh2DXhVB+d4FI4vpF4GrxTKwRTcVdcUol5b+O2UVqHa13idUbNl0tk+yL
-2XQK0JDITzMmDxnYdn+82KVh821w4KyIZrFmMjjyR3TnjLtkifjjV9dY8YDrlhwQ
-q1jRthTAJ2cZznER+KOxlIedKH7D2RbdHaH+fKiUc0HC6jSskeQoU1sw7ZPccpAv
-HQgDKLH1HDyaaDCRHMAdRmkwp65bjhctjnEIUfYqvvepevgcXscou3jI7ZxQKndX
-0KgyYiQFhpKMNpCsyGTP
-=vFji
+iF4EAREIAAYFAlXCDGYACgkQknrdDGLu8JDK0QD9ESPxsB6jYsSTKtbuCxwXr6wU
+nLzSyghJDSBLN25CAmQA/0dL01/mgIo2cTYcDWjx3BPFsHbgw6ZzIvB171SxTy/6
+=RbzY
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/zbar/zbar-0.10-r3.ebuild b/media-gfx/zbar/zbar-0.10_p20121015.ebuild
index b5c25307bff0..7e8ea3f613c5 100644
--- a/media-gfx/zbar/zbar-0.10-r3.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015.ebuild
@@ -1,50 +1,63 @@
 # 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.5 2015/02/27 12:12:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10_p20121015.ebuild,v 1.1 2015/08/05 13:15:17 xmw Exp $
 
 EAPI=5
-PYTHON_DEPEND="2:2.7"
 
-inherit autotools eutils flag-o-matic python
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils flag-o-matic python-single-r1
 
 DESCRIPTION="Library and tools for reading barcodes from images or video"
 HOMEPAGE="http://zbar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2"
+SRC_URI="http://sourceforge.net/code-snapshots/hg/z/zb/zbar/code/zbar-code-38e78368283d5afe34bbc0cedb36d4540cda3a30.zip -> ${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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:0 )
-	python? ( gtk? ( >=dev-python/pygtk-2 ) )
+	python? ( ${PYTHON_DEPS}
+		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) )
 	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
 	X? ( x11-libs/libXext
 		xv? ( x11-libs/libXv ) )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	#vcs-snapshot doesn't work on .zip
+	default
+	mv * ${P} || die
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-v4l1-check.patch
-	epatch "${FILESDIR}"/${P}-errors.patch
+	#epatch "${FILESDIR}"/${P}-no-v4l1-check.patch
+	epatch "${FILESDIR}"/${PN}-0.10-errors.patch
+	epatch "${FILESDIR}"/${PN}-0.10-python-crash.patch
 
-	python_convert_shebangs 2 examples/upcrpc.py test/{barcodetest,test_pygtk}.py
+	use python && python_fix_shebang examples/upcrpc.py test/*.py
 
-	sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581
+	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
+		-e '/^AM_CFLAGS=/s: -Werror::' \
+		-i configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
-	append-cflags -DNDEBUG
+	append-cppflags -DNDEBUG
 	econf \
 		$(use_with jpeg) \
 		$(use_with gtk) \