Fix glib slot dep (bug 444644, thanks James Cloos)

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

3 files changed, 77 insertions, 17 deletions

diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog
index d85cb0727cd0..89472c282056 100644
--- a/media-gfx/zbar/ChangeLog
+++ b/media-gfx/zbar/ChangeLog
@@ -1,6 +1,11 @@
 # 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.9 2013/03/02 21:41:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.10 2013/04/19 20:11:10 xmw Exp $
+
+*zbar-0.10-r3 (19 Apr 2013)
+
+  19 Apr 2013; Michael Weber <xmw@gentoo.org> +zbar-0.10-r3.ebuild:
+  Fix glib slot dep (bug 444644, thanks James Cloos)
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> zbar-0.10-r1.ebuild,
   zbar-0.10-r2.ebuild:
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 1fd029de94b9..c625477b9491 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -6,24 +6,13 @@ AUX zbar-0.10-no-v4l1-check.patch 2270 SHA256 fe41b3855be44d0f61e6e21dfd3fd90fc5
 DIST zbar-0.10.tar.bz2 592602 SHA256 234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6 SHA512 76cb8a469e3ac9ea7932a95c500cf933501249cdb8dce4df558bf5681bd44c62111327b494e6e887079a5fd30b32154887dcc12962e6d27b1453f55457483db4 WHIRLPOOL b4d8f6b2f6deb52fc7a60721888c3bbec2f4a94d5e29488167908e8a448ca698d64db7f78fb22408d4e3360eda44fd82195a0d762b71d203ca87d549461cde7f
 EBUILD zbar-0.10-r1.ebuild 1585 SHA256 e61d90088933210bfacddd11d1d7e4707c8bb3c0cf8977c1de258d858d5a74e2 SHA512 4d30808800d2b50b02f6327e5c9c956994396c8512365de3a60248ade2ba2128f76791dc7d74792cc017a7be75cc1e226e8e114cb9d59becccfa15a991ad0985 WHIRLPOOL 79ea7abed42127869a166649e5c2c043e256b3aa4bc0d2ed4742eee2c5b38f09eba37c97bace787e4d7c67fb1fc6fbf1f0393af4c01dd18d7268a6a61e0ed69d
 EBUILD zbar-0.10-r2.ebuild 1708 SHA256 ad8c21ce246df066830e35162c1868e0359d327401564822e7c3d9efb5713178 SHA512 8a34e06067339088ba6fa204a3deacdbfff92855bc031be29edf1618b7cfaf05fe24f0acf964d113f98d5537f975744649fac6b5fcbe742d5bb4e1f2fef5befe WHIRLPOOL 4dc493fc034b18cdfe9a350115fb349d207249bf96430905d6b5cf587973e949e06afa46dad2d5035c9fd3c65e35b8f45af29ff8fe139f5189d32a4e7f2da996
-MISC ChangeLog 1609 SHA256 7ba969a72b78412c71e13ff6ee5c4c2662af6094f01440d6e949fdf2c7700af4 SHA512 228e8cfa950d9146b92af60d4b355f2bfd6f3faf000f48c77eee779b45786544cb00021cb89c52b443aa6be7b9b8f341e4088e53a68ed1f72f75c83a4101b584 WHIRLPOOL 48b6ad1e502483fabebea6e75ea0e6699edf22d8ea6158cc44dc49261166520fd27f4abde083fde5432f500a2e30d4a9984dd36352391b73a1ac759552da212a
+EBUILD zbar-0.10-r3.ebuild 1701 SHA256 6e00aca22edd1a49c1cf893bdcab4231616ffca8e9a3047bdd24e851950fe0e6 SHA512 661bdd6621cc4fde1ee63d7bc0b7b1e94244b1fb6b6abd448e21c6cdb40dcea41bada99aee6ecb39d88f18f4a44add812307271d87a0f514e863f839fc2288d8 WHIRLPOOL df8163a490d5e56b80592709f48858fa2a4f2cf38db8a7a7031de2bdf3b294c4f14bf11719ded94bf5a10e2575b0e7d26dae60fd8848e08d50f4d9575f350d08
+MISC ChangeLog 1756 SHA256 34aa4ef54d834d6a9ad9adf854f11a27126a27dfe1216ae5fc4958c02cdeda30 SHA512 48f8834fa6debf63c61b8dd9149832446d271777293e2e1759ca5af6f36048527b586cf4e68d88f0012e5e93dd67ab2232b97374b577e55cf3b6ac8806e38f1b WHIRLPOOL dcf0e95a3824c594a691221306602db4a59c6ff5594647f34c5aa5739d209154b333a8410a58906a5822cdd2accb9913ee814f97c05f32e3dcea400f2dfb68ae
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMnIkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88DEAP/3Ty9W80pNUSpoeOZQHDrCRT
-Dj7QHjTbXx4J1QgcKT9bAgkEVbdbzfiR6qOIjvmD+OOP0DMf2FL7fdDDpTwnWzwu
-lzahcxSBCPrag40ML9LTL5T+mOXp6wwgY91ZRqBtueSh5aaOWTOO3GwWqvp6qxfh
-7OMYRu2JzxN21+7q5clk9mgvV1i3HnapE8uSZ64bbkfm2uG1VFO1QiTvn1ywnpfk
-yEZ7zbRT+dFWY2oimf2DTlGgOFZrsnu+K6+Q/dCjkptKTNMRCu7JtBAjAtTf/LMy
-dzyjC7mhy5+zZNqHVWZj7LyVFiXZUsgJyrCLz9iL3AMJx76I6/cGYFP8J0CNHIZ9
-SrFWoC/EuTAKVJerqmfUTzwByi4iGvFAITUj8XD2vDrTgxbJrsuv+7f7ua1MQ4hI
-oWXHrddWi7QamhvlYpfvTixL8dztnqg/o9UhOp1HkiSJzu+OU0VY9LIMQVNGHthW
-a0ys/IvYkpElt8U4Zdyue/G6yQBBN6Rrp1o+SbPImka4nRLVmTRtUM8cVb1vTj03
-1eTI8k5N5fjdF5/qN0/d5Ba/N+KYI6LFbtC8leswSBa6dO8Msh1ttAAbI/GkoVHj
-U/0dmwIRKfIbEdSsuhC7J3MlLqirMHehG0qa1D4ituPwlZOJ8wHM6muqKOTO+GM6
-12JJ2wL7m5rFvuRURHH9
-=Nukx
+iF4EAREIAAYFAlFxpOUACgkQknrdDGLu8JD8bgD9HagDVnN0ABNoziG5OQ4KMzCU
+T4IbUmTjr9+gNvYBiyIBAIl5tuZB0KzySjzzf19z2/SvpeVQqcs+T6kXmlZTDhlD
+=1GHy
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/zbar/zbar-0.10-r3.ebuild b/media-gfx/zbar/zbar-0.10-r3.ebuild
new file mode 100644
index 000000000000..35928cde0421
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.10-r3.ebuild
@@ -0,0 +1,66 @@
+# 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-r3.ebuild,v 1.1 2013/04/19 20:11:10 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? ( 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
+
+	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
+}