diff options
author | Michael Weber <xmw@gentoo.org> | 2015-02-27 12:12:58 +0000 |
---|---|---|
committer | Michael Weber <xmw@gentoo.org> | 2015-02-27 12:12:58 +0000 |
commit | 22b8b8b2d1282fd5c84e85c07ecadd04c6220f75 (patch) | |
tree | c56348e0bdd1bd29fff69fea0f45050e949de9ca /media-gfx/zbar | |
parent | Version bump (bug 539634, thanks ainieco@yandex.ru for the hint). (diff) | |
download | gentoo-2-22b8b8b2d1282fd5c84e85c07ecadd04c6220f75.tar.gz gentoo-2-22b8b8b2d1282fd5c84e85c07ecadd04c6220f75.tar.bz2 gentoo-2-22b8b8b2d1282fd5c84e85c07ecadd04c6220f75.zip |
add gettext ot RDEPEND (bug 531546, thanks Nikoli), adjust jpeg dep and use valid python2 slot.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'media-gfx/zbar')
-rw-r--r-- | media-gfx/zbar/ChangeLog | 9 | ||||
-rw-r--r-- | media-gfx/zbar/zbar-0.10-r3.ebuild | 8 | ||||
-rw-r--r-- | media-gfx/zbar/zbar-0.10-r4.ebuild | 67 | ||||
-rw-r--r-- | media-gfx/zbar/zbar-0.10-r5.ebuild | 9 |
4 files changed, 16 insertions, 77 deletions
diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog index 76cb3962a18c..22af41b3de76 100644 --- a/media-gfx/zbar/ChangeLog +++ b/media-gfx/zbar/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/zbar -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.17 2014/12/03 12:18:37 mgorny Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.18 2015/02/27 12:12:58 xmw Exp $ + + 27 Feb 2015; Michael Weber <xmw@gentoo.org> -zbar-0.10-r4.ebuild, + zbar-0.10-r3.ebuild, zbar-0.10-r5.ebuild: + add gettext ot RDEPEND (bug 531546, thanks Nikoli), adjust jpeg dep and use + valid python2 slot. 03 Dec 2014; Michał Górny <mgorny@gentoo.org> zbar-0.10-r5.ebuild: Call python_fix_shebang conditionally to USE=python, bug #531240. diff --git a/media-gfx/zbar/zbar-0.10-r3.ebuild b/media-gfx/zbar/zbar-0.10-r3.ebuild index 5efd8ef50b41..b5c25307bff0 100644 --- a/media-gfx/zbar/zbar-0.10-r3.ebuild +++ b/media-gfx/zbar/zbar-0.10-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.4 2013/06/29 09:37:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild,v 1.5 2015/02/27 12:12:58 xmw Exp $ EAPI=5 -PYTHON_DEPEND="2:2.6" +PYTHON_DEPEND="2:2.7" inherit autotools eutils flag-o-matic python @@ -20,7 +20,7 @@ RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:0 ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) X? ( x11-libs/libXext diff --git a/media-gfx/zbar/zbar-0.10-r4.ebuild b/media-gfx/zbar/zbar-0.10-r4.ebuild deleted file mode 100644 index 0838330ca674..000000000000 --- a/media-gfx/zbar/zbar-0.10-r4.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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-r4.ebuild,v 1.1 2013/11/27 23:11:55 vapier 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 ~arm ~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 - epatch "${FILESDIR}"/${P}-python-crash.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-cppflags -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 -} diff --git a/media-gfx/zbar/zbar-0.10-r5.ebuild b/media-gfx/zbar/zbar-0.10-r5.ebuild index 1d6cc9430520..478aa8f170b2 100644 --- a/media-gfx/zbar/zbar-0.10-r5.ebuild +++ b/media-gfx/zbar/zbar-0.10-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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-r5.ebuild,v 1.3 2014/12/03 12:18:37 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild,v 1.4 2015/02/27 12:12:58 xmw Exp $ EAPI=5 @@ -17,11 +17,12 @@ SLOT="0" 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 ) + jpeg? ( virtual/jpeg:0 ) python? ( ${PYTHON_DEPS} gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) |