Fix compilation (bug 455076, reported by renesanso)

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

4 files changed, 89 insertions, 7 deletions

diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog
index cf329b4fc584..df0085264b09 100644
--- a/media-gfx/zbar/ChangeLog
+++ b/media-gfx/zbar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/zbar
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.6 2012/07/28 23:07:30 xmw Exp $
+# 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 $
+
+*zbar-0.10-r2 (28 Feb 2013)
+
+  28 Feb 2013; Michael Weber <xmw@gentoo.org> +zbar-0.10-r2.ebuild,
+  +files/zbar-0.10-errors.patch:
+  Fix compilation (bug 455076, reported by renesanso)
 
   28 Jul 2012; Michael Weber <xmw@gentoo.org> -zbar-0.10.ebuild:
   Drop old
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 66901d4ee661..bf532e579335 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX zbar-0.10-errors.patch 178 SHA256 664434317c666147927fa23af138122c7248b06f37f8ae10a005713c1cb804ce SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1 WHIRLPOOL 1f9095a53d9320a4526fa773a0171a1176bda0b383982347b138175bed2aa0623cdacd23c48e35afd07f7a4dcd13f58d50dfa6dfd8ac1bd78152525bca41260a
 AUX zbar-0.10-no-v4l1-check.patch 2270 SHA256 fe41b3855be44d0f61e6e21dfd3fd90fc56b6f01b1e6633e3d2ab9ed9617f5c8 SHA512 f2f66476769469d701206bf1efae16d384cfbaa138c877a0ea32bedcd39b5abfd6dae630e7d729b009ab50052db0166198949f49ddfb66d708792000808da74d WHIRLPOOL 3e2c65812ada05197085a6823b0c063f6264d72c55a91383d25c8b8576a4cb50ff707ad655993723fcae87f42f366f6ea637640db21ba6d15544443e07269db6
-DIST zbar-0.10.tar.bz2 592602 SHA256 234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6
+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
-MISC ChangeLog 1180 SHA256 55a66c97e8e09c11cbe18f4d373862afbc315676f6df8b7093ae2482fcb06dc4 SHA512 a5c0d6be9724d9ec149e9e0291e48b60380ca7a3c81d95a0291396ed287fd73d8d975b963352c1c2f5bf34b18c6151bfd0cbf7ecb9ef5b8cb5be5cab2234c60e WHIRLPOOL 3527277e82881c92cd0ace4a380a48589d2a1f1354d7c4d5035d9c0ce2a2f0fc0d4d78d45fab7625b982b9b0716d53160cbe6c4899505203c2ff411ebbca716b
+EBUILD zbar-0.10-r2.ebuild 1696 SHA256 02199979a53c3192595632139ac5b7c7be6516ca7bb2e76ccb0b23a0fa5ce471 SHA512 1486c877d0678a45f08453d7f345d384e00d108c054882d4529343a4089d8cce2dc027afcc668fda0faf49db71bcb3206cfa9af1cb90d2dead850c9e3d556002 WHIRLPOOL 69f1a7565f7f0fa1a2afaee29601e8ed918cbed92154adf582028ad5e10edc32a16304e73b4c8c92e8335352d5e0dd203b724eeb63cf7f0d458f1effaea9eec5
+MISC ChangeLog 1365 SHA256 961d9dec433f8b9afa30bfec1ca2c44213940cb7aa32be20a6778b3e51e848fc SHA512 74724b1d9233b1f378b326139cff72eda62c00f7953ababc440536a213af8e03741ce768ea475b6540bf132bf4f6236042019bef1c2e657eebf3bcbf16ca808b WHIRLPOOL b2bd54dc63c66b822a9d47119b4a1dd01b7ad844a47e48aa3006e642121cb2ffe6803e830e21f1139ffee36d00ce796c6453c58e10e92e3d980929efba14bbc1
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAUcGsACgkQknrdDGLu8JAfBwD+IJyRPJa4AqYmgaF3DLSKV8ez
-RVux0NRHbq5r/iYyHwkA/ijiD78VRBZUoY6xLIF8GU1Fj1yRXKZnHiJeJPGmS5Ft
-=qPX7
+iF4EAREIAAYFAlEvOVcACgkQknrdDGLu8JC2bwEAgUJkksAVGvptLuIMuNcLZmcH
+iOlpDDnllj5QxrgphK4A/393+ghi3Up5llcls46syyQq11Hrcv+buh2O9a6aeiWL
+=R2pu
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/zbar/files/zbar-0.10-errors.patch b/media-gfx/zbar/files/zbar-0.10-errors.patch
new file mode 100644
index 000000000000..63328ce664bb
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.10-errors.patch
@@ -0,0 +1,10 @@
+--- zbar-0.10/include/zbar/Exception.h
++++ zbar-0.10/include/zbar/Exception.h
+@@ -32,6 +32,7 @@
+ 
+ #include <exception>
+ #include <new>
++#include <cstddef>
+ 
+ namespace zbar {
+ 
diff --git a/media-gfx/zbar/zbar-0.10-r2.ebuild b/media-gfx/zbar/zbar-0.10-r2.ebuild
new file mode 100644
index 000000000000..d6fdafb2120f
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.10-r2.ebuild
@@ -0,0 +1,64 @@
+# 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 $
+
+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 ~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? ( x11-libs/qt-core:4 x11-libs/qt-gui: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
+
+	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-cflags -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
+}