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

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

2 files changed, 34 insertions, 15 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/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) \