Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libgphoto2/
Date: Wed, 15 Feb 2017 20:38:40
Message-Id: 1487191036.bc1af9f2cea3da82e1195fe0423d4e9401729fca.leio@gentoo
1 commit: bc1af9f2cea3da82e1195fe0423d4e9401729fca
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 15 20:27:13 2017 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 15 20:37:16 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1af9f2
7
8 media-libs/libgphoto2: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 media-libs/libgphoto2/Manifest | 2 -
13 media-libs/libgphoto2/libgphoto2-2.5.11.ebuild | 208 ------------------------
14 media-libs/libgphoto2/libgphoto2-2.5.8.ebuild | 214 -------------------------
15 3 files changed, 424 deletions(-)
16
17 diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
18 index 997d124d73..c637649603 100644
19 --- a/media-libs/libgphoto2/Manifest
20 +++ b/media-libs/libgphoto2/Manifest
21 @@ -1,4 +1,2 @@
22 DIST libgphoto2-2.5.10.tar.bz2 6992591 SHA256 8d8668d432ba595c7466442aec2cf553bdf8782ec171291dbc65717c633a4ef2 SHA512 13f593e09e8428bf72fc783b4ddfd5fc418fcf42ebe17d05b44255458dbac956293fb189c48b609fba5586f39771d148a3541fa484ac51fd68c921f2f05ca18a WHIRLPOOL 9a1a87450cda0321ebc20d3a95d50ae1ab5a6f2a6083346cba15b9d5d4276e6ce1a84a6198f70d3cfa42cfacd3fe004a41dd7dd866047094ae6e9e54520883ef
23 -DIST libgphoto2-2.5.11.tar.bz2 6986123 SHA256 7fb61486d6c153fbbadc57b8bada8528abd289f46175bfaab09350f33f38e0aa SHA512 5a84a6ba4fb0c44dd852508bd9a7672ea643547b4a8312cacba92cfd04f3c8f0cc08fdd79fc1aa79fc435f59efadeb575000ef25087aa02ec5c3ed59f0137db2 WHIRLPOOL 09b591f0a1683d0bb81117422f6c7d22e8d3a3c979ab0b825e6c857ee45ae1c7d1305ddafbf6607b3cd8708c3f7ff1c93d660d4dd4ccaea691896d62f982ac3a
24 DIST libgphoto2-2.5.12.tar.bz2 6974928 SHA256 b9bb28990fde45ac385e4851a07dbad2e1250404b535b0a3a3b898bb431e4e2e SHA512 aa47e9be64579e0691f58b775ca4d80f3ed65763e6d832cba9fd28603ba2dce4c9b5b3291f38dad399b69393d325896f67f2bde622062ca38b9b138f48f12336 WHIRLPOOL b690d5b55a7dc11cdd04e694e4ec4a44c0b3801c3e778610c32b414fd7e6e89f1ef49ac1c9b5f36a57d35afbb94c08e4e4f8cb9663c4106658eaaeaea1ddf5bd
25 -DIST libgphoto2-2.5.8.tar.bz2 6941251 SHA256 031a262e342fae43f724afe66787947ce1fb483277dfe5a8cf1fbe92c58e27b6 SHA512 142957ce3c80e8ac091005ba51b24fc0b199aa46f1a196cb0cfd71e0101d6020f4dd0ec2deb7209ef9ff7b946453b5fd9faf944047c07eb9962d8d52c876b1f4 WHIRLPOOL 0a214237cc646dcf3902e065eae862a4d9b8a9df533e39a5508e41dabd837060a135fac79edb28394ab4638e86513abdeee6ca940ca6fe744833c94432e336c1
26
27 diff --git a/media-libs/libgphoto2/libgphoto2-2.5.11.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.11.ebuild
28 deleted file mode 100644
29 index fe7e43b331..0000000000
30 --- a/media-libs/libgphoto2/libgphoto2-2.5.11.ebuild
31 +++ /dev/null
32 @@ -1,208 +0,0 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -# TODO
38 -# 1. Track upstream bug --disable-docs does not work.
39 -# https://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
40 -
41 -EAPI=6
42 -inherit eutils multilib multilib-minimal udev user
43 -
44 -DESCRIPTION="Library that implements support for numerous digital cameras"
45 -HOMEPAGE="http://www.gphoto.org/"
46 -SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
47 -
48 -LICENSE="GPL-2"
49 -
50 -# FIXME: should we also bump for libgphoto2_port.so soname version?
51 -SLOT="0/6" # libgphoto2.so soname version
52 -
53 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
54 -IUSE="doc examples exif gd jpeg nls serial"
55 -
56 -# By default, drivers for all supported cameras will be compiled.
57 -# If you want to only compile for specific camera(s), set CAMERAS
58 -# environment to a space-separated list (no commas) of drivers that
59 -# you want to build.
60 -IUSE_CAMERAS="
61 - adc65 agfa_cl20 aox ax203
62 - barbie
63 - canon casio_qv clicksmart310
64 - digigr8 digita dimagev dimera3500 directory
65 - enigma13
66 - fuji
67 - gsmart300
68 - hp215
69 - iclick
70 - jamcam jd11 jl2005a jl2005c
71 - kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
72 - largan lg_gsm
73 - mars mustek
74 - panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
75 - ricoh ricoh_g3
76 - samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
77 - toshiba_pdrm11 topfield tp6801
78 -"
79 -
80 -for camera in ${IUSE_CAMERAS}; do
81 - IUSE="${IUSE} cameras_${camera}"
82 -done
83 -
84 -# libgphoto2 actually links to libltdl
85 -RDEPEND="
86 - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
87 - dev-libs/libltdl:0[${MULTILIB_USEDEP}]
88 - >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
89 - cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
90 - cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
91 - exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
92 - gd? ( >=media-libs/gd-2.0.35-r4[jpeg=,${MULTILIB_USEDEP}] )
93 - jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
94 - serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
95 - !<sys-fs/udev-201
96 -"
97 -DEPEND="${RDEPEND}
98 - dev-util/gtk-doc-am
99 - sys-devel/flex
100 - >=sys-devel/gettext-0.14.1
101 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
102 - doc? ( app-doc/doxygen )
103 -"
104 -
105 -MULTILIB_CHOST_TOOLS=(
106 - /usr/bin/gphoto2-port-config
107 - /usr/bin/gphoto2-config
108 -)
109 -
110 -pkg_pretend() {
111 - if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
112 - einfo "No camera drivers will be built since you did not specify any."
113 - fi
114 -}
115 -
116 -pkg_setup() {
117 - enewgroup plugdev
118 -}
119 -
120 -src_prepare() {
121 - default
122 -
123 - # Handle examples ourselves
124 - sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
125 - || die "examples sed failed"
126 -
127 - sed -e 's/sleep 2//' -i configure || die
128 -}
129 -
130 -multilib_src_configure() {
131 - local cameras
132 - local cam
133 - local cam_warn=no
134 - for cam in ${IUSE_CAMERAS} ; do
135 - if use "cameras_${cam}"; then
136 - cameras="${cameras},${cam}"
137 - else
138 - cam_warn=yes
139 - fi
140 - done
141 -
142 - if [ "${cam_warn}" = "yes" ]; then
143 - [ -z "${cameras}" ] || cameras="${cameras:1}"
144 - einfo "Enabled camera drivers: ${cameras:-none}"
145 - einfo "Upstream will not support you if you do not compile all camera drivers first"
146 - else
147 - cameras="all"
148 - einfo "Enabled camera drivers: all"
149 - fi
150 -
151 - local myconf
152 - use doc || myconf=( ac_cv_path_DOXYGEN=false )
153 -
154 - # Upstream doesn't default to --enable-option-checking due having another
155 - # configure in libgphoto2_port/ that also needs to be checked on every bump
156 - #
157 - # Serial port uses either lockdev or ttylock, but we don't have ttylock
158 - # --with-doc-dir needed to prevent duplicate docs installation, bug #586842
159 - ECONF_SOURCE=${S} \
160 - econf \
161 - --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
162 - --disable-docs \
163 - --disable-gp2ddb \
164 - $(use_enable nls) \
165 - $(use_with exif libexif auto) \
166 - $(use_with gd) \
167 - $(use_with jpeg) \
168 - $(use_enable serial) \
169 - $(use_enable serial lockdev) \
170 - --with-libusb=no \
171 - --with-libusb-1.0=auto \
172 - --disable-ttylock \
173 - --with-camlibs=${cameras} \
174 - --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
175 - --with-rpmbuild=$(type -P true) \
176 - udevscriptdir="$(get_udevdir)" \
177 - "${myconf[@]}"
178 -}
179 -
180 -multilib_src_compile() {
181 - default
182 -
183 - if multilib_is_native_abi && use doc; then
184 - doxygen doc/Doxyfile || die "Documentation generation failed"
185 - fi
186 -}
187 -
188 -multilib_src_install_all() {
189 - prune_libtool_files --modules
190 -
191 - einstalldocs
192 - dodoc TESTERS MAINTAINERS HACKING
193 -
194 - if use examples; then
195 - insinto /usr/share/doc/${PF}/examples
196 - doins examples/README examples/*.c examples/*.h
197 - fi
198 -
199 - # FIXME: fixup autoconf bug #????
200 - if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
201 - rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
202 - fi
203 - # end fixup
204 -
205 - local udev_rules cam_list
206 - udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
207 - cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
208 -
209 - if [ -x "${ED}"${cam_list} ]; then
210 - # Let print-camera-list find libgphoto2.so
211 - export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
212 - # Let libgphoto2 find its camera-modules
213 - export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
214 -
215 - einfo "Generating UDEV-rules ..."
216 - mkdir -p "${ED}"/${udev_rules%/*}
217 - echo -e "# do not edit this file, it will be overwritten on update\n#" \
218 - > "${ED}"/${udev_rules}
219 - "${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \
220 - || die "failed to create udev-rules"
221 - else
222 - eerror "Unable to find print-camera-list"
223 - eerror "and therefore unable to generate hotplug usermap."
224 - eerror "You will have to manually generate it by running:"
225 - eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}"
226 - fi
227 -
228 -}
229 -
230 -pkg_postinst() {
231 - if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" ; then
232 - elog "Don't forget to add yourself to the plugdev group "
233 - elog "if you want to be able to access your camera."
234 - fi
235 -
236 - local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
237 - if [[ -f ${old_udev_rules} ]]; then
238 - rm -f "${old_udev_rules}"
239 - fi
240 -}
241
242 diff --git a/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild
243 deleted file mode 100644
244 index d748cf0c39..0000000000
245 --- a/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild
246 +++ /dev/null
247 @@ -1,214 +0,0 @@
248 -# Copyright 1999-2017 Gentoo Foundation
249 -# Distributed under the terms of the GNU General Public License v2
250 -# $Id$
251 -
252 -# TODO
253 -# 1. Track upstream bug --disable-docs does not work.
254 -# https://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
255 -
256 -EAPI="5"
257 -
258 -inherit eutils multilib multilib-minimal udev user
259 -
260 -DESCRIPTION="Library that implements support for numerous digital cameras"
261 -HOMEPAGE="http://www.gphoto.org/"
262 -SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
263 -
264 -LICENSE="GPL-2"
265 -
266 -# FIXME: should we also bump for libgphoto2_port.so soname version?
267 -SLOT="0/6" # libgphoto2.so soname version
268 -
269 -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
270 -IUSE="doc examples exif gd jpeg nls serial"
271 -
272 -# By default, drivers for all supported cameras will be compiled.
273 -# If you want to only compile for specific camera(s), set CAMERAS
274 -# environment to a space-separated list (no commas) of drivers that
275 -# you want to build.
276 -IUSE_CAMERAS="
277 - adc65 agfa_cl20 aox ax203
278 - barbie
279 - canon casio_qv clicksmart310
280 - digigr8 digita dimagev dimera3500 directory
281 - enigma13
282 - fuji
283 - gsmart300
284 - hp215
285 - iclick
286 - jamcam jd11 jl2005a jl2005c
287 - kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
288 - largan lg_gsm
289 - mars mustek
290 - panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
291 - ricoh ricoh_g3
292 - samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
293 - toshiba_pdrm11 topfield tp6801
294 -"
295 -
296 -for camera in ${IUSE_CAMERAS}; do
297 - IUSE="${IUSE} cameras_${camera}"
298 -done
299 -
300 -# libgphoto2 actually links to libltdl
301 -RDEPEND="
302 - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
303 - dev-libs/libltdl:0[${MULTILIB_USEDEP}]
304 - >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
305 - cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
306 - cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
307 - exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
308 - gd? ( >=media-libs/gd-2.0.35-r4[jpeg=,${MULTILIB_USEDEP}] )
309 - jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
310 - serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
311 - !<sys-fs/udev-175
312 - abi_x86_32? (
313 - !<=app-emulation/emul-linux-x86-medialibs-20140508
314 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
315 - )
316 -"
317 -DEPEND="${RDEPEND}
318 - dev-util/gtk-doc-am
319 - sys-devel/flex
320 - >=sys-devel/gettext-0.14.1
321 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
322 - doc? ( app-doc/doxygen )
323 -"
324 -
325 -MULTILIB_CHOST_TOOLS=(
326 - /usr/bin/gphoto2-port-config
327 - /usr/bin/gphoto2-config
328 -)
329 -
330 -pkg_pretend() {
331 - if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
332 - einfo "No camera drivers will be built since you did not specify any."
333 - fi
334 -}
335 -
336 -pkg_setup() {
337 - enewgroup plugdev
338 -}
339 -
340 -src_prepare() {
341 - # Handle examples ourselves
342 - sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
343 - || die "examples sed failed"
344 -
345 - # If running eautoreconf
346 - # sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die
347 - sed -e 's/sleep 2//' -i configure || die
348 -}
349 -
350 -multilib_src_configure() {
351 - local cameras
352 - local cam
353 - local cam_warn=no
354 - for cam in ${IUSE_CAMERAS} ; do
355 - if use "cameras_${cam}"; then
356 - cameras="${cameras},${cam}"
357 - else
358 - cam_warn=yes
359 - fi
360 - done
361 -
362 - if [ "${cam_warn}" = "yes" ]; then
363 - [ -z "${cameras}" ] || cameras="${cameras:1}"
364 - einfo "Enabled camera drivers: ${cameras:-none}"
365 - ewarn "Upstream will not support you if you do not compile all camera drivers first"
366 - else
367 - cameras="all"
368 - einfo "Enabled camera drivers: all"
369 - fi
370 -
371 - local myconf
372 - use doc || myconf=( ac_cv_path_DOXYGEN=false )
373 -
374 - # Upstream doesn't default to --enable-option-checking due having another
375 - # configure in libgphoto2_port/ that also needs to be checked on every bump
376 - #
377 - # Serial port uses either lockdev or ttylock, but we don't have ttylock
378 - ECONF_SOURCE=${S} \
379 - econf \
380 - --disable-docs \
381 - --disable-gp2ddb \
382 - $(use_enable nls) \
383 - $(use_with exif libexif auto) \
384 - $(use_with gd) \
385 - $(use_with jpeg) \
386 - $(use_enable serial) \
387 - $(use_enable serial lockdev) \
388 - --with-libusb=no \
389 - --with-libusb-1.0=auto \
390 - --disable-ttylock \
391 - --with-camlibs=${cameras} \
392 - --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
393 - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
394 - --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
395 - --with-rpmbuild=$(type -P true) \
396 - udevscriptdir="$(get_udevdir)" \
397 - "${myconf[@]}"
398 -}
399 -
400 -multilib_src_compile() {
401 - default
402 -
403 - if multilib_is_native_abi && use doc; then
404 - doxygen doc/Doxyfile || die "Documentation generation failed"
405 - fi
406 -}
407 -
408 -multilib_src_install_all() {
409 - prune_libtool_files --modules
410 -
411 - # Clean up unwanted files
412 - rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
413 - dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING
414 -
415 - if use examples; then
416 - insinto /usr/share/doc/${PF}/examples
417 - doins examples/README examples/*.c examples/*.h
418 - fi
419 -
420 - # FIXME: fixup autoconf bug #????
421 - if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
422 - rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
423 - fi
424 - # end fixup
425 -
426 - local udev_rules cam_list
427 - udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
428 - cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
429 -
430 - if [ -x "${ED}"${cam_list} ]; then
431 - # Let print-camera-list find libgphoto2.so
432 - export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
433 - # Let libgphoto2 find its camera-modules
434 - export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
435 -
436 - einfo "Generating UDEV-rules ..."
437 - mkdir -p "${ED}"/${udev_rules%/*}
438 - echo -e "# do not edit this file, it will be overwritten on update\n#" \
439 - > "${ED}"/${udev_rules}
440 - "${ED}"${cam_list} udev-rules version 175 group plugdev >> "${ED}"/${udev_rules} \
441 - || die "failed to create udev-rules"
442 - else
443 - eerror "Unable to find print-camera-list"
444 - eerror "and therefore unable to generate hotplug usermap."
445 - eerror "You will have to manually generate it by running:"
446 - eerror " ${cam_list} udev-rules version 175 group plugdev > ${udev_rules}"
447 - fi
448 -
449 -}
450 -
451 -pkg_postinst() {
452 - if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" ; then
453 - elog "Don't forget to add yourself to the plugdev group "
454 - elog "if you want to be able to access your camera."
455 - fi
456 -
457 - local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
458 - if [[ -f ${old_udev_rules} ]]; then
459 - rm -f "${old_udev_rules}"
460 - fi
461 -}