1 |
xmw 15/02/27 12:12:58 |
2 |
|
3 |
Modified: zbar-0.10-r3.ebuild zbar-0.10-r5.ebuild ChangeLog |
4 |
Removed: zbar-0.10-r4.ebuild |
5 |
Log: |
6 |
add gettext ot RDEPEND (bug 531546, thanks Nikoli), adjust jpeg dep and use valid python2 slot. |
7 |
|
8 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
9 |
|
10 |
Revision Changes Path |
11 |
1.5 media-gfx/zbar/zbar-0.10-r3.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild?rev=1.5&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild?rev=1.5&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild?r1=1.4&r2=1.5 |
16 |
|
17 |
Index: zbar-0.10-r3.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild,v |
20 |
retrieving revision 1.4 |
21 |
retrieving revision 1.5 |
22 |
diff -u -r1.4 -r1.5 |
23 |
--- zbar-0.10-r3.ebuild 29 Jun 2013 09:37:13 -0000 1.4 |
24 |
+++ zbar-0.10-r3.ebuild 27 Feb 2015 12:12:58 -0000 1.5 |
25 |
@@ -1,9 +1,9 @@ |
26 |
-# Copyright 1999-2013 Gentoo Foundation |
27 |
+# Copyright 1999-2015 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild,v 1.4 2013/06/29 09:37:13 ago Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r3.ebuild,v 1.5 2015/02/27 12:12:58 xmw Exp $ |
31 |
|
32 |
EAPI=5 |
33 |
-PYTHON_DEPEND="2:2.6" |
34 |
+PYTHON_DEPEND="2:2.7" |
35 |
|
36 |
inherit autotools eutils flag-o-matic python |
37 |
|
38 |
@@ -20,7 +20,7 @@ |
39 |
imagemagick? ( |
40 |
|| ( media-gfx/imagemagick |
41 |
media-gfx/graphicsmagick[imagemagick] ) ) |
42 |
- jpeg? ( virtual/jpeg ) |
43 |
+ jpeg? ( virtual/jpeg:0 ) |
44 |
python? ( gtk? ( >=dev-python/pygtk-2 ) ) |
45 |
qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) |
46 |
X? ( x11-libs/libXext |
47 |
|
48 |
|
49 |
|
50 |
1.4 media-gfx/zbar/zbar-0.10-r5.ebuild |
51 |
|
52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild?rev=1.4&view=markup |
53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild?rev=1.4&content-type=text/plain |
54 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild?r1=1.3&r2=1.4 |
55 |
|
56 |
Index: zbar-0.10-r5.ebuild |
57 |
=================================================================== |
58 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild,v |
59 |
retrieving revision 1.3 |
60 |
retrieving revision 1.4 |
61 |
diff -u -r1.3 -r1.4 |
62 |
--- zbar-0.10-r5.ebuild 3 Dec 2014 12:18:37 -0000 1.3 |
63 |
+++ zbar-0.10-r5.ebuild 27 Feb 2015 12:12:58 -0000 1.4 |
64 |
@@ -1,6 +1,6 @@ |
65 |
-# Copyright 1999-2014 Gentoo Foundation |
66 |
+# Copyright 1999-2015 Gentoo Foundation |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild,v 1.3 2014/12/03 12:18:37 mgorny Exp $ |
69 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10-r5.ebuild,v 1.4 2015/02/27 12:12:58 xmw Exp $ |
70 |
|
71 |
EAPI=5 |
72 |
|
73 |
@@ -17,11 +17,12 @@ |
74 |
KEYWORDS="~amd64 ~arm ~x86" |
75 |
IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv" |
76 |
|
77 |
-RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) |
78 |
+RDEPEND="sys-devel/gettext |
79 |
+ gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) |
80 |
imagemagick? ( |
81 |
|| ( media-gfx/imagemagick |
82 |
media-gfx/graphicsmagick[imagemagick] ) ) |
83 |
- jpeg? ( virtual/jpeg ) |
84 |
+ jpeg? ( virtual/jpeg:0 ) |
85 |
python? ( ${PYTHON_DEPS} |
86 |
gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) ) |
87 |
qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) |
88 |
|
89 |
|
90 |
|
91 |
1.18 media-gfx/zbar/ChangeLog |
92 |
|
93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.18&view=markup |
94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.18&content-type=text/plain |
95 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?r1=1.17&r2=1.18 |
96 |
|
97 |
Index: ChangeLog |
98 |
=================================================================== |
99 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v |
100 |
retrieving revision 1.17 |
101 |
retrieving revision 1.18 |
102 |
diff -u -r1.17 -r1.18 |
103 |
--- ChangeLog 3 Dec 2014 12:18:37 -0000 1.17 |
104 |
+++ ChangeLog 27 Feb 2015 12:12:58 -0000 1.18 |
105 |
@@ -1,6 +1,11 @@ |
106 |
# ChangeLog for media-gfx/zbar |
107 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
108 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.17 2014/12/03 12:18:37 mgorny Exp $ |
109 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
110 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.18 2015/02/27 12:12:58 xmw Exp $ |
111 |
+ |
112 |
+ 27 Feb 2015; Michael Weber <xmw@g.o> -zbar-0.10-r4.ebuild, |
113 |
+ zbar-0.10-r3.ebuild, zbar-0.10-r5.ebuild: |
114 |
+ add gettext ot RDEPEND (bug 531546, thanks Nikoli), adjust jpeg dep and use |
115 |
+ valid python2 slot. |
116 |
|
117 |
03 Dec 2014; Michał Górny <mgorny@g.o> zbar-0.10-r5.ebuild: |
118 |
Call python_fix_shebang conditionally to USE=python, bug #531240. |