From 09351e78166b5e864197c4456ebae3f89dd0bed9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Jan 2019 10:09:44 +0000 Subject: gentoo resync : 22.01.2019 --- media-libs/libgphoto2/Manifest | 4 +- media-libs/libgphoto2/libgphoto2-2.5.14.ebuild | 211 ------------------------- media-libs/libgphoto2/libgphoto2-2.5.16.ebuild | 4 +- 3 files changed, 3 insertions(+), 216 deletions(-) delete mode 100644 media-libs/libgphoto2/libgphoto2-2.5.14.ebuild (limited to 'media-libs/libgphoto2') diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index fdde75373675..cfe2cc56f517 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,7 +1,5 @@ -DIST libgphoto2-2.5.14.tar.bz2 6992238 BLAKE2B 6173ada55f032ae2b630db5324c87ad9bebb3fda485fe9bc89a042d192a136a73596a92b1df3c762ffd7168cf91ca12f1fa2998e154152eb19cfd9b780ee2b2d SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688 DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f655620a88fb2df2220fbe9337eb0f61b7babd9d36e1f1d58f45ca617c57feab93e9714228eae54c742385c3e4b0fc3667ff5 SHA512 13364a8fdfe137a21ebf04dfd2b30b20c7fb652e11e1b98cd06176e9a1576ef8f67121523111395100ed39d1d3e6e5d6d458b86d58502f7056a1c06a5623640a -EBUILD libgphoto2-2.5.14.ebuild 6227 BLAKE2B 8190fdd390cd567388bf0648ce593e50c38778f5006a096bb0f8bcec061b9f1c7b7c7d369dffebb0bb98229c1c588c592f8d9ba2948c81de1b0efb97ed28b037 SHA512 361a169bc125a3833c2c6f795c908a7c3cce8ecc21d3961d4a8e556048be3d588b5776134900bd16eeaaeae032966fc4b20f55f1c3c5d289ced3c7029af391d3 -EBUILD libgphoto2-2.5.16.ebuild 6225 BLAKE2B 84fea70c074baf5e3327ae394b2d63e9198fb7782f5e07a1a7b4cbcd5b38dd7b24f69359665971e6799271bbd65396af6c772eb6bf3847c81ad4c1e4fbc56c37 SHA512 b5ef7e46b153fc0626cfd7623e3d95b721315776be4a26c5e52b4f59fd095ba61b4af16701e1825676509e1f9eccd65a4a19ded9b1f0440ee8c382c9a290f8db +EBUILD libgphoto2-2.5.16.ebuild 6224 BLAKE2B 1476fe208ddb0d72622e532722173f743aad470b19bf2e7bfc6d0fbd3dfcbe0da994f15297a79f95d457e7d5d48f676cb1a265b75ae5a555554273ca5e2f2bc5 SHA512 4129d67158d3f443a407e979d11fbe563b7c759e5c742e1f6fec79edbadc085e482e54e5c6152ab45e7998149ac4dc8b2c73dd29d697b5d384428403c7924dc3 EBUILD libgphoto2-2.5.20.ebuild 6233 BLAKE2B c87d500b7401ccf5d140eb5fc42deb98a2d6a96d6d4c0c0b777620c03183fb424d82221ce5307574344ed369f155d6aa53cb7c70016a5c69f28176f15cc0ddb9 SHA512 8aa7c58e779b1a4bc548ef2400f707c9e5aca4954232279e6435c79f44f357df8dbee6da906a0f57d806d79a2727cd7a208109ced955d0184ad5b533566165da MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0 diff --git a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild deleted file mode 100644 index 85c31936976e..000000000000 --- a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# TODO -# 1. Track upstream bug --disable-docs does not work. -# https://sourceforge.net/p/gphoto/bugs/643/ - -EAPI=6 -inherit eutils multilib multilib-minimal udev user - -DESCRIPTION="Library that implements support for numerous digital cameras" -HOMEPAGE="http://www.gphoto.org/" -SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2" - -LICENSE="GPL-2" - -# FIXME: should we also bump for libgphoto2_port.so soname version? -SLOT="0/6" # libgphoto2.so soname version - -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="doc examples exif gd jpeg nls serial" - -# By default, drivers for all supported cameras will be compiled. -# If you want to only compile for specific camera(s), set CAMERAS -# environment to a space-separated list (no commas) of drivers that -# you want to build. -IUSE_CAMERAS=" - adc65 agfa_cl20 aox ax203 - barbie - canon casio_qv clicksmart310 - digigr8 digita dimagev dimera3500 directory - enigma13 - fuji - gsmart300 - hp215 - iclick - jamcam jd11 jl2005a jl2005c - kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 - largan lg_gsm - mars mustek - panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 - ricoh ricoh_g3 - samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z - toshiba_pdrm11 topfield tp6801 -" - -for camera in ${IUSE_CAMERAS}; do - IUSE="${IUSE} +cameras_${camera}" -done - -# libgphoto2 actually links to libltdl -RDEPEND=" - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - dev-libs/libltdl:0[${MULTILIB_USEDEP}] - >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] - cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] ) - cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] ) - exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] ) - gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] ) - jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) - serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] ) - ! /dev/null 2>&1; then - einfo "No camera drivers will be built since you did not specify any." - fi -} - -pkg_setup() { - enewgroup plugdev -} - -src_prepare() { - default - - # Handle examples ourselves - sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ - || die "examples sed failed" - - sed -e 's/sleep 2//' -i configure || die -} - -multilib_src_configure() { - local myconf - use doc || myconf=( ac_cv_path_DOXYGEN=false ) - - # Upstream doesn't default to --enable-option-checking due having another - # configure in libgphoto2_port/ that also needs to be checked on every bump - # - # Serial port uses either lockdev or ttylock, but we don't have ttylock - # --with-doc-dir needed to prevent duplicate docs installation, bug #586842 - ECONF_SOURCE=${S} \ - econf \ - --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --disable-docs \ - --disable-gp2ddb \ - $(use_enable nls) \ - $(use_with exif libexif auto) \ - $(use_with gd) \ - $(use_with jpeg) \ - $(use_enable serial) \ - $(use_enable serial lockdev) \ - --with-libusb=no \ - --with-libusb-1.0=auto \ - --disable-ttylock \ - --with-camlibs=${cameras} \ - --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \ - --with-rpmbuild=$(type -P true) \ - udevscriptdir="$(get_udevdir)" \ - "${myconf[@]}" -} - -src_configure() { - local cameras - local cam - local cam_warn=no - for cam in ${IUSE_CAMERAS} ; do - if use "cameras_${cam}"; then - cameras="${cameras},${cam}" - else - cam_warn=yes - fi - done - - if [ "${cam_warn}" = "yes" ]; then - [ -z "${cameras}" ] || cameras="${cameras:1}" - einfo "Enabled camera drivers: ${cameras:-none}" - einfo "Upstream will not support you if you do not compile all camera drivers first" - else - cameras="all" - einfo "Enabled camera drivers: all" - fi - - multilib-minimal_src_configure -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc; then - doxygen doc/Doxyfile || die "Documentation generation failed" - fi -} - -multilib_src_install_all() { - prune_libtool_files --modules - - einstalldocs - dodoc TESTERS MAINTAINERS HACKING - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/README examples/*.c examples/*.h - fi - - # FIXME: fixup autoconf bug #???? - if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then - rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html" - fi - # end fixup - - local udev_rules cam_list - udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules" - cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list" - - if [ -x "${ED}"${cam_list} ]; then - # Let print-camera-list find libgphoto2.so - export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" - # Let libgphoto2 find its camera-modules - export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}" - - einfo "Generating UDEV-rules ..." - mkdir -p "${ED}"/${udev_rules%/*} - echo -e "# do not edit this file, it will be overwritten on update\n#" \ - > "${ED}"/${udev_rules} - "${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \ - || die "failed to create udev-rules" - else - eerror "Unable to find print-camera-list" - eerror "and therefore unable to generate hotplug usermap." - eerror "You will have to manually generate it by running:" - eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}" - fi - -} - -pkg_postinst() { - if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to access your camera." - fi - - local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules - if [[ -f ${old_udev_rules} ]]; then - rm -f "${old_udev_rules}" - fi -} diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild index 82b2906c70cd..2575e4781e8c 100644 --- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # TODO @@ -17,7 +17,7 @@ LICENSE="GPL-2" # FIXME: should we also bump for libgphoto2_port.so soname version? SLOT="0/6" # libgphoto2.so soname version -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="doc examples exif gd jpeg nls serial" # By default, drivers for all supported cameras will be compiled. -- cgit v1.2.3