xmw 15/02/27 12:12:58 Modified: zbar-0.10-r3.ebuild zbar-0.10-r5.ebuild ChangeLog Removed: zbar-0.10-r4.ebuild Log: 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)
Revision Changes Path 1.5 media-gfx/zbar/zbar-0.10-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild?r1=1.4&r2=1.5 Index: zbar-0.10-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- zbar-0.10-r3.ebuild 29 Jun 2013 09:37:13 -0000 1.4 +++ zbar-0.10-r3.ebuild 27 Feb 2015 12:12:58 -0000 1.5 @@ -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 @@ 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 1.4 media-gfx/zbar/zbar-0.10-r5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild?r1=1.3&r2=1.4 Index: zbar-0.10-r5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- zbar-0.10-r5.ebuild 3 Dec 2014 12:18:37 -0000 1.3 +++ zbar-0.10-r5.ebuild 27 Feb 2015 12:12:58 -0000 1.4 @@ -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 @@ 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 ) 1.18 media-gfx/zbar/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?r1=1.17&r2=1.18 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ChangeLog 3 Dec 2014 12:18:37 -0000 1.17 +++ ChangeLog 27 Feb 2015 12:12:58 -0000 1.18 @@ -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 <[email protected]> -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 <[email protected]> zbar-0.10-r5.ebuild: Call python_fix_shebang conditionally to USE=python, bug #531240.
