Fix building when active version of Python is set to 3.x. Remove -Werror from AM_INIT_AUTOMAKE for compability with sys-devel/automake >= 1.12 wrt #423581. Convert to prune_libtool_files from eutils.eclass.

Package-Manager: portage-2.2.0_alpha111/cvs/Linux x86_64

3 files changed, 35 insertions, 20 deletions

diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog
index 3bd98532be00..ba232052f6ab 100644
--- a/media-gfx/zbar/ChangeLog
+++ b/media-gfx/zbar/ChangeLog
@@ -1,6 +1,11 @@
 # 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.4 2012/02/20 04:19:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.5 2012/06/26 11:49:35 ssuominen Exp $
+
+  26 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> zbar-0.10-r1.ebuild:
+  Fix building when active version of Python is set to 3.x. Remove -Werror from
+  AM_INIT_AUTOMAKE for compability with sys-devel/automake >= 1.12 wrt #423581.
+  Convert to prune_libtool_files from eutils.eclass.
 
   20 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
   Drop no-herd.
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index ee6c414ddc66..7cc9fe35ea20 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX zbar-0.10-no-v4l1-check.patch 2270 RMD160 028f01f0f4e0b25feddc67b139fbba69eb5fe386 SHA1 1c2f3ca24247304bf59a77aef3104e4f80c01df8 SHA256 fe41b3855be44d0f61e6e21dfd3fd90fc56b6f01b1e6633e3d2ab9ed9617f5c8
 DIST zbar-0.10.tar.bz2 592602 RMD160 a68db3e81d596a506e50e797c3540a05b8b84a9f SHA1 273b47c26788faba4325baecc34063e27a012963 SHA256 234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6
-EBUILD zbar-0.10-r1.ebuild 1351 RMD160 a889d3c51eb65bdbbdd8ee255d1a93fbe685cb43 SHA1 d9ecd04845e4cc105d95fe83f5e5f54b2027c583 SHA256 61223ddc00496792676eb1c829fe82afb778a918abd0c420bff611c282ef6445
+EBUILD zbar-0.10-r1.ebuild 1592 RMD160 68c3258f8e0a4481011356fb093e090e006f09aa SHA1 a9f79ee14416253da6744b9109d6bac2da1aa73c SHA256 d1de1014aaed416622be2fe11e4de1f8e3e49b2b929615cd2050074fe3109bee
 EBUILD zbar-0.10.ebuild 1287 RMD160 75e51e811db9ba3e734568e93e763014f8b57fd8 SHA1 1b361ef635054c2892435eb95ab23f49a3c166d0 SHA256 8b110af173f32f6cbc9bb29e500fcd39f9f3143adf13a13035cdc3309b40c66e
-MISC ChangeLog 819 RMD160 2458019ff79cacb075223d893762bb0143d685b9 SHA1 a35cd2d166e5ebae3085d1cb8095f4e62d2f08fb SHA256 0b1b33a3c7c7e5087888f99b18c5f36bd8db240cfd9fce632412acb94dca9496
+MISC ChangeLog 1110 RMD160 2b82aeaa9b14425ebf57896e0461b774e8eccf68 SHA1 70b1b8368858366cad9d3d0b7c2e9261c0b29844 SHA256 1c8e095fc3a6684e50a4d4dd47f37f3c2be38891cdac3caac8126b8d374f07f5
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9ByfIACgkQC77qH+pIQ6QVXgD+PCkTAuohdtU+B9wKe6ct+Tkw
-uIpEDW7iZbWTu3Pxb5EA/2EWp19/WX2WMgEZ0+QVbra9F4nOei5GejsUpCkclDn1
-=wSqd
+iQEcBAEBAgAGBQJP6aCdAAoJEEdUh39IaPFNRv8H/itzGbiY6mynJkMVEKqNI3Pn
+4XfeyS3d4NDAYbNJQeJ+ikI78VIvw2RYEBnISV3AdUQZq1xPzeRfXHh9ZMKLaJ6i
+8kHkgrC8aMFtRpRrRy7akNhvYzF1pfuFHMdtyjB/qiS0h3A7WB7RS7c0Zy7GSji0
+fqLnLaS/Wf/TnsRQe0h6eNg4mNdtXqv+yZisxw9+hMhBtABZD6fjyi3sORw2er1k
+IEWs6i+/cqQ8+Iy9RPYWmGaDXIepuBeN7kuYhNQT7F0WKW4VlsbsODs/+sjrCvVb
+dfAPhe40WfkSGri7xjXGu8foHm6wYyuwkeiyeWU+rpWQcqwx6/mHaFoX07yX73M=
+=XVwo
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/zbar/zbar-0.10-r1.ebuild b/media-gfx/zbar/zbar-0.10-r1.ebuild
index cd5dcbf0c5ec..d6da04a68023 100644
--- a/media-gfx/zbar/zbar-0.10-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.10-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r1.ebuild,v 1.1 2011/11/10 08:50:44 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r1.ebuild,v 1.2 2012/06/26 11:49:35 ssuominen Exp $
 
-EAPI="4"
-
-PYTHON_DEPEND="2"
+EAPI=4
+PYTHON_DEPEND="2:2.6"
 inherit autotools eutils python
 
 DESCRIPTION="Library and tools for reading barcodes from images or video"
@@ -16,18 +15,25 @@ 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* )
+RDEPEND="gtk? ( =dev-libs/glib-2* x11-libs/gtk+:2 )
 	imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
 	jpeg? ( virtual/jpeg )
-	python? ( gtk? ( dev-python/pygtk )	)
-	qt4? ( x11-libs/qt-core x11-libs/qt-gui )
+	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"
 
-DEPEND="${RDEPEND}"
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-no-v4l1-check.patch"
+	epatch "${FILESDIR}"/${P}-no-v4l1-check.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
 }
 
@@ -48,6 +54,6 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc HACKING NEWS README TODO
-	rm -r "${D}"/usr/share/doc/${PN}
-	find "${D}" -nam "*.la" -delete
+	rm -r "${ED}"/usr/share/doc/${PN}
+	prune_libtool_files --all
 }