Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: libgphoto2-2.4.6.ebuild libgphoto2-2.4.8.ebuild ChangeLog libgphoto2-2.4.9.ebuild libgphoto2-2.4.7-r2.ebuild libgphoto2-2.4.8-r1.ebuild
Date: Sat, 02 Oct 2010 14:16:32
Message-Id: 20101002141628.6D0DA20051@flycatcher.gentoo.org
1 eva 10/10/02 14:16:28
2
3 Modified: libgphoto2-2.4.6.ebuild libgphoto2-2.4.8.ebuild
4 ChangeLog libgphoto2-2.4.9.ebuild
5 Removed: libgphoto2-2.4.7-r2.ebuild
6 libgphoto2-2.4.8-r1.ebuild
7 Log:
8 Clean up old revisions. Rename bonjour to zeroconf, bug #283330.
9
10 (Portage version: 2.2_rc88/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.10 media-libs/libgphoto2/libgphoto2-2.4.6.ebuild
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild?rev=1.10&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild?rev=1.10&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild?r1=1.9&r2=1.10
18
19 Index: libgphoto2-2.4.6.ebuild
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild,v
22 retrieving revision 1.9
23 retrieving revision 1.10
24 diff -u -r1.9 -r1.10
25 --- libgphoto2-2.4.6.ebuild 14 Jan 2010 16:44:03 -0000 1.9
26 +++ libgphoto2-2.4.6.ebuild 2 Oct 2010 14:16:28 -0000 1.10
27 @@ -1,6 +1,6 @@
28 # Copyright 1999-2010 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild,v 1.9 2010/01/14 16:44:03 jer Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.6.ebuild,v 1.10 2010/10/02 14:16:28 eva Exp $
32
33 # TODO
34 # 1. Track upstream bug --disable-docs does not work.
35 @@ -18,7 +18,7 @@
36 SLOT="0"
37 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
38
39 -IUSE="bonjour doc exif hal nls kernel_linux"
40 +IUSE="doc exif hal nls kernel_linux zeroconf"
41 RESTRICT="test"
42
43 # By default, drivers for all supported cameras will be compiled.
44 @@ -43,7 +43,7 @@
45
46 # libgphoto2 actually links to libtool
47 RDEPEND="virtual/libusb:0
48 - bonjour? ( || (
49 + zeroconf? ( || (
50 net-dns/avahi[mdnsresponder-compat]
51 net-misc/mDNSResponder ) )
52 exif? ( >=media-libs/libexif-0.5.9 )
53 @@ -105,7 +105,7 @@
54 econf \
55 --disable-docs \
56 --disable-gp2ddb \
57 - $(use_with bonjour) \
58 + $(use_with zeroconf bonjour) \
59 $(use_with hal) \
60 $(use_enable nls) \
61 $(use_with exif libexif) \
62
63
64
65 1.7 media-libs/libgphoto2/libgphoto2-2.4.8.ebuild
66
67 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild?rev=1.7&view=markup
68 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild?rev=1.7&content-type=text/plain
69 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild?r1=1.6&r2=1.7
70
71 Index: libgphoto2-2.4.8.ebuild
72 ===================================================================
73 RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild,v
74 retrieving revision 1.6
75 retrieving revision 1.7
76 diff -u -r1.6 -r1.7
77 --- libgphoto2-2.4.8.ebuild 5 Apr 2010 14:57:39 -0000 1.6
78 +++ libgphoto2-2.4.8.ebuild 2 Oct 2010 14:16:28 -0000 1.7
79 @@ -1,6 +1,6 @@
80 # Copyright 1999-2010 Gentoo Foundation
81 # Distributed under the terms of the GNU General Public License v2
82 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild,v 1.6 2010/04/05 14:57:39 armin76 Exp $
83 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.8.ebuild,v 1.7 2010/10/02 14:16:28 eva Exp $
84
85 # TODO
86 # 1. Track upstream bug --disable-docs does not work.
87 @@ -17,7 +17,7 @@
88 LICENSE="GPL-2"
89 SLOT="0"
90 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
91 -IUSE="bonjour doc examples exif hal nls kernel_linux"
92 +IUSE="doc examples exif hal nls kernel_linux zeroconf"
93
94 # ???
95 #RESTRICT="test"
96 @@ -44,7 +44,7 @@
97
98 # libgphoto2 actually links to libtool
99 RDEPEND="virtual/libusb:0
100 - bonjour? ( || (
101 + zeroconf? ( || (
102 net-dns/avahi[mdnsresponder-compat]
103 net-misc/mDNSResponder ) )
104 exif? ( >=media-libs/libexif-0.5.9 )
105 @@ -87,7 +87,7 @@
106 sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
107 fi
108
109 - # Fix USE=bonjour, bug #283332
110 + # Fix USE=zeroconf, bug #283332
111 epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch"
112
113 # Do not build test if not running make check, bug #226241
114 @@ -117,7 +117,7 @@
115 econf \
116 --disable-docs \
117 --disable-gp2ddb \
118 - $(use_with bonjour) \
119 + $(use_with zeroconf bonjour) \
120 $(use_with hal) \
121 $(use_enable nls) \
122 $(use_with exif libexif auto) \
123
124
125
126 1.173 media-libs/libgphoto2/ChangeLog
127
128 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.173&view=markup
129 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.173&content-type=text/plain
130 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.172&r2=1.173
131
132 Index: ChangeLog
133 ===================================================================
134 RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
135 retrieving revision 1.172
136 retrieving revision 1.173
137 diff -u -r1.172 -r1.173
138 --- ChangeLog 10 Sep 2010 18:25:46 -0000 1.172
139 +++ ChangeLog 2 Oct 2010 14:16:28 -0000 1.173
140 @@ -1,6 +1,12 @@
141 # ChangeLog for media-libs/libgphoto2
142 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
143 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.172 2010/09/10 18:25:46 ssuominen Exp $
144 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.173 2010/10/02 14:16:28 eva Exp $
145 +
146 + 02 Oct 2010; Gilles Dartiguelongue <eva@g.o>
147 + libgphoto2-2.4.6.ebuild, -libgphoto2-2.4.7-r2.ebuild,
148 + -files/libgphoto2-2.4.7-no-test-build.patch, libgphoto2-2.4.8.ebuild,
149 + -libgphoto2-2.4.8-r1.ebuild, libgphoto2-2.4.9.ebuild:
150 + Clean up old revisions. Rename bonjour to zeroconf, bug #283330.
151
152 10 Sep 2010; Samuli Suominen <ssuominen@g.o>
153 libgphoto2-2.4.9.ebuild, +files/libgphoto2-2.4.9-dnl.patch:
154
155
156
157 1.4 media-libs/libgphoto2/libgphoto2-2.4.9.ebuild
158
159 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild?rev=1.4&view=markup
160 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild?rev=1.4&content-type=text/plain
161 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild?r1=1.3&r2=1.4
162
163 Index: libgphoto2-2.4.9.ebuild
164 ===================================================================
165 RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild,v
166 retrieving revision 1.3
167 retrieving revision 1.4
168 diff -u -r1.3 -r1.4
169 --- libgphoto2-2.4.9.ebuild 10 Sep 2010 18:25:46 -0000 1.3
170 +++ libgphoto2-2.4.9.ebuild 2 Oct 2010 14:16:28 -0000 1.4
171 @@ -1,6 +1,6 @@
172 # Copyright 1999-2010 Gentoo Foundation
173 # Distributed under the terms of the GNU General Public License v2
174 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild,v 1.3 2010/09/10 18:25:46 ssuominen Exp $
175 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild,v 1.4 2010/10/02 14:16:28 eva Exp $
176
177 # TODO
178 # 1. Track upstream bug --disable-docs does not work.
179 @@ -17,7 +17,7 @@
180 LICENSE="GPL-2"
181 SLOT="0"
182 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
183 -IUSE="bonjour doc examples exif hal nls kernel_linux"
184 +IUSE="doc examples exif hal nls kernel_linux zeroconf"
185
186 # ???
187 #RESTRICT="test"
188 @@ -44,7 +44,7 @@
189
190 # libgphoto2 actually links to libtool
191 RDEPEND="virtual/libusb:0
192 - bonjour? ( || (
193 + zeroconf? ( || (
194 net-dns/avahi[mdnsresponder-compat]
195 net-misc/mDNSResponder ) )
196 exif? ( >=media-libs/libexif-0.5.9 )
197 @@ -87,7 +87,7 @@
198 sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
199 fi
200
201 - # Fix USE=bonjour, bug #283332
202 + # Fix USE=zeroconf, bug #283332
203 epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch"
204
205 # Do not build test if not running make check, bug #226241
206 @@ -122,7 +122,7 @@
207 econf \
208 --disable-docs \
209 --disable-gp2ddb \
210 - $(use_with bonjour) \
211 + $(use_with zeroconf bonjour) \
212 $(use_with hal) \
213 $(use_enable nls) \
214 $(use_with exif libexif auto) \