diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-06-26 11:49:35 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-06-26 11:49:35 +0000 |
| commit | 301a11837d89cdc481eeebbb65910328b6cbf4c6 (patch) | |
| tree | 770cea21669c7f64068fb268068553b8550ccfae /media-gfx/zbar | |
| parent | Install desktop entry for neroexpress wrt #409035. Use linux-info.eclass inst... (diff) | |
| download | gentoo-2-301a11837d89cdc481eeebbb65910328b6cbf4c6.tar.gz gentoo-2-301a11837d89cdc481eeebbb65910328b6cbf4c6.tar.bz2 gentoo-2-301a11837d89cdc481eeebbb65910328b6cbf4c6.zip | |
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.
(Portage version: 2.2.0_alpha111/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/zbar')
| -rw-r--r-- | media-gfx/zbar/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/zbar/zbar-0.10-r1.ebuild | 30 |
2 files changed, 24 insertions, 13 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/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 } |